Merge pull request #1711 from KelvinTegelaar/dev

KelvinTegelaar · web-flow · commit 106823e9bdd6 · 2023-08-27T23:30:58.000+02:00
Dev to release
diff --git 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')))]"
   },
diff --git 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')))]"
   },
diff --git 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')))]"
   },
diff --git 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')))]"
   },
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-4.0.1
+4.1.0
diff --git a/src/components/layout/AppFooter.js b/src/components/layout/AppFooter.js
@@ -20,7 +20,7 @@ const AppFooter = () => {
           </CLink>{' '}
           <CLink href="https://rewst.io/">
             <CImage src={rewstLogo} alt="Rewst" />
-          </CLink>
+          </CLink>{' '}
           <CLink href="https://netfriends.com">
             <CImage src={netfriends} alt="Netfriends" />
           </CLink>
diff --git a/src/components/tables/CippTable.js b/src/components/tables/CippTable.js
@@ -505,16 +505,10 @@ export default function CippTable({
               {(massResults.length >= 1 || loopRunning) && (
                 <CCallout color="info">
                   {massResults.map((message, idx) => {
-                    return (
-                      <li key={idx}>
-                        {
-                          //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
-                        }
-                      </li>
-                    )
+                    const results = message.data?.Results
+                    const displayResults = Array.isArray(results) ? results.join(', ') : results
+
+                    return <li key={`message-${idx}`}>{displayResults}</li>
                   })}
                   {loopRunning && (
                     <li>
diff --git 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",
diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js
@@ -766,13 +766,15 @@ const ExcludedTenantsSettings = () => {
           {removeExcludeTenantResult.data?.Results}
         </CCallout>
       )}
-      {refreshPermissionsResults.isSuccess && (
+      {refreshPermissionsResults.isSuccess &&
+      refreshPermissionsResults.data?.Results &&
+      Array.isArray(refreshPermissionsResults.data.Results) ? (
         <CCallout color="success" dismissible>
-          {refreshPermissionsResults.data?.Results.map((result, idx) => (
+          {refreshPermissionsResults.data.Results.map((result, idx) => (
             <li key={idx}>{result}</li>
           ))}
         </CCallout>
-      )}
+      ) : null}
       {addExcludeTenantResult.isSuccess && (
         <CCallout color="success" dismissible>
           {addExcludeTenantResult.data?.Results}
diff --git a/src/views/cipp/Setup.js b/src/views/cipp/Setup.js
@@ -130,8 +130,7 @@ const Setup = () => {
             <CCol md={6} className="mb-3">
               Click the buttons below to refresh your token.
               <br /> 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'.
               <br />
               {getResults.isUninitialized && genericGetRequest({ path: 'api/ExecListAppId' })}
               {getResults.isSuccess && (
@@ -255,7 +254,7 @@ const Setup = () => {
                     <CCol md={3}></CCol>
                     <CCol md={6}>
                       {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.'}
                     </CCol>
diff --git 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)
   }
 
diff --git a/src/views/tenant/conditional/ConditionalAccess.js b/src/views/tenant/conditional/ConditionalAccess.js
@@ -42,7 +42,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             icon: <FontAwesomeIcon icon={faBook} className="me-2" />,
             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?',
           },
           {
diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-4.0.1
+4.1.0
