(fix) O3-4489: obsGroup child question id gets flagged as duplicate (#409)

* (fix) obsGroup child question id gets flagged as duplicate

* update yarn.lock

* update yarn.lock

Author: NethmiRodrigo

src/components/interactive-builder/modals/question/question.modal.tsx

@@ -29,6 +29,11 @@ interface QuestionModalProps {
   resetIndices: () => void;
 }
 
+const getAllQuestionIds = (questions?: FormField[]): string[] => {
+  if (!questions) return [];
+  return flattenDeep(questions.map((question) => [question.id, getAllQuestionIds(question.questions)]));
+};
+
 const QuestionModalContent: React.FC<QuestionModalProps> = ({
   formField: formFieldProp,
   closeModal,
@@ -41,32 +46,43 @@ const QuestionModalContent: React.FC<QuestionModalProps> = ({
   const { t } = useTranslation();
   const { formField, setFormField } = useFormField();
 
-  const getAllQuestionIds = useCallback((questions?: FormField[]): string[] => {
-    if (!questions) return [];
-    return flattenDeep(questions.map((question) => [question.id, getAllQuestionIds(question.questions)]));
-  }, []);
-
+  /**
+   * NOTE - this does not support nested obsGroup questions
+   */
   const checkIfQuestionIdExists = useCallback(
     (idToTest: string): boolean => {
       // Get all IDs from the schema
       const schemaIds: string[] =
         schema?.pages?.flatMap((page) => page?.sections?.flatMap((section) => getAllQuestionIds(section.questions))) ||
         [];
 
-      // Get all IDs from the current formField's questions array
+      // Get all IDs from the obsGroup questions
       const formFieldIds: string[] = formField?.questions ? getAllQuestionIds(formField.questions) : [];
 
+      // The main question's id
+      formFieldIds.push(formField.id);
+
+      const originalFormFieldQuestionIds =
+        formFieldProp && formFieldProp.id !== '' ? getAllQuestionIds(formFieldProp.questions) : [];
+
+      if (formFieldProp && formFieldProp.id !== '') originalFormFieldQuestionIds.push(formFieldProp.id);
+
+      // Remove the ids from the original question from the schema ids
+      const filteredSchemaIds = schemaIds.slice(); // Create a copy to modify
+      originalFormFieldQuestionIds.forEach((idToRemove) => {
+        const indexToRemove = filteredSchemaIds.indexOf(idToRemove);
+        if (indexToRemove !== -1) {
+          filteredSchemaIds.splice(indexToRemove, 1);
+        }
+      });
+
       // Combine both arrays, along with the parent question ID and count occurrences of the ID
-      const allIds = [...schemaIds, ...formFieldIds];
-      if (!formFieldProp || formFieldProp.id !== formField.id) {
-        allIds.push(formField.id);
-      }
+      const allIds = [...filteredSchemaIds, ...formFieldIds];
       const occurrences = allIds.filter((id) => id === idToTest).length;
 
-      // Return true if ID occurs more than once
       return occurrences > 1;
     },
-    [schema, getAllQuestionIds, formField, formFieldProp],
+    [schema, formField, formFieldProp],
   );
 
   const addObsGroupQuestion = useCallback(() => {

yarn.lock

@@ -3738,8 +3738,8 @@ __metadata:
   linkType: hard
 
 "@openmrs/esm-patient-common-lib@npm:next":
-  version: 9.2.1-pre.6870
-  resolution: "@openmrs/esm-patient-common-lib@npm:9.2.1-pre.6870"
+  version: 9.2.2-pre.6922
+  resolution: "@openmrs/esm-patient-common-lib@npm:9.2.2-pre.6922"
   dependencies:
     "@carbon/react": "npm:^1.12.0"
     lodash-es: "npm:^4.17.21"
@@ -3748,7 +3748,7 @@ __metadata:
     "@openmrs/esm-framework": 6.x
     react: 18.x
     single-spa: 6.x
-  checksum: 10/0891a1c2b020d16c5dc57c69dd58bbcaac1ef081686a038a16a3b3fc18abe71b03fb26360b39dd421c862d7ec3f63ec70e4ccf0b08fc726a29188f55c6f6ec26
+  checksum: 10/41001b0beba68c277b2013bd6457dc3c742436f188fec23ae3ea395bca3802c6aae725eac783a00110c434100615c1f41a7348b01a7789ded180d75bbb459d18
   languageName: node
   linkType: hard