Merge pull request KelvinTegelaar#2789 from JohnDuprey/dev

Bugfixes and improvements
spinen · Aug 8, 2024 · 681c8ff · 681c8ff
2 parents 968c5d7 + 5739fc4
commit 681c8ff
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/src/views/tenant/administration/GDAPRoleWizard.jsx b/src/views/tenant/administration/GDAPRoleWizard.jsx
@@ -168,7 +168,7 @@ const GDAPRoleWizard = () => {
                 return <li key={idx}>{message}</li>
               })}
             </CCallout>
-            <Link to="/tenant/administration/gdap-invite">
+            <Link to="/tenant/administration/gdap-invite-wizard">
               <CButton>Create GDAP Invite</CButton>
             </Link>
           </>

diff --git a/src/views/tenant/administration/TenantOnboardingWizard.jsx b/src/views/tenant/administration/TenantOnboardingWizard.jsx
@@ -136,7 +136,10 @@ const TenantOnboardingWizard = () => {
         </center>
         <hr className="my-4" />
         <div className="mb-2">
-          <TitleButton href="/tenant/administration/gdap-invite" title="Create GDAP Invite" />
+          <TitleButton
+            href="/tenant/administration/gdap-invite-wizard"
+            title="Create GDAP Invite"
+          />
         </div>
         <Field name="selectedRelationships" validate={requiredArray}>
           {(props) => (

diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -76,6 +76,7 @@ const DeleteAction = () => {
     </>
   )
 }
+
 const ApplyNewStandard = () => {
   const [templateStandard, setTemplateStandard] = useState()
   const [loadedTemplate, setLoadedTemplate] = useState(false)
@@ -268,6 +269,7 @@ const ApplyNewStandard = () => {
     })
 
   const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
+  const tenantDisplayName = useSelector((state) => state.app.currentTenant.displayName)
   //console.log('tenantDomain', tenantDomain)
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
 
@@ -294,20 +296,27 @@ const ApplyNewStandard = () => {
   })
 
   const handleSubmit = async (values) => {
-    Object.keys(values.standards).filter(function (x) {
-      if (values.standards[x] === false) {
-        delete values.standards[x]
-      }
-      return null
-    })
-
-    //filter on only objects that are 'true'
-    genericPostRequest({
-      path: '/api/AddStandardsDeploy',
-      values: { ...values.standards, tenant: tenantDomain },
-    }).then(() => {
-      refetchStandards()
-      refetchConsolidated()
+    ModalService.confirm({
+      title: 'Save Standards',
+      body: (
+        <div>
+          <p>
+            Are you sure you want to save these standards to {tenantDisplayName}? This will apply
+            all Remediate options on the next run.
+          </p>
+        </div>
+      ),
+      confirmLabel: 'Save',
+      cancelLabel: 'Cancel',
+      onConfirm: () => {
+        genericPostRequest({
+          path: '/api/AddStandardsDeploy',
+          values: { ...values.standards, tenant: tenantDomain },
+        }).then(() => {
+          refetchStandards()
+          refetchConsolidated()
+        })
+      },
     })
   }
   const [intuneGetRequest, intuneTemplates] = useLazyGenericGetRequestQuery()