Merge pull request #1335 from spadgett/overview

Merged by openshift-bot

Author: OpenShift Bot

app/index.html

@@ -208,10 +208,13 @@ <h1>JavaScript Required</h1>
         <script src="scripts/services/keyValueEditorProvider.js"></script>
         <script src="scripts/services/keyValueEditorUtils.js"></script>
         <script src="scripts/services/fullscreen.js"></script>
+        <script src="scripts/services/apps.js"></script>
+        <script src="scripts/services/resourceAlerts.js"></script>
         <script src="scripts/controllers/projects.js"></script>
         <script src="scripts/controllers/pods.js"></script>
         <script src="scripts/controllers/pod.js"></script>
         <script src="scripts/controllers/overview.js"></script>
+        <script src="scripts/controllers/newOverview.js"></script>
         <script src="scripts/controllers/topology.js"></script>
         <script src="scripts/controllers/quota.js"></script>
         <script src="scripts/controllers/monitoring.js"></script>
@@ -337,6 +340,9 @@ <h1>JavaScript Required</h1>
         <script src="scripts/directives/editCommand.js"></script>
         <script src="scripts/directives/buildPipeline.js"></script>
         <script src="scripts/directives/buildStatus.js"></script>
+        <script src="scripts/directives/routeServiceBarChart.js"></script>
+
+        <!-- Old Overview, TODO: remove -->
         <script src="scripts/directives/serviceGroupNotifications.js"></script>
         <script src="scripts/directives/overview/service.js"></script>
         <script src="scripts/directives/overview/serviceGroup.js"></script>
@@ -345,6 +351,17 @@ <h1>JavaScript Required</h1>
         <script src="scripts/directives/overview/dc.js"></script>
         <script src="scripts/directives/overview/deployment.js"></script>
         <script src="scripts/directives/overview/imageNames.js"></script>
+
+        <!-- New Overview -->
+        <script src="scripts/directives/buildCounts.js"></script>
+        <script src="scripts/directives/metricsSummary.js"></script>
+        <script src="scripts/directives/miniLog.js"></script>
+        <script src="scripts/directives/notificationIcon.js"></script>
+        <script src="scripts/directives/overview/builds.js"></script>
+        <script src="scripts/directives/overview/listRow.js"></script>
+        <script src="scripts/directives/overview/networking.js"></script>
+        <script src="scripts/directives/overview/pipelines.js"></script>
+
         <script src="scripts/directives/istagSelect.js"></script>
         <script src="scripts/directives/deployImage.js"></script>
         <script src="scripts/directives/selector.js"></script>

app/scripts/app.js

@@ -33,6 +33,23 @@ angular
     'openshiftCommon'
   ])
   .config(function ($routeProvider) {
+    var overviewRoute;
+    if (window.OPENSHIFT_CONSTANTS.HIDE_NEW_OVERVIEW ||
+        localStorage.getItem('hide-new-overview') === 'true') {
+      overviewRoute = {
+        templateUrl: 'views/overview.html',
+        controller: 'OverviewController'
+      };
+    } else {
+      // TODO Rename new overview controller / view when the old is removed
+      overviewRoute = {
+        templateUrl: 'views/new-overview.html',
+        controller: 'NewOverviewController',
+        controllerAs: 'overview',
+        reloadOnSearch: false
+      };
+    }
+
     $routeProvider
       .when('/', {
         templateUrl: 'views/projects.html',
@@ -47,15 +64,7 @@ angular
           return '/project/' + encodeURIComponent(params.project) + "/overview";
         }
       })
-      .when('/project/:project/overview', {
-        templateUrl: 'views/overview.html',
-        controller: 'OverviewController'
-      })
-      // Old overview, keep for now in case of emergency
-      // .when('/project/:project/overview', {
-      //   templateUrl: 'views/project.html',
-      //   controller: 'TopologyController'
-      // })
+      .when('/project/:project/overview', overviewRoute)
       .when('/project/:project/quota', {
         templateUrl: 'views/quota.html',
         controller: 'QuotaController'