Handle @metadata.controller_dir properly

... and the other optional parameters as well.

We also fix the other fetch of run.prefix which could be undefined.

Author: portante

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

@@ -85,31 +85,28 @@ export default {
           );
           return;
         }
-        let config =
-          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] : 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({
+        let record = {
           key: name,
           startUnixTimestamp: Date.parse(start),
-          ['@metadata.controller_dir']: controller_dir,
-          ['@metadata.satellite']: satellite,
           ['run.name']: name,
-          ['run.config']: config,
           ['run.controller']: controller,
-          ['run.prefix']: prefix,
           ['run.start']: start,
           ['run.end']: end,
           ['id']: id,
-        });
+        };
+        if (typeof result.fields['run.config'] != 'undefined') {
+          record['run.config'] = result.fields['run.config'][0];
+        }
+        if (typeof result.fields['run.prefix'] != 'undefined') {
+          record['run.prefix'] = result.fields['run.prefix'][0];
+        }
+        if (typeof result.fields['@metadata.controller_dir'] != 'undefined') {
+          record['@metadata.controller_dir'] = result.fields['@metadata.controller_dir'][0];
+        }
+        if (typeof result.fields['@metadata.satellite'] != 'undefined') {
+          record['@metadata.satellite'] = result.fields['@metadata.satellite'][0];
+        }
+        results.push(record);
       });
 
       yield put({

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

@@ -58,8 +58,9 @@ export default {
           selectedFields.map(field => {
             parsedResult[field] = result._source[field.split('.')[0]][field.split('.')[1]];
           });
-          parsedResult['run.prefix'] =
-            result._source['run.prefix'.split('.')[0]]['run.prefix'.split('.')[1]];
+          if (typeof result._source['run']['prefix'] != 'undefined') {
+            parsedResult['run.prefix'] = result._source['run']['prefix'];
+          }
           parsedResults.push(parsedResult);
         });
         searchResults['results'] = parsedResults;

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

@@ -134,7 +134,7 @@ export async function queryIterations(params) {
 
   let iterationRequests = [];
   selectedResults.map(result => {
-    const controller_dir = result['@metadata.controller_dir'];
+    let controller_dir = result['@metadata.controller_dir'];
     if (controller_dir === undefined) {
       controller_dir = result['run.controller'];
       controller_dir = controller_dir.includes('.')