Kavitha| fix support for array with keys

Bahmni · Oct 24, 2024 · 7d0031c · 7d0031c
1 parent afda3b1
commit 7d0031c
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/features/DisplayControls/Vitals/utils/VitalsUtils.js b/src/features/DisplayControls/Vitals/utils/VitalsUtils.js
@@ -40,16 +40,15 @@ export const getConceptDetails = (conceptConfig, conceptDetails, intl) => {
   let concepts = {};
 
   Object.keys(conceptConfig).forEach((conceptName) => {
-    const conceptByLocale = intl.formatMessage({
-      id: conceptConfig[conceptName],
-      defaultMessage: conceptConfig[conceptName],
-    });
     let obj;
-
-    if (Array.isArray(conceptByLocale)) {
+    if (Array.isArray(conceptConfig[conceptName])) {
       obj = conceptDetails.filter((field) => {
-        return conceptByLocale.some((concept) => {
-          return field.fullName.toLowerCase() === concept.toLowerCase();
+        return conceptConfig[conceptName].some((concept) => {
+          let conceptByLocale = intl.formatMessage({
+            id: concept,
+            defaultMessage: concept,
+          });
+          return field.fullName.toLowerCase() === conceptByLocale.toLowerCase();
         });
       });
 
@@ -58,6 +57,10 @@ export const getConceptDetails = (conceptConfig, conceptDetails, intl) => {
         unit: matchedField.units,
       }));
     } else {
+      const conceptByLocale = intl.formatMessage({
+        id: conceptConfig[conceptName],
+        defaultMessage: conceptConfig[conceptName],
+      });
       obj = conceptDetails.find(
         (field) => field.fullName.toLowerCase() === conceptByLocale.toLowerCase()
       );