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/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx index c0f6ff6d8b19..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] @@ -645,9 +646,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 } @@ -683,8 +688,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 +699,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) { 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', 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