Merge branch 'KelvinTegelaar:dev' into dev

JohnDuprey · May 13, 2024 · 5817ce6 · 5817ce6
2 parents 268abe5 + ad2a04f
commit 5817ce6
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 4 deletions.
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -60,6 +60,57 @@
       "remediate": false
     }
   },
+  {
+    "name": "standards.Branding",
+    "cat": "Global Standards",
+    "tag": ["lowimpact"],
+    "helpText": "Sets the branding for the tenant. This includes the login page, and the Office 365 portal.",
+    "addedComponent": [
+      {
+        "type": "input",
+        "name": "standards.Branding.signInPageText",
+        "label": "Sign-in page text"
+      },
+      {
+        "type": "input",
+        "name": "standards.Branding.usernameHintText",
+        "label": "Username hint Text"
+      },
+      {
+        "type": "boolean",
+        "name": "standards.Branding.hideAccountResetCredentials",
+        "label": "Hide self-service password reset"
+      },
+      {
+        "type": "Select",
+        "label": "Visual Template",
+        "name": "standards.Branding.layoutTemplateType",
+        "values": [
+          {
+            "label": "Full-screen background",
+            "value": "default"
+          },
+          {
+            "label": "Parial-screen background",
+            "value": "verticalSplit"
+          }
+        ]
+      },
+      {
+        "type": "boolean",
+        "name": "standards.Branding.isHeaderShown",
+        "label": "Show header"
+      },
+      {
+        "type":"boolean",
+        "name":"standards.Branding.isFooterShown",
+        "label":"Show footer"
+      }
+    ],
+    "label": "Set branding for the tenant",
+    "impact": "Low Impact",
+    "impactColour": "info"
+  },
   {
     "name": "standards.EnableCustomerLockbox",
     "cat": "Global Standards",

diff --git a/src/views/email-exchange/administration/QuarantineList.jsx b/src/views/email-exchange/administration/QuarantineList.jsx
@@ -98,7 +98,7 @@ const QuarantineList = () => {
       name: 'Reason',
       sortable: true,
       exportSelector: 'Type',
-      maxWidth: '150px',
+      maxWidth: '200px',
     },
     {
       selector: (row) => row['ReceivedTime'],
@@ -126,7 +126,7 @@ const QuarantineList = () => {
     {
       name: 'Actions',
       cell: Offcanvas,
-      maxWidth: '150px',
+      maxWidth: '100px',
     },
   ]
 
@@ -139,6 +139,32 @@ const QuarantineList = () => {
         reportName: `${tenant?.defaultDomainName}-Mailbox-Quarantine`,
         path: '/api/ListMailQuarantine',
         columns,
+        tableProps: {
+          selectableRows: true,
+          actionsList: [
+            {
+              label: 'Release',
+              color: 'info',
+              modal: true,
+              modalUrl: `/api/ExecQuarantineManagement?TenantFilter=${tenant.defaultDomainName}&ID=!Identity&Type=Release`,
+              modalMessage: 'Are you sure you want to release these messages?',
+            },
+            {
+              label: 'Deny',
+              color: 'info',
+              modal: true,
+              modalUrl: `/api/ExecQuarantineManagement?TenantFilter=${tenant.defaultDomainName}&ID=!Identity&Type=Deny`,
+              modalMessage: 'Are you sure you want to deny these messages?',
+            },
+            {
+              label: 'Release & Allow Sender',
+              color: 'info',
+              modal: true,
+              modalUrl: `/api/ExecQuarantineManagement?TenantFilter=${tenant.defaultDomainName}&ID=!Identity&Type=Release&AllowSender=true`,
+              modalMessage: 'Are you sure you want to release these messages, and add the senders to the whitelist?',
+            },
+          ]
+        },
         params: { TenantFilter: tenant?.defaultDomainName },
       }}
     />

diff --git a/src/views/identity/reports/MFAReport.jsx b/src/views/identity/reports/MFAReport.jsx
@@ -139,11 +139,15 @@ const MFAList = () => {
           {
             filterName: 'Enabled, licensed non-guest users missing MFA',
             filter:
-              'Complex: UPN notlike #EXT#; IsLicensed eq true; accountEnabled eq true; MFARegistration eq false',
+              'Complex: UPN notlike #EXT#; IsLicensed eq true; accountEnabled eq true; MFARegistration ne true',
           },
           {
             filterName: 'No MFA methods registered',
-            filter: 'Complex: MFARegistration eq false',
+            filter: 'Complex: MFARegistration ne true',
+          },
+          {
+            filterName: 'MFA methods registered',
+            filter: 'Complex: MFARegistration eq true',
           },
         ],
         columns: tenant.defaultDomainName === 'AllTenants' ? Altcolumns : columns,

diff --git a/src/views/tenant/administration/ListGDAPRelationships.jsx b/src/views/tenant/administration/ListGDAPRelationships.jsx
@@ -111,6 +111,14 @@ const Actions = (row, rowIndex, formatExtraData) => {
             modalUrl: `/api/ExecAutoExtendGDAP?ID=${row.id}`,
             modalMessage: 'Are you sure you want to enable auto-extend for this relationship',
           },
+          {
+            label: 'Remove Global Administrator from Relationship',
+            color: 'danger',
+            modal: true,
+            modalUrl: `/api/ExecGDAPRemoveGArole?&GDAPID=${row.id}`,
+            modalMessage:
+              'Are you sure you want to remove Global Administrator from this relationship?',
+          },
           {
             label: 'Terminate Relationship',
             color: 'danger',
@@ -218,6 +226,13 @@ const GDAPRelationships = () => {
           tableProps: {
             selectableRows: true,
             actionsList: [
+              {
+                label: 'Remove Global Administrator from Relationship',
+                modal: true,
+                modalUrl: `/api/ExecGDAPRemoveGArole?&GDAPID=!id`,
+                modalMessage:
+                  'Are you sure you want to remove Global Administrator from these relationship(s)?',
+              },
               {
                 label: 'Terminate Relationship',
                 modal: true,