Merge pull request #1584 from gigacodedev/dev

Updated Intune Wipe Actions

Author: KelvinTegelaar

src/views/endpoint/intune/Devices.js

@@ -132,18 +132,38 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             color: 'danger',
             modal: true,
             modalType: 'POST',
-            modalBody: { keepUserData: 'false', keepEnrollmentData: 'true' },
+            modalBody: { keepUserData: false, keepEnrollmentData: true },
+            modalUrl: `/api/ExecDeviceAction?TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}&Action=cleanWindowsDevice`,
+            modalMessage: 'Are you sure you want to wipe this device, and retain enrollment data?',
+          },
+          {
+            label: 'Wipe Device, remove enrollment data',
+            color: 'danger',
+            modal: true,
+            modalType: 'POST',
+            modalBody: { keepUserData: false, keepEnrollmentData: false },
             modalUrl: `/api/ExecDeviceAction?TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}&Action=cleanWindowsDevice`,
-            modalMessage: 'Are you sure you want to wipe this device',
+            modalMessage: 'Are you sure you want to wipe this device, and remove enrollment data?',
           },
           {
-            label: 'Wipe Device and continue at powerloss',
+            label: 'Wipe Device, keep enrollment data, and continue at powerloss',
+            color: 'danger',
+            modal: true,
+            modalType: 'POST',
+            modalBody: { keepEnrollmentData: true, keepUserData: false, useProtectedWipe: true },
+            modalUrl: `/api/ExecDeviceAction?TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}&Action=cleanWindowsDevice`,
+            modalMessage:
+              'Are you sure you want to wipe this device? This will retain enrollment data. Continuing at powerloss may cause boot issues if wipe is interrupted.',
+          },
+          {
+            label: 'Wipe Device, remove enrollment data, and continue at powerloss',
             color: 'danger',
             modal: true,
             modalType: 'POST',
             modalBody: { keepEnrollmentData: false, keepUserData: false, useProtectedWipe: true },
             modalUrl: `/api/ExecDeviceAction?TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}&Action=cleanWindowsDevice`,
-            modalMessage: 'Are you sure you want to wipe this device',
+            modalMessage:
+              'Are you sure you want to wipe this device? This will also remove enrollment data. Continuing at powerloss may cause boot issues if wipe is interrupted.',
           },
           {
             label: 'Autopilot Reset',
@@ -152,7 +172,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             modalType: 'POST',
             modalBody: { keepUserData: 'false', keepEnrollmentData: 'true' },
             modalUrl: `/api/ExecDeviceAction?TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}&Action=wipe`,
-            modalMessage: 'Are you sure you want to wipe this device',
+            modalMessage: 'Are you sure you want to Autopilot Reset this device?',
           },
           {
             label: 'Retire device',