Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

jchurchh · Jun 22, 2024 · 5eccc8f · 5eccc8f
2 parents b579070 + 5c0601c
commit 5eccc8f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx
@@ -644,7 +644,13 @@ export default function CippTable({
           if (typeof value === 'object' && !Array.isArray(value)) {
             Object.assign(output, flatten(value, newKey))
           } else {
-            output[newKey] = value
+            if (Array.isArray(value)) {
+              value.map((item, idx) => {
+                Object.assign(output, flatten(item, `${newKey}[${idx}]`))
+              })
+            } else {
+              output[newKey] = value
+            }
           }
           return output
         }, {})

diff --git a/src/views/identity/administration/DeployJITAdmin.jsx b/src/views/identity/administration/DeployJITAdmin.jsx
@@ -75,6 +75,7 @@ const DeployJITAdmin = () => {
       $select: 'id,displayName,userPrincipalName,accountEnabled',
       $count: true,
       $top: 999,
+      $orderby: 'displayName',
     },
   })
 

diff --git a/src/views/tenant/conditional/DeployVacation.jsx b/src/views/tenant/conditional/DeployVacation.jsx
@@ -50,7 +50,17 @@ const ListClassicAlerts = () => {
     data: users = [],
     isFetching: usersIsFetching,
     error: usersError,
-  } = useListUsersQuery({ tenantDomain })
+  } = useGenericGetRequestQuery({
+    path: '/api/ListGraphRequest',
+    params: {
+      TenantFilter: tenantDomain,
+      Endpoint: 'users',
+      $select: 'id,displayName,userPrincipalName,accountEnabled',
+      $count: true,
+      $top: 999,
+      $orderby: 'displayName',
+    },
+  })
 
   const {
     data: caPolicies = [],
@@ -90,12 +100,13 @@ const ListClassicAlerts = () => {
                         <CCol>
                           <RFFSelectSearch
                             label={'Users in ' + tenantDomain}
-                            values={users?.map((user) => ({
+                            values={users?.Results?.map((user) => ({
                               value: user.id,
                               name: `${user.displayName} <${user.userPrincipalName}>`,
                             }))}
                             placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
                             name="UserId"
+                            isLoading={usersIsFetching}
                           />
                         </CCol>
                       </CRow>
@@ -109,6 +120,7 @@ const ListClassicAlerts = () => {
                             }))}
                             placeholder={!caIsFetching ? 'Select policy' : 'Loading...'}
                             name="PolicyId"
+                            isLoading={caIsFetching}
                           />
                         </CCol>
                       </CRow>

diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -548,7 +548,7 @@ const ApplyNewStandard = () => {
                                   />
                                 </CCol>
                                 <CCol md={3}>
-                                  <h5>Optional Input</h5>
+                                  <h5>Settings</h5>
                                 </CCol>
                               </CRow>
                             </CAccordionBody>
@@ -647,7 +647,7 @@ const ApplyNewStandard = () => {
                                             />
                                           </CCol>
                                           <CCol md={3}>
-                                            <h5>Optional Input</h5>
+                                            <h5>Settings</h5>
                                             {obj.addedComponent &&
                                               obj.addedComponent.map((component) => (
                                                 <>
@@ -768,7 +768,7 @@ const ApplyNewStandard = () => {
                                   <RFFCFormSwitch name={`${template.switchName}.remediate`} />
                                 </CCol>
                                 <CCol md={3}>
-                                  <h5>Optional Input</h5>
+                                  <h5>Settings</h5>
                                   {template.templates.isSuccess && (
                                     <RFFSelectSearch
                                       name={`${template.switchName}.TemplateList`}
@@ -845,7 +845,7 @@ const ApplyNewStandard = () => {
                                 <RFFCFormSwitch name={`standards.APConfig.remediate`} />
                               </CCol>
                               <CCol md={3}>
-                                <h5>Optional Input</h5>
+                                <h5>Settings</h5>
                                 <CRow>
                                   <CCol md={12}>
                                     <RFFCFormInput
@@ -955,7 +955,7 @@ const ApplyNewStandard = () => {
                                 <RFFCFormSwitch name={`standards.APESP.remediate`} />
                               </CCol>
                               <CCol md={3}>
-                                <h5>Optional Input</h5>
+                                <h5>Settings</h5>
                                 <CRow>
                                   <CCol>
                                     <RFFCFormInput