fix: name and namespce duplication validation and adding modal valida…

…tion error in status applications CS-3818 (#3886) * fix: name and namespce duplication validation and adding modal validation error in status applications CS-3818 * fix:update defination accordingly
GovAlta · Dec 23, 2024 · f29fcc6 · f29fcc6
1 parent a48034d
commit f29fcc6
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 11 deletions.
diff --git a/...ement-webapp/src/app/pages/admin/services/configuration/definitions/addEditDefinition.tsx b/...ement-webapp/src/app/pages/admin/services/configuration/definitions/addEditDefinition.tsx
@@ -142,12 +142,18 @@ export const AddEditConfigDefinition: FunctionComponent<AddEditConfigDefinitionP
             value={definition.namespace}
             disabled={isEdit}
             testId="form-namespace"
-            aria-label="nameSpace"
+            aria-label="namespace"
             width="100%"
             onChange={(key, value) => {
-              validators.remove('namespace');
+              const updatedDefinition = { ...definition, namespace: value };
+              setDefinition(updatedDefinition);
+              const updatedIdentifiers = Object.keys(configurations).map(
+                (key) => `${configurations[key]?.namespace}:${configurations[key]?.name}`
+              );
+              const currentIdentifier = `${updatedDefinition.namespace}:${updatedDefinition.name}`;
+              validators.remove('duplicated');
+              validators['duplicated'].check(currentIdentifier, updatedIdentifiers);
               validators['namespace'].check(value);
-              setDefinition({ ...definition, namespace: value });
             }}
             onBlur={() => validators.checkAll({ namespace: definition.namespace })}
           />
@@ -162,13 +168,20 @@ export const AddEditConfigDefinition: FunctionComponent<AddEditConfigDefinitionP
             aria-label="name"
             width="100%"
             onChange={(key, value) => {
-              validators.remove('name');
+              const updatedDefinition = { ...definition, name: value };
+              setDefinition(updatedDefinition);
+              const updatedIdentifiers = Object.keys(configurations).map(
+                (key) => `${configurations[key]?.namespace}:${configurations[key]?.name}`
+              );
+              const currentIdentifier = `${updatedDefinition.namespace}:${updatedDefinition.name}`;
+              validators.remove('duplicated');
+              validators['duplicated'].check(currentIdentifier, updatedIdentifiers);
               validators['name'].check(value);
-              setDefinition({ ...definition, name: value });
             }}
             onBlur={() => validators.checkAll({ name: definition.name })}
           />
         </GoAFormItem>
+
         <GoAFormItem error={errors?.['description']} label="Description">
           <GoATextArea
             name="description"

diff --git a/apps/tenant-management-webapp/src/app/pages/admin/services/status/form.tsx b/apps/tenant-management-webapp/src/app/pages/admin/services/status/form.tsx
@@ -13,6 +13,7 @@ import {
   isNotEmptyCheck,
   Validator,
   wordMaxLengthCheck,
+  duplicateNameCheck,
 } from '@lib/validation/checkInput';
 
 import { RootState } from '@store/index';
@@ -99,6 +100,14 @@ export const ApplicationFormModal: FC<Props> = ({
     isDuplicateAppKey()
   )
     .add('nameOnly', 'name', checkForBadChars, isDuplicateAppName())
+    .add(
+      'duplicated',
+      'name',
+      duplicateNameCheck(
+        applications.map((app) => app.name),
+        'Application'
+      )
+    )
     .add('description', 'description', wordMaxLengthCheck(250, 'Description'))
     .add(
       'url',
@@ -167,7 +176,7 @@ export const ApplicationFormModal: FC<Props> = ({
         </GoAButtonGroup>
       }
     >
-      <GoAFormItem error={errors?.['name']} label="Application name">
+      <GoAFormItem error={errors?.['duplicated'] || errors?.['name']} label="Application name">
         <GoAInput
           type="text"
           name="name"
@@ -179,6 +188,8 @@ export const ApplicationFormModal: FC<Props> = ({
               const appKey = toKebabName(value);
               validators.remove('nameAppKey');
               validators['nameAppKey'].check(appKey);
+              validators.remove('duplicated');
+              validators['duplicated'].check(value);
               setApplication({
                 ...application,
                 name: value,
@@ -187,6 +198,8 @@ export const ApplicationFormModal: FC<Props> = ({
             } else {
               validators.remove('nameOnly');
               validators['nameOnly'].check(value);
+              validators.remove('duplicated');
+              validators['duplicated'].check(value);
               setApplication({
                 ...application,
                 name: value,

diff --git a/apps/tenant-management-webapp/src/app/pages/admin/services/value/addEditDefinition.tsx b/apps/tenant-management-webapp/src/app/pages/admin/services/value/addEditDefinition.tsx
@@ -140,12 +140,16 @@ export const AddEditValueDefinition = ({
             value={definition.namespace}
             disabled={isEdit}
             testId="value-namespace"
-            aria-label="nameSpace"
+            aria-label="namespace"
             width="100%"
             onChange={(key, value) => {
-              validators.remove('namespace');
+              const updatedDefinition = { ...definition, namespace: value };
+              setDefinition(updatedDefinition);
+              const updatedIdentifiers = values.map((v: ValueDefinition) => `${v.namespace}:${v.name}`);
+              const currentIdentifier = `${updatedDefinition.namespace}:${updatedDefinition.name}`;
+              validators.remove('duplicated');
+              validators['duplicated'].check(currentIdentifier, updatedIdentifiers);
               validators['namespace'].check(value);
-              setDefinition({ ...definition, namespace: value });
             }}
             onBlur={() => validators.checkAll({ namespace: definition.namespace })}
           />
@@ -160,9 +164,13 @@ export const AddEditValueDefinition = ({
             aria-label="name"
             width="100%"
             onChange={(key, value) => {
-              validators.remove('name');
+              const updatedDefinition = { ...definition, name: value };
+              setDefinition(updatedDefinition);
+              const updatedIdentifiers = values.map((v: ValueDefinition) => `${v.namespace}:${v.name}`);
+              const currentIdentifier = `${updatedDefinition.namespace}:${updatedDefinition.name}`;
+              validators.remove('duplicated');
+              validators['duplicated'].check(currentIdentifier, updatedIdentifiers);
               validators['name'].check(value);
-              setDefinition({ ...definition, name: value });
             }}
             onBlur={() => validators.checkAll({ name: definition.name })}
           />