Merge pull request #496 from CBIIT/CRDCDH-1497

CRDCDH-1497
CBIIT · Oct 18, 2024 · 8b1df14 · 8b1df14
2 parents 658acc3 + 3e93f79
commit 8b1df14
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/utils/dataModelUtils.ts b/src/utils/dataModelUtils.ts
@@ -159,6 +159,9 @@ export const traverseAndReplace = (
   apiError: boolean,
   parentKey = ""
 ) => {
+  const getCDEPublicID = (cdeCode, cdeVersion) =>
+    `https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=${cdeCode}%20and%20ver_nr=${cdeVersion}`;
+
   if (typeof node !== "object" || node === null) return;
 
   if (node.properties) {
@@ -167,22 +170,29 @@ export const traverseAndReplace = (
         const fullKey = `${parentKey}.${key}`.replace(/^\./, "");
         const prefixMatch = mapKeyPrefixes.get(fullKey);
         const noValuesMatch = mapKeyPrefixesNoValues.get(fullKey);
+        const property = node.properties[key];
         const fallbackMessage = [
           "Permissible values are currently not available. Please contact the Data Hub HelpDesk at [email protected]",
         ];
 
         if (prefixMatch) {
-          const resultMapEntry = resultMap.get(prefixMatch);
-
-          if (resultMapEntry?.PermissibleValues?.length && node.properties[key].enum) {
-            node.properties[key].enum = resultMapEntry.PermissibleValues;
-          } else if (resultMapEntry?.PermissibleValues?.length === 0 && node.properties[key].enum) {
-            node.properties[key].enum = fallbackMessage;
+          const { CDECode, CDEFullName, CDEVersion, PermissibleValues } =
+            resultMap.get(prefixMatch);
+
+          if (PermissibleValues?.length && property.enum) {
+            property.enum = PermissibleValues;
+            property.CDEFullName = CDEFullName;
+            property.CDECode = CDECode;
+            property.CDEPublicID = getCDEPublicID(CDECode, CDEVersion);
+            property.CDEVersion = CDEVersion;
+            property.CDEOrigin = "caDSR";
+          } else if (PermissibleValues?.length === 0 && property.enum) {
+            property.enum = fallbackMessage;
           }
         }
 
-        if (noValuesMatch && apiError && node.properties[key].enum) {
-          node.properties[key].enum = fallbackMessage;
+        if (noValuesMatch && apiError && property.enum) {
+          property.enum = fallbackMessage;
         }
       }
     }