Merge pull request #1950 from johnduprey/dev

KelvinTegelaar · web-flow · commit bfcb6b0e4361 · 2023-12-18T10:56:28.000+01:00
Tenant Onboarding
diff --git a/src/components/buttons/TableModalButton.jsx b/src/components/buttons/TableModalButton.jsx
@@ -3,8 +3,16 @@ import { CButton } from '@coreui/react'
 import { ModalService } from '../utilities'
 import { cellGenericFormatter } from '../tables/CellGenericFormat'
 import PropTypes from 'prop-types'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
-export default function TableModalButton({ data, title, className, countOnly = false, ...input }) {
+export default function TableModalButton({
+  data,
+  title,
+  className,
+  countOnly = false,
+  icon = '',
+  ...input
+}) {
   const handleTable = (data) => {
     const QueryColumns = []
     const columns = Object.keys(data[0]).map((key) => {
@@ -31,6 +39,7 @@ export default function TableModalButton({ data, title, className, countOnly = f
 
   return (
     <CButton {...input} className={buttonClass} onClick={() => handleTable(data)}>
+      {icon != '' && <FontAwesomeIcon icon={icon} className="me-2" />}
       <>{countOnly === true ? data.length : `${title} (${data.length})`}</>
     </CButton>
   )
diff --git a/src/views/tenant/administration/GDAPInviteWizard.jsx b/src/views/tenant/administration/GDAPInviteWizard.jsx
@@ -87,6 +87,7 @@ const GDAPInviteWizard = () => {
           <div className="mb-2">
             <TitleButton href="/tenant/administration/gdap-role-wizard" title="Map GDAP Roles" />
           </div>
+
           <Field name="gdapRoles" validate={requiredArray}>
             {(props) => (
               <WizardTableField
@@ -198,6 +199,14 @@ const GDAPInviteWizard = () => {
                   wrapLongLines={true}
                   language="text"
                 />
+
+                <TitleButton
+                  href={
+                    '/tenant/administration/tenant-onboarding-wizard?tableFilter=Complex: id eq ' +
+                    results.Invite.RowKey
+                  }
+                  title="Start Onboarding"
+                />
               </CCallout>
             )
           })}
diff --git a/src/views/tenant/administration/TenantOnboardingWizard.jsx b/src/views/tenant/administration/TenantOnboardingWizard.jsx
@@ -7,9 +7,6 @@ import {
   CButton,
   CCallout,
   CCol,
-  CFormLabel,
-  CListGroup,
-  CListGroupItem,
   CRow,
   CSpinner,
 } from '@coreui/react'
@@ -29,6 +26,7 @@ import {
   cellNullTextFormatter,
 } from 'src/components/tables'
 import ReactTimeAgo from 'react-time-ago'
+import { TableModalButton, TitleButton } from 'src/components/buttons'
 
 const Error = ({ name }) => (
   <Field
@@ -37,7 +35,7 @@ const Error = ({ name }) => (
     render={({ meta: { touched, error } }) =>
       touched && error ? (
         <CCallout color="danger">
-          <FontAwesomeIcon icon={faExclamationTriangle} color="danger" />
+          <FontAwesomeIcon icon={faExclamationTriangle} color="danger" className="me-2" />
           {error}
         </CCallout>
       ) : null
@@ -70,7 +68,7 @@ function useInterval(callback, delay, state) {
   }, [delay, state])
 }
 
-const RelationshipOnboarding = ({ relationship, gdapRoles }) => {
+const RelationshipOnboarding = ({ relationship, gdapRoles, autoMapRoles, addMissingGroups }) => {
   const [relationshipReady, setRelationshipReady] = useState(false)
   const [refreshGuid, setRefreshGuid] = useState(false)
   const [getOnboardingStatus, onboardingStatus] = useLazyGenericPostRequestQuery()
@@ -155,22 +153,31 @@ const RelationshipOnboarding = ({ relationship, gdapRoles }) => {
         {onboardingStatus.isUninitialized &&
           getOnboardingStatus({
             path: '/api/ExecOnboardTenant',
-            values: { id: relationship.id, gdapRoles },
+            values: { id: relationship.id, gdapRoles, autoMapRoles, addMissingGroups },
           })}
         {onboardingStatus.isSuccess && (
           <>
-            {onboardingStatus.data?.Status == 'failed' && (
-              <CButton
-                onClick={() =>
-                  getOnboardingStatus({
-                    path: '/api/ExecOnboardTenant?Retry=True',
-                    values: { id: relationship.id, gdapRoles },
-                  })
-                }
+            {onboardingStatus.data?.Status != 'running' &&
+              onboardingStatus.data?.Status != 'queued' && (
+                <CButton
+                  onClick={() =>
+                    getOnboardingStatus({
+                      path: '/api/ExecOnboardTenant?Retry=True',
+                      values: { id: relationship.id, gdapRoles, autoMapRoles, addMissingGroups },
+                    })
+                  }
+                  className="mb-3 me-2"
+                >
+                  <FontAwesomeIcon icon="sync" /> Retry
+                </CButton>
+              )}
+            {onboardingStatus.data?.Logs && (
+              <TableModalButton
+                title="Logs"
+                icon="book"
+                data={onboardingStatus.data?.Logs}
                 className="mb-3"
-              >
-                Retry
-              </CButton>
+              />
             )}
             <hr className="mb-3" />
             {onboardingStatus.data?.OnboardingSteps?.map((step, idx) => (
@@ -211,6 +218,7 @@ const TenantOnboardingWizard = () => {
   const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
   const currentSettings = useSelector((state) => state.app)
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+  const requiredArray = (value) => (value && value.length !== 0 ? undefined : 'Required')
 
   const handleSubmit = async (values) => {}
   const columns = [
@@ -289,32 +297,41 @@ const TenantOnboardingWizard = () => {
           <h5 className="card-title mb-4">Choose a relationship</h5>
         </center>
         <hr className="my-4" />
-        <Field name="selectedRelationships">
+        <div className="mb-2">
+          <TitleButton href="/tenant/administration/gdap-invite" title="Create GDAP Invite" />
+        </div>
+        <Field name="selectedRelationships" validate={requiredArray}>
           {(props) => (
-            <WizardTableField
-              reportName="Add-GDAP-Relationship"
-              keyField="id"
-              path="/api/ListGraphRequest"
-              params={{ Endpoint: 'tenantRelationships/delegatedAdminRelationships' }}
-              columns={columns}
-              filterlist={[
-                { filterName: 'Active Relationships', filter: 'Complex: status eq active' },
-                { filterName: 'Terminated Relationships', filter: 'Complex: status eq terminated' },
-                {
-                  filterName: 'Pending Relationships',
-                  filter: 'Complex: status eq approvalPending',
-                },
-                {
-                  filterName: 'Active with Auto Extend',
-                  filter: 'Complex: status eq active; autoExtendDuration ne PT0S',
-                },
-                {
-                  filterName: 'Active without Auto Extend',
-                  filter: 'Complex: status eq active; autoExtendDuration eq PT0S',
-                },
-              ]}
-              fieldProps={props}
-            />
+            <>
+              <WizardTableField
+                reportName="Add-GDAP-Relationship"
+                keyField="id"
+                path="/api/ListGraphRequest"
+                params={{ Endpoint: 'tenantRelationships/delegatedAdminRelationships' }}
+                columns={columns}
+                filterlist={[
+                  { filterName: 'Active Relationships', filter: 'Complex: status eq active' },
+                  {
+                    filterName: 'Terminated Relationships',
+                    filter: 'Complex: status eq terminated',
+                  },
+                  {
+                    filterName: 'Pending Relationships',
+                    filter: 'Complex: status eq approvalPending',
+                  },
+                  {
+                    filterName: 'Active with Auto Extend',
+                    filter: 'Complex: status eq active; autoExtendDuration ne PT0S',
+                  },
+                  {
+                    filterName: 'Active without Auto Extend',
+                    filter: 'Complex: status eq active; autoExtendDuration eq PT0S',
+                  },
+                ]}
+                fieldProps={props}
+              />
+              <Error name="selectedRelationships" />
+            </>
           )}
         </Field>
         <hr className="my-4" />
@@ -328,33 +345,46 @@ const TenantOnboardingWizard = () => {
           <h5 className="card-title mb-4">Tenant Onboarding Options</h5>
         </center>
         <hr className="my-4" />
-        <CFormLabel>
-          (Optional) Automatically map groups for relationships not created in CIPP. This will not
-          map groups that do not have a corresponding role in the relationship.
-        </CFormLabel>
-        <Field name="gdapRoles">
-          {(props) => (
-            <WizardTableField
-              reportName="gdaproles"
-              keyField="defaultDomainName"
-              path="/api/ListGDAPRoles"
-              columns={[
-                {
-                  name: 'Name',
-                  selector: (row) => row['RoleName'],
-                  sortable: true,
-                  exportselector: 'Name',
-                },
-                {
-                  name: 'Group',
-                  selector: (row) => row['GroupName'],
-                  sortable: true,
-                },
-              ]}
-              fieldProps={props}
-            />
-          )}
-        </Field>
+        <RFFCFormSwitch name="autoMapRoles" label="Map missing groups to GDAP Roles" />
+        <RFFCFormSwitch name="addMissingGroups" label="Add CIPP SAM user to missing groups" />
+        <FormSpy>
+          {/* eslint-disable react/prop-types */}
+          {(props) => {
+            return (
+              <>
+                {(props.values.autoMapRoles || props.values.addMissingGroups) && (
+                  <Field name="gdapRoles" validate={requiredArray}>
+                    {(props) => (
+                      <>
+                        <WizardTableField
+                          reportName="gdaproles"
+                          keyField="defaultDomainName"
+                          path="/api/ListGDAPRoles"
+                          isModal={true}
+                          columns={[
+                            {
+                              name: 'Name',
+                              selector: (row) => row['RoleName'],
+                              sortable: true,
+                              exportselector: 'Name',
+                            },
+                            {
+                              name: 'Group',
+                              selector: (row) => row['GroupName'],
+                              sortable: true,
+                            },
+                          ]}
+                          fieldProps={props}
+                        />
+                        <Error name="gdapRoles" />
+                      </>
+                    )}
+                  </Field>
+                )}
+              </>
+            )
+          }}
+        </FormSpy>
         <hr className="my-4" />
       </CippWizard.Page>
       <CippWizard.Page
@@ -382,6 +412,8 @@ const TenantOnboardingWizard = () => {
                           <RelationshipOnboarding
                             relationship={relationship}
                             gdapRoles={props.values.gdapRoles}
+                            autoMapRoles={props.values.autoMapRoles}
+                            addMissingGroups={props.values.addMissingGroups}
                             key={idx}
                           />
                         ))}
