From 8e622cf7e796d986dec79a0bcb536d58dbf9cc94 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 12 Feb 2025 17:20:19 -0500 Subject: [PATCH 1/8] add import template button --- src/pages/tools/community-repos/repo.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/pages/tools/community-repos/repo.js b/src/pages/tools/community-repos/repo.js index 7b4772561f1d..37d0e9f0c6ca 100644 --- a/src/pages/tools/community-repos/repo.js +++ b/src/pages/tools/community-repos/repo.js @@ -17,6 +17,7 @@ import CippJSONView from "/src/components/CippFormPages/CippJSONView"; import { EyeIcon } from "@heroicons/react/24/outline"; import { CippAutoComplete } from "/src/components/CippComponents/CippAutocomplete"; import React from "react"; +import { CloudDownload } from "@mui/icons-material"; const Page = () => { const router = useRouter(); @@ -202,6 +203,19 @@ const Page = () => { icon: , hideBulk: true, }, + { + label: "Import Template", + url: "/api/ExecCommunityRepo", + icon: , + type: "POST", + data: { + Action: "ImportTemplate", + FullName: selectedRepo, + Path: "path", + Branch: selectedBranch, + }, + confirmText: "Are you sure you want to import [path]?", + }, ]} isFetching={fileTreeQuery.isFetching} refreshFunction={() => fetchFileTree(selectedBranch)} From 7ce94e72b86924f45a467c0f6bc78c5bca60f744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 12 Feb 2025 23:25:33 +0100 Subject: [PATCH 2/8] fix casing --- src/components/CippFormPages/CippAddGroupForm.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CippFormPages/CippAddGroupForm.jsx b/src/components/CippFormPages/CippAddGroupForm.jsx index 49be141db5dd..daac5f7aef7f 100644 --- a/src/components/CippFormPages/CippAddGroupForm.jsx +++ b/src/components/CippFormPages/CippAddGroupForm.jsx @@ -76,7 +76,7 @@ const CippAddGroupForm = (props) => { { label: "Security Group", value: "generic" }, { label: "Microsoft 365 Group", value: "m365" }, { label: "Dynamic Group", value: "dynamic" }, - { label: "Dynamic Distribution Group", value: "dynamicdistribution" }, + { label: "Dynamic Distribution Group", value: "dynamicDistribution" }, { label: "Distribution List", value: "distribution" }, { label: "Mail Enabled Security Group", value: "security" }, ]} From 21168314014ae3321acc2f60d6049a458e26940a Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 12 Feb 2025 18:03:56 -0500 Subject: [PATCH 3/8] json view tweak --- src/components/CippFormPages/CippJSONView.jsx | 2 +- src/pages/tools/community-repos/repo.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx index 5abb73e8ee37..e90fc8732c13 100644 --- a/src/components/CippFormPages/CippJSONView.jsx +++ b/src/components/CippFormPages/CippJSONView.jsx @@ -235,7 +235,7 @@ function CippJsonView({ {viewJson ? : } {viewJson ? ( - + ) : ( {drilldownData.slice(0, 4).map((data, index) => ( diff --git a/src/pages/tools/community-repos/repo.js b/src/pages/tools/community-repos/repo.js index 37d0e9f0c6ca..8b93c7dae27e 100644 --- a/src/pages/tools/community-repos/repo.js +++ b/src/pages/tools/community-repos/repo.js @@ -230,7 +230,7 @@ const Page = () => { {fileQuery.isPending ? ( - + ) : ( From bb2209a96759f48625f25b5944b7705546ea99a2 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Thu, 13 Feb 2025 00:42:16 +0100 Subject: [PATCH 4/8] fixes escos whining --- src/pages/identity/administration/groups/index.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/pages/identity/administration/groups/index.js b/src/pages/identity/administration/groups/index.js index 7915d4656404..03d36a08a198 100644 --- a/src/pages/identity/administration/groups/index.js +++ b/src/pages/identity/administration/groups/index.js @@ -107,17 +107,7 @@ const Page = () => { } - apiUrl="/api/ListGraphRequest" - apiData={{ - Endpoint: "groups", - $select: - "id,createdDateTime,displayName,description,mail,mailEnabled,mailNickname,resourceProvisioningOptions,securityEnabled,visibility,organizationId,onPremisesSamAccountName,membershipRule,grouptypes,onPremisesSyncEnabled,resourceProvisioningOptions,userPrincipalName,assignedLicenses", - $count: true, - $orderby: "displayName", - $top: 999, - manualPagination: true, - }} - apiDataKey="Results" + apiUrl="/api/ListGroups" actions={actions} offCanvas={offCanvas} simpleColumns={[ From a5f454525fa29d3f6abe01dc9f7fd3b06f938844 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 12 Feb 2025 18:46:02 -0500 Subject: [PATCH 5/8] up version --- public/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/version.json b/public/version.json index 795806e4fd04..7ffa464d8338 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "7.1.3" + "version": "7.2.0" } From ec49fb71caa9d607a0b35d86e9ec0e89345d1ebd Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 12 Feb 2025 20:03:11 -0500 Subject: [PATCH 6/8] github null safety --- public/version.json | 2 +- .../email/spamfilter/list-connectionfilter-templates/index.js | 2 +- src/pages/email/spamfilter/list-templates/index.js | 2 +- src/pages/email/transport/list-connector-templates/index.js | 2 +- src/pages/email/transport/list-templates/index.js | 2 +- src/pages/endpoint/MEM/list-templates/index.js | 2 +- src/pages/identity/administration/group-templates/index.js | 2 +- src/pages/tenant/conditional/list-template/index.js | 2 +- src/pages/tenant/standards/bpa-report/index.js | 2 +- src/pages/tenant/standards/list-standards/index.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/version.json b/public/version.json index 7ffa464d8338..9e50dd4377c9 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "7.2.0" + "version": "7.2.1" } diff --git a/src/pages/email/spamfilter/list-connectionfilter-templates/index.js b/src/pages/email/spamfilter/list-connectionfilter-templates/index.js index 9eeb2638a408..ca0ced2e75ea 100644 --- a/src/pages/email/spamfilter/list-connectionfilter-templates/index.js +++ b/src/pages/email/spamfilter/list-connectionfilter-templates/index.js @@ -53,7 +53,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/email/spamfilter/list-templates/index.js b/src/pages/email/spamfilter/list-templates/index.js index ce86b031198c..ad1e87195129 100644 --- a/src/pages/email/spamfilter/list-templates/index.js +++ b/src/pages/email/spamfilter/list-templates/index.js @@ -53,7 +53,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/email/transport/list-connector-templates/index.js b/src/pages/email/transport/list-connector-templates/index.js index 567eac960f94..7f35e6629322 100644 --- a/src/pages/email/transport/list-connector-templates/index.js +++ b/src/pages/email/transport/list-connector-templates/index.js @@ -57,7 +57,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/email/transport/list-templates/index.js b/src/pages/email/transport/list-templates/index.js index 5e9e8d12e90e..58340c19ff38 100644 --- a/src/pages/email/transport/list-templates/index.js +++ b/src/pages/email/transport/list-templates/index.js @@ -55,7 +55,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/endpoint/MEM/list-templates/index.js b/src/pages/endpoint/MEM/list-templates/index.js index 9a1dfc6e3264..d87b2243c259 100644 --- a/src/pages/endpoint/MEM/list-templates/index.js +++ b/src/pages/endpoint/MEM/list-templates/index.js @@ -77,7 +77,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/identity/administration/group-templates/index.js b/src/pages/identity/administration/group-templates/index.js index d1d047594a89..497f3ce71b6c 100644 --- a/src/pages/identity/administration/group-templates/index.js +++ b/src/pages/identity/administration/group-templates/index.js @@ -55,7 +55,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/tenant/conditional/list-template/index.js b/src/pages/tenant/conditional/list-template/index.js index fbfb20795f40..8db07cbdca14 100644 --- a/src/pages/tenant/conditional/list-template/index.js +++ b/src/pages/tenant/conditional/list-template/index.js @@ -54,7 +54,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/tenant/standards/bpa-report/index.js b/src/pages/tenant/standards/bpa-report/index.js index 1bb4a6cca89b..d80e5eb5ae1c 100644 --- a/src/pages/tenant/standards/bpa-report/index.js +++ b/src/pages/tenant/standards/bpa-report/index.js @@ -77,7 +77,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", diff --git a/src/pages/tenant/standards/list-standards/index.js b/src/pages/tenant/standards/list-standards/index.js index 023e58df5071..6dcc15daeb7f 100644 --- a/src/pages/tenant/standards/list-standards/index.js +++ b/src/pages/tenant/standards/list-standards/index.js @@ -95,7 +95,7 @@ const Page = () => { }, ], confirmText: "Are you sure you want to save this template to the selected repository?", - condition: () => integrations.isSuccess && integrations?.data?.GitHub.Enabled, + condition: () => integrations.isSuccess && integrations?.data?.GitHub?.Enabled, }, { label: "Delete Template", From a279d8b96dc57515c33636ace6f26abd0545a6d5 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 12 Feb 2025 20:23:35 -0500 Subject: [PATCH 7/8] null safety sam wizard --- .../CippWizard/CIPPDeploymentStep.js | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/components/CippWizard/CIPPDeploymentStep.js b/src/components/CippWizard/CIPPDeploymentStep.js index 5ebc0ecf67fd..90a0840fc16e 100644 --- a/src/components/CippWizard/CIPPDeploymentStep.js +++ b/src/components/CippWizard/CIPPDeploymentStep.js @@ -16,7 +16,7 @@ import { CippWizardStepButtons } from "./CippWizardStepButtons"; import { ApiGetCall } from "../../api/ApiCall"; import CippButtonCard from "../CippCards/CippButtonCard"; import { CippCopyToClipBoard } from "../CippComponents/CippCopyToClipboard"; -import { CheckCircle } from "@mui/icons-material"; +import { CheckCircle, Sync } from "@mui/icons-material"; import CippPermissionCheck from "../CippSettings/CippPermissionCheck"; import { useQueryClient } from "@tanstack/react-query"; import { CippApiResults } from "../CippComponents/CippApiResults"; @@ -43,7 +43,7 @@ export const CippDeploymentStep = (props) => { const appId = ApiGetCall({ url: `/api/ExecListAppId`, queryKey: `ExecListAppId`, - waiting: values.selectedOption !== "UpdateTokens" ? false : true, + waiting: true, }); useEffect(() => { if ( @@ -260,19 +260,29 @@ export const CippDeploymentStep = (props) => { disabled={ appId.isLoading || !/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test( - appId.data.applicationId + appId?.data?.applicationId ) } - onClick={() => openPopup(appId.data.refreshUrl)} + onClick={() => openPopup(appId?.data?.refreshUrl)} color="primary" > Refresh Graph Token + {!/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test( - appId.data.applicationId + appId?.data?.applicationId ) && ( - The Application ID is not valid. Please return to the first page of the SAM wizard and use the Manual . + The Application ID is not valid. Please return to the first page of the SAM + wizard and use the Manual . )} From 4d7dea81d96294539be6e9d8e09015e5936d7cad Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 12 Feb 2025 20:39:38 -0500 Subject: [PATCH 8/8] Update CIPPDeploymentStep.js --- src/components/CippWizard/CIPPDeploymentStep.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/CippWizard/CIPPDeploymentStep.js b/src/components/CippWizard/CIPPDeploymentStep.js index 90a0840fc16e..3ba090c1a75e 100644 --- a/src/components/CippWizard/CIPPDeploymentStep.js +++ b/src/components/CippWizard/CIPPDeploymentStep.js @@ -16,7 +16,7 @@ import { CippWizardStepButtons } from "./CippWizardStepButtons"; import { ApiGetCall } from "../../api/ApiCall"; import CippButtonCard from "../CippCards/CippButtonCard"; import { CippCopyToClipBoard } from "../CippComponents/CippCopyToClipboard"; -import { CheckCircle, Sync } from "@mui/icons-material"; +import { CheckCircle, OpenInNew, Sync } from "@mui/icons-material"; import CippPermissionCheck from "../CippSettings/CippPermissionCheck"; import { useQueryClient } from "@tanstack/react-query"; import { CippApiResults } from "../CippComponents/CippApiResults"; @@ -265,12 +265,15 @@ export const CippDeploymentStep = (props) => { } onClick={() => openPopup(appId?.data?.refreshUrl)} color="primary" + startIcon={ + + } > Refresh Graph Token