From d33ce0f8245c407e86157615e7eb18c659b368a3 Mon Sep 17 00:00:00 2001 From: Zacgoose <107489668+Zacgoose@users.noreply.github.com> Date: Sat, 13 Sep 2025 17:43:41 +0800 Subject: [PATCH 1/5] Support for deleting SPO sites both modern and group connected sites --- src/pages/teams-share/sharepoint/index.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pages/teams-share/sharepoint/index.js b/src/pages/teams-share/sharepoint/index.js index 13657bb47f82..d11415f904a8 100644 --- a/src/pages/teams-share/sharepoint/index.js +++ b/src/pages/teams-share/sharepoint/index.js @@ -8,6 +8,7 @@ import { PersonRemove, AdminPanelSettings, NoAccounts, + Delete, } from "@mui/icons-material"; import Link from "next/link"; import { CippDataTable } from "/src/components/CippTable/CippDataTable"; @@ -176,6 +177,18 @@ const Page = () => { ], multiPost: false, }, + { + label: "Delete Site", + type: "POST", + icon: , + url: "/api/DeleteSharepointSite", + data: { + SiteId: "siteId", + }, + confirmText: "Are you sure you want to delete this SharePoint site? This action cannot be undone.", + color: "error", + multiPost: false, + }, ]; const offCanvas = { From a23e994688df8ce0ef61668fce3aa1aa938a03c8 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Sun, 14 Sep 2025 22:47:45 +0200 Subject: [PATCH 2/5] fix localecompare --- src/utils/get-cipp-unique-licenses.js | 30 +++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/utils/get-cipp-unique-licenses.js b/src/utils/get-cipp-unique-licenses.js index eb48d16edf02..fcb68de559a0 100644 --- a/src/utils/get-cipp-unique-licenses.js +++ b/src/utils/get-cipp-unique-licenses.js @@ -22,12 +22,12 @@ export const getCippUniqueLicenses = (dataArray) => { // Get the translated name for this license const translatedName = getCippLicenseTranslation([license]); const displayName = Array.isArray(translatedName) ? translatedName[0] : translatedName; - + uniqueLicensesMap.set(license.skuId, { skuId: license.skuId, displayName: displayName, // Store the original license object for reference - originalLicense: license + originalLicense: license, }); } } @@ -36,9 +36,11 @@ export const getCippUniqueLicenses = (dataArray) => { }); // Convert map to array and sort by display name - return Array.from(uniqueLicensesMap.values()).sort((a, b) => - a.displayName.localeCompare(b.displayName) - ); + return Array.from(uniqueLicensesMap.values()).sort((a, b) => { + const nameA = a?.displayName || ''; + const nameB = b?.displayName || ''; + return nameA.localeCompare(nameB); + }); }; /** @@ -56,12 +58,10 @@ export const userHasAllLicenses = (userLicenses, requiredLicenseSkuIds) => { return true; // No licenses required } - const userSkuIds = userLicenses.map(license => license.skuId).filter(Boolean); - + const userSkuIds = userLicenses.map((license) => license.skuId).filter(Boolean); + // Check if user has all required licenses - return requiredLicenseSkuIds.every(requiredSkuId => - userSkuIds.includes(requiredSkuId) - ); + return requiredLicenseSkuIds.every((requiredSkuId) => userSkuIds.includes(requiredSkuId)); }; /** @@ -79,10 +79,8 @@ export const userHasAnyLicense = (userLicenses, licenseSkuIds) => { return true; // No licenses specified } - const userSkuIds = userLicenses.map(license => license.skuId).filter(Boolean); - + const userSkuIds = userLicenses.map((license) => license.skuId).filter(Boolean); + // Check if user has any of the specified licenses - return licenseSkuIds.some(licenseSkuId => - userSkuIds.includes(licenseSkuId) - ); -}; \ No newline at end of file + return licenseSkuIds.some((licenseSkuId) => userSkuIds.includes(licenseSkuId)); +}; From be5928e2310221c79c89c045aeb6ff867f35a04a Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sun, 14 Sep 2025 21:43:41 -0400 Subject: [PATCH 3/5] up package ver --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f816b31d5d71..8b6a5a847685 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cipp", - "version": "8.0.3", + "version": "8.4.1", "author": "CIPP Contributors", "homepage": "https://cipp.app/", "bugs": { @@ -112,4 +112,4 @@ "eslint": "9.35.0", "eslint-config-next": "15.5.2" } -} +} \ No newline at end of file From 2e3994ea64827e624bcbeace898d4e7e366cfa0f Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sun, 14 Sep 2025 21:43:56 -0400 Subject: [PATCH 4/5] table toolbar padding --- src/components/CippTable/CIPPTableToptoolbar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js index c14da5ce3467..9abffd703fba 100644 --- a/src/components/CippTable/CIPPTableToptoolbar.js +++ b/src/components/CippTable/CIPPTableToptoolbar.js @@ -545,7 +545,8 @@ export const CIPPTableToptoolbar = ({ display: "flex", flexDirection: { xs: "column", md: "row" }, gap: { xs: 1, md: 2 }, - p: 0.5, + px: 0.5, + pb: 2, justifyContent: "space-between", alignItems: { xs: "stretch", md: "center" }, backgroundColor: "background.paper", From e18d13c7a46bfe7921735ddfafe5de5dc02fee7d Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Mon, 15 Sep 2025 12:32:43 +0200 Subject: [PATCH 5/5] update --- package.json | 4 ++-- public/version.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8b6a5a847685..2ade75d4e6c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cipp", - "version": "8.4.1", + "version": "8.4.2", "author": "CIPP Contributors", "homepage": "https://cipp.app/", "bugs": { @@ -112,4 +112,4 @@ "eslint": "9.35.0", "eslint-config-next": "15.5.2" } -} \ No newline at end of file +} diff --git a/public/version.json b/public/version.json index a809230b8095..6a8d059b3176 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "8.4.1" + "version": "8.4.2" }