Skip to content

Commit

Permalink
Merge pull request #52 from KelvinTegelaar/dev
Browse files Browse the repository at this point in the history
[pull] dev from KelvinTegelaar:dev
  • Loading branch information
pull[bot] authored Jan 27, 2025
2 parents 0d0edf1 + da746cd commit a6be80d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/Check_for_Version_Update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 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
with:
wildcard: '.github/workflows/*.yml'
wildcard: ".github/workflows/*.yml"
exit_code_found: 1
exit_code_not_found: 0
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"bugs": {
"url": "https://github.com/KelvinTegelaar/CIPP/issues"
},
"license": "AGPL-3.0",
"engines": {
"node": "^18.17.0"
},
Expand Down
2 changes: 1 addition & 1 deletion public/version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "7.1.1"
"version": "7.1.2"
}
6 changes: 3 additions & 3 deletions src/pages/tenant/gdap-management/offboarding.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -60,7 +60,7 @@ const Page = () => {
queryKey: "ListMSPApps-" + tenantId?.value,
});

const vendorApps = ApiGetCall({
const vendorApps = ApiGetCallWithPagination({
url: "/api/ListGraphRequest",
data: {
Endpoint: "servicePrincipals",
Expand Down Expand Up @@ -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}
/>
<CippFormComponent
formControl={formControl}
Expand Down

0 comments on commit a6be80d

Please sign in to comment.