feat(company role): support optional agreements (#173)

#130
eclipse-tractusx · May 22, 2024 · 7a2824a · 7a2824a
1 parent 01cbad8
commit 7a2824a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+- Company Role
+  - Support optional agreements for company role
+
 ## 2.0.0-RC1
 
 ### Change

diff --git a/src/components/cax-companyRole.tsx b/src/components/cax-companyRole.tsx
@@ -176,9 +176,17 @@ export const CompanyRoleCax = () => {
                           {agreement.name}
                         </span>{' '}
                         {t('companyRole.TermsAndCondSpan3')}
+                        <span style={{ color: 'red' }}>
+                          {agreement.mandatory ? ' *' : ''}
+                        </span>
                       </>
                     ) : (
-                      <span>{agreement.name}</span>
+                      <>
+                        <span>{agreement.name}</span>
+                        <span style={{ color: 'red' }}>
+                          {agreement.mandatory ? ' *' : ''}
+                        </span>
+                      </>
                     )}
                   </p>
                 ) : (
@@ -197,33 +205,53 @@ export const CompanyRoleCax = () => {
   }
 
   const nextClick = async () => {
+    setSubmitError(false)
     const companyRoles = Object.keys(companyRoleChecked).filter(
       (item) => companyRoleChecked[item]
     )
 
-    const agreements = Object.keys(agreementChecked)
-      .filter((agreementId) => agreementChecked[agreementId])
-      .map((agreementId) => {
-        return {
-          agreementId,
-          consentStatus: 'ACTIVE',
-        }
-      })
+    const agreementsToBeChecked = allConsentData.companyRoles
+      .filter((item) => companyRoles.includes(item.companyRole))
+      .map((i) => i.agreementIds)
+      .flat()
 
-    const data = {
-      companyRoles,
-      agreements,
-    }
+    const checkedAgreements = Object.keys(agreementChecked).filter(
+      (i) => agreementChecked[i]
+    )
+
+    const mandatoryAgreementsToBeChecked = allConsentData.agreements
+      .filter((item) => agreementsToBeChecked.includes(item.agreementId))
+      .filter((i) => i.mandatory)
+      .map((agreement) => agreement.agreementId)
 
-    await updateAgreementConsents({ applicationId, data })
-      .unwrap()
-      .then(() => {
-        dispatch(addCurrentStep(currentActiveStep + 1))
-      })
-      .catch((errors) => {
-        console.log('errors', errors)
-        setSubmitError(true)
-      })
+    const valid = mandatoryAgreementsToBeChecked.every((i) =>
+      checkedAgreements.includes(i)
+    )
+
+    if (valid) {
+      const agreements = Object.keys(agreementChecked)
+        .filter((agreementId) => agreementChecked[agreementId])
+        .map((agreementId) => {
+          return {
+            agreementId,
+            consentStatus: 'ACTIVE',
+          }
+        })
+
+      const data = {
+        companyRoles,
+        agreements,
+      }
+
+      await updateAgreementConsents({ applicationId, data })
+        .unwrap()
+        .then(() => {
+          dispatch(addCurrentStep(currentActiveStep + 1))
+        })
+        .catch((errors) => {
+          setSubmitError(true)
+        })
+    } else setSubmitError(true)
   }
 
   const renderSnackbar = (message: string) => {

diff --git a/src/state/features/applicationCompanyRole/applicationCompanyRoleApiSlice.ts b/src/state/features/applicationCompanyRole/applicationCompanyRoleApiSlice.ts
@@ -35,6 +35,7 @@ export type AgreementData = {
   name: string
   agreementLink: string
   documentId: string
+  mandatory: boolean
 }
 
 export type AgreementResponse = {