From 1abab9db944af8894682f961fee7ff4dab69519c Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Tue, 18 Mar 2025 21:57:45 +1100
Subject: [PATCH] Move DN export to its own modal, leveraging page-modal

---
 resources/views/frames/dn.blade.php           | 100 +++++++-----------
 resources/views/modals/entry-delete.blade.php |   2 +-
 resources/views/modals/entry-export.blade.php |  37 +++++++
 routes/web.php                                |   1 +
 4 files changed, 80 insertions(+), 60 deletions(-)
 create mode 100644 resources/views/modals/entry-export.blade.php

diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index b0190fbe..0140ace0 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -11,7 +11,7 @@
 				<ul class="nav">
 					@if(isset($page_actions) && $page_actions->contains('export'))
 						<li>
-							<span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
+							<span id="entry-export" data-bs-toggle="modal" data-bs-target="#page-modal">
 								<button class="btn btn-outline-dark p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Export')"><i class="fas fa-fw fa-download fs-5"></i></button>
 							</span>
 						</li>
@@ -114,27 +114,6 @@
 		</div>
 	</div>
 
-	<!-- EXPORT -->
-	<div class="modal fade" id="entry_export-modal" tabindex="-1" aria-labelledby="entry_export-label" aria-hidden="true">
-		<div class="modal-dialog modal-lg modal-fullscreen-lg-down">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h1 class="modal-title fs-5" id="entry_export-label">LDIF for {{ $dn }}</h1>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				</div>
-
-				<div class="modal-body">
-					<div id="entry_export"><div class="fa-3x"><i class="fas fa-spinner fa-pulse fa-sm"></i></div></div>
-				</div>
-
-				<div class="modal-footer">
-					<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-					<button type="button" class="btn btn-sm btn-primary" id="entry_export-download">Download</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
 	@if($up=$o->getObject('userpassword'))
 		<!-- CHECK USERPASSWORD -->
 		<div class="modal fade" id="userpassword_check-modal" tabindex="-1" aria-labelledby="userpassword_check-label" aria-hidden="true">
@@ -177,18 +156,6 @@
 		var dn = '{{ $o->getDNSecure() }}';
 		var oc = {!! $o->getObject('objectclass')->values !!};
 
-		function download(filename,text) {
-			var element = document.createElement('a');
-
-			element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
-			element.setAttribute('download', filename);
-			element.style.display = 'none';
-			document.body.appendChild(element);
-
-			element.click();
-			document.body.removeChild(element);
-		}
-
 		function editmode() {
 			$('#dn-edit input[name="dn"]').val(dn);
 
@@ -231,7 +198,7 @@
 						$('#newattrs').append(data);
 					},
 					error: function(e) {
-						if (e.status != 412)
+						if (e.status !== 412)
 							alert('That didnt work? Please try again....');
 					},
 					url: '{{ url('entry/attr/add') }}/'+item.target.value,
@@ -249,13 +216,6 @@
 					$('#newattr-select').remove();
 			});
 
-			$('#entry_export-download').on('click',function(item) {
-				item.preventDefault();
-
-				let ldif = $('#entry_export').find('pre:first'); // update this selector in your local version
-				download('ldap-export.ldif',ldif.html());
-			});
-
 			$('#page-modal').on('shown.bs.modal',function(item) {
 				var that = $(this).find('.modal-content');
 
@@ -273,7 +233,44 @@
 								that.empty().html(data);
 							},
 							error: function(e) {
-								if (e.status != 412)
+								if (e.status !== 412)
+									alert('That didnt work? Please try again....');
+							},
+						})
+						break;
+
+					case 'entry-export':
+						$.ajax({
+							method: 'GET',
+							url: '{{ url('modal/export') }}/'+dn,
+							dataType: 'html',
+							cache: false,
+							beforeSend: function() {
+								that.empty().append('<span class="p-3"><i class="fas fa-3x fa-spinner fa-pulse"></i></span>');
+							},
+							success: function(data) {
+								that.empty().html(data);
+
+								that = $('#entry_export');
+
+								$.ajax({
+									type: 'GET',
+									url: '{{ url('entry/export') }}/'+dn,
+									cache: false,
+									beforeSend: function() {
+										that.empty().append('<span class="p-3"><i class="fas fa-3x fa-spinner fa-pulse"></i></span>');
+									},
+									success: function(data) {
+										that.empty().append(data);
+									},
+									error: function(e) {
+										if (e.status !== 412)
+											alert('That didnt work? Please try again....');
+									},
+								})
+							},
+							error: function(e) {
+								if (e.status !== 412)
 									alert('That didnt work? Please try again....');
 							},
 						})
@@ -284,21 +281,6 @@
 				}
 			});
 
-			$('#entry_export-modal').on('shown.bs.modal',function() {
-				$.ajax({
-					type: 'GET',
-					success: function(data) {
-						$('#entry_export').empty().append(data);
-					},
-					error: function(e) {
-						if (e.status != 412)
-							alert('That didnt work? Please try again....');
-					},
-					url: '{{ url('entry/export') }}/'+dn,
-					cache: false
-				})
-			})
-
 			@if($up)
 				$('button[id=userpassword_check-submit]').on('click',function(item) {
 					var that = $(this);
@@ -342,7 +324,7 @@
 							})
 						},
 						error: function(e) {
-							if (e.status != 412)
+							if (e.status !== 412)
 								alert('That didnt work? Please try again....');
 						},
 						url: '{{ url('entry/password/check') }}',
diff --git a/resources/views/modals/entry-delete.blade.php b/resources/views/modals/entry-delete.blade.php
index f6d54b95..fcea1232 100644
--- a/resources/views/modals/entry-delete.blade.php
+++ b/resources/views/modals/entry-delete.blade.php
@@ -1,5 +1,5 @@
 <div class="modal-header bg-danger text-white">
-	<h1 class="modal-title fs-5" id="entry_export-label">
+	<h1 class="modal-title fs-5">
 		<i class="fas fa-fw fa-exclamation-triangle"></i> <strong>@lang('WARNING')</strong>: @lang('Delete') <strong>{{ Crypt::decryptString($dn) }}</strong>
 	</h1>
 	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
diff --git a/resources/views/modals/entry-export.blade.php b/resources/views/modals/entry-export.blade.php
new file mode 100644
index 00000000..ac507950
--- /dev/null
+++ b/resources/views/modals/entry-export.blade.php
@@ -0,0 +1,37 @@
+<div class="modal-header bg-dark text-white">
+	<h1 class="modal-title fs-5">
+		LDIF for {{ Crypt::decryptString($dn) }}
+	</h1>
+</div>
+
+<div class="modal-body">
+	<div id="entry_export"></div>
+</div>
+
+<div class="modal-footer">
+	<x-modal.close/>
+	<button id="entry_export-download" type="button" class="btn btn-sm btn-primary">Download</button>
+</div>
+
+<script>
+	function download(filename,text) {
+		var element = document.createElement('a');
+
+		element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
+		element.setAttribute('download', filename);
+		element.style.display = 'none';
+		document.body.appendChild(element);
+
+		element.click();
+		document.body.removeChild(element);
+	}
+
+	$(document).ready(function() {
+		$('button[id=entry_export-download]').on('click',function(item) {
+			item.preventDefault();
+
+			let ldif = $('#entry_export').find('pre:first');
+			download('ldap-export.ldif',ldif.html());
+		});
+	});
+</script>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 6d625d76..8498ca0f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -54,5 +54,6 @@ Route::controller(HomeController::class)->group(function() {
 		Route::post('import/process/{type}','import');
 
 		Route::view('modal/delete/{dn}','modals.entry-delete');
+		Route::view('modal/export/{dn}','modals.entry-export');
 	});
 });
\ No newline at end of file