Merge branch 'KelvinTegelaar:main' into main

.vscode/launch.json

@@ -27,6 +27,13 @@
       "request": "launch",
       "name": "Launch Chrome Debugger",
       "url": "http://localhost:4280"
+    },
+    {
+      "type": "PowerShell",
+      "name": "Launch in Windows Terminal",
+      "request": "launch",
+      "cwd": "${cwd}",
+      "script": ". '${cwd}\\Tools\\Start-CippDevEmulators.ps1'"
     }
   ],
   "compounds": [

Tools/Start-CippDevEmulators.ps1

@@ -0,0 +1,4 @@
+Write-Host "Starting CIPP Dev Emulators"
+$Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
+wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.8.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": {

public/MFAStates.json

@@ -0,0 +1,14 @@
+[
+  {
+    "value": "disabled",
+    "label": "Disabled"
+  },
+  {
+    "value": "enabled",
+    "label": "Enabled"
+  },
+  {
+    "value": "enforced",
+    "label": "Enforced"
+  }
+]

public/version_latest.txt

@@ -1 +1 @@
-5.8.0
+5.9.3

src/_nav.jsx

@@ -45,6 +45,11 @@ const _nav = [
         name: 'Users',
         to: '/identity/administration/users',
       },
+      {
+        component: CNavItem,
+        name: 'Risky Users',
+        to: '/identity/administration/risky-users',
+      },
       {
         component: CNavItem,
         name: 'Groups',
@@ -114,6 +119,11 @@ const _nav = [
         name: 'AAD Connect Report',
         to: '/identity/reports/azure-ad-connect-report',
       },
+      {
+        component: CNavItem,
+        name: 'Risk Detections',
+        to: '/identity/reports/risk-detections',
+      },
     ],
   },
   {

src/components/buttons/TableModalButton.jsx

@@ -50,4 +50,5 @@ TableModalButton.propTypes = {
   title: PropTypes.string,
   className: PropTypes.string,
   countOnly: PropTypes.bool,
+  icon: PropTypes.string,
 }

src/components/forms/RFFComponents.jsx

@@ -470,19 +470,25 @@ RFFCFormSelect.propTypes = {
 export function Condition({ when, is, children, like, regex }) {
   return (
     <>
-      {is && (
+      {is !== undefined && (
         <Field name={when} subscription={{ value: true }}>
-          {({ input: { value } }) => (value === is ? children : null)}
+          {({ input: { value } }) => {
+            return value === is ? children : null
+          }}
         </Field>
       )}
-      {like && (
+      {like !== undefined && (
         <Field name={when} subscription={{ value: true }}>
-          {({ input: { value } }) => (value.includes(like) ? children : null)}
+          {({ input: { value } }) => {
+            return value.includes(like) ? children : null
+          }}
         </Field>
       )}
-      {regex && (
+      {regex !== undefined && (
         <Field name={when} subscription={{ value: true }}>
-          {({ input: { value } }) => (value.match(regex) ? children : null)}
+          {({ input: { value } }) => {
+            return value.match(regex) ? children : null
+          }}
         </Field>
       )}
     </>

src/components/layout/AppHeader.jsx

@@ -15,7 +15,12 @@ import { AppHeaderSearch } from 'src/components/header'
 import { CippActionsOffcanvas, TenantSelector } from '../utilities'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faBars } from '@fortawesome/free-solid-svg-icons'
-import { setCurrentTheme, setUserSettings, toggleSidebarShow } from 'src/store/features/app'
+import {
+  setCurrentTheme,
+  setSetupCompleted,
+  setUserSettings,
+  toggleSidebarShow,
+} from 'src/store/features/app'
 import { useMediaPredicate } from 'react-media-hook'
 import {
   useGenericGetRequestQuery,
@@ -92,6 +97,25 @@ const AppHeader = () => {
       }
     }, [delay, state])
   }
+  //useEffect to check if any of the dashboard alerts contained the key "setupCompleted" and if so,
+  //check if the value of this key is false. If so, set the setupCompleted state to false
+  //if none is found, set the setupCompleted state to true
+  useEffect(() => {
+    if (dashboard && Array.isArray(dashboard) && dashboard.length >= 1) {
+      console.log('Finding if setup is completed.')
+      const setupCompleted = dashboard.find((alert) => alert && alert.setupCompleted === false)
+      if (setupCompleted) {
+        console.log("Setup isn't completed yet, we found a match with false.")
+        dispatch(setSetupCompleted({ setupCompleted: false }))
+      } else {
+        console.log('Setup is completed.')
+        dispatch(setSetupCompleted({ setupCompleted: true }))
+      }
+    } else {
+      console.log('Setup is completed.')
+      dispatch(setSetupCompleted({ setupCompleted: true }))
+    }
+  }, [dashboard, dispatch])
 
   useEffect(() => {
     if (cippQueueList.isUninitialized && (cippQueueList.isFetching || cippQueueList.isLoading)) {

src/components/tables/CellBoolean.jsx

@@ -47,6 +47,7 @@ export default function CellBoolean({
     if (
       cell.toLowerCase() === 'success' ||
       cell.toLowerCase() === 'enabled' ||
+      cell.toLowerCase() === 'enforced' ||
       cell.toLowerCase() === 'pass' ||
       cell.toLowerCase() === 'true' ||
       cell.toLowerCase() === 'compliant'

src/components/tables/CippTable.jsx

@@ -637,14 +637,25 @@ 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]
 
           if (typeof value === 'object' && !Array.isArray(value)) {
             Object.assign(output, flatten(value, newKey))
           } else {
-            output[newKey] = value
+            if (Array.isArray(value)) {
+              if (typeof value[0] === 'object') {
+                value.map((item, idx) => {
+                  Object.assign(output, flatten(item, `${newKey}[${idx}]`))
+                })
+              } else {
+                output[newKey] = value
+              }
+            } else {
+              output[newKey] = value
+            }
           }
           return output
         }, {})
@@ -677,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))
             })
           : []
       }
@@ -689,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) {

src/components/utilities/CippActionsOffcanvas.jsx

@@ -345,7 +345,7 @@ export default function CippActionsOffcanvas(props) {
   }
   let actionsSelectorsContent
   try {
-    actionsSelectorsContent = props.actionsSelect.map((action, index) => (
+    actionsSelectorsContent = props?.actionsSelect?.map((action, index) => (
       <CListGroupItem className="" component="label" color={action.color} key={index}>
         {action.label}
         <CListGroupItem