fix(de form fields): ignore "itself" when validating uniqueness

dhis2 · Oct 30, 2023 · 489626b · 489626b
1 parent 903a9a9
commit 489626b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/src/pages/dataElements/form/fields.tsx b/src/pages/dataElements/form/fields.tsx
@@ -12,6 +12,7 @@ import {
 import React, { useRef } from 'react'
 import { Field as FieldRFF, useField } from 'react-final-form'
 import { useHref } from 'react-router'
+import { useParams } from 'react-router-dom'
 import {
     AggregationLevelMultiSelect,
     ColorAndIconPicker,
@@ -26,8 +27,13 @@ import { EditableFieldWrapper } from './EditableFieldWrapper'
 import { useIsFieldValueUnique } from './useIsFieldValueUnique'
 
 export function NameField() {
+    const params = useParams()
+    const dataElementId = params.id as string
+    const checkIsValueTaken = useIsFieldValueUnique({
+        field: 'name',
+        id: dataElementId,
+    })
     const { meta } = useField('name')
-    const checkIsValueTaken = useIsFieldValueUnique('name')
 
     return (
         <FieldRFF
@@ -52,8 +58,13 @@ export function NameField() {
 }
 
 export function ShortNameField() {
+    const params = useParams()
+    const dataElementId = params.id as string
+    const checkIsValueTaken = useIsFieldValueUnique({
+        field: 'shortName',
+        id: dataElementId,
+    })
     const { meta } = useField('shortName')
-    const checkIsValueTaken = useIsFieldValueUnique('shortName')
 
     return (
         <FieldRFF

diff --git a/src/pages/dataElements/form/useIsFieldValueUnique.ts b/src/pages/dataElements/form/useIsFieldValueUnique.ts
@@ -8,11 +8,15 @@ import { Pager } from '../../../types/generated'
 const HAS_FIELD_VALUE_QUERY = {
     dataElements: {
         resource: 'dataElements',
-        params: (variables: Record<string, string>) => ({
-            pageSize: 1,
-            fields: 'id',
-            filter: [`${variables.field}:eq:${variables.value}`],
-        }),
+        params: (variables: Record<string, string>) => {
+            const filter = [`${variables.field}:eq:${variables.value}`]
+
+            if (variables.id) {
+                filter.push(`id:ne:${variables.id}`)
+            }
+
+            return { pageSize: 1, fields: 'id', filter }
+        },
     },
 }
 
@@ -22,7 +26,13 @@ interface QueryResponse {
     }
 }
 
-export function useIsFieldValueUnique(field: string) {
+export function useIsFieldValueUnique({
+    field,
+    id,
+}: {
+    field: string
+    id: string
+}) {
     const engine = useDataEngine()
 
     const validate = useMemo(
@@ -33,7 +43,7 @@ export function useIsFieldValueUnique(field: string) {
                 }
 
                 const data = (await engine.query(HAS_FIELD_VALUE_QUERY, {
-                    variables: { field, value },
+                    variables: { field, value, id },
                 })) as unknown as QueryResponse
 
                 if (data.dataElements.pager.total > 0) {
@@ -42,7 +52,7 @@ export function useIsFieldValueUnique(field: string) {
                     )
                 }
             }),
-        [field, engine]
+        [field, engine, id]
     )
 
     return useDebouncedCallback(validate, 200, { leading: true })