Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

Author: KelvinTegelaar

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

@@ -9,6 +9,7 @@ import {
   Password,
   PasswordOutlined,
   Key,
+  Edit,
   Security,
   FindInPage,
   Shield,
@@ -69,6 +70,25 @@ const Page = () => {
       ],
       confirmText: "Select the User to set as the primary user for this device",
     },
+    {
+      label: "Rename Device",
+      type: "POST",
+      icon: <Edit />,
+      url: "/api/ExecDeviceAction",
+      data: {
+        GUID: "id",
+        Action: "setDeviceName",
+      },
+      confirmText: "Enter the new name for the device",
+      fields: [
+        {
+          type: "textField",
+          name: "input",
+          label: "New Device Name",
+          required: true,
+        },
+      ],
+    },
     {
       label: "Sync Device",
       type: "POST",
@@ -180,19 +200,6 @@ const Page = () => {
       },
       confirmText: "Are you sure you want to generate logs and ship these to MEM?",
     },
-    /*
-    {
-      label: "Rename device",
-      type: "POST",
-      icon: null,
-      url: "/api/ExecDeviceAction",
-      data: {
-        GUID: "id",
-        Action: "setDeviceName",
-      },
-      confirmText: "Enter the new name for the device",
-    },
-    */
     {
       label: "Fresh Start (Remove user data)",
       type: "POST",
@@ -318,7 +325,11 @@ const Page = () => {
   return (
     <CippTablePage
       title={pageTitle}
-      apiUrl="/api/ListDevices"
+      apiUrl="/api/ListGraphRequest"
+      apiData={{
+        Endpoint: "deviceManagement/managedDevices",
+      }}
+      apiDataKey="Results"
       actions={actions}
       queryKey={`MEMDevices-${tenantFilter}`}
       offCanvas={offCanvas}