MB-12222: update ui-router to version 1.0.0 alpha0

We have to use latest ui router because it has transitionsProvider, we need transitionsProvider in order to properly handle transition to the state with rbac permissions https://github.com/angular-ui/ui-router/releases/tag/1.0.0alpha0 Old ui-router is deprecated https://github.com/angular-ui/ui-router/releases/tag/0.2.17 Process of migrating is pretty smooth, although there are couple bugs angular-ui/ui-router#2504 angular-ui/ui-router#2503 Change-Id: I67fc81adecf5ebf9cf294171d5583f8555696cee Reviewed-on: http://review.couchbase.org/59318 Reviewed-by: Dave Finlay <dave.finlay@couchbase.com> Tested-by: Dave Finlay <dave.finlay@couchbase.com>
couchbase · Feb 17, 2016 · cc7ef04 · cc7ef04
1 parent 51482e2
commit cc7ef04
Show file tree

Hide file tree

Showing 8 changed files with 4,353 additions and 4,421 deletions.
diff --git a/priv/public/ui/app/app.js b/priv/public/ui/app/app.js
@@ -10,18 +10,10 @@
     'ui.bootstrap'
   ]).run(appRun);
 
-  function appRun($rootScope, $state, $urlRouter, mnPools, $uibModalStack, $window, $exceptionHandler, $http, $templateCache, mnPendingQueryKeeper) {
-    var originalOnerror = $window.onerror;
+  function appRun($state, $urlRouter, $exceptionHandler, mnPools, $window, $http, $templateCache, $transitions) {
 
+    var originalOnerror = $window.onerror;
     $window.onerror = onError;
-    $rootScope.$on('$stateChangeError', onStateChangeError);
-    $rootScope.$on('$stateChangeStart', onStateChangeStart);
-    $rootScope.$on('$locationChangeSuccess', onLocationChangeSuccess);
-    $urlRouter.listen();
-    angular.forEach(angularTemplatesList, function (url) {
-      $http.get(url, {cache: $templateCache});
-    });
-
     function onError(message, url, lineNumber, columnNumber, exception) {
       $exceptionHandler({
         message: message,
@@ -32,37 +24,26 @@
       });
       originalOnerror && originalOnerror.apply($window, Array.prototype.slice.call(arguments));
     }
-    function onStateChangeError(event, toState, toParams, fromState, fromParams, error) {
-      $exceptionHandler(error);
-    }
-    function onStateChangeStart(event, toState, toParams, fromState, fromParams, error) {
-      if (fromState.name.indexOf('app.admin') > -1 && toState.name.indexOf('app.admin') > -1) {
-        if ($uibModalStack.getTop()) {
-          return event.preventDefault();
-        }
-        mnPools.get().then(function (pools) {
-          var required = (toState.data && toState.data.required) || {};
-          var isOnlyForEnterprise = (required.enterprise && !pools.isEnterprise);
-          if (isOnlyForEnterprise) {
-            event.preventDefault();
-            return $state.go('app.admin.overview');
-          }
-        });
+
+    angular.forEach(angularTemplatesList, function (url) {
+      $http.get(url, {cache: $templateCache});
+    });
+
+    mnPools.get().then(function (pools) {
+      if (!pools.isInitialized) {
+        return $state.go('app.wizard.welcome');
       }
-    }
-    function onLocationChangeSuccess(event) {
-      event.preventDefault();
-      mnPools.get().then(function (pools) {
-        if (pools.isInitialized) {
-          $urlRouter.sync();
-        } else {
-          $state.go('app.wizard.welcome');
-        }
-      }, function (resp) {
-        switch (resp.status) {
-          case 401: return $state.go('app.auth');
-        }
-      });
-    }
+    }, function (resp) {
+      switch (resp.status) {
+        case 401: return $state.go('app.auth');
+      }
+    }).then(function () {
+      $urlRouter.listen();
+      $urlRouter.sync();
+    })
+
+    $transitions.defaultErrorHandler(function (error) {
+      error && $exceptionHandler(error);
+    });
   }
 })();
diff --git a/priv/public/ui/app/app_config.js b/priv/public/ui/app/app_config.js
@@ -5,7 +5,7 @@
     .module('app')
     .config(appConfig);
 
-  function appConfig($httpProvider, $stateProvider, $urlRouterProvider, $uibModalProvider) {
+  function appConfig($httpProvider, $stateProvider, $urlRouterProvider, $uibModalProvider, $transitionsProvider) {
     $httpProvider.defaults.headers.common['invalid-auth-response'] = 'on';
     $httpProvider.defaults.headers.common['Cache-Control'] = 'no-cache';
     $httpProvider.defaults.headers.common['Pragma'] = 'no-cache';
@@ -29,7 +29,67 @@
       template: '<div ui-view="" />'
     });
 
+    $transitionsProvider.onBefore({
+      to: "app.admin.**",
+      from: "app.admin.**"
+    }, function ($uibModalStack) {
+      return !$uibModalStack.getTop();
+    });
+    $transitionsProvider.onBefore({
+      to: "app.admin.**",
+      from: "app.auth"
+    }, function (mnPools) {
+      return mnPools.get().then(function () {
+        return true;
+      }, function (resp) {
+        switch (resp.status) {
+          case 401: return false;
+        }
+      });
+    });
+    $transitionsProvider.onBefore({
+      from: "app.wizard.**",
+      to: "app.auth"
+    }, function (mnPools) {
+      return mnPools.get().then(function (pools) {
+        return pools.isInitialized;
+      });
+    });
+    $transitionsProvider.onBefore({
+      from: "app.admin.**",
+      to: "app.auth"
+    }, function (mnPools) {
+      return mnPools.get().then(function () {
+        return false;
+      }, function (resp) {
+        switch (resp.status) {
+          case 401: return true;
+        }
+      });
+    });
+    $transitionsProvider.onStart({
+      to: function (state) {
+        return state.data && state.data.permissions;
+      }
+    }, function ($state, $parse, mnPermissions, $transition$) {
+      return mnPermissions.check().then(function() {
+        if (!$parse($transition$.to().data.permissions)(mnPermissions.export)) {
+          return false;
+        }
+      });
+    });
+    $transitionsProvider.onStart({
+      to: function (state) {
+        return state.data && state.data.required && state.data.required.enterprise;
+      }
+    }, function ($state, mnPools) {
+      return mnPools.get().then(function (pools) {
+        if (!pools.isEnterprise) {
+          return false;
+        }
+      });
+    });
+
     $urlRouterProvider.deferIntercept();
-    $urlRouterProvider.otherwise('/overview');
   }
 })();
diff --git a/priv/public/ui/app/components/mn_helper.js b/priv/public/ui/app/components/mn_helper.js
@@ -71,11 +71,11 @@
           var stateParams = {};
           if ($scope.isDetailsOpened(hashValue)) {
             stateParams[hashKey] = _.difference(currentlyOpened, [String(hashValue)]);
-            $state.go(stateName, stateParams, {notify: false});
+            $state.go(stateName, stateParams);
           } else {
             currentlyOpened.push(String(hashValue));
             stateParams[hashKey] = currentlyOpened;
-            $state.go(stateName, stateParams, {notify: false});
+            $state.go(stateName, stateParams);
           }
         };
       }
@@ -87,7 +87,7 @@
       }
       function reloadState() {
         mnPendingQueryKeeper.cancelAllQueries();
-        $state.transitionTo($state.current, $stateParams, {reload: true, inherit: true, notify: true});
+        $state.transitionTo($state.current, $stateParams, {reload: true, inherit: true});
       }
     }
   }

diff --git a/priv/public/ui/app/mn_admin/mn_admin_config.js b/priv/public/ui/app/mn_admin/mn_admin_config.js
@@ -121,6 +121,7 @@
       .state('app.admin.analytics.list', {
         abstract: true,
         url: '?openedStatsBlock',
+        // reloadOnSearch: false, should be uncomented after this fix will be merget https://github.com/angular-ui/ui-router/issues/2470
         params: {
           openedStatsBlock: {
             array: true
@@ -169,6 +170,7 @@
             array: true
           }
         },
+        reloadOnSearch: false,
         views: {
           "": {
             controller: 'mnBucketsController as bucketsCtl',
@@ -196,6 +198,7 @@
             array: true
           }
         },
+        reloadOnSearch: false,
         views: {
           "" : {
             controller: 'mnServersListController as serversListCtl',

diff --git a/priv/public/ui/app/mn_admin/mn_indexes/mn_indexes_config.js b/priv/public/ui/app/mn_admin/mn_indexes/mn_indexes_config.js
@@ -22,6 +22,9 @@
             value: null
           }
         },
+        resolve: {
+          setDefaultBucketName: mnHelperProvider.setDefaultBucketName("viewsBucket", 'app.admin.indexes.views.list')
+        },
         templateUrl: 'app/mn_admin/mn_indexes/mn_views/mn_views.html',
         controller: 'mnViewsController as viewsCtl'
       })
@@ -32,9 +35,6 @@
             value: 'development'
           }
         },
-        resolve: {
-          setDefaultBucketName: mnHelperProvider.setDefaultBucketName("viewsBucket", 'app.admin.indexes.views.list')
-        },
         controller: 'mnViewsListController as viewsListCtl',
         templateUrl: 'app/mn_admin/mn_indexes/mn_views/list/mn_views_list.html'
       })
@@ -64,6 +64,7 @@
             array: true
           }
         },
+        reloadOnSearch: false,
         controller: "mnGsiController as gsiCtl",
         templateUrl: "app/mn_admin/mn_indexes/mn_gsi/mn_gsi.html"
       });

diff --git a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/editing/mn_views_editing_service.js b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/editing/mn_views_editing_service.js
@@ -32,6 +32,9 @@
     }
 
     function buildViewUrl(params) {
+      if (!params || !params.documentId) {
+        return;
+      }
       var params = _.clone(params);
       if (params.documentId.slice(0, "_design/".length) === "_design/") {
         params.documentId = "_design/" + encodeURIComponent(params.documentId.slice("_design/".length));

diff --git a/priv/public/ui/app/mn_auth/mn_auth_config.js b/priv/public/ui/app/mn_auth/mn_auth_config.js
@@ -9,9 +9,8 @@
 
   function mnAuthConfig($stateProvider, $httpProvider, $urlRouterProvider) {
     $httpProvider.interceptors.push(['$q', '$injector', interceptorOf401]);
-    $urlRouterProvider.when('', '/auth');
-    $urlRouterProvider.when('/', '/auth');
     $stateProvider.state('app.auth', {
+      url: "/auth",
       templateUrl: 'app/mn_auth/mn_auth.html',
       controller: 'mnAuthController as authCtl'
     });