Merge pull request #22 from KelvinTegelaar/main

[pull] main from KelvinTegelaar:main
mhcg · Feb 15, 2025 · 2e90384 · 2e90384
2 parents 36d40af + 93b02f1
commit 2e90384
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 118 deletions.
diff --git a/.github/workflows/cipp_dev_build.yml b/.github/workflows/cipp_dev_build.yml
@@ -1,14 +1,11 @@
-name: CIPP Frontend Build
+name: CIPP Frontend Dev Build
 
 on:
   push:
     branches:
       - dev
   workflow_dispatch:
 
-permissions:
-  contents: write
-
 jobs:
   build:
     if: github.event.repository.fork == false
@@ -18,11 +15,11 @@ jobs:
     steps:
       # Checkout the repository
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
 
       # Set up Node.js
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4.2.0
         with:
           node-version: '20.18.1'
 
@@ -43,7 +40,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/[email protected].0
+        uses: LanceMcCarthy/[email protected].1
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp

diff --git a/.github/workflows/cipp_frontend_build.yml b/.github/workflows/cipp_frontend_build.yml
@@ -6,9 +6,6 @@ on:
       - main
   workflow_dispatch:
 
-permissions:
-  contents: write
-
 jobs:
   build:
     if: github.event.repository.fork == false
@@ -18,11 +15,11 @@ jobs:
     steps:
       # Checkout the repository
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
 
       # Set up Node.js
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4.2.0
         with:
           node-version: '20.18.1'
 
@@ -43,11 +40,10 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/[email protected].0
+        uses: LanceMcCarthy/[email protected].1
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp
           source_folder: build/
           destination_folder: /
           delete_if_exists: true
-
diff --git a/public/version.json b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.2.2"
+  "version": "7.2.3"
 }
diff --git a/src/components/CippComponents/CippFormTenantSelector.jsx b/src/components/CippComponents/CippFormTenantSelector.jsx
@@ -3,6 +3,7 @@ import { CippFormComponent } from "./CippFormComponent";
 
 export const CippFormTenantSelector = ({
   formControl,
+  componentType='autoComplete',
   allTenants = false,
   type = "multiple",
   name = "tenantFilter",
@@ -23,7 +24,7 @@ export const CippFormTenantSelector = ({
 
   return (
     <CippFormComponent
-      type="autoComplete"
+      type={componentType}
       name={name}
       formControl={formControl}
       placeholder="Select a tenant"

diff --git a/src/components/CippFormPages/CippFormPage.jsx b/src/components/CippFormPages/CippFormPage.jsx
@@ -134,7 +134,7 @@ const CippFormPage = (props) => {
                   <Stack spacing={2} direction="row">
                     {addedButtons && addedButtons}
                     <Button
-                      disabled={postCall.isPending || !isValid || (!allowResubmit && !isDirty)}
+                      disabled={postCall.isPending || !isValid || (!allowResubmit && (!isDirty))}
                       onClick={formControl.handleSubmit(handleSubmit)}
                       type="submit"
                       variant="contained"

diff --git a/src/components/CippTable/util-columnsFromAPI.js b/src/components/CippTable/util-columnsFromAPI.js
@@ -2,7 +2,7 @@ import { getCippFilterVariant } from "../../utils/get-cipp-filter-variant";
 import { getCippFormatting } from "../../utils/get-cipp-formatting";
 import { getCippTranslation } from "../../utils/get-cipp-translation";
 
-const skipRecursion = ["location"];
+const skipRecursion = ["location", "ScheduledBackupValues"];
 // Function to merge keys from all objects in the array
 const mergeKeys = (dataArray) => {
   return dataArray.reduce((acc, item) => {

diff --git a/src/components/CippWizard/CIPPDeploymentStep.js b/src/components/CippWizard/CIPPDeploymentStep.js
@@ -341,8 +341,7 @@ export const CippDeploymentStep = (props) => {
               placeholder="Enter the application secret. Leave blank to retain previous key."
               validators={{
                 validate: (value) => {
-                  const secretRegex =
-                    /^(?![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}$)[0-9a-zA-Z]{40}$/;
+                  const secretRegex = /^(?!^[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}$)[A-Za-z0-9-_~.]{20,}$/;
                   return (
                     value === "" ||
                     secretRegex.test(value) ||