#31: Updated Scoring for OData Standard Display Names

RESOStandards · Sep 12, 2023 · 5e6844d · 5e6844d
1 parent 080e450
commit 5e6844d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,3 +102,4 @@ dist
 
 # TernJS port file
 .tern-port
+.DS_Store
diff --git a/lib/process-metadata.js b/lib/process-metadata.js
@@ -73,9 +73,9 @@ const parseLookupName = (lookupName = '') => {
   const FQDNSeparator = '.';
   return {
     lookupName:
-      lookupName?.slice(lookupName?.lastIndexOf(FQDNSeparator) + 1) || null,
+      lookupName?.slice(lookupName?.lastIndexOf(FQDNSeparator) + 1) ?? null,
     lookupNameFQDN:
-      lookupName?.slice(0, lookupName?.lastIndexOf(FQDNSeparator)) || null,
+      lookupName?.slice(0, lookupName?.lastIndexOf(FQDNSeparator)) ?? null,
     lookupNameWithFQDN: lookupName,
   };
 };
@@ -151,7 +151,7 @@ const buildStandardLookupValueMap = (lookups = []) => {
       const { lookupName, lookupValue, standardDisplayName, annotations } =
         item;
 
-      if (!(lookupName && (standardDisplayName || lookupValue))) return cache;
+      if (!(lookupName && (standardDisplayName ?? lookupValue))) return cache;
       if (!cache[lookupName]) cache[lookupName] = {};
 
       //add entry for the standard lookup value
@@ -224,7 +224,7 @@ const getTransformedLookups = (metadataReportJson = {}) => {
   const referenceLookups =
     referenceMetadataJson?.lookups?.filter(
       (lookup) => !isReferencePlaceholderValue(lookup)
-    ) || [];
+    ) ?? [];
 
   const referenceLookupNameValueMap =
     buildStandardLookupValueMap(referenceLookups);
@@ -233,7 +233,7 @@ const getTransformedLookups = (metadataReportJson = {}) => {
   const lookupMap = buildLookupMap(metadataReportJson?.lookups);
 
   return Object.values(
-    (metadataReportJson?.fields || [])
+    (metadataReportJson?.fields ?? [])
       .filter(isLookupField)
       .flatMap((field = {}) => {
         const { resourceName, fieldName, type: fieldType } = field;
@@ -250,11 +250,11 @@ const getTransformedLookups = (metadataReportJson = {}) => {
             referenceFieldMap[resourceName][fieldName];
 
           const { lookupName: resoLookupName } =
-            parseLookupName(standardField?.type) || {};
+            parseLookupName(standardField?.type) ?? {};
 
           //get lookup maps for the given item
           const standardLookupValueMap =
-            referenceLookupNameValueMap[resoLookupName] || {};
+            referenceLookupNameValueMap[resoLookupName] ?? {};
 
           if (!lookupMap[lookupName]) {
             return [];
@@ -264,7 +264,6 @@ const getTransformedLookups = (metadataReportJson = {}) => {
             const {
               lookupValue,
               lookupNameWithFQDN: lookupName,
-              annotations,
               type,
             } = lookup;
 
@@ -282,21 +281,6 @@ const getTransformedLookups = (metadataReportJson = {}) => {
               };
             }
 
-            const standardDisplayName =
-              findStandardDisplayNameAnnotation(annotations);
-            const standardDisplayNameMatch =
-              standardDisplayName &&
-              standardLookupValueMap[standardDisplayName];
-            if (standardDisplayNameMatch) {
-              return {
-                lookupName,
-                lookupValue: standardDisplayName,
-                type,
-                standardRESO: true,
-                standardDisplayName,
-              };
-            }
-
             //otherwise the lookup is local
             return { lookupName, lookupValue, type, standardRESO: false };
           });