fold changes from temporary /perspectivesBeta back into /perspectives (…

…#74)
salesforce · Nov 1, 2016 · 6926d4c · 6926d4c
1 parent c21ddd3
commit 6926d4c
Show file tree

Hide file tree

Showing 9 changed files with 165 additions and 1,775 deletions.
diff --git a/view/loadView.js b/view/loadView.js
@@ -36,8 +36,6 @@ const viewmap = {
   '/samples/:key/edit': 'admin',
   '/perspectives': 'perspective/perspective',
   '/perspectives/:key': 'perspective/perspective',
-  '/perspectivesBeta': 'perspectiveBeta/perspective',
-  '/perspectivesBeta/:key': 'perspectiveBeta/perspective',
 };
 
 /**
@@ -133,9 +131,7 @@ module.exports = function loadView(app, passport) {
         // if url contains a query, render perspective detail page with realtime
         // updates
         if ((key === '/perspectives' && Object.keys(req.query).length) ||
-        key === '/perspectives/:key' ||
-        (key === '/perspectivesBeta' && Object.keys(req.query).length) ||
-        key === '/perspectivesBeta/:key') {
+        key === '/perspectives/:key') {
           res.render(viewmap[key], templateVars);
         } else {
           res.render(viewmap[key], trackObj);

diff --git a/view/perspective/PerspectiveController.js b/view/perspective/PerspectiveController.js
@@ -73,7 +73,7 @@ class PerspectiveController extends React.Component {
           placeholderText='Search Perspectives'
           options={ persNames }
           showSearchIcon={ true }
-          onAddNewButton={ this.openCreatePanel.bind(this) }
+          onAddNewButton={ values.lenses ? this.openCreatePanel.bind(this) : undefined }
           onClickItem={ this.goToUrl.bind(this) }
           newButtonText='New Perspective'
         />