From 35f01dbf3d9af436d3a27ef3b150348b2656570e Mon Sep 17 00:00:00 2001 From: Esco Date: Tue, 25 Jun 2024 09:51:44 +0200 Subject: [PATCH 1/5] filterlist typo fix --- src/views/identity/reports/SignIns.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/identity/reports/SignIns.jsx b/src/views/identity/reports/SignIns.jsx index 4840a906f9f0..45934e5de02b 100644 --- a/src/views/identity/reports/SignIns.jsx +++ b/src/views/identity/reports/SignIns.jsx @@ -201,7 +201,7 @@ const SignInsReport = () => { title="Sign Ins Report" capabilities={{ allTenants: false, helpContext: 'https://google.com' }} datatable={{ - filterlists: [ + filterlist: [ { filterName: 'Risky sign-ins', filter: 'Complex: riskState ne none', From ca4f768fc83e43ab389a35023ec8eb3769cdf2a2 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 25 Jun 2024 10:17:22 -0400 Subject: [PATCH 2/5] fix flatten/format functions --- src/components/tables/CippTable.jsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx index c0f6ff6d8b19..3de34a64d4be 100644 --- a/src/components/tables/CippTable.jsx +++ b/src/components/tables/CippTable.jsx @@ -683,8 +683,7 @@ export default function CippTable({ }) return Array.isArray(exportData) && exportData.length > 0 ? exportData.map((obj) => { - const flattenedObj = flatten(obj) - return applyFormatter(flattenedObj) + return flatten(applyFormatter(obj)) }) : [] } @@ -695,8 +694,7 @@ export default function CippTable({ // Adjusted dataFlat processing to include formatting let dataFlat = Array.isArray(data) ? data.map((item) => { - const flattenedItem = flatten(item) - return applyFormatter(flattenedItem) + return flatten(applyFormatter(item)) }) : [] if (!disablePDFExport) { From f5ebf89137ca6ec06661e8eaba4c990c6ba2fad6 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 25 Jun 2024 16:57:12 -0400 Subject: [PATCH 3/5] fix nested array --- src/components/tables/CippTable.jsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx index 3de34a64d4be..8db2dbcf1db4 100644 --- a/src/components/tables/CippTable.jsx +++ b/src/components/tables/CippTable.jsx @@ -645,9 +645,13 @@ export default function CippTable({ Object.assign(output, flatten(value, newKey)) } else { if (Array.isArray(value)) { - value.map((item, idx) => { - Object.assign(output, flatten(item, `${newKey}[${idx}]`)) - }) + if (typeof value[0] === 'object') { + value.map((item, idx) => { + Object.assign(output, flatten(item, `${newKey}[${idx}]`)) + }) + } else { + output[newKey] = value + } } else { output[newKey] = value } From 453e59d8734a1961476fe9b66bceb400c361f22d Mon Sep 17 00:00:00 2001 From: KelvinTegelaar Date: Wed, 26 Jun 2024 10:21:16 +0200 Subject: [PATCH 4/5] fix flatten when obj is null --- src/components/tables/CippTable.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx index 8db2dbcf1db4..6eee3a54e611 100644 --- a/src/components/tables/CippTable.jsx +++ b/src/components/tables/CippTable.jsx @@ -637,6 +637,7 @@ export default function CippTable({ // Define the flatten function const flatten = (obj, prefix = '') => { + if (obj === null) return {} return Object.keys(obj).reduce((output, key) => { const newKey = prefix ? `${prefix}.${key}` : key const value = obj[key] === null ? '' : obj[key] From c025a51ab6d26e2887d4cd7af90c9247e820280c Mon Sep 17 00:00:00 2001 From: KelvinTegelaar Date: Wed, 26 Jun 2024 10:28:31 +0200 Subject: [PATCH 5/5] version up --- package.json | 2 +- public/version_latest.txt | 2 +- version_latest.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ed6174da5afa..039c0b97dd85 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cipp", - "version": "5.9.0", + "version": "5.9.3", "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.", "homepage": "https://cipp.app/", "bugs": { diff --git a/public/version_latest.txt b/public/version_latest.txt index b3d91f9cfc04..99a8b57b6f85 100644 --- a/public/version_latest.txt +++ b/public/version_latest.txt @@ -1 +1 @@ -5.9.0 +5.9.3 diff --git a/version_latest.txt b/version_latest.txt index b3d91f9cfc04..99a8b57b6f85 100644 --- a/version_latest.txt +++ b/version_latest.txt @@ -1 +1 @@ -5.9.0 +5.9.3