From 55d05acea3c752fcf25a16e60f35349a324d4580 Mon Sep 17 00:00:00 2001 From: Roel van der Wegen Date: Fri, 18 Aug 2023 10:51:54 +0200 Subject: [PATCH 01/12] Footer spacing fix --- src/components/layout/AppFooter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/layout/AppFooter.js b/src/components/layout/AppFooter.js index d7893c9533b6..ecfba658b219 100644 --- a/src/components/layout/AppFooter.js +++ b/src/components/layout/AppFooter.js @@ -20,7 +20,7 @@ const AppFooter = () => { {' '} - + {' '} From b01bb1ed10b848b1882a6252f221d5cc7588d932 Mon Sep 17 00:00:00 2001 From: Roel van der Wegen Date: Tue, 22 Aug 2023 08:12:35 +0200 Subject: [PATCH 02/12] Remove repoUrl variable --- deployment/AzureDeploymentTemplate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json index bc7eb0ba9efe..ff7e9a97bada 100644 --- a/deployment/AzureDeploymentTemplate.json +++ b/deployment/AzureDeploymentTemplate.json @@ -36,7 +36,6 @@ "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]", "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]", - "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git", "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]" }, From 9713f0d9fb08c48cceafb299c7573ce82555b9b2 Mon Sep 17 00:00:00 2001 From: Roel van der Wegen Date: Tue, 22 Aug 2023 08:12:52 +0200 Subject: [PATCH 03/12] Remove repoUrl variable --- deployment/AzureDeploymentTemplate_regionoptions.json | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json index 11fccba7350c..bc2f24089d4d 100644 --- a/deployment/AzureDeploymentTemplate_regionoptions.json +++ b/deployment/AzureDeploymentTemplate_regionoptions.json @@ -36,7 +36,6 @@ "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]", "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]", - "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git", "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]" }, From 4e186fe3b832dc8b96e90cf4dced92b80897969f Mon Sep 17 00:00:00 2001 From: Roel van der Wegen Date: Tue, 22 Aug 2023 08:13:08 +0200 Subject: [PATCH 04/12] Update DevAzureDeploymentTemplate.json --- deployment/DevAzureDeploymentTemplate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/DevAzureDeploymentTemplate.json b/deployment/DevAzureDeploymentTemplate.json index dee70ee11871..8beefadd450c 100644 --- a/deployment/DevAzureDeploymentTemplate.json +++ b/deployment/DevAzureDeploymentTemplate.json @@ -64,7 +64,6 @@ "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]", "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]", - "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git", "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]" }, From fd3eea5a6ddba930838ab8f407be55bab9e004a5 Mon Sep 17 00:00:00 2001 From: Roel van der Wegen Date: Tue, 22 Aug 2023 08:13:28 +0200 Subject: [PATCH 05/12] Remove repoUrl variable --- deployment/DevAzureDeploymentTemplate_regionoptions.json | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/DevAzureDeploymentTemplate_regionoptions.json b/deployment/DevAzureDeploymentTemplate_regionoptions.json index 301d50d5437a..0fb300af06c9 100644 --- a/deployment/DevAzureDeploymentTemplate_regionoptions.json +++ b/deployment/DevAzureDeploymentTemplate_regionoptions.json @@ -64,7 +64,6 @@ "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]", "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]", - "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git", "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]", "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]" }, From b78888714fa56cafb03b10effa45f29db3fb740a Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:20:28 +0200 Subject: [PATCH 06/12] fixes --- src/components/tables/CippTable.js | 14 ++++---------- src/views/cipp/CIPPSettings.js | 8 +++++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/components/tables/CippTable.js b/src/components/tables/CippTable.js index 75e3380d2a79..4cdad5b0c56f 100644 --- a/src/components/tables/CippTable.js +++ b/src/components/tables/CippTable.js @@ -505,16 +505,10 @@ export default function CippTable({ {(massResults.length >= 1 || loopRunning) && ( {massResults.map((message, idx) => { - return ( -
  • - { - //if message.data.results is an array, join, else just show the message - message.data?.Results?.length > 1 - ? message.data?.Results?.join(', ') - : message.data?.Results - } -
    • - ) + const results = message.data?.Results + const displayResults = Array.isArray(results) ? results.join(', ') : results + + return
  • {displayResults}
    • })} {loopRunning && (
  • diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js index 19520444cda2..f3206116d62d 100644 --- a/src/views/cipp/CIPPSettings.js +++ b/src/views/cipp/CIPPSettings.js @@ -766,13 +766,15 @@ const ExcludedTenantsSettings = () => { {removeExcludeTenantResult.data?.Results} )} - {refreshPermissionsResults.isSuccess && ( + {refreshPermissionsResults.isSuccess && + refreshPermissionsResults.data?.Results && + Array.isArray(refreshPermissionsResults.data.Results) ? ( - {refreshPermissionsResults.data?.Results.map((result, idx) => ( + {refreshPermissionsResults.data.Results.map((result, idx) => (
  • {result}
    • ))}     - )} + ) : null} {addExcludeTenantResult.isSuccess && ( {addExcludeTenantResult.data?.Results} From 9fc0c30ca8fd37fde08bb0d9b0fb1db9f20052d1 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:42:53 +0200 Subject: [PATCH 07/12] add smtp basic auth standard --- src/data/standards.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/data/standards.json b/src/data/standards.json index bfc4f5df0b4b..255449b17c3a 100644 --- a/src/data/standards.json +++ b/src/data/standards.json @@ -78,6 +78,13 @@ "addedComponent": null, "label": "Disable Basic Authentication" }, + { + "name": "standards.DisableBasicAuthSMTP", + "cat": "Global", + "helpText": "", + "addedComponent": null, + "label": "Disable SMTP Basic Authentication" + }, { "name": "standards.laps", "cat": "AAD", From 2e44d45f65460e7d3153cea3d17f10886d9734ba Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 22 Aug 2023 17:59:04 -0400 Subject: [PATCH 08/12] Autopilot import Multiple CSV support --- src/views/endpoint/autopilot/AutopilotAddDevice.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/endpoint/autopilot/AutopilotAddDevice.js b/src/views/endpoint/autopilot/AutopilotAddDevice.js index 0496ea4e1acc..6073da03f5fe 100644 --- a/src/views/endpoint/autopilot/AutopilotAddDevice.js +++ b/src/views/endpoint/autopilot/AutopilotAddDevice.js @@ -33,7 +33,7 @@ Error.propTypes = { const AddAPDevice = () => { const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery() - const [autopilotData, setAutopilotdata] = useState(false) + const [autopilotData, setAutopilotdata] = useState([]) const tableColumns = [ { name: 'serialNumber', @@ -74,7 +74,9 @@ const AddAPDevice = () => { }, ] const valbutton = (value) => - autopilotData ? undefined : 'You must add at least one device. Did you forget to click add?' + autopilotData.length + ? undefined + : 'You must add at least one device. Did you forget to click add?' const handleOnDrop = (data) => { const importdata = data.map((item) => { const normalizedData = {} @@ -90,7 +92,7 @@ const AddAPDevice = () => { modelName: normalizedData['device model'], } }) - setAutopilotdata(importdata) + setAutopilotdata([...autopilotData, ...importdata]) // console.log(importdata) } From 8a407ad5e2c2116b6232c66d3e047df797b20787 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Wed, 23 Aug 2023 00:01:47 +0200 Subject: [PATCH 09/12] add tenantfilter for named location deployment --- src/views/tenant/conditional/ConditionalAccess.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/tenant/conditional/ConditionalAccess.js b/src/views/tenant/conditional/ConditionalAccess.js index 205816829601..54df028702e6 100644 --- a/src/views/tenant/conditional/ConditionalAccess.js +++ b/src/views/tenant/conditional/ConditionalAccess.js @@ -42,7 +42,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => { icon: , modalBody: JSON.parse(row.rawjson), modalType: 'POST', - modalUrl: `/api/AddCATemplate`, + modalUrl: `/api/AddCATemplate?TenantFilter=${tenant.defaultDomainName}`, modalMessage: 'Are you sure you want to create a template based on this rule?', }, { From e23a46892d69ee62f01228e39adb3a17d3feb060 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:51:25 +0200 Subject: [PATCH 10/12] token cache clear removeal --- src/views/cipp/Setup.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/cipp/Setup.js b/src/views/cipp/Setup.js index 0304e311993e..603e2a07a0e2 100644 --- a/src/views/cipp/Setup.js +++ b/src/views/cipp/Setup.js @@ -130,8 +130,7 @@ const Setup = () => { Click the buttons below to refresh your token.
    Remember to login under a account that has been added to the correct GDAP - groups or the group 'AdminAgents'. After confirmation that the refresh is successful, - the token cache must be cleared. + groups and the group 'AdminAgents'.
    {getResults.isUninitialized && genericGetRequest({ path: 'api/ExecListAppId' })} {getResults.isSuccess && ( @@ -255,7 +254,7 @@ const Setup = () => { {usedWizard && - 'You have used the setup wizard. You can close this screen. Setup has been completed. You must execute a clear of the token cache. See the documentation on how to perform this.'} + 'You have used the setup wizard. You can close this screen. Setup has been completed.'} {!usedWizard && 'You are sending your own Secure Application Model setup to the Keyvault. For security reasons we do not show the keys. Please make sure you have entered the keys correctly.'} From d59444a75ff702063ac5f66fec4310e0c8788858 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar Date: Sun, 27 Aug 2023 22:56:27 +0200 Subject: [PATCH 11/12] version up --- version_latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_latest.txt b/version_latest.txt index cc868b62c301..99eba4de9311 100644 --- a/version_latest.txt +++ b/version_latest.txt @@ -1 +1 @@ -4.0.1 \ No newline at end of file +4.1.0 \ No newline at end of file From 34a30c0d6ffe92cf12d8d30f129479f24b9fea1c Mon Sep 17 00:00:00 2001 From: KelvinTegelaar Date: Sun, 27 Aug 2023 22:57:07 +0200 Subject: [PATCH 12/12] version --- public/version_latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/version_latest.txt b/public/version_latest.txt index cc868b62c301..99eba4de9311 100644 --- a/public/version_latest.txt +++ b/public/version_latest.txt @@ -1 +1 @@ -4.0.1 \ No newline at end of file +4.1.0 \ No newline at end of file