Merge pull request #38 from KelvinTegelaar/dev

kris6673 · web-flow · commit 0c371e4516ca · 2024-05-17T17:49:42.000+02:00
[pull] dev from KelvinTegelaar:dev
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.6.2",
+  "version": "5.7.0",
   "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
@@ -1 +1 @@
-5.6.2
+5.7.0
diff --git a/src/_nav.jsx b/src/_nav.jsx
@@ -150,7 +150,7 @@ const _nav = [
       {
         component: CNavItem,
         name: 'Tenant Onboarding',
-        to: '/tenant/administration/tenant-onboarding-wizard',
+        to: '/tenant/administration/tenant-onboarding',
       },
       {
         component: CNavItem,
diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx
@@ -125,6 +125,7 @@ export default function CippTable({
   filterlist,
   showFilter = true,
   endpointName,
+  defaultSortAsc = true,
   tableProps: {
     keyField = 'id',
     theme = 'cyberdrain',
@@ -989,7 +990,7 @@ export default function CippTable({
               expandableRowsComponent={expandableRowsComponent}
               highlightOnHover={highlightOnHover}
               expandOnRowClicked={expandOnRowClicked}
-              defaultSortAsc
+              defaultSortAsc={defaultSortAsc}
               defaultSortFieldId={1}
               sortFunction={customSort}
               paginationPerPage={tablePageSize}
@@ -1050,6 +1051,7 @@ export const CippTablePropTypes = {
   disableCSVExport: PropTypes.bool,
   error: PropTypes.object,
   filterlist: PropTypes.arrayOf(PropTypes.object),
+  defaultSortAsc: PropTypes.bool,
 }
 
 CippTable.propTypes = CippTablePropTypes
diff --git a/src/components/utilities/CippTableOffcanvas.jsx b/src/components/utilities/CippTableOffcanvas.jsx
@@ -14,7 +14,7 @@ function CippTableOffcanvas({
   tableProps,
   data = null,
 }) {
-  if (Array.isArray(data) && data !== null && data !== undefined) {
+  if (Array.isArray(data) && data !== null && data !== undefined && data?.length > 0) {
     if (!Array.isArray(data) && typeof data === 'object') {
       data = Object.keys(data).map((key) => {
         return {
diff --git a/src/data/AuditLogSchema.json b/src/data/AuditLogSchema.json
@@ -100,6 +100,9 @@
     { "value": "remove delegation entry.", "name": "removed delegation entry" },
     { "value": "remove domain from company.", "name": "removed domain from company" },
     { "value": "remove member from group.", "name": "removed member from group" },
+    { "value": "remove member from a role.", "name": "remove member from a role" },
+    { "value": "Disable Strong Authentication.", "name": "Disable Strong Authentication." },
+
     {
       "value": "remove service principal.",
       "name": "removed a service principal from the directory"
diff --git a/src/data/AuditLogTemplates.json b/src/data/AuditLogTemplates.json
@@ -87,7 +87,23 @@
   {
     "value": "Add member to role.",
     "name": "A user has been added to an admin role",
-    "template": []
+    "template": {
+      "preset": {
+        "value": "Add member to role.",
+        "label": "A user has been added to an admin role"
+      },
+      "logbook": { "value": "Audit.AzureActiveDirectory", "label": "Azure AD" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Add member to role.",
+            "label": "Add member to role."
+          }
+        }
+      ]
+    }
   },
   {
     "value": "Update StsRefreshTokenValidFrom Timestamp.",
@@ -113,12 +129,44 @@
   {
     "value": "Disable Strong Authentication.",
     "name": "A users MFA has been disabled",
-    "template": []
+    "template": {
+      "preset": {
+        "value": "Disable Strong Authentication.",
+        "label": "A users MFA has been disabled"
+      },
+      "logbook": { "value": "Audit.AzureActiveDirectory", "label": "Azure AD" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Disable Strong Authentication.",
+            "label": "Disable Strong Authentication."
+          }
+        }
+      ]
+    }
   },
   {
     "value": "Remove Member from a role.",
     "name": "A user has been removed from a role",
-    "template": []
+    "template": {
+      "preset": {
+        "value": "Remove Member from a role.",
+        "label": "A user has been removed from a role"
+      },
+      "logbook": { "value": "Audit.AzureActiveDirectory", "label": "Azure AD" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Remove Member from a role.",
+            "label": "Remove Member from a role."
+          }
+        }
+      ]
+    }
   },
   {
     "value": "Reset user password.",
@@ -169,12 +217,44 @@
   {
     "value": "Add service principal.",
     "name": "A service principal has been created",
-    "template": []
+    "template": {
+      "preset": {
+        "value": "Add service principal.",
+        "label": "A service principal has been created"
+      },
+      "logbook": { "value": "Audit.AzureActiveDirectory", "label": "Azure AD" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Add service principal.",
+            "label": "Add service principal."
+          }
+        }
+      ]
+    }
   },
   {
     "value": "Remove service principal.",
     "name": "A service principal has been removed",
-    "template": []
+    "template": {
+      "preset": {
+        "value": "Remove service principal.",
+        "label": "A service principal has been removed"
+      },
+      "logbook": { "value": "Audit.AzureActiveDirectory", "label": "Azure AD" },
+      "conditions": [
+        {
+          "Property": { "value": "List:Operation", "label": "Operation" },
+          "Operator": { "value": "EQ", "label": "Equals to" },
+          "Input": {
+            "value": "Remove service principal.",
+            "label": "Remove service principal."
+          }
+        }
+      ]
+    }
   },
   {
     "value": "badRepIP",
diff --git a/src/importsMap.jsx b/src/importsMap.jsx
@@ -140,6 +140,7 @@ import React from 'react'
   "/tenant/administration/gdap-status": React.lazy(() => import('./views/tenant/administration/ListGDAPQueue')), 
   "/tenant/standards/list-standards": React.lazy(() => import('./views/tenant/standards/ListStandards')), 
   "/tenant/administration/tenant-offboarding-wizard": React.lazy(() => import('./views/tenant/administration/TenantOffboardingWizard')), 
+  "/tenant/administration/tenant-onboarding": React.lazy(() => import('./views/tenant/administration/TenantOnboarding')), 
   "/tenant/administration/tenant-onboarding-wizard": React.lazy(() => import('./views/tenant/administration/TenantOnboardingWizard')), 
 }
 export default importsMap
diff --git a/src/routes.json b/src/routes.json
@@ -954,6 +954,12 @@
     "component": "views/tenant/administration/TenantOffboardingWizard",
     "allowedRoles": ["admin"]
   },
+  {
+    "path": "/tenant/administration/tenant-onboarding",
+    "name": "Tenant Onboarding",
+    "component": "views/tenant/administration/TenantOnboarding",
+    "allowedRoles": ["admin"]
+  },
   {
     "path": "/tenant/administration/tenant-onboarding-wizard",
     "name": "Tenant Onboarding",
diff --git a/src/views/cipp/app-settings/SettingsPartner.jsx b/src/views/cipp/app-settings/SettingsPartner.jsx
@@ -19,7 +19,7 @@ import {
   CSpinner,
 } from '@coreui/react'
 import { Form } from 'react-final-form'
-import { RFFSelectSearch } from 'src/components/forms/index.js'
+import { RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms/index.js'
 import React, { useEffect } from 'react'
 import { CippCallout } from 'src/components/layout/index.js'
 import { CippCodeBlock } from 'src/components/utilities'
@@ -45,6 +45,7 @@ export function SettingsPartner() {
   const onSubmit = (values) => {
     const shippedValues = {
       EventType: values?.EventType?.map((event) => event.value),
+      standardsExcludeAllTenants: values?.standardsExcludeAllTenants,
     }
     submitWebhook({
       path: '/api/ExecPartnerWebhook?Action=CreateSubscription',
@@ -141,6 +142,8 @@ export function SettingsPartner() {
                         label: event,
                         value: event,
                       })),
+                      standardsExcludeAllTenants:
+                        webhookConfig?.data?.Results?.standardsExcludeAllTenants,
                     }}
                     render={({ handleSubmit }) => (
                       <>
@@ -156,6 +159,14 @@ export function SettingsPartner() {
                             refreshFunction={() => webhookEvents.refetch()}
                             helpText="Select the events you want to receive notifications for."
                           />
+                          <RFFCFormSwitch
+                            name="standardsExcludeAllTenants"
+                            helpText='Enabling this feature excludes tenants from any top-level
+                                      "All Tenants" standard. This means that only the standards you
+                                      explicitly set for this tenant will be applied.'
+                            label="Exclude onboarded tenants from top-level standards"
+                            className="mt-3"
+                          />
                           <CButton
                             type="submit"
                             color="primary"
diff --git a/src/views/email-exchange/connectors/ConnectorList.jsx b/src/views/email-exchange/connectors/ConnectorList.jsx
@@ -156,8 +156,14 @@ const ConnectorList = () => {
           { filterName: 'Disabled connectors', filter: 'Complex: Enabled eq false' },
           { filterName: 'Inbound connectors', filter: 'Complex: cippconnectortype eq inbound' },
           { filterName: 'Outbound connectors', filter: 'Complex: cippconnectortype eq outbound' },
-          { filterName: 'Transport rule connectors', filter: 'Complex: IsTransportRuleScoped eq true' },
-          { filterName: 'Non-transport rule connectors', filter: 'Complex: IsTransportRuleScoped eq false' },
+          {
+            filterName: 'Transport rule connectors',
+            filter: 'Complex: IsTransportRuleScoped eq true',
+          },
+          {
+            filterName: 'Non-transport rule connectors',
+            filter: 'Complex: IsTransportRuleScoped eq false',
+          },
         ],
         reportName: `${tenant?.defaultDomainName}-connectors-list`,
         path: '/api/ListExchangeConnectors',
diff --git a/src/views/home/Home.jsx b/src/views/home/Home.jsx
@@ -2,10 +2,8 @@ import React, { useState } from 'react'
 import {
   faBook,
   faCog,
-  faEllipsisH,
   faLaptopCode,
   faMailBulk,
-  faSearch,
   faUser,
   faUserFriends,
   faUserPlus,
@@ -16,19 +14,15 @@ import {
   CCol,
   CCollapse,
   CDropdown,
-  CDropdownHeader,
-  CDropdownItem,
   CDropdownMenu,
   CDropdownToggle,
   CLink,
-  CNav,
   CRow,
 } from '@coreui/react'
 import { useGenericGetRequestQuery } from 'src/store/api/app'
 import { CippContentCard } from 'src/components/layout'
 import Skeleton from 'react-loading-skeleton'
 import { UniversalSearch } from 'src/components/utilities/UniversalSearch'
-import { ActionContentCard } from 'src/components/contentcards'
 import { useSelector } from 'react-redux'
 import allStandardsList from 'src/data/standards'
 import Portals from 'src/data/portals'
@@ -37,11 +31,14 @@ import { CChart } from '@coreui/react-chartjs'
 import { getStyle } from '@coreui/utils'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { Link } from 'react-router-dom'
-import CippPrettyCard from 'src/components/contentcards/CippPrettyCard'
+import { useNavigate } from 'react-router-dom'
+import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
+import { ModalService } from 'src/components/utilities'
 
 const TenantDashboard = () => {
   const [visible, setVisible] = useState(false)
   const [domainVisible, setDomainVisible] = useState(false)
+  const navigate = useNavigate()
 
   const currentTenant = useSelector((state) => state.app.currentTenant)
   const theme = useSelector((state) => state.app.currentTheme)
@@ -174,6 +171,55 @@ const TenantDashboard = () => {
       )
     })
   }
+
+  const handleTable = (data, title) => {
+    const QueryColumns = []
+    const columns = Object.keys(data[0]).map((key) => {
+      QueryColumns.push({
+        name: key,
+        selector: (row) => row[key], // Accessing the property using the key
+        sortable: true,
+        exportSelector: key,
+        cell: cellGenericFormatter(),
+      })
+    })
+    ModalService.open({
+      data: data,
+      componentType: 'table',
+      componentProps: {
+        columns: QueryColumns,
+        keyField: 'id',
+      },
+      title: title,
+      size: 'lg',
+    })
+  }
+
+  const userChartLegendClickHandler = function (e, legendItem, legend) {
+    switch (legendItem.text) {
+      case 'Total Users':
+        navigate('/identity/administration/users?customerId=' + currentTenant.customerId)
+        break
+      case 'Licensed Users':
+        navigate(
+          '/identity/administration/users?customerId=' +
+            currentTenant.customerId +
+            '&tableFilter=Graph%3A+assignedLicenses%2F%24count+ne+0',
+        )
+        break
+      case 'Guests':
+        navigate(
+          '/identity/administration/users?customerId=' +
+            currentTenant.customerId +
+            '&tableFilter=Graph%3A+usertype+eq+%27guest%27',
+        )
+        break
+      case 'Global Admins':
+        handleTable(GlobalAdminList.data?.Results, 'Global Admins')
+        break
+    }
+  }
+
   return (
     <>
       <CRow className="mb-3">
@@ -337,6 +383,13 @@ const TenantDashboard = () => {
                           labels: {
                             color: getStyle('--cui-body-color'),
                           },
+                          onClick: userChartLegendClickHandler,
+                          onHover: (event) => {
+                            event.native.target.style.cursor = 'pointer'
+                          },
+                          onLeave: (event) => {
+                            event.native.target.style.cursor = 'default'
+                          },
                         },
                       },
                     }}
diff --git a/src/views/identity/administration/EditUser.jsx b/src/views/identity/administration/EditUser.jsx
diff --git a/src/views/identity/administration/OffboardingWizard.jsx b/src/views/identity/administration/OffboardingWizard.jsx
diff --git a/src/views/tenant/administration/TenantOnboarding.jsx b/src/views/tenant/administration/TenantOnboarding.jsx
diff --git a/src/views/tenant/administration/TenantOnboardingWizard.jsx b/src/views/tenant/administration/TenantOnboardingWizard.jsx
diff --git a/src/views/tenant/administration/onboarding/RelationshipOnboarding.jsx b/src/views/tenant/administration/onboarding/RelationshipOnboarding.jsx
diff --git a/version_latest.txt b/version_latest.txt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cipp",`
`3`		`- "version": "5.6.2",`
	`3`	`+ "version": "5.7.0",`
`4`	`4`	`"description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",`
`5`	`5`	`"homepage": "https://cipp.app/",`
`6`	`6`	`"bugs": {`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ const _nav = [`
`150`	`150`	`{`
`151`	`151`	`component: CNavItem,`
`152`	`152`	`name: 'Tenant Onboarding',`
`153`		`- to: '/tenant/administration/tenant-onboarding-wizard',`
	`153`	`+ to: '/tenant/administration/tenant-onboarding',`
`154`	`154`	`},`
`155`	`155`	`{`
`156`	`156`	`component: CNavItem,`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ import React from 'react'`
`140`	`140`	`"/tenant/administration/gdap-status": React.lazy(() => import('./views/tenant/administration/ListGDAPQueue')),`
`141`	`141`	`"/tenant/standards/list-standards": React.lazy(() => import('./views/tenant/standards/ListStandards')),`
`142`	`142`	`"/tenant/administration/tenant-offboarding-wizard": React.lazy(() => import('./views/tenant/administration/TenantOffboardingWizard')),`
	`143`	`+ "/tenant/administration/tenant-onboarding": React.lazy(() => import('./views/tenant/administration/TenantOnboarding')),`
`143`	`144`	`"/tenant/administration/tenant-onboarding-wizard": React.lazy(() => import('./views/tenant/administration/TenantOnboardingWizard')),`
`144`	`145`	`}`
`145`	`146`	`export default importsMap`