Merge remote-tracking branch 'upstream/dev' into dev

JohnDuprey · May 29, 2024 · dafe571 · dafe571
2 parents 6fd3c25 + 1da3471
commit dafe571
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 6 deletions.
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -830,6 +830,48 @@
     "impact": "Low Impact",
     "impactColour": "info"
   },
+  {
+    "name": "standards.ShortenMeetings",
+    "cat": "Exchange Standards",
+    "tag": ["mediumimpact"],
+    "helpText": "Sets the shorten meetings settings on a tenant level. This will shorten meetings by the selected amount of minutes. Valid values are 0 to 29. Short meetings are under 60 minutes, long meetings are over 60 minutes.",
+    "addedComponent": [
+      {
+        "type": "Select",
+        "label": "Select value",
+        "name": "standards.ShortenMeetings.ShortenEventScopeDefault",
+        "values": [
+          {
+            "label": "Disabled/None",
+            "value": "None"
+          },
+          {
+            "label": "End early",
+            "value": "EndEarly"
+          },
+          {
+            "label": "Start late",
+            "value": "StartLate"
+          }
+        ]
+      },
+      {
+        "type": "number",
+        "name": "standards.ShortenMeetings.DefaultMinutesToReduceShortEventsBy",
+        "label": "Minutes to reduce short calendar events by (Default is 5)",
+        "default": 5
+      },
+      {
+        "type": "number",
+        "name": "standards.ShortenMeetings.DefaultMinutesToReduceLongEventsBy",
+        "label": "Minutes to reduce long calendar events by (Default is 10)",
+        "default": 10
+      }
+    ],
+    "label": "Set shorten meetings state",
+    "impact": "Medium Impact",
+    "impactColour": "warning"
+  },
   {
     "name": "standards.DisableOutlookAddins",
     "cat": "Exchange Standards",

diff --git a/src/views/endpoint/autopilot/AutopilotAddDevice.jsx b/src/views/endpoint/autopilot/AutopilotAddDevice.jsx
@@ -34,6 +34,28 @@ Error.propTypes = {
 const AddAPDevice = () => {
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const [autopilotData, setAutopilotdata] = useState([])
+  const completeColumns = [
+    {
+      name: 'Serial Number',
+      selector: (row) => row['serialNumber'],
+      sortable: true,
+    },
+    {
+      name: 'Status',
+      selector: (row) => row['status'],
+      sortable: true,
+    },
+    {
+      name: 'Error Code',
+      selector: (row) => row['errorCode'],
+      sortable: true,
+    },
+    {
+      name: 'Error Description',
+      selector: (row) => row['errorDescription'],
+      sortable: true,
+    },
+  ]
   const tableColumns = [
     {
       name: 'serialNumber',
@@ -267,8 +289,18 @@ const AddAPDevice = () => {
               <CSpinner>Loading</CSpinner>
             </CCallout>
           )}
-          {postResults.isSuccess && <CCallout color="success">{postResults.data.Results}</CCallout>}
-          {autopilotData && (
+          {postResults.isSuccess && (
+            <>
+              <CCallout color="success">{postResults.data?.Results?.Status}</CCallout>
+              <CippTable
+                reportName="none"
+                tableProps={{ subheader: false }}
+                data={postResults.data?.Results?.Devices}
+                columns={completeColumns}
+              />
+            </>
+          )}
+          {autopilotData && !postResults.isSuccess && (
             <CippTable
               reportName="none"
               tableProps={{ subheader: false }}

diff --git a/src/views/home/Home.jsx b/src/views/home/Home.jsx
@@ -30,8 +30,7 @@ import CippCopyToClipboard from 'src/components/utilities/CippCopyToClipboard'
 import { CChart } from '@coreui/react-chartjs'
 import { getStyle } from '@coreui/utils'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { Link } from 'react-router-dom'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate, Link } from 'react-router-dom'
 import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
 import { ModalService } from 'src/components/utilities'
 

diff --git a/src/views/identity/administration/OffboardingWizard.jsx b/src/views/identity/administration/OffboardingWizard.jsx
@@ -302,7 +302,7 @@ const OffboardingWizard = () => {
                           >
                             <h5 className="mb-0">Selected User:</h5>
                             <span>
-                              {users.find((x) => x.userPrincipalName === user.value)
+                              {users.Results?.find((x) => x.userPrincipalName === user.value)
                                 .onPremisesSyncEnabled === true ? (
                                 <CTooltip content="This user is AD sync enabled, offboarding will fail for some steps">
                                   <FontAwesomeIcon

diff --git a/src/views/identity/administration/Users.jsx b/src/views/identity/administration/Users.jsx
@@ -447,11 +447,12 @@ const Users = (row) => {
         filterlist: [
           { filterName: 'Enabled users', filter: '"accountEnabled":true' },
           { filterName: 'Disabled users', filter: '"accountEnabled":false' },
-          { filterName: 'AAD users', filter: '"onPremisesSyncEnabled":false' },
+          { filterName: 'AAD users', filter: 'Complex: onPremisesSyncEnabled ne True' },
           {
             filterName: 'Synced users',
             filter: '"onPremisesSyncEnabled":true',
           },
+          { filterName: 'Non-guest users', filter: 'Complex: usertype ne Guest' },
           { filterName: 'Guest users', filter: '"usertype":"guest"' },
           {
             filterName: 'Users with a license',