Merge pull request #86 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Feb 11, 2025 · dbe0495 · dbe0495
2 parents 6d2b2ba + 7895a4d
commit dbe0495
Show file tree

Hide file tree

Showing 16 changed files with 614 additions and 54 deletions.
diff --git a/src/components/CippComponents/CippApiResults.jsx b/src/components/CippComponents/CippApiResults.jsx
@@ -10,7 +10,7 @@ const extractAllResults = (data) => {
 
   const getSeverity = (text) => {
     if (typeof text !== "string") return "success";
-    return /error|failed|exception|not found/i.test(text) ? "error" : "success";
+    return /error|failed|exception|not found|invalid_grant/i.test(text) ? "error" : "success";
   };
 
   const processResultItem = (item) => {

diff --git a/src/components/CippComponents/CippFormComponent.jsx b/src/components/CippComponents/CippFormComponent.jsx
@@ -24,12 +24,17 @@ import {
 } from "mui-tiptap";
 import StarterKit from "@tiptap/starter-kit";
 import { CippDataTable } from "../CippTable/CippDataTable";
+import React from "react";
 
 // Helper function to convert bracket notation to dot notation
 const convertBracketsToDots = (name) => {
   return name.replace(/\[(\d+)\]/g, ".$1"); // Replace [0] with .0
 };
 
+const MemoizedCippAutoComplete = React.memo((props) => {
+  return <CippAutoComplete {...props} />;
+});
+
 export const CippFormComponent = (props) => {
   const {
     validators,
@@ -233,19 +238,17 @@ export const CippFormComponent = (props) => {
               name={convertedName}
               control={formControl.control}
               rules={validators}
-              render={({ field }) =>
-                React.memo(
-                  <CippAutoComplete
-                    {...other}
-                    isFetching={other.isFetching}
-                    variant="filled"
-                    defaultValue={field.value}
-                    label={label}
-                    multiple={false}
-                    onChange={(value) => field.onChange(value.value)}
-                  />
-                )
-              }
+              render={({ field }) => (
+                <MemoizedCippAutoComplete
+                  {...other}
+                  isFetching={other.isFetching}
+                  variant="filled"
+                  defaultValue={field.value}
+                  label={label}
+                  multiple={false}
+                  onChange={(value) => field.onChange(value.value)}
+                />
+              )}
             />
           </div>
           <Typography variant="subtitle3" color="error">
@@ -263,7 +266,7 @@ export const CippFormComponent = (props) => {
               control={formControl.control}
               rules={validators}
               render={({ field }) => (
-                <CippAutoComplete
+                <MemoizedCippAutoComplete
                   {...other}
                   isFetching={other.isFetching}
                   variant="filled"

diff --git a/src/components/CippComponents/CippUserActions.jsx b/src/components/CippComponents/CippUserActions.jsx
@@ -284,7 +284,7 @@ export const CippUserActions = () => {
     },
     {
       label: "Clear Immutable ID",
-      type: "GET",
+      type: "POST",
       icon: <Clear />,
       url: "/api/ExecClrImmId",
       data: {

diff --git a/src/components/CippWizard/CippWizardCSVImport.jsx b/src/components/CippWizard/CippWizardCSVImport.jsx
@@ -32,6 +32,11 @@ export const CippWizardCSVImport = (props) => {
   const [newTableData, setTableData] = useState([]);
   const [open, setOpen] = useState(false);
 
+  // Register form field with validation
+  formControl.register(name, {
+    validate: (value) => Array.isArray(value) && value.length > 0,
+  });
+
   const handleRemoveItem = (row) => {
     if (row === undefined) return false;
     const index = tableData?.findIndex((item) => item === row);
@@ -49,7 +54,9 @@ export const CippWizardCSVImport = (props) => {
   };
 
   useEffect(() => {
-    formControl.setValue(name, newTableData);
+    formControl.setValue(name, newTableData, {
+      shouldValidate: true,
+    });
   }, [newTableData]);
 
   const actions = [

diff --git a/src/components/CippWizard/CippWizardOffboarding.jsx b/src/components/CippWizard/CippWizardOffboarding.jsx
@@ -97,6 +97,12 @@ export const CippWizardOffboarding = (props) => {
                 type="switch"
                 formControl={formControl}
               />
+              <CippFormComponent
+                name="ClearImmutableId"
+                label="Clear Immutable ID"
+                type="switch"
+                formControl={formControl}
+              />
               <CippFormComponent
                 name="ResetPass"
                 label="Reset Password"

diff --git a/src/data/Extensions.json b/src/data/Extensions.json
@@ -515,7 +515,7 @@
     "logo": "/assets/integrations/github.png",
     "logoDark": "/assets/integrations/github_dark.png",
     "description": "Enable the GitHub integration to manage your repositories from CIPP.",
-    "helpText": "This integration allows you to manage your GitHub repositories from CIPP. Requires a GitHub Fine Grained Personal Access Token (PAT).",
+    "helpText": "This integration allows you to manage GitHub repositories from CIPP, including the Community Repositorities functionality. Requires a GitHub Personal Access Token (PAT) with a minimum of repo:public_repo permissions. You can create a PAT in your GitHub account settings, see the GitHub Token documentation for more info.",
     "links": [
       {
         "name": "GitHub Token",
@@ -526,7 +526,7 @@
       {
         "type": "password",
         "name": "GitHub.APIKey",
-        "label": "GitHub Fine Grained Personal Access Token",
+        "label": "GitHub Personal Access Token",
         "placeholder": "Enter your GitHub PAT",
         "required": true
       },

diff --git a/src/data/alerts.json b/src/data/alerts.json
@@ -81,6 +81,15 @@
     "label": "Alert on overused licenses",
     "recommendedRunInterval": "7d"
   },
+  {
+    "name": "EntraLicenseUtilization",
+    "label": "Alert on Entra ID P1/P2 license over-utilization",
+    "recommendedRunInterval": "7d",
+    "requiresInput": true,
+    "inputType": "textField",
+    "inputLabel": "Alert when utilization exceeds % (default: 110)",
+    "inputName": "EntraLicenseUtilizationThreshold"
+  },
   {
     "name": "AppSecretExpiry",
     "label": "Alert on expiring application secrets",