moved logic to json parser, removed full url check (now handled in cs-web-lib)

Author: tomkane-dls

src/utils/csWebLibActions.ts

@@ -43,7 +43,8 @@ export const executeOpenPageActionWithFileMetadata = (
   fileContext: any,
   overrideMacros?: MacroMap
 ) => {
-  // get macros
+  let filePath = fileMetadata?.file ?? beamlineState.topLevelScreen;
+
   const fileMetadataMacros: MacroMap =
     fileMetadata?.macros && fileMetadata?.macros.length > 0
       ? fileMetadata?.macros[0]
@@ -53,26 +54,7 @@ export const executeOpenPageActionWithFileMetadata = (
       ? overrideMacros
       : fileMetadataMacros;
 
-  // TEMP FIX - adding colon as PVs using M macros don't work because they are missing a colon
-  if (selectedMacros.M && !selectedMacros.M.startsWith(":")) {
-    selectedMacros.M = ":" + selectedMacros.M;
-  }
-
-  let filePath = fileMetadata?.file ?? beamlineState.topLevelScreen;
-
-  // replace macro values first
-  Object.entries(selectedMacros).forEach(([key, value]) => {
-    filePath = filePath.replace(`$(${key})`, value);
-  });
-
-  // check if the filepath is now already a url
-  const isFullUrl =
-    filePath.startsWith("http://") || filePath.startsWith("https://");
-
-  // build screen from url or relative path
-  const newScreen = isFullUrl
-    ? filePath
-    : buildUrl(beamlineState.host, filePath);
+  const newScreen = buildUrl(beamlineState.host, filePath);
 
   const beamlineUrlId = `/synoptic/${selectedBeamlineId}`;
 

src/utils/parser.ts

@@ -174,16 +174,31 @@ export const RecursiveAppendDuplicateFileMacros = (
   if (!jsonSiblings) {
     return;
   }
-
   for (const sibling of jsonSiblings) {
-    if (sibling.duplicate && sibling.macros) {
+    if (sibling.macros) {
+      // TEMP?
+      addMColon(sibling.macros);
+
+      // Substitute macros into the filename
+      const filename =
+        sibling.file && sibling.macros
+          ? substituteMacrosIntoFilename(sibling.file, sibling.macros)
+          : sibling.file;
+
+      // Match against unresolved filename
       const matchingFileKey = Object.keys(fileMap).find(
         key => fileMap[key].file === sibling.file
       );
       if (matchingFileKey) {
-        fileMap[matchingFileKey].macros = fileMap[matchingFileKey].macros
-          ? [...fileMap[matchingFileKey].macros, sibling.macros]
-          : [sibling.macros];
+        // Replace with resolved filename
+        fileMap[matchingFileKey].file = filename;
+
+        if (sibling.duplicate) {
+          // Attach macros
+          fileMap[matchingFileKey].macros = fileMap[matchingFileKey].macros
+            ? [...fileMap[matchingFileKey].macros, sibling.macros]
+            : [sibling.macros];
+        }
       }
     }
 
@@ -215,3 +230,22 @@ export const buildUrlId = (
   const urlId = `${idPrefix}${idPrefix === "" ? "" : "+"}${fileLabel}`;
   return { urlId, fileLabel };
 };
+
+// TEMP? add colon to M macro
+const addMColon = (macros: any) => {
+  if (macros.M && !macros.M.startsWith(":")) {
+    macros.M = ":" + macros.M;
+  }
+};
+
+// Substitute macros into a filename
+const substituteMacrosIntoFilename = (
+  filename: string,
+  macros: any
+): string => {
+  let resolvedFilename = filename;
+  Object.entries(macros).forEach(([key, value]) => {
+    resolvedFilename = resolvedFilename.replace(`$(${key})`, value as string);
+  });
+  return resolvedFilename;
+};