From 563cee5dfb234ce1ac5a017d5b86c7846a3689b2 Mon Sep 17 00:00:00 2001 From: Esco Date: Wed, 15 Jan 2025 14:26:07 +0100 Subject: [PATCH 1/2] feat: added features to Inactive users page --- .../reports/inactive-users-report/index.js | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/src/pages/identity/reports/inactive-users-report/index.js b/src/pages/identity/reports/inactive-users-report/index.js index af1dd1a1ff05..8cebccb90d56 100644 --- a/src/pages/identity/reports/inactive-users-report/index.js +++ b/src/pages/identity/reports/inactive-users-report/index.js @@ -1,17 +1,57 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { EyeIcon, TrashIcon } from "@heroicons/react/24/outline"; +import { Edit } from "@mui/icons-material"; const Page = () => { const pageTitle = "Inactive users (6 months)"; const apiUrl = "/api/ListInactiveAccounts"; - const actions = []; + const actions = [ + { + label: "View User", + link: "/identity/administration/users/user?userId=[azureAdUserId]", + multiPost: false, + icon: , + color: "success", + }, + { + label: "Edit User", + link: "/identity/administration/users/user/edit?userId=[azureAdUserId]", + icon: , + color: "success", + target: "_self", + }, + { + label: "Delete User", + type: "GET", + icon: , + url: "/api/RemoveUser", + data: { ID: "azureAdUserId" }, + confirmText: "Are you sure you want to delete this user?", + multiPost: false, + }, + ]; - const offCanvas = null; + const offCanvas = { + extendedInfoFields: [ + "tenantDisplayName", + "displayName", + "userPrincipalName", + "userType", + "createdDateTime", + "lastSignInDateTime", + "lastNonInteractiveSignInDateTime", + "numberOfAssignedLicenses", + "lastRefreshedDateTime", + ], + actions: actions, + }; const simpleColumns = [ "tenantDisplayName", "userPrincipalName", "displayName", + "lastSignInDateTime", "lastNonInteractiveSignInDateTime", "numberOfAssignedLicenses", "lastRefreshedDateTime", From 243e318b50cb0780efb9a64d70431e193cd0eff1 Mon Sep 17 00:00:00 2001 From: Esco Date: Wed, 15 Jan 2025 14:42:20 +0100 Subject: [PATCH 2/2] feat: added block sign in to Inactive users --- .../identity/reports/inactive-users-report/index.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/identity/reports/inactive-users-report/index.js b/src/pages/identity/reports/inactive-users-report/index.js index 8cebccb90d56..8764ec1236c1 100644 --- a/src/pages/identity/reports/inactive-users-report/index.js +++ b/src/pages/identity/reports/inactive-users-report/index.js @@ -1,7 +1,7 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; import { EyeIcon, TrashIcon } from "@heroicons/react/24/outline"; -import { Edit } from "@mui/icons-material"; +import { Edit, Block } from "@mui/icons-material"; const Page = () => { const pageTitle = "Inactive users (6 months)"; @@ -21,6 +21,15 @@ const Page = () => { color: "success", target: "_self", }, + { + label: "Block Sign In", + type: "GET", + icon: , + url: "/api/ExecDisableUser", + data: { ID: "azureAdUserId" }, + confirmText: "Are you sure you want to block the sign-in for this user?", + multiPost: false, + }, { label: "Delete User", type: "GET",