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

BNWEIN · Oct 10, 2023 · bcf1c4a · bcf1c4a
2 parents a13d053 + 94c331e
commit bcf1c4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/components/tables/CippDatatable.js b/src/components/tables/CippDatatable.js
@@ -20,10 +20,10 @@ export default function CippDatatable({ path, params, ...rest }) {
   }
   return (
     <>
-      {data[0]?.Queued && <CCallout color="info">{data[0]?.QueueMessage}</CCallout>}
+      {data?.Metadata?.Queued && <CCallout color="info">{data?.Metadata?.QueueMessage}</CCallout>}
       <CippTable
         {...rest}
-        data={data[0]?.Queued ? [] : data}
+        data={Array.isArray(data?.Results) ? data?.Results : data}
         isFetching={isFetching}
         error={error}
         defaultFilterText={defaultFilterText}

diff --git a/src/views/cipp/Scheduler.js b/src/views/cipp/Scheduler.js
@@ -283,7 +283,9 @@ const Scheduler = () => {
                                 paramblock = parameters.map((param, idx) => (
                                   <CRow key={idx} className="mb-3">
                                     <CCol>
-                                      {param.Type === 'System.Boolean' ? (
+                                      {param.Type === 'System.Boolean' ||
+                                      param.Type ===
+                                        'System.Management.Automation.SwitchParameter' ? (
                                         <>
                                           <label>{param.Name}</label>
                                           <RFFCFormSwitch

diff --git a/src/views/home/Home.js b/src/views/home/Home.js
@@ -333,7 +333,7 @@ const Home = () => {
                     {(isLoadingPartners || isFetchingPartners) && <Skeleton />}
                     {issuccessPartners &&
                       !isFetchingPartners &&
-                      partners.map((partner) => {
+                      partners?.Results.map((partner) => {
                         if (partner.TenantInfo) {
                           return (
                             <li key={`${partner.tenantId}`}>