fix(osp): fix osp validation (#333)

eclipse-tractusx · Nov 2, 2023 · 7fa214a · 7fa214a
1 parent b611534
commit 7fa214a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/src/components/overlays/OSPRegister/OSPRegisterContent.tsx b/src/components/overlays/OSPRegister/OSPRegisterContent.tsx
@@ -27,9 +27,9 @@ import {
   isCountryCode,
   isFirstName,
   isID,
-  isIDOrEmpty,
   isLastName,
   isMail,
+  isPartnerUniqueID,
   isRegionNameOrEmpty,
   isStreetName,
   isStreetNumberOrEmpty,
@@ -51,35 +51,11 @@ import {
   emptyPartnerRegistration,
 } from 'features/admin/networkApiSlice'
 
-const emptyData: PartnerRegistration = {
-  externalId: '',
-  name: '',
-  bpn: '',
-  streetName: '',
-  streetNumber: '',
-  city: '',
-  zipCode: '',
-  region: '',
-  countryAlpha2Code: '',
-  uniqueIds: [],
-  userDetails: [
-    {
-      identityProviderId: '',
-      providerId: '',
-      username: '',
-      firstName: '',
-      lastName: '',
-      email: '',
-    },
-  ],
-  companyRoles: [],
-}
-
 const getEmptyPartnerRegistration = (identityProviderId: string) => ({
-  ...emptyData,
+  ...emptyPartnerRegistration,
   userDetails: [
     {
-      ...emptyData.userDetails[0],
+      ...emptyPartnerRegistration.userDetails[0],
       identityProviderId,
     },
   ],
@@ -385,7 +361,7 @@ const OSPRegisterForm = ({
         name={'uniqeIdValue'}
         label={t('field.uniqeIdValue.name')}
         hint={t('field.uniqeIdValue.hint')}
-        validate={isIDOrEmpty}
+        validate={isPartnerUniqueID}
         onInvalid={invalidate}
         onValid={(_key, value: string) => {
           updateData({

diff --git a/src/features/admin/networkApiSlice.ts b/src/features/admin/networkApiSlice.ts
@@ -123,7 +123,7 @@ export type CompanyRoleAgreementData = {
 export const emptyPartnerRegistration: PartnerRegistration = {
   externalId: '',
   name: '',
-  bpn: '',
+  bpn: null,
   streetName: '',
   streetNumber: '',
   city: '',

diff --git a/src/types/Patterns.ts b/src/types/Patterns.ts
@@ -45,6 +45,13 @@ export const Patterns = {
     MAIL: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@/,
   },
   SEARCH: /^[a-zA-ZÀ-ÿ0-9 !?@&_\-.]{3,80}$/,
+  partner: {
+    COMMERCIAL_REG_NUMBER: /^[a-zA-Z\d-\s]{9}$/,
+    VAT_ID: /^[a-zA-Z\d-\s]{8,15}$/,
+    LEI_CODE: /^[a-zA-Z\d]{20}$/,
+    VIES: /.{1,500}/,
+    EORI: /^[a-zA-Z\d\s]{18}$/,
+  },
   appMarketCard: {
     appTitle: /^([A-Za-z.:_@&0-9' -]){5,40}$/,
     appProvider: /^([A-Za-z.:_@&0-9' -]){3,30}$/,
@@ -114,6 +121,18 @@ export const isValidCancelInput = (expr: string) =>
   Patterns.CANCEL_INPUT.test(expr)
 export const isClientID = (expr: string) =>
   Patterns.techuser.clientId.test(expr)
+export const isCommercialRegNumber = (expr: string) =>
+  Patterns.partner.COMMERCIAL_REG_NUMBER.test(expr)
+export const isVatID = (expr: string) => Patterns.partner.VAT_ID.test(expr)
+export const isLeiCode = (expr: string) => Patterns.partner.LEI_CODE.test(expr)
+export const isVies = (expr: string) => Patterns.partner.VIES.test(expr)
+export const isEori = (expr: string) => Patterns.partner.EORI.test(expr)
+export const isPartnerUniqueID = (expr: string) =>
+  isVies(expr) ||
+  isCommercialRegNumber(expr) ||
+  isVatID(expr) ||
+  isLeiCode(expr) ||
+  isEori(expr)
 export const isMailOrEmpty = (expr: string) => expr === '' || isMail(expr)
 export const isBPNOrEmpty = (expr: string) => expr === '' || isBPN(expr)
 export const isDomainOrEmpty = (expr: string) => expr === '' || isDomain(expr)