From d805803291b882e1aa1b1e07246e203cdb8e2d02 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 27 Jan 2025 14:47:58 -0500 Subject: [PATCH 1/3] up version minor package/workflow tweaks --- .github/workflows/Check_for_Version_Update.yml | 8 ++++---- package.json | 1 + public/version.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Check_for_Version_Update.yml b/.github/workflows/Check_for_Version_Update.yml index ec6f3e68769b..0958e8190cea 100644 --- a/.github/workflows/Check_for_Version_Update.yml +++ b/.github/workflows/Check_for_Version_Update.yml @@ -7,17 +7,17 @@ on: jobs: build: if: github.repository_owner == 'KelvinTegelaar' - name: 'Check for Version Update' + name: "Check for Version Update" runs-on: ubuntu-latest steps: - name: Check for Changed Files uses: brettcannon/check-for-changed-files@v1.1.0 with: - file-pattern: version_latest.txt - failure-message: 'You have not updated version_latest.txt. This is a required file to update at each PR. Please sync your latest changes and update the version number.' + file-pattern: version.json + failure-message: "You have not updated version.json. This is a required file to update at each PR. Please sync your latest changes and update the version number." - name: Prevent changes to workflow files uses: DovnarAlexander/github-action-file-detection@v0.3.0 with: - wildcard: '.github/workflows/*.yml' + wildcard: ".github/workflows/*.yml" exit_code_found: 1 exit_code_not_found: 0 diff --git a/package.json b/package.json index 6c2c57ba925d..eb70d4b08762 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "bugs": { "url": "https://github.com/KelvinTegelaar/CIPP/issues" }, + "license": "AGPL-3.0", "engines": { "node": "^18.17.0" }, diff --git a/public/version.json b/public/version.json index fa68337146a1..ef511cf84994 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "7.1.1" + "version": "7.1.2" } From be8347685b0325a96892ca7278bbb86b96315a77 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 27 Jan 2025 14:50:23 -0500 Subject: [PATCH 2/3] Update Check_for_Version_Update.yml --- .github/workflows/Check_for_Version_Update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Check_for_Version_Update.yml b/.github/workflows/Check_for_Version_Update.yml index 0958e8190cea..f8a7db0343f2 100644 --- a/.github/workflows/Check_for_Version_Update.yml +++ b/.github/workflows/Check_for_Version_Update.yml @@ -13,7 +13,7 @@ jobs: - name: Check for Changed Files uses: brettcannon/check-for-changed-files@v1.1.0 with: - file-pattern: version.json + file-pattern: public/version.json failure-message: "You have not updated version.json. This is a required file to update at each PR. Please sync your latest changes and update the version number." - name: Prevent changes to workflow files uses: DovnarAlexander/github-action-file-detection@v0.3.0 From da746cde6ecf76ec9eb31fbd55164da8ada978e9 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Mon, 27 Jan 2025 15:09:50 -0500 Subject: [PATCH 3/3] Update offboarding.js --- src/pages/tenant/gdap-management/offboarding.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/tenant/gdap-management/offboarding.js b/src/pages/tenant/gdap-management/offboarding.js index 1fb872a6d2da..1fe26d282b70 100644 --- a/src/pages/tenant/gdap-management/offboarding.js +++ b/src/pages/tenant/gdap-management/offboarding.js @@ -7,7 +7,7 @@ import { CippFormComponent } from "/src/components/CippComponents/CippFormCompon import vendorTenantList from "/src/data/vendorTenantList"; import { Box, Grid, Stack } from "@mui/system"; import { Alert, Divider, Typography } from "@mui/material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiGetCallWithPagination } from "/src/api/ApiCall"; import { CippInfoBar } from "../../../components/CippCards/CippInfoBar"; import { ShieldCheckIcon } from "@heroicons/react/24/outline"; import { Apps, Description, Widgets } from "@mui/icons-material"; @@ -60,7 +60,7 @@ const Page = () => { queryKey: "ListMSPApps-" + tenantId?.value, }); - const vendorApps = ApiGetCall({ + const vendorApps = ApiGetCallWithPagination({ url: "/api/ListGraphRequest", data: { Endpoint: "servicePrincipals", @@ -193,7 +193,7 @@ const Page = () => { }, valueField: "appId", }} - disabled={vendorApps?.data?.Results?.length > 0 ? false : true} + disabled={vendorApps?.data?.pages?.[0]?.Results?.length > 0 ? false : true} />