Merge pull request maestrano#84 from alexnoox/215-app-init-refactor

[MNOE-215] App initialisation refactor

src/app/components/dashboard-company-selectbox/dashboard-company-selectbox.coffee

@@ -16,6 +16,7 @@ DashboardCompanySelectboxCtrl = ($scope, $location, $stateParams, $cookies, $sce
   }
 
   selectBox.changeTo = (organization) ->
+    MnoeAppInstances.emptyAppInstances()
     MnoeAppInstances.clearCache()
     MnoeOrganizations.get(organization.id)
     selectBox.close()

src/app/components/dashboard-menu/dashboard-menu.controller.coffee

@@ -8,16 +8,16 @@ angular.module 'mnoEnterpriseAngular'
       restrict: 'EA'
       templateUrl: 'app/components/dashboard-menu/dashboard-menu.html',
 
-      controller: ($scope, $state, MnoeOrganizations, DOCK_CONFIG) ->
-        $scope.isLoading = true
+      controller: ($scope, MnoeCurrentUser, MnoeOrganizations, DOCK_CONFIG) ->
+        $scope.isDockEnabled = DOCK_CONFIG.enabled
 
-        $scope.$watch(MnoeOrganizations.getSelected, (newValue, oldValue) ->
-          if newValue?
-            # Impac! is displayed only to admin and super admin
-            $scope.isAdmin = (MnoeOrganizations.role.isAdmin() || MnoeOrganizations.role.isSuperAdmin())
-            $scope.isDockEnabled = DOCK_CONFIG.enabled
-            $scope.isLoading = false
-            $state.go('home.login') if oldValue? && newValue != oldValue
+        $scope.$watch(MnoeOrganizations.getSelectedId, (newValue) ->
+          # Impac! is displayed only to admin and super admin
+          MnoeCurrentUser.get().then(
+            (response) ->
+              selectedOrg = _.find(response.organizations, {id: parseInt(newValue)})
+              $scope.isAdmin = MnoeOrganizations.role.atLeastAdmin(selectedOrg.current_user_role)
+          ) if newValue?
         )
 
         return

src/app/components/impac-config/impac-config.svc.js.coffee

@@ -5,7 +5,7 @@ angular.module 'mnoEnterpriseAngular'
       MnoeCurrentUser.get()
 
     @getOrganizations = ->
-      userOrgs = MnoeCurrentUser.get().then(
+      userOrgsPromise = MnoeCurrentUser.get().then(
         ->
           userOrgs = MnoeCurrentUser.user.organizations
 
@@ -16,7 +16,7 @@ angular.module 'mnoEnterpriseAngular'
           return userOrgs
       )
 
-      currentOrgId = MnoeOrganizations.get().then(
+      currentOrgIdPromise = MnoeOrganizations.get(MnoeOrganizations.selectedId).then(
         ->
           currentOrgId = parseInt(MnoeOrganizations.selectedId)
 
@@ -27,7 +27,7 @@ angular.module 'mnoEnterpriseAngular'
           return currentOrgId
       )
 
-      $q.all([userOrgs, currentOrgId]).then(
+      $q.all([userOrgsPromise, currentOrgIdPromise]).then(
         (responses) ->
           return {organizations: responses[0], currentOrgId: responses[1]}
       )

src/app/components/mnoe-api/app-instances.svc.coffee

@@ -53,6 +53,9 @@ angular.module 'mnoEnterpriseAngular'
           MnoLocalStorage.setObject(MnoeCurrentUser.user.id + "_" + LOCALSTORAGE.appInstancesKey, _self.appInstances)
       )
 
+    @emptyAppInstances = () ->
+      @appInstances.length = 0
+
     @clearCache = () ->
       MnoLocalStorage.removeItem(MnoeCurrentUser.user.id + "_" + LOCALSTORAGE.appInstancesKey)
 

src/app/components/mnoe-api/organizations.svc.coffee

@@ -28,7 +28,7 @@ angular.module 'mnoEnterpriseAngular'
     organizationPromise = null
     @get = (id = null) ->
       # return the cached promise if not a new call
-      return organizationPromise if ((!id? || id == _self.selectedId) && organizationPromise != null)
+      return organizationPromise if ((!id? || id == _self.selectedId) && organizationPromise?)
 
       _self.selectedId = id if id?
 

src/app/index.route.coffee

@@ -10,9 +10,6 @@ angular.module 'mnoEnterpriseAngular'
         templateUrl: 'app/views/layout.html'
         controller: 'LayoutController'
         controllerAs: 'layout'
-      .state 'home.login',
-        url: '/login'
-        controller: 'LoginRouterCtrl'
       .state 'home.apps',
         data:
           pageTitle:'Apps'
@@ -69,4 +66,4 @@ angular.module 'mnoEnterpriseAngular'
               $window.location.href = "#{URI.login}"
           )
 
-    $urlRouterProvider.otherwise '/login'
+    $urlRouterProvider.otherwise '/impac'

src/app/index.run.coffee

@@ -48,11 +48,12 @@ angular.module 'mnoEnterpriseAngular'
   # Display flash messages from the backend in toastr
   # They're passed this way:
   #   ?flash={"msg":"An error message.","type":"error"}
-  .run (toastr, $location) ->
+  .run((toastr, $location) ->
     if flash = $location.search().flash
       message = JSON.parse(flash)
       toastr[message.type](message.msg, _.capitalize(message.type), timeout: 10000)
       $location.search('flash', null) # remove the flash from url
+  )
 
   .run(($rootScope, $timeout, AnalyticsSvc) ->
     $timeout ( -> AnalyticsSvc.init() )
@@ -61,3 +62,25 @@ angular.module 'mnoEnterpriseAngular'
       AnalyticsSvc.update()
     )
   )
+
+  # App initialization: Retrieve current user and current organization, then preload marketplace
+  .run(($rootScope, $q, $stateParams, MnoeCurrentUser, MnoeOrganizations, MnoeMarketplace) ->
+
+    # Hide the layout with a loader
+    $rootScope.isLoggedIn = false
+
+    # Load the current user
+    userPromise = MnoeCurrentUser.get()
+
+    # Load the current organization if defined (url param, cookie or first)
+    organizationPromise = MnoeOrganizations.getCurrentId($stateParams.dhbRefId)
+
+    $q.all([userPromise, organizationPromise]).then(
+      ->
+        # Display the layout
+        $rootScope.isLoggedIn = true
+
+        # Pre-load the market place
+        MnoeMarketplace.getApps()
+    )
+  )

src/app/views/impac/impac.controller.coffee

@@ -1,24 +1,25 @@
 angular.module 'mnoEnterpriseAngular'
-  .controller 'ImpacController', ($scope, $state, MnoeOrganizations, DOCK_CONFIG) ->
+  .controller 'ImpacController', ($scope, $state, ImpacDashboardsSvc, MnoeCurrentUser, MnoeOrganizations, DOCK_CONFIG) ->
     'ngInject'
 
     vm = this
+    vm.isImpacShown = false
     vm.isDockEnabled = DOCK_CONFIG.enabled
 
     #====================================
     # Post-Initialization
     #====================================
-    $scope.$watch(MnoeOrganizations.getSelectedId, (newValue) ->
-      vm.isImpacShown = true
-
-      # Fetch current organization to check if user is allowed
-      MnoeOrganizations.get().then(
-        ->
-          # Impac is displayed only to admin and super admin
-          vm.isImpacShown = (MnoeOrganizations.role.isAdmin() || MnoeOrganizations.role.isSuperAdmin())
-
-          if !vm.isImpacShown
-            $state.go('home.login')
+    $scope.$watch(MnoeOrganizations.getSelectedId, (newValue, oldValue) ->
+      MnoeCurrentUser.get().then(
+        (response) ->
+          selectedOrg = _.find(response.organizations, {id: parseInt(newValue)})
+          # Needs to be at least admin to display impac! or user is redirected to apps dashboard
+          if MnoeOrganizations.role.atLeastAdmin(selectedOrg.current_user_role)
+            # Display impac! and force it to reload if necessary
+            vm.isImpacShown = true
+            ImpacDashboardsSvc.reload(true) if newValue? && oldValue? && newValue != oldValue
+          else
+            $state.go('home.apps')
       ) if newValue?
     )
 

src/app/views/layout.controller.coffee

@@ -1,28 +1,17 @@
 angular.module 'mnoEnterpriseAngular'
-  .controller 'LayoutController', ($stateParams, $state, $q, MnoeCurrentUser, MnoeOrganizations, MnoeMarketplace) ->
+  .controller 'LayoutController', ($scope, $stateParams, $state, $q, MnoeCurrentUser, MnoeOrganizations) ->
     'ngInject'
 
-    layout = this
-
-    # Hide the layout
-    layout.isLoggedIn = false
-
-    # App initialization
-    userPromise = MnoeCurrentUser.get()
-
-    # Load the current organization if defined (url param, cookie or first)
-    organizationPromise = MnoeOrganizations.getCurrentId($stateParams.dhbRefId)
-
-    $q.all([userPromise, organizationPromise]).then(
-      ->
-        # Display the layout
-        layout.isLoggedIn = true
-
-        # Pre-load the market place
-        MnoeMarketplace.getApps()
-
-        # Remove param from url
-        $state.go('.', {dhbRefId: undefined})
+    # Impac! is displayed only to admin and super admin
+    $scope.$watch(MnoeOrganizations.getSelectedId, (newValue) ->
+      MnoeCurrentUser.get().then(
+        (response) ->
+          selectedOrg = _.find(response.organizations, {id: parseInt(newValue)})
+          if MnoeOrganizations.role.atLeastAdmin(selectedOrg.current_user_role)
+            $state.go('home.impac')
+          else
+            $state.go('home.apps')
+      ) if newValue?
     )
 
     return

src/app/views/layout.html

@@ -1,4 +1,4 @@
-<div id="layout-loading" ng-show="!layout.isLoggedIn" class="text-center">
+<div id="layout-loading" ng-show="!isLoggedIn" class="text-center">
   <mno-loader></mno-loader>
   <span class="layout-loading-text">Your dashboard is loading...</span>
 </div>