Use @metadata.controller_dir when present

Instead of using the regular controller name, we use the controller_dir
field, if present, to construct incoming URL references on the web
server.

We also pull the satellite field as well.

Author: portante

web-server/v0.4/src/models/dashboard.js

@@ -71,11 +71,11 @@ export default {
           controller = result.fields['run.controller'][0];
           id = result.fields['run.id'][0];
           start =
-            typeof result.fields['run.start'] !== 'undefined'
+            typeof result.fields['run.start'] != 'undefined'
               ? result.fields['run.start'][0]
               : result.fields['run.start_run'][0];
           end =
-            typeof result.fields['run.end'] !== 'undefined'
+            typeof result.fields['run.end'] != 'undefined'
               ? result.fields['run.end'][0]
               : result.fields['run.end_run'][0];
         } catch (error) {
@@ -86,16 +86,22 @@ export default {
           return;
         }
         let config =
-          typeof result.fields['run.config'] !== 'undefined'
-            ? result.fields['run.config'][0]
-            : null;
+          typeof result.fields['run.config'] != 'undefined' ? result.fields['run.config'][0] : null;
         let prefix =
-          typeof result.fields['run.prefix'] !== 'undefined'
-            ? result.fields['run.prefix'][0]
+          typeof result.fields['run.prefix'] != 'undefined' ? result.fields['run.prefix'][0] : null;
+        let controller_dir =
+          typeof result.fields['@metadata.controller_dir'] != 'undefined'
+            ? result.fields['@metadata.controller_dir'][0]
+            : null;
+        let satellite =
+          typeof result.fields['@metadata.satellite'] != 'undefined'
+            ? result.fields['@metadata.satellite'][0]
             : null;
         results.push({
           key: name,
           startUnixTimestamp: Date.parse(start),
+          ['@metadata.controller_dir']: controller_dir,
+          ['@metadata.satellite']: satellite,
           ['run.name']: name,
           ['run.config']: config,
           ['run.controller']: controller,

web-server/v0.4/src/services/dashboard.js

@@ -61,6 +61,8 @@ export async function queryResults(params) {
     method: 'POST',
     body: {
       fields: [
+        '@metadata.controller_dir',
+        '@metadata.satellite',
         'run.controller',
         'run.start',
         'run.start_run', // For pre-v1 run mapping version
@@ -132,17 +134,21 @@ export async function queryIterations(params) {
 
   let iterationRequests = [];
   selectedResults.map(result => {
-    const controller = result['run.controller'];
+    const controller_dir = result['@metadata.controller_dir'];
+    if (controller_dir === undefined) {
+      controller_dir = result['run.controller'];
+      controller_dir = controller_dir.includes('.')
+        ? controller_dir.slice(0, controller_dir.indexOf('.'))
+        : controller_dir;
+    }
     iterationRequests.push(
       axios.get(
-        datastoreConfig.results
-          + '/incoming/'
-          + (controller.includes('.')
-             ? encodeURI(controller.slice(0, controller.indexOf('.')))
-             : encodeURI(controller))
-          + '/'
-          + encodeURI(result['run.name'])
-          + '/result.json'
+        datastoreConfig.results +
+          '/incoming/' +
+          encodeURI(controller_dir) +
+          '/' +
+          encodeURI(result['run.name']) +
+          '/result.json'
       )
     );
   });
@@ -157,24 +163,27 @@ export async function queryIterations(params) {
           resultName: iteration.config.url.split('/')[5],
           tableId: index,
         });
-      })
+      });
       return iterations;
     })
     .catch(error => {
-      if ((error.response !== undefined) && (error.response.status !== undefined)) {
+      if (error.response !== undefined && error.response.status !== undefined) {
         if (error.response.status == 404) {
           console.log('(404) Not Found (queryIterations): ' + error.request.responseURL);
           return [];
-        }
-        else {
+        } else {
           console.log(
-            '(' + error.response.status + ') queryIterations: GET ' + error.request.responseURL + ' -- ' + error
+            '(' +
+              error.response.status +
+              ') queryIterations: GET ' +
+              error.request.responseURL +
+              ' -- ' +
+              error
           );
           throw error;
         }
-      }
-      else {
-        console.log("queryIterations: " + error);
+      } else {
+        console.log('queryIterations: ' + error);
         throw error;
       }
     });