Merge branch 'master' into instrument-realtime-events

view/perspective/app.js

@@ -48,7 +48,7 @@ import request from 'superagent';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import PerspectiveController from './PerspectiveController';
-import { getFilterQuery, getTagsFromResources, getValuesObject } from './utils';
+import { getValuesObject } from './utils';
 const u = require('../utils');
 const eventsQueue = require('./eventsQueue');
 const pcValues = {};
@@ -127,6 +127,10 @@ function handleEvent(eventData, eventTypeName) {
  * @param  {Object} persBody - Perspective object
  */
 function setupSocketIOClient(persBody) {
+  if (!persBody) {
+    throw new Error('Cannot set up socket IO client without a perspective');
+  }
+
   /*
    * Add the perspective name as a query param so that it's available server-
    * side on connect.
@@ -351,7 +355,13 @@ window.onload = () => {
   };
 
   getValuesObject(accumulatorObject)
-  .then(loadController)
+  .then((valuesObject) => {
+
+    // skip loading the controller if nothing is returned
+    if (valuesObject) {
+      loadController(valuesObject);
+    }
+  })
   .catch((error) => {
     document.getElementById('errorInfo').innerHTML = error;
   });

view/perspective/utils.js

@@ -386,25 +386,35 @@ function getValuesObject(accumulatorObject) {
       getPromiseWithUrl('/v1/subjects?fields=isPublished,absolutePath,tags'),
       getPromiseWithUrl('/v1/aspects?fields=isPublished,name,tags')
      ];
-     if (returnedPerspective) {
+
+     if (named) {
+      if (returnedPerspective) {
         setupSocketIOClient(returnedPerspective);
         valuesObj.perspective = returnedPerspective;
         valuesObj.name = valuesObj.perspective.name;
 
         // perspective exists. GET its hierarchy and lenses soon.
         promisesArr.concat(getPageLoadingPromises(returnedPerspective));
-     } else if (named) {
+      } else {
 
-      // named perspective does not exist
-      const name = url.split('/').pop();
-      customHandleError('Sorry, but the perspective you were trying ' +
-        'to load, ' + name + ', does not exist. Please select a ' +
-        'perspective from the dropdown.');
+        // named perspective does not exist
+        const name = url.split('/').pop();
+        customHandleError('Sorry, but the perspective you were trying ' +
+          'to load, ' + name + ', does not exist. Please select a ' +
+          'perspective from the dropdown.');
+      }
     }
 
     return Promise.all(promisesArr);
   })
   .then((responses) => {
+
+    // on redirect, responses is a string
+    // otherwise it is an array of API responses
+    if (typeof responses === 'string') {
+      return;
+    }
+
     const lenses = responses[0].body;
     const subjects = responses[1].body;
     const aspects = responses[2].body;