Merge pull request #58 from firewall004/fix-export-url-params

fix: Export button URL: Merge new with existing query params
yajra · Apr 16, 2024 · e692c62 · e692c62
2 parents 443162b + c1f54e0
commit e692c62
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/src/resources/views/export-button.blade.php b/src/resources/views/export-button.blade.php
@@ -5,15 +5,25 @@
                 var oTable = LaravelDataTables['{{ $tableId }}'];
                 var baseUrl = oTable.ajax.url() === '' ? window.location.toString() : oTable.ajax.url();
 
-                var params = new URLSearchParams({
-                    action: 'exportQueue',
-                    exportType: '{{$fileType}}',
-                    sheetName: '{{$sheetName}}',
-                    emailTo: '{{urlencode($emailTo)}}',
-                });
+                var url = new URL(baseUrl);
+                var searchParams = new URLSearchParams(url.search);
+                searchParams.set('action', 'exportQueue');
+                searchParams.set('exportType', '{{$fileType}}');
+                searchParams.set('sheetName', '{{$sheetName}}');
+                searchParams.set('emailTo', '{{urlencode($emailTo)}}');
+
+                var tableParams = $.param(oTable.ajax.params());
+                if (tableParams) {
+                    var tableSearchParams = new URLSearchParams(tableParams);
+                    tableSearchParams.forEach((value, key) => {
+                        searchParams.append(key, value);
+                    });
+                }
+
+                url.search = searchParams.toString();
 
-                $.get(baseUrl + '?' + params.toString() + '&' + $.param(oTable.ajax.params())).then(function(exportId) {
-                    $wire.export(exportId)
+                $.get(url.toString()).then(function(exportId) {
+                    $wire.export(exportId);
                 }).catch(function(error) {
                     $wire.exportFinished = true;
                     $wire.exporting = false;