Merge pull request #97 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Feb 13, 2025 · ea79083 · ea79083
2 parents c607084 + 4d7dea8
commit ea79083
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 30 deletions.
diff --git a/public/version.json b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.1.3"
+  "version": "7.2.1"
 }
diff --git 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" },
           ]}

diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx
@@ -235,7 +235,7 @@ function CippJsonView({
           {viewJson ? <VisibilityOffIcon /> : <VisibilityIcon />}
         </IconButton>
         {viewJson ? (
-          <CippCodeBlock type="editor" code={JSON.stringify(cleanObject(object))} />
+          <CippCodeBlock type="editor" code={JSON.stringify(cleanObject(object), null, 2)} />
         ) : (
           <Grid container spacing={2}>
             {drilldownData.slice(0, 4).map((data, index) => (

diff --git 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, OpenInNew, 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,32 @@ 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"
+                  startIcon={
+                    <OpenInNew />
+                  }
                 >
                   Refresh Graph Token
                 </Button>
+                <Button
+                  onClick={() => appId.refetch()}
+                  variant="outlined"
+                  color="primary"
+                  startIcon={<Sync />}
+                  disabled={appId.isFetching}
+                >
+                  Check Application ID
+                </Button>
                 {!/^[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
                 ) && (
                   <Alert severity="warning">
-                    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 .
                   </Alert>
                 )}
               </>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/identity/administration/groups/index.js b/src/pages/identity/administration/groups/index.js
@@ -107,17 +107,7 @@ const Page = () => {
           </Button>
         </>
       }
-      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={[

diff --git 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
@@ -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
@@ -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",

diff --git 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: <EyeIcon />,
             hideBulk: true,
           },
+          {
+            label: "Import Template",
+            url: "/api/ExecCommunityRepo",
+            icon: <CloudDownload />,
+            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)}
@@ -216,7 +230,7 @@ const Page = () => {
         <DialogContent>
           {fileQuery.isPending ? (
             <Box>
-              <Skeleton height={300} />
+              <Skeleton height={300} variant="rectangular" />
             </Box>
           ) : (
             <CippJSONView object={jsonContent} defaultOpen={true} />