Merge branch 'KelvinTegelaar:main' into main

MattDunn12 · Nov 29, 2023 · ea688d4 · ea688d4
2 parents 26eabb5 + 21672d3
commit ea688d4
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 31 deletions.
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-4.7.0
+4.7.3
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -188,9 +188,13 @@
   },
   {
     "cat": "AAD",
-    "name": "standards.EnableAppConsentRequests",
+    "name": "standards.EnableAppConsentRequests.Enabled",
     "helpText": "Enables App consent admin requests for the tenant via the GA role. Does not overwrite existing reviewer settings",
-    "addedComponent": null,
+    "addedComponent": {
+      "type": "AdminRolesMultiSelect",
+      "label": "App Consent Reviewer Roles",
+      "name": "standards.EnableAppConsentRequests.ReviewerRoles"
+    },
     "label": "Enable App consent admin requests"
   },
   {

diff --git a/src/views/email-exchange/administration/AddContact.jsx b/src/views/email-exchange/administration/AddContact.jsx
@@ -43,7 +43,7 @@ const AddContact = () => {
             onSubmit={onSubmit}
             render={({ handleSubmit, submitting, values }) => {
               return (
-                <CForm onSubmit={handleSubmit}>
+                <CForm onSubmit={handleSubmit} autoComplete="off">
                   <CRow>
                     <CCol md={8}>
                       <RFFCFormInput type="text" name="displayName" label="Display Name" />

diff --git a/src/views/identity/administration/Deleted.jsx b/src/views/identity/administration/Deleted.jsx
@@ -40,7 +40,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             color: 'info',
             modal: true,
             modalUrl: `/api/ExecRestoreDeleted?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}`,
-            modalMessage: 'Are you sure you want to create a Temporary Access Pass?',
+            modalMessage: 'Are you sure you want to restore the user?',
           },
         ]}
         placement="end"

diff --git a/src/views/identity/administration/UserActions.jsx b/src/views/identity/administration/UserActions.jsx
@@ -32,7 +32,7 @@ export default function UserActions({ tenantDomain, userId, userEmail, className
   }
 
   const editLink = `/identity/administration/users/edit?tenantDomain=${tenantDomain}&userId=${userId}`
-  const editMailboxLink = `/email/administration/edit-mailbox-permissions?tenantDomain=${tenantDomain}&userId=${userId}`
+  const editMailboxLink = `/email/administration/edit-mailbox-permissions?tenantDomain=${tenantDomain}&userId=${userEmail}`
 
   const actions = [
     {

diff --git a/src/views/tenant/administration/TenantOffboardingWizard.jsx b/src/views/tenant/administration/TenantOffboardingWizard.jsx
@@ -8,7 +8,7 @@ import { CippWizard } from 'src/components/layout'
 import PropTypes from 'prop-types'
 import { RFFCFormCheck, RFFCFormInput, RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms'
 import { TenantSelector } from 'src/components/utilities'
-import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
 
 const Error = ({ name }) => (
   <Field
@@ -38,6 +38,9 @@ const TenantOffboardingWizard = () => {
     const shippedValues = {
       TenantFilter: tenantDomain,
       RemoveCSPGuestUsers: values.RemoveCSPGuestUsers ? values.RemoveCSPGuestUsers : '',
+      RemoveCSPnotificationContacts: values.RemoveCSPnotificationContacts
+        ? values.RemoveCSPnotificationContacts
+        : '',
       RemoveMultitenantCSPApps: values.RemoveMultitenantCSPApps
         ? values.RemoveMultitenantCSPApps
         : '',
@@ -82,17 +85,27 @@ const TenantOffboardingWizard = () => {
                 label="Remove all guest users originating from the CSP tenant."
               />
               <RFFCFormSwitch
-                name="RemoveMultitenantCSPApps"
-                label="Remove all multitenant applications originating from CSP tenant (including CIPP-SAM)."
-              />
-              <RFFCFormSwitch
-                name="TerminateGDAP"
-                label="Terminate all active GDAP relationships (will send email to tenant admins and contacts)."
-              />
-              <RFFCFormSwitch
-                name="TerminateContract"
-                label="Terminate contract relationship (reseller, etc)."
+                name="RemoveCSPnotificationContacts"
+                label="Remove all notification contacts originating from the CSP tenant (technical,security,marketing notifications)."
               />
+              <center>
+                <CCallout color="danger">
+                  These actions will terminate all delegated access to the customer tenant!
+                  <hr className="my-4" />
+                  <RFFCFormSwitch
+                    name="RemoveMultitenantCSPApps"
+                    label="Remove all multitenant applications originating from CSP tenant (including CIPP-SAM)."
+                  />
+                  <RFFCFormSwitch
+                    name="TerminateGDAP"
+                    label="Terminate all active GDAP relationships (will send email to tenant admins and contacts)."
+                  />
+                  <RFFCFormSwitch
+                    name="TerminateContract"
+                    label="Terminate contract relationship (reseller, etc)."
+                  />
+                </CCallout>
+              </center>
             </CCol>
           </CRow>
         </div>
@@ -131,10 +144,6 @@ const TenantOffboardingWizard = () => {
                 <>
                   <CRow>
                     <CCol md={{ span: 6, offset: 3 }}>
-                      <CCallout color="danger">
-                        <FontAwesomeIcon icon={faExclamationTriangle} color="danger" />
-                        These actions are irreversible!
-                      </CCallout>
                       <CListGroup flush>
                         <CListGroupItem className="d-flex justify-content-between align-items-center">
                           <h5 className="mb-0">Selected Tenant:</h5>
@@ -147,6 +156,15 @@ const TenantOffboardingWizard = () => {
                   <CRow>
                     <CCol md={{ span: 6, offset: 3 }}>
                       <CListGroup flush>
+                        <CListGroupItem className="d-flex justify-content-between align-items-center">
+                          Remove all notification contacts originating from the CSP tenant
+                          (technical,security,marketing notifications)
+                          <FontAwesomeIcon
+                            color="#f77f00"
+                            size="lg"
+                            icon={props.values.RemoveCSPnotificationContacts ? faCheck : faTimes}
+                          />
+                        </CListGroupItem>
                         <CListGroupItem className="d-flex justify-content-between align-items-center">
                           Remove all guest users originating from the CSP tenant
                           <FontAwesomeIcon

diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -22,6 +22,7 @@ import Skeleton from 'react-loading-skeleton'
 import { CippTable } from 'src/components/tables'
 import allStandardsList from 'src/data/standards'
 import CippCodeOffCanvas from 'src/components/utilities/CippCodeOffcanvas'
+import GDAPRoles from 'src/data/GDAPRoles'
 
 const RefreshAction = () => {
   const [execStandards, execStandardsResults] = useLazyGenericGetRequestQuery()
@@ -306,21 +307,33 @@ const ListAppliedStandards = () => {
                                   />
                                   {item.addedComponent && (
                                     <Condition when={item.name} is={true}>
-                                      {item.addedComponent.type === 'Select' ? (
+                                      {(item.addedComponent.type === 'Select' && (
                                         <RFFCFormSelect
                                           name={item.addedComponent.name}
                                           className="mb-3"
                                           label={item.addedComponent.label}
                                           values={item.addedComponent.values}
                                         />
-                                      ) : (
-                                        <RFFCFormInput
-                                          type="text"
-                                          className="mb-3"
-                                          name={item.addedComponent.name}
-                                          label={item.addedComponent.label}
-                                        />
-                                      )}
+                                      )) ||
+                                        (item.addedComponent.type === 'AdminRolesMultiSelect' && (
+                                          <RFFSelectSearch
+                                            multi={true}
+                                            name={item.addedComponent.name}
+                                            className="mb-3"
+                                            label={item.addedComponent.label}
+                                            values={GDAPRoles.map((role) => ({
+                                              value: role.ObjectId,
+                                              name: role.Name,
+                                            }))}
+                                          />
+                                        )) || (
+                                          <RFFCFormInput
+                                            type="text"
+                                            className="mb-3"
+                                            name={item.addedComponent.name}
+                                            label={item.addedComponent.label}
+                                          />
+                                        )}
                                     </Condition>
                                   )}
                                 </CCol>

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-4.7.0
+4.7.3