Merge pull request #119 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

.github/workflows/dev_deploy.yml

@@ -0,0 +1,41 @@
+name: CIPP Development Frontend CI/CD
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build_and_deploy_job:
+    if: github.event.repository.fork == false && github.event_name == 'push'
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_MOSS_0A047A40F }} # change this to your repository secret name
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: 'upload'
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: '/' # App source code path
+          api_location: '' # Api source code path - optional
+          output_location: 'out' # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event.repository.fork == false && github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_MOSS_0A047A40F }} # change this to your repository secret name
+          action: 'close'

src/components/CippComponents/CippFormCondition.jsx

@@ -1,8 +1,9 @@
 import { useWatch } from "react-hook-form";
 import isEqual from "lodash/isEqual"; // lodash for deep comparison
+import React from "react";
 
 export const CippFormCondition = (props) => {
-  let { field, compareType = "is", compareValue, children, formControl } = props;
+  let { field, compareType = "is", compareValue, action = 'hide', children, formControl } = props;
 
   if (
     field === undefined ||
@@ -22,24 +23,48 @@ export const CippFormCondition = (props) => {
     compareValue = compareValue.value;
   }
 
+  const disableChildren = (children) => {
+    return React.Children.map(children, (child) => {
+      if (React.isValidElement(child)) {
+        if (child.props?.children && child.type.name !== "CippFormCondition") {
+          return React.cloneElement(child, {
+            children: disableChildren(child.props.children),
+            disabled: true,
+          });
+        }
+        return React.cloneElement(child, { disabled: true });
+      }
+      return child;
+    });
+  };
+
   switch (compareType) {
     case "regex":
       if (watcher?.match(new RegExp(compareValue))) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
     case "is":
       // Deep comparison for objects and arrays
       if (isEqual(watcher, compareValue)) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "isNot":
       // Deep comparison for objects and arrays (negation)
       if (!isEqual(watcher, compareValue)) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "contains":
@@ -55,6 +80,9 @@ export const CippFormCondition = (props) => {
         // Check if object contains the key
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "doesNotContain":
@@ -73,6 +101,9 @@ export const CippFormCondition = (props) => {
         // Check if object does not contain the key
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "greaterThan":
@@ -83,6 +114,9 @@ export const CippFormCondition = (props) => {
       ) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "lessThan":
@@ -93,6 +127,9 @@ export const CippFormCondition = (props) => {
       ) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "arrayLength":
@@ -103,12 +140,18 @@ export const CippFormCondition = (props) => {
       ) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "hasValue":
       if (watcher !== undefined && watcher !== null && watcher !== "") {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     /*
@@ -119,6 +162,9 @@ export const CippFormCondition = (props) => {
       if (Array.isArray(watcher) && watcher.some((item) => item?.label === compareValue)) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "labelContains":
@@ -129,13 +175,19 @@ export const CippFormCondition = (props) => {
       ) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "valueEq":
       // Checks if any object in array has .value exactly equal to compareValue
       if (Array.isArray(watcher) && watcher.some((item) => item?.value === compareValue)) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     case "valueContains":
@@ -146,9 +198,15 @@ export const CippFormCondition = (props) => {
       ) {
         return children;
       }
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
 
     default:
+      if (action === "disable") {
+        return disableChildren(children);
+      }
       return null;
   }
 };

src/components/CippFormPages/CippSchedulerForm.jsx

@@ -203,7 +203,6 @@ const CippSchedulerForm = (props) => {
             options={recurrenceOptions}
             multiple={false}
             disableClearable={true}
-            creatable={false}
           />
         </Grid>
         {selectedCommand?.addedFields?.Synopsis && (