Merge pull request #152 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippStandards/CippStandardAccordion.jsx

@@ -159,17 +159,30 @@ const CippStandardAccordion = ({
               {selectedActions && selectedActions?.length > 0 && (
                 <Stack direction="row" spacing={1} sx={{ my: 0.5 }}>
                   {selectedActions?.map((action, index) => (
-                    <Chip
-                      key={index}
-                      label={action.label}
-                      color="info"
-                      variant="outlined"
-                      size="small"
-                      sx={{ mr: 1 }}
-                    />
+                    <>
+                      <Chip
+                        key={index}
+                        label={action.label}
+                        color="info"
+                        variant="outlined"
+                        size="small"
+                        sx={{ mr: 1 }}
+                      />
+                      <Chip
+                        key={index}
+                        label={standard?.impact}
+                        color={standard?.impact === "High Impact" ? "error" : "info"}
+                        variant="outlined"
+                        size="small"
+                        sx={{ mr: 1 }}
+                      />
+                    </>
                   ))}
                 </Stack>
               )}
+              {
+                //add a chip that shows the impact
+              }
               <Typography variant="body2" color="textSecondary">
                 {standard.helpText}
               </Typography>

src/data/standards.json

@@ -1113,7 +1113,14 @@
     "cat": "Exchange Standards",
     "tag": [],
     "helpText": "Enables litigation hold for all UserMailboxes with a valid license.",
-    "addedComponent": [],
+    "addedComponent": [
+      {
+        "type": "textField",
+        "name": "standards.EnableLitigationHold.days",
+        "required": false,
+        "label": "Days to apply for litigation hold"
+      }
+    ],
     "label": "Enable Litigation Hold for all users",
     "impact": "Low Impact",
     "impactColour": "info",

src/pages/endpoint/MEM/devices/index.js

@@ -128,7 +128,8 @@ const Page = () => {
         GUID: "id",
         Action: "windowsDefenderUpdateSignatures",
       },
-      confirmText: "Are you sure you want to update the Windows Defender signatures for this device?",
+      confirmText:
+        "Are you sure you want to update the Windows Defender signatures for this device?",
     },
     {
       label: "Generate logs and ship to MEM",
@@ -216,7 +217,8 @@ const Page = () => {
         keepUserData: false,
         useProtectedWipe: true,
       },
-      confirmText: "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.",
+      confirmText:
+        "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",
@@ -230,7 +232,8 @@ const Page = () => {
         keepUserData: false,
         useProtectedWipe: true,
       },
-      confirmText: "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.",
+      confirmText:
+        "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",
@@ -245,6 +248,17 @@ const Page = () => {
       },
       confirmText: "Are you sure you want to Autopilot Reset this device?",
     },
+    {
+      label: "Delete device",
+      type: "POST",
+      icon: <Recycling />,
+      url: "/api/ExecDeviceAction",
+      data: {
+        GUID: "id",
+        Action: "delete",
+      },
+      confirmText: "Are you sure you want to retire this device?",
+    },
     {
       label: "Retire device",
       type: "POST",