Merge pull request #1256 from hargata/Hargata/cleanup.delete

hargata · web-flow · commit 6af7dbf94609 · 2026-02-09T09:38:23.000-07:00
Consolidate all delete swals into a single function.
diff --git a/Views/Admin/Index.cshtml b/Views/Admin/Index.cshtml
@@ -147,13 +147,7 @@
     }
     function deleteUser(userId) {
         event.stopPropagation();
-        Swal.fire({
-            title: "Confirm Deletion?",
-            text: "Deleted Users cannot be restored.",
-            showCancelButton: true,
-            confirmButtonText: "Delete",
-            confirmButtonColor: "#dc3545"
-        }).then((result) => {
+        confirmDelete("Deleted Users cannot be restored.",(result) => {
             if (result.isConfirmed) {
                 $.post(`/Admin/DeleteUser?userId=${userId}`, function (data) {
                     if (data) {
diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js
@@ -43,13 +43,7 @@ function hideAddCollisionRecordModal() {
 }
 function deleteCollisionRecord(collisionRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Repair Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Repair Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteCollisionRecordById?collisionRecordId=${collisionRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/equipmentrecord.js b/wwwroot/js/equipmentrecord.js
@@ -39,13 +39,7 @@ function hideAddEquipmentRecordModal() {
 }
 function deleteEquipmentRecord(equipmentRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Equipment Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Equipment Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteEquipmentRecordById?equipmentRecordId=${equipmentRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/garage.js b/wwwroot/js/garage.js
@@ -130,13 +130,7 @@ function deleteCalendarReminderRecord(reminderRecordId, e) {
         event.stopPropagation();
     }
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Reminders cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Reminders cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteReminderRecordById?reminderRecordId=${reminderRecordId}`, function (data) {
                 if (data.success) {
@@ -357,13 +351,7 @@ function deleteVehicles(vehicleIds) {
         return;
     }
     let messageWording = vehicleIds.length > 1 ? `these ${vehicleIds.length} vehicles` : 'this vehicle';
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: `This will also delete all data tied to ${messageWording}. Deleted Vehicles and their associated data cannot be restored.`,
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete(`This will also delete all data tied to ${messageWording}. Deleted Vehicles and their associated data cannot be restored.`, (result) => {
         if (result.isConfirmed) {
             $.post('/Vehicle/DeleteVehicles', { vehicleIds: vehicleIds }, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js
@@ -43,13 +43,7 @@ function hideAddGasRecordModal() {
 }
 function deleteGasRecord(gasRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Gas Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Gas Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteGasRecordById?gasRecordId=${gasRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/inspectionrecord.js b/wwwroot/js/inspectionrecord.js
@@ -191,13 +191,7 @@ function saveInspectionRecordTemplateToVehicle(isEdit) {
 }
 function deleteInspectionRecordTemplate(inspectionRecordTemplateId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Inspection Templates cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Inspection Templates cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteInspectionRecordTemplateById?inspectionRecordTemplateId=${inspectionRecordTemplateId}`, function (data) {
                 $("#workAroundInput").hide();
@@ -413,13 +407,7 @@ function showEditInspectionRecordModal(inspectionRecordId) {
 }
 function deleteInspectionRecord(inspectionRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Inspection Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Inspection Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteInspectionRecordById?inspectionRecordId=${inspectionRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/note.js b/wwwroot/js/note.js
@@ -39,13 +39,7 @@ function hideAddNoteModal() {
 }
 function deleteNote(noteId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Notes cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Notes cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteNoteById?noteId=${noteId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/odometerrecord.js b/wwwroot/js/odometerrecord.js
@@ -43,13 +43,7 @@ function hideAddOdometerRecordModal() {
 }
 function deleteOdometerRecord(odometerRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Odometer Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Odometer Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteOdometerRecordById?odometerRecordId=${odometerRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/planrecord.js b/wwwroot/js/planrecord.js
@@ -79,13 +79,7 @@ function hideAddPlanRecordModal() {
 }
 function deletePlanRecord(planRecordId, noModal) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Plan Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Plan Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeletePlanRecordById?planRecordId=${planRecordId}`, function (data) {
                 if (data.success) {
@@ -161,13 +155,7 @@ function usePlannerRecordTemplate(planRecordTemplateId) {
 
 function deletePlannerRecordTemplate(planRecordTemplateId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Plan Templates cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Plan Templates cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeletePlanRecordTemplateById?planRecordTemplateId=${planRecordTemplateId}`, function (data) {
                 $("#workAroundInput").hide();
diff --git a/wwwroot/js/reminderrecord.js b/wwwroot/js/reminderrecord.js
@@ -85,13 +85,7 @@ function deleteReminderRecord(reminderRecordId, e) {
         event.stopPropagation();
     }
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Reminders cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Reminders cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteReminderRecordById?reminderRecordId=${reminderRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/servicerecord.js b/wwwroot/js/servicerecord.js
@@ -43,13 +43,7 @@ function hideAddServiceRecordModal() {
 }
 function deleteServiceRecord(serviceRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Service Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Service Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteServiceRecordById?serviceRecordId=${serviceRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/shared.js b/wwwroot/js/shared.js
@@ -7,6 +7,17 @@ const mobileScreen = window.matchMedia("(max-width: 576px)");
 function returnToGarage() {
     window.location.href = '/Home';
 }
+function confirmDelete(message, callBack) {
+    Swal.fire({
+        title: "Confirm Deletion?",
+        text: message,
+        showCancelButton: true,
+        confirmButtonText: "Delete",
+        confirmButtonColor: "#dc3545"
+    }).then((result) => {
+        callBack(result);
+    });
+}
 function successToast(message) {
     Swal.fire({
         toast: true,
@@ -1064,13 +1075,7 @@ function deleteRecords(ids, source) {
             break;
     }
 
-    Swal.fire({
-        title: "Confirm Delete?",
-        text: `Delete ${recordVerbiage} from ${friendlySource}?`,
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete(`Delete ${recordVerbiage} from ${friendlySource}?`, (result) => {
         if (result.isConfirmed) {
             $.post('/Vehicle/DeleteRecords', { recordIds: ids, importMode: source }, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/supplyrecord.js b/wwwroot/js/supplyrecord.js
@@ -43,13 +43,7 @@ function hideAddSupplyRecordModal() {
 }
 function deleteSupplyRecord(supplyRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Supply Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Supply Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteSupplyRecordById?supplyRecordId=${supplyRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/taxrecord.js b/wwwroot/js/taxrecord.js
@@ -51,13 +51,7 @@ function hideAddTaxRecordModal() {
 }
 function deleteTaxRecord(taxRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Tax Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Tax Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteTaxRecordById?taxRecordId=${taxRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/upgraderecord.js b/wwwroot/js/upgraderecord.js
@@ -43,13 +43,7 @@ function hideAddUpgradeRecordModal() {
 }
 function deleteUpgradeRecord(upgradeRecordId) {
     $("#workAroundInput").show();
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "Deleted Upgrade Records cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("Deleted Upgrade Records cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeleteUpgradeRecordById?upgradeRecordId=${upgradeRecordId}`, function (data) {
                 if (data.success) {
diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js
@@ -225,13 +225,7 @@ function hideEditVehicleModal() {
     $('#editVehicleModal').modal('hide');
 }
 function deleteVehicle(vehicleId) {
-    Swal.fire({
-        title: "Confirm Deletion?",
-        text: "This will also delete all data tied to this vehicle. Deleted Vehicles and their associated data cannot be restored.",
-        showCancelButton: true,
-        confirmButtonText: "Delete",
-        confirmButtonColor: "#dc3545"
-    }).then((result) => {
+    confirmDelete("This will also delete all data tied to this vehicle. Deleted Vehicles and their associated data cannot be restored.", (result) => {
         if (result.isConfirmed) {
             $.post('/Vehicle/DeleteVehicle', { vehicleId: vehicleId }, function (data) {
                 if (data.success) {
