Skip to content

Commit 94c331e

Browse files
Merge pull request #1796 from johnduprey/dev
CippDatatable.js
2 parents 7046c76 + 45a00ae commit 94c331e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/components/tables/CippDatatable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ export default function CippDatatable({ path, params, ...rest }) {
2020
}
2121
return (
2222
<>
23-
{data[0]?.Queued && <CCallout color="info">{data[0]?.QueueMessage}</CCallout>}
23+
{data?.Metadata?.Queued && <CCallout color="info">{data?.Metadata?.QueueMessage}</CCallout>}
2424
<CippTable
2525
{...rest}
26-
data={data[0]?.Queued ? [] : data}
26+
data={Array.isArray(data?.Results) ? data?.Results : data}
2727
isFetching={isFetching}
2828
error={error}
2929
defaultFilterText={defaultFilterText}

src/views/cipp/Scheduler.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ const Scheduler = () => {
283283
paramblock = parameters.map((param, idx) => (
284284
<CRow key={idx} className="mb-3">
285285
<CCol>
286-
{param.Type === 'System.Boolean' ? (
286+
{param.Type === 'System.Boolean' ||
287+
param.Type ===
288+
'System.Management.Automation.SwitchParameter' ? (
287289
<>
288290
<label>{param.Name}</label>
289291
<RFFCFormSwitch

src/views/home/Home.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ const Home = () => {
333333
{(isLoadingPartners || isFetchingPartners) && <Skeleton />}
334334
{issuccessPartners &&
335335
!isFetchingPartners &&
336-
partners.map((partner) => {
336+
partners?.Results.map((partner) => {
337337
if (partner.TenantInfo) {
338338
return (
339339
<li key={`${partner.tenantId}`}>

0 commit comments

Comments
 (0)