moved showIDE logic into the routeChange listener

Signed-off-by: Oleksii Orel <oorel@redhat.com>
eclipse-che · Jun 19, 2017 · 5538f93 · 5538f93
1 parent 2ca7488
commit 5538f93
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 124 deletions.
diff --git a/dashboard/src/app/administration/administration-config.ts b/dashboard/src/app/administration/administration-config.ts
@@ -11,29 +11,24 @@
 'use strict';
 
 
-import {AdministrationController} from './administration.controller';
 import {DockerRegistryList} from './docker-registry/docker-registry-list/docker-registry-list.directive';
 import {DockerRegistryListController} from './docker-registry/docker-registry-list/docker-registry-list.controller';
 import {EditRegistryController} from './docker-registry/docker-registry-list/edit-registry/edit-registry.controller';
 
 
 export class AdministrationConfig {
 
-  constructor(register) {
-    register.controller('AdministrationController', AdministrationController);
-
+  constructor(register: che.IRegisterService) {
     register.directive('dockerRegistryList', DockerRegistryList);
     register.controller('DockerRegistryListController', DockerRegistryListController);
 
     register.controller('EditRegistryController', EditRegistryController);
 
     // config routes
-    register.app.config(($routeProvider) => {
+    register.app.config(($routeProvider: ng.route.IRouteProvider) => {
       $routeProvider.accessWhen('/administration', {
         title: 'Administration',
-        templateUrl: 'app/administration/administration.html',
-        controller: 'AdministrationController',
-        controllerAs: 'administrationController'
+        templateUrl: 'app/administration/administration.html'
       });
     });
 

diff --git a/dashboard/src/app/administration/administration.controller.ts b/dashboard/src/app/administration/administration.controller.ts
diff --git a/dashboard/src/app/dashboard/dashboard-config.ts b/dashboard/src/app/dashboard/dashboard-config.ts
@@ -10,34 +10,30 @@
  */
 'use strict';
 
-import {DashboardController} from './dashboard.controller';
 import {DashboardLastWorkspacesController} from './last-workspaces/last-workspaces.controller';
 import {DashboardLastWorkspaces} from './last-workspaces/last-workspaces.directive';
 import {DashboardPanel} from './dashboard-panel/dashboard-panel.directive';
+import {CheService} from '../../components/api/che-service.factory';
+import {CheWorkspace} from '../../components/api/che-workspace.factory';
 
 export class DashboardConfig {
 
-  constructor(register) {
+  constructor(register: che.IRegisterService) {
 
     // last workspaces
     register.controller('DashboardLastWorkspacesController', DashboardLastWorkspacesController);
     register.directive('dashboardLastWorkspaces', DashboardLastWorkspaces);
 
-    // controller
-    register.controller('DashboardController', DashboardController);
-
     // panel of last used entries
     register.directive('dashboardPanel', DashboardPanel);
 
     // config routes
-    register.app.config(($routeProvider) => {
+    register.app.config(($routeProvider: ng.route.IRouteProvider) => {
       $routeProvider.accessWhen('/', {
         title: 'Dashboard',
         templateUrl: 'app/dashboard/dashboard.html',
-        controller: 'DashboardController',
-        controllerAs: 'dashboardController',
         resolve: {
-          check: ['$q', '$location', 'cheWorkspace', 'cheService', ($q, $location, cheWorkspace, cheService) => {
+          check: ['$q', '$location', 'cheWorkspace', 'cheService', ($q: ng.IQService, $location: ng.ILocationService, cheWorkspace: CheWorkspace, cheService: CheService) => {
             cheWorkspace.fetchWorkspaces().then(() => {
               if (cheWorkspace.getWorkspaces().length === 0) {
                 $location.path('/create-project');

diff --git a/dashboard/src/app/dashboard/dashboard.controller.spec.ts b/dashboard/src/app/dashboard/dashboard.controller.spec.ts
diff --git a/dashboard/src/app/dashboard/dashboard.controller.ts b/dashboard/src/app/dashboard/dashboard.controller.ts
diff --git a/dashboard/src/app/factories/list-factories/list-factories.controller.ts b/dashboard/src/app/factories/list-factories/list-factories.controller.ts
@@ -40,7 +40,7 @@ export class ListFactoriesController {
    * Default constructor that is using resource injection
    * @ngInject for Dependency injection
    */
-  constructor($q: ng.IQService, $log: ng.ILogService, cheAPI: CheAPI, cheNotification: CheNotification, $rootScope: che.IRootScopeService,
+  constructor($q: ng.IQService, $log: ng.ILogService, cheAPI: CheAPI, cheNotification: CheNotification,
               confirmDialogService: ConfirmDialogService, $scope: ng.IScope, cheListHelperFactory: che.widget.ICheListHelperFactory) {
     this.$q = $q;
     this.$log = $log;
@@ -72,8 +72,6 @@ export class ListFactoriesController {
     });
 
     this.pagesInfo = cheAPI.getFactory().getPagesInfo();
-
-    $rootScope.showIDE = false;
   }
 
   /**

diff --git a/dashboard/src/app/ide/ide.controller.ts b/dashboard/src/app/ide/ide.controller.ts
@@ -46,7 +46,6 @@ class IdeCtrl {
     this.cheWorkspace = cheWorkspace;
     this.$timeout = $timeout;
 
-    this.$rootScope.showIDE = false;
     this.$rootScope.wantTokeepLoader = true;
 
     this.selectedWorkspaceExists = true;

diff --git a/dashboard/src/app/index.module.ts b/dashboard/src/app/index.module.ts
@@ -143,14 +143,17 @@ initModule.run(['$rootScope', '$location', '$routeParams', 'routingRedirect', '$
       }
     });
 
-
-    $rootScope.$on('$routeChangeSuccess', (event, next) => {
-      if (next.$$route.title && angular.isFunction(next.$$route.title)) {
-        $rootScope.currentPage = next.$$route.title($routeParams);
+    $rootScope.$on('$routeChangeSuccess', (event: ng.IAngularEvent, next: ng.route.IRoute) => {
+      const route = (<any>next).$$route;
+      if (angular.isFunction(route.title)) {
+        $rootScope.currentPage = route.title($routeParams);
       } else {
-        $rootScope.currentPage = next.$$route.title || 'Dashboard';
+        $rootScope.currentPage = route.title || 'Dashboard';
+      }
+      const originalPath: string = route.originalPath;
+      if (originalPath && originalPath.indexOf('/ide/') === -1) {
+        $rootScope.showIDE = false;
       }
-
       // when a route is about to change, notify the routing redirect node
       if (next.resolve) {
         if (DEV) {

diff --git a/dashboard/src/app/projects/create-project/create-project.controller.ts b/dashboard/src/app/projects/create-project/create-project.controller.ts
@@ -221,8 +221,6 @@ export class CreateProjectController {
 
     cheAPI.getWorkspace().getWorkspaces();
 
-    $rootScope.showIDE = false;
-
     this.isHandleClose = true;
     this.connectionClosed = () => {
       if (!this.isHandleClose) {

diff --git a/dashboard/src/app/workspaces/list-workspaces/list-workspaces.controller.ts b/dashboard/src/app/workspaces/list-workspaces/list-workspaces.controller.ts
@@ -56,7 +56,7 @@ export class ListWorkspacesCtrl {
    * @ngInject for Dependency injection
    */
   constructor($log: ng.ILogService, $mdDialog: ng.material.IDialogService, $q: ng.IQService, lodash: any,
-              $rootScope: che.IRootScopeService, cheAPI: CheAPI, cheNotification: CheNotification, cheBranding: CheBranding,
+              cheAPI: CheAPI, cheNotification: CheNotification, cheBranding: CheBranding,
               cheWorkspace: CheWorkspace, cheNamespaceRegistry: CheNamespaceRegistry,
               confirmDialogService: ConfirmDialogService, $scope: ng.IScope, cheListHelperFactory: che.widget.ICheListHelperFactor) {
     this.cheAPI = cheAPI;
@@ -90,8 +90,6 @@ export class ListWorkspacesCtrl {
 
     this.getUserWorkspaces();
 
-    $rootScope.showIDE = false;
-
     this.cheNamespaceRegistry.fetchNamespaces().then(() => {
       this.namespaceLabels = this.getNamespaceLabelsList();
     });

diff --git a/dashboard/src/components/widget/input/che-input-box.html b/dashboard/src/components/widget/input/che-input-box.html
@@ -9,7 +9,7 @@
         <div class="che-input-area">
           <input ng-trim="false" name="{{inputName}}"
                  ng-model-options="{allowInvalid: true}"
-                 ng-change="onChange({value: valueModel})"
+                 ng-change="onChange({$value: valueModel})"
                  ng-model="valueModel">
           <span class="che-input-asterisk fa" ng-show="valueModel"
                 ng-class="myForm[inputName] && myForm[inputName].$invalid ? 'fa-times' : 'fa-check'"></span>