From 06d6b6ed35e4102bd8868747cc6a1c72b6b9a328 Mon Sep 17 00:00:00 2001 From: Jeremy Mitchell Date: Wed, 3 May 2017 08:19:09 -0600 Subject: [PATCH 1/3] moved a couple pages around; button and tooltip changes as well --- traffic_ops/experimental/ui/app/src/app.js | 6 ++-- .../ui/app/src/common/api/AuthService.js | 2 +- .../form/cacheGroup/form.cacheGroup.tpl.html | 7 ++-- .../modules/form/cdn/FormCDNController.js | 4 --- .../common/modules/form/cdn/form.cdn.tpl.html | 12 ++++--- .../FormDeliveryServiceController.js | 6 +--- .../form.deliveryService.tpl.html | 9 ++--- .../form/profile/form.profile.tpl.html | 6 ++-- .../modules/form/server/form.server.tpl.html | 11 ++++-- .../modules/navigation/navigation.tpl.html | 5 ++- .../table.cacheGroupParameters.tpl.html | 4 +-- .../cdnServers/table.cdnServers.tpl.html | 32 ++++++++--------- .../table.deliveryServiceJobs.tpl.html | 2 +- .../table.deliveryServiceRegexes.tpl.html | 2 +- .../table.deliveryServiceServers.tpl.html | 4 +-- .../table.parameterProfiles.tpl.html | 4 +-- .../table.profileParameters.tpl.html | 4 +-- .../table.serverDeliveryServices.tpl.html | 4 +-- .../table/servers/table.servers.tpl.html | 5 +-- .../table.userDeliveryServices.tpl.html | 4 +-- .../DashboardController.js} | 6 ++-- .../_dashboard.scss} | 0 .../dashboard.tpl.html} | 2 +- .../{dashboards => dashboard}/index.js | 16 ++++----- .../monitor/dashboards/dashboards.tpl.html | 22 ------------ .../three/DashboardsThreeController.js | 24 ------------- .../dashboards/three/_dashboards.three.scss | 16 --------- .../three/dashboards.three.tpl.html | 20 ----------- .../private/monitor/dashboards/three/index.js | 35 ------------------- .../dashboards/two/DashboardsTwoController.js | 24 ------------- .../dashboards/two/_dashboards.two.scss | 16 --------- .../private/monitor/dashboards/two/index.js | 35 ------------------- .../MapController.js} | 6 ++-- .../_dashboards.map.scss => map/_map.scss} | 0 .../monitor/{dashboards => }/map/index.js | 12 +++---- .../map.tpl.html} | 0 .../experimental/ui/app/src/styles/main.scss | 6 ++-- 37 files changed, 89 insertions(+), 284 deletions(-) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards/DashboardsController.js => dashboard/DashboardController.js} (86%) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards/_dashboards.scss => dashboard/_dashboard.scss} (100%) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards/two/dashboards.two.tpl.html => dashboard/dashboard.tpl.html} (97%) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards => dashboard}/index.js (78%) delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/_dashboards.three.scss delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/_dashboards.two.scss delete mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards/map/DashboardsMapController.js => map/MapController.js} (88%) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards/map/_dashboards.map.scss => map/_map.scss} (100%) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards => }/map/index.js (77%) rename traffic_ops/experimental/ui/app/src/modules/private/monitor/{dashboards/map/dashboards.map.tpl.html => map/map.tpl.html} (100%) diff --git a/traffic_ops/experimental/ui/app/src/app.js b/traffic_ops/experimental/ui/app/src/app.js index 820ee28f5f..ac4a99d555 100644 --- a/traffic_ops/experimental/ui/app/src/app.js +++ b/traffic_ops/experimental/ui/app/src/app.js @@ -154,10 +154,8 @@ var trafficOps = angular.module('trafficOps', [ require('./modules/private/monitor').name, // dashboards - require('./modules/private/monitor/dashboards').name, - require('./modules/private/monitor/dashboards/map').name, - require('./modules/private/monitor/dashboards/two').name, - require('./modules/private/monitor/dashboards/three').name, + require('./modules/private/monitor/dashboard').name, + require('./modules/private/monitor/map').name, // common modules require('./common/modules/dialog/confirm').name, diff --git a/traffic_ops/experimental/ui/app/src/common/api/AuthService.js b/traffic_ops/experimental/ui/app/src/common/api/AuthService.js index da534fa75c..d1b7c9c476 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/AuthService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/AuthService.js @@ -30,7 +30,7 @@ var AuthService = function($rootScope, $http, $state, $location, $q, $state, htt $location.search('redirect', null); // remove the redirect query param $location.url(redirect); } else { - $location.url('/monitor/dashboards/map'); + $location.url('/monitor/map'); } }, function(fault) { diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html index 527580844a..40beeb401e 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html @@ -24,14 +24,17 @@
  • {{cacheGroupName}}
    • - - + +
      +
    • Queue Server Updates
      • +
    • Clear Server Updates
      • +
    • View ASNs
    • View Parameters
    • View Servers
      • diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js index d76772d2c9..41f814735f 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js @@ -34,10 +34,6 @@ var FormCDNController = function(cdn, $scope, $location, formUtils, stringUtils, alert('not hooked up yet: manageSSL for cdn'); }; - $scope.cachegroupHealth = function() { - alert('not hooked up yet: cachegroupHealth for CDN'); - }; - $scope.queueServerUpdates = function(cdn) { cdnService.queueServerUpdates(cdn.id); }; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html index 661c3a8aa3..8528350afe 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html @@ -24,19 +24,23 @@
    • {{cdnName}}
      • - - - + + +
        +
      • Snapshot {{cdn.name}} Config
        • +
      • +
      • Queue {{cdn.name}} Server Updates
        • +
      • Clear {{cdn.name}} Server Updates
        • +
      • Manage DNSSEC Keys
      • Manage SSL Keys
      • -
      • View Cachegroup Health
      • View Delivery Services
      • View Profiles
      • View Servers
        • diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js index 30a2378aec..e1e7cbedf9 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js @@ -122,7 +122,7 @@ var FormDeliveryServiceController = function(deliveryService, $scope, $location, { value: 4, label: "4 - Latch on Failover" } ]; - $scope.assignServers = function() { + $scope.viewServers = function() { $location.path($location.path() + '/servers'); }; @@ -130,10 +130,6 @@ var FormDeliveryServiceController = function(deliveryService, $scope, $location, $location.path($location.path() + '/regexes'); }; - $scope.cachegroupHealth = function() { - alert('not hooked up yet: cachegroupHealth for DS'); - }; - $scope.viewJobs = function() { $location.path($location.path() + '/jobs'); }; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html index 3cddf16998..fed8aa33ff 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html @@ -24,21 +24,18 @@
      • {{deliveryServiceName}}
        • -
        diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html index f2d5450ac2..00c41a7de7 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html @@ -24,15 +24,15 @@
      • {{profileName}}
        • -
          -
        • View Delivery Services
          • -
        • View Servers
          • +
        • View Delivery Services
          • +
        • View Parameters
          • +
        • View Servers
        • Clone Profile
        • Export Profile
          • diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html index 7cf7d03ac0..c5e4a54ab2 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html @@ -26,16 +26,21 @@
          - - + +
          diff --git a/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html index 3e0821d153..7a1bb82fd5 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/navigation/navigation.tpl.html @@ -27,9 +27,8 @@
          • Monitor
          • Configure diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html index 4a66d01fae..6ab49f017a 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html @@ -25,7 +25,7 @@
          • Parameters
            • - +
            @@ -48,7 +48,7 @@ {{::parameter.name}} {{::parameter.configFile}} {{::parameter.value}} - + diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html index 8d4e6b0f33..4401e1e4df 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html @@ -21,12 +21,12 @@
            1. CDNs
              2. -
            2. {{cdn.name}}
              3. +
            3. {{::cdn.name}}
            4. Servers
            - - + +
            @@ -57,21 +57,21 @@ - {{server.hostName}} - {{server.domainName}} - {{server.cdnName}} - {{server.cachegroup}} - {{server.type}} - {{server.physLocation}} - {{server.ipAddress}} - {{server.ip6Address}} + {{::server.hostName}} + {{::server.domainName}} + {{::server.cdnName}} + {{::server.cachegroup}} + {{::server.type}} + {{::server.physLocation}} + {{::server.ipAddress}} + {{::server.ip6Address}} - {{server.status}} - {{server.status}} + {{::server.status}} + {{::server.status}} - {{server.profile}} - {{server.iloIpAddress}} - {{server.iloIpGateway}} + {{::server.profile}} + {{::server.iloIpAddress}} + {{::server.iloIpGateway}} diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/table.deliveryServiceJobs.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/table.deliveryServiceJobs.tpl.html index ba214d54e4..d43f3a44b4 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/table.deliveryServiceJobs.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/table.deliveryServiceJobs.tpl.html @@ -37,7 +37,7 @@ assetUrl parameters - start + start (UTC) createdBy diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html index 9c6045a38a..5e7f1f3215 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html @@ -25,7 +25,7 @@
          • Regexes
            • - +
            diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html index 3a91cdeffa..2fa9e92237 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html @@ -25,7 +25,7 @@
          • Servers
            • - +
            @@ -72,7 +72,7 @@ {{::server.profile}} {{::server.iloIpAddress}} {{::server.iloIpGateway}} - + diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html index 975f4cd2a4..51f00e8ef1 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html @@ -25,7 +25,7 @@
          • Profiles
            • - +
            @@ -44,7 +44,7 @@ {{::parameterProfile.name}} {{::parameterProfile.description}} - + diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html index 1f70b102a9..3a36e8b866 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html @@ -25,7 +25,7 @@
          • Parameters
            • - +
            @@ -48,7 +48,7 @@ {{::parameter.name}} {{::parameter.configFile}} {{::parameter.value}} - + diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html index 6bcd54244c..a9efa33758 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html @@ -25,7 +25,7 @@
          • Delivery Services
            • - +
            + diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html index c449343f2f..a7be280536 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html @@ -24,8 +24,6 @@
            - -
            diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html index a0de18e0ec..e5c5a90e04 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html @@ -25,7 +25,7 @@
          • Delivery Services
            • - +
            @@ -46,7 +46,7 @@ {{::deliveryService.xmlId}} {{::deliveryService.orgServerFqdn}} {{::deliveryService.cdnName}} - + diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js similarity index 86% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js index ab114c2694..f6d611f92d 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/DashboardsController.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js @@ -17,8 +17,8 @@ * under the License. */ -var DashboardsController = function($scope) { +var DashboardController = function($scope) { }; -DashboardsController.$inject = ['$scope']; -module.exports = DashboardsController; +DashboardController.$inject = ['$scope']; +module.exports = DashboardController; diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/_dashboards.scss b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/_dashboard.scss similarity index 100% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/_dashboards.scss rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/_dashboard.scss diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html similarity index 97% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html index de5ac124d4..cc3c2fc1db 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/dashboards.two.tpl.html +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html @@ -17,4 +17,4 @@ under the License. --> -

            Dashboard #2

            +

            Dashboard

            diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js similarity index 78% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js index aa6994ab39..041dc196ef 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/index.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js @@ -17,19 +17,19 @@ * under the License. */ -module.exports = angular.module('trafficOps.private.monitor.dashboards', []) - .controller('DashboardsController', require('./DashboardsController')) +module.exports = angular.module('trafficOps.private.monitor.dashboard', []) + .controller('DashboardController', require('./DashboardController')) .config(function($stateProvider, $urlRouterProvider) { $stateProvider - .state('trafficOps.private.monitor.dashboards', { - url: '/dashboards', - abstract: true, + .state('trafficOps.private.monitor.dashboard', { + url: '/dashboard', views: { monitorContent: { - templateUrl: 'modules/private/monitor/dashboards/dashboards.tpl.html', - controller: 'DashboardsController' + templateUrl: 'modules/private/monitor/dashboard/dashboard.tpl.html', + controller: 'DashboardController' } } - }); + }) + ; $urlRouterProvider.otherwise('/'); }); diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html deleted file mode 100644 index 3a7a94aae4..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/dashboards.tpl.html +++ /dev/null @@ -1,22 +0,0 @@ - - -
            -
            -
            diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js deleted file mode 100644 index 65317c20d9..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/DashboardsThreeController.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -var DashboardsThreeController = function($scope) { -}; - -DashboardsThreeController.$inject = ['$scope']; -module.exports = DashboardsThreeController; diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/_dashboards.three.scss b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/_dashboards.three.scss deleted file mode 100644 index d57b9c620a..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/_dashboards.three.scss +++ /dev/null @@ -1,16 +0,0 @@ -/* - - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -*/ diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html deleted file mode 100644 index 5fc86dd156..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/dashboards.three.tpl.html +++ /dev/null @@ -1,20 +0,0 @@ - - -

            Dashboard #3

            diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js deleted file mode 100644 index 28fe8c4955..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/three/index.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -module.exports = angular.module('trafficOps.private.monitor.dashboards.three', []) - .controller('DashboardsThreeController', require('./DashboardsThreeController')) - .config(function($stateProvider, $urlRouterProvider) { - $stateProvider - .state('trafficOps.private.monitor.dashboards.three', { - url: '/three', - views: { - dashboardsContent: { - templateUrl: 'modules/private/monitor/dashboards/three/dashboards.three.tpl.html', - controller: 'DashboardsThreeController' - } - } - }) - ; - $urlRouterProvider.otherwise('/'); - }); diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js deleted file mode 100644 index 5cc6f60c59..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/DashboardsTwoController.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -var DashboardsTwoController = function($scope) { -}; - -DashboardsTwoController.$inject = ['$scope']; -module.exports = DashboardsTwoController; diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/_dashboards.two.scss b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/_dashboards.two.scss deleted file mode 100644 index d57b9c620a..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/_dashboards.two.scss +++ /dev/null @@ -1,16 +0,0 @@ -/* - - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -*/ diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js deleted file mode 100644 index 7e14aedc2f..0000000000 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/two/index.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -module.exports = angular.module('trafficOps.private.monitor.dashboards.two', []) - .controller('DashboardsTwoController', require('./DashboardsTwoController')) - .config(function($stateProvider, $urlRouterProvider) { - $stateProvider - .state('trafficOps.private.monitor.dashboards.two', { - url: '/two', - views: { - dashboardsContent: { - templateUrl: 'modules/private/monitor/dashboards/two/dashboards.two.tpl.html', - controller: 'DashboardsTwoController' - } - } - }) - ; - $urlRouterProvider.otherwise('/'); - }); diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/DashboardsMapController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/map/MapController.js similarity index 88% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/DashboardsMapController.js rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/map/MapController.js index 192804b442..a85185d1e8 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/DashboardsMapController.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/map/MapController.js @@ -17,7 +17,7 @@ * under the License. */ -var DashboardsMapController = function(cacheGroups, cacheGroupHealth, $scope, NgMap) { +var MapController = function(cacheGroups, cacheGroupHealth, $scope, NgMap) { $scope.map = NgMap.getMap('cgMap'); @@ -58,5 +58,5 @@ var DashboardsMapController = function(cacheGroups, cacheGroupHealth, $scope, Ng }; -DashboardsMapController.$inject = ['cacheGroups', 'cacheGroupHealth', '$scope', 'NgMap']; -module.exports = DashboardsMapController; +MapController.$inject = ['cacheGroups', 'cacheGroupHealth', '$scope', 'NgMap']; +module.exports = MapController; diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/_dashboards.map.scss b/traffic_ops/experimental/ui/app/src/modules/private/monitor/map/_map.scss similarity index 100% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/_dashboards.map.scss rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/map/_map.scss diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/map/index.js similarity index 77% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/index.js rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/map/index.js index 74fe61a7a9..22083bb9dc 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/index.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/map/index.js @@ -17,16 +17,16 @@ * under the License. */ -module.exports = angular.module('trafficOps.private.monitor.dashboards.map', []) - .controller('DashboardsMapController', require('./DashboardsMapController')) +module.exports = angular.module('trafficOps.private.monitor.map', []) + .controller('MapController', require('./MapController')) .config(function($stateProvider, $urlRouterProvider) { $stateProvider - .state('trafficOps.private.monitor.dashboards.map', { + .state('trafficOps.private.monitor.map', { url: '/map', views: { - dashboardsContent: { - templateUrl: 'modules/private/monitor/dashboards/map/dashboards.map.tpl.html', - controller: 'DashboardsMapController', + monitorContent: { + templateUrl: 'modules/private/monitor/map/map.tpl.html', + controller: 'MapController', resolve: { cacheGroups: function(cacheGroupService) { return cacheGroupService.getCacheGroups(); diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/dashboards.map.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/map/map.tpl.html similarity index 100% rename from traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboards/map/dashboards.map.tpl.html rename to traffic_ops/experimental/ui/app/src/modules/private/monitor/map/map.tpl.html diff --git a/traffic_ops/experimental/ui/app/src/styles/main.scss b/traffic_ops/experimental/ui/app/src/styles/main.scss index 8a3c1c5cfd..c79d6bd226 100755 --- a/traffic_ops/experimental/ui/app/src/styles/main.scss +++ b/traffic_ops/experimental/ui/app/src/styles/main.scss @@ -60,10 +60,8 @@ $fa-font-path: "../assets/fonts"; @import "../modules/private/monitor/monitor"; // dashboards -@import "../modules/private/monitor/dashboards/dashboards"; -@import "../modules/private/monitor/dashboards/map/dashboards.map"; -@import "../modules/private/monitor/dashboards/two/dashboards.two"; -@import "../modules/private/monitor/dashboards/three/dashboards.three"; +@import "../modules/private/monitor/dashboard/dashboard"; +@import "../modules/private/monitor/map/map"; [ng-click] { cursor: pointer; From 28709a336569614f59a4600ec00376d7a71da94f Mon Sep 17 00:00:00 2001 From: Jeremy Mitchell Date: Wed, 3 May 2017 15:30:34 -0600 Subject: [PATCH 2/3] adds dashboard page --- .../monitor/dashboard/DashboardController.js | 28 +- .../private/monitor/dashboard/_dashboard.scss | 46 ++ .../monitor/dashboard/dashboard.tpl.html | 546 +++++++++++++++++- .../private/monitor/dashboard/index.js | 12 +- traffic_ops/experimental/ui/bower.json | 3 + 5 files changed, 631 insertions(+), 4 deletions(-) diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js index f6d611f92d..2abe7029b6 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js @@ -17,8 +17,32 @@ * under the License. */ -var DashboardController = function($scope) { +var DashboardController = function(changeLogs, cacheGroupHealth, $scope, locationUtils) { + + $scope.changeLogs = changeLogs; + + $scope.getRelativeTime = function(date) { + return moment(date).fromNow(); + }; + + $scope.navigateToPath = locationUtils.navigateToPath; + + + $scope.locationHealth = { + totalOnline: cacheGroupHealth.totalOnline, + totalOffline: cacheGroupHealth.totalOffline, + locations: cacheGroupHealth.cachegroups + }; + + // pagination + $scope.currentLocationPage = 1; + $scope.locationsPerPage = 10; + + $scope.onlinePercent = function(location) { + return location.online / (location.online + location.offline); + }; + }; -DashboardController.$inject = ['$scope']; +DashboardController.$inject = ['changeLogs', 'cacheGroupHealth', '$scope', 'locationUtils']; module.exports = DashboardController; diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/_dashboard.scss b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/_dashboard.scss index d57b9c620a..99435c46a8 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/_dashboard.scss +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/_dashboard.scss @@ -14,3 +14,49 @@ limitations under the License. */ + +#cache-groups-outer-container { + + #cacheGroupsContainer { + max-height: 452px; + margin-bottom: 0; + + .list-group-item { + background-color: transparent; + } + + .cache-group-health { + height: 45px; + + .cache-groups-table { + margin-top: -10px; + border-style: none; + + td { + border-top: none !important; + padding: 12px 8px !important; + } + + } + + } + + } + + .cache-groups-pagination { + margin: 0 0 10px 0; + float: left; + } + + .cache-group-search-form { + float: right; + width: 250px; + margin-bottom: 10px; + } + +} + +#cacheGroupsLoadingContainer { + height: 555px; + background-color: transparent; +} diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html index cc3c2fc1db..ffee368f90 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html @@ -17,4 +17,548 @@ under the License. --> -

            Dashboard

            + +
            + +
            +
            + Total Users +
            2500
            + 4% From last Week +
            +
            + Average Time +
            123.50
            + 3% From last Week +
            +
            + Total Males +
            2,500
            + 34% From last Week +
            +
            + Total Females +
            4,567
            + 12% From last Week +
            +
            + Total Collections +
            2,315
            + 34% From last Week +
            +
            + Total Connections +
            7,325
            + 34% From last Week +
            +
            + + +
            +
            +
            + +
            +
            +

            Network Activities Graph title sub-title

            +
            +
            +
            + + December 30, 2014 - January 28, 2015 +
            +
            +
            + +
            +
            +
            +
            +
            +

            Top Campaign Performance

            +
            +
            + +
            +
            +

            Facebook Campaign

            +
            +
            +
            +
            +
            +
            +
            +

            Twitter Campaign

            +
            +
            +
            +
            +
            +
            +
            +
            +
            +

            Conventional Media

            +
            +
            +
            +
            +
            +
            +
            +

            Bill boards

            +
            +
            +
            +
            +
            +
            +
            + +
            + +
            +
            +
            + +
            +
            + +
            + + +
            +
            +
            +

            App Versions

            +
            +
            +

            App Usage across versions

            +
            +
            + 0.1.5.2 +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 123k +
            +
            +
            + +
            +
            + 0.1.5.3 +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 53k +
            +
            +
            +
            +
            + 0.1.5.4 +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 23k +
            +
            +
            +
            +
            + 0.1.5.5 +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 3k +
            +
            +
            +
            +
            + 0.1.5.6 +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 1k +
            +
            +
            + +
            +
            +
            + +
            +
            +
            +

            Device Usage

            +
            +
            + + + + + + + + + +
            +

            Top 5

            +             		+
            +

            Device

            +
            +
            +

            Progress

            +
            +
            + + + + + + + + + + + + + + + + + + + + + + + +
            +

            IOS

            +             		30%
            +

            Android

            +             		10%
            +

            Blackberry

            +             		20%
            +

            Symbian

            +             		15%
            +

            Others

            +             		30%
            +
            +
            +
            +
            + + +
            +
            +
            +

            Quick Settings

            +
            +
            +
            + + +
            +

            Profile Completion

            + +
            + 0 + % + 100% +
            +
            +
            +
            +
            +
            + +
            + + +
            +
            +
            +
            +

            Change Logs

            +
            +
            +
            +
              +
            • +
              +
              +

              {{::changeLog.level}}

              +
              + {{::getRelativeTime(changeLog.lastUpdated)}} by {{::changeLog.user}} +
              +

              {{::changeLog.message}}

              +
              +
              +
              • +
            +
            +
            + + See All Change Logs + + +
            +
            +
            +
            + + +
            + + + +
            + +
            +
            +
            +

            Cache Groups 100% online

            +
            +
            +
            +
            +

            Cache Groups {{locationHealth.totalOnline/(locationHealth.totalOnline + locationHealth.totalOffline) | percentFilter}} online

            +
            + +
            +
            + +
            +
            + + + + +
            +
            +
            +
            +
            +
            + +
            +
            + + + +
            +
            +
            +

            To Do List Sample tasks

            +
            +
            + +
            +
              +
            • +

              + Schedule meeting with new client

              +
              • +
            • +

              + Create email address for new intern

              +
              • +
            • +

              + Have IT fix the network printer

              +
              • +
            • +

              + Copy backups to offsite location

              +
              • +
            • +

              + Food truck fixie locavors mcsweeney

              +
              • +
            • +

              + Food truck fixie locavors mcsweeney

              +
              • +
            • +

              + Create email address for new intern

              +
              • +
            • +

              + Have IT fix the network printer

              +
              • +
            • +

              + Copy backups to offsite location

              +
              • +
            +
            +
            +
            +
            + + + +
            +
            +
            +

            Daily active users Sessions

            +
            +
            +
            +
            +
            Monday, 07:30 AM + F + C +
            +
            +
            +
            +
            +
            + +
            +
            +
            +
            +

            Texas
            Partly Cloudy Day

            +
            +
            +
            +
            +
            +

            23

            +
            +
            + +
            + +
            +
            +
            +

            Mon

            +

            25

            + +
            15 km/h
            +
            +
            +
            +
            +

            Tue

            +

            25

            + +
            12 km/h
            +
            +
            +
            +
            +

            Wed

            +

            27

            + +
            14 km/h
            +
            +
            +
            +
            +

            Thu

            +

            28

            + +
            15 km/h
            +
            +
            +
            +
            +

            Fri

            +

            28

            + +
            11 km/h
            +
            +
            +
            +
            +

            Sat

            +

            26

            + +
            10 km/h
            +
            +
            +
            +
            +
            +
            + +
            + +
            +
            +
            +
            diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js index 041dc196ef..2b887f7dc4 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js @@ -26,7 +26,17 @@ module.exports = angular.module('trafficOps.private.monitor.dashboard', []) views: { monitorContent: { templateUrl: 'modules/private/monitor/dashboard/dashboard.tpl.html', - controller: 'DashboardController' + controller: 'DashboardController', + resolve: { + changeLogs: function(changeLogService) { + return []; + // return changeLogService.getChangeLogs({ limit: 6 }); + }, + cacheGroupHealth: function(cacheGroupService) { + return cacheGroupService.getCacheGroupHealth(); + } + } + } } }) diff --git a/traffic_ops/experimental/ui/bower.json b/traffic_ops/experimental/ui/bower.json index a09ab069bf..6364104a6f 100755 --- a/traffic_ops/experimental/ui/bower.json +++ b/traffic_ops/experimental/ui/bower.json @@ -14,6 +14,9 @@ "angular-jwt": "0.0.9", "bootstrap-sass-official": "3.3.6", "es5-shim": "4.5.6", + "flot": "0.8.3", + "flot.tooltip": "0.8.7", + "flot-axislabels": "release-2.0.1", "font-awesome": "4.5.0", "jquery": "2.0.0", "json3": "3.3.2", From ec96c7146080057499785f4ebe2690da6f46b8f1 Mon Sep 17 00:00:00 2001 From: Jeremy Mitchell Date: Fri, 5 May 2017 15:08:58 -0600 Subject: [PATCH 3/3] hooks up dashboard page --- traffic_ops/experimental/ui/app/src/app.js | 8 + .../ui/app/src/common/api/AuthService.js | 2 +- .../ui/app/src/common/api/CDNService.js | 36 +- .../app/src/common/api/CacheStatsService.js | 63 +++ .../ui/app/src/common/api/index.js | 3 +- .../app/src/common/filters/PercentFilter.js | 16 + .../ui/app/src/common/filters/index.js | 1 + .../WidgetCacheGroupsController.js | 41 ++ .../modules/widget/cacheGroups/index.js | 21 + .../cacheGroups/widget.cacheGroups.tpl.html | 44 ++ .../capacity/WidgetCapacityController.js | 101 ++++ .../widget/capacity/_widget.capacity.scss | 14 + .../common/modules/widget/capacity/index.js | 21 + .../widget/capacity/widget.capacity.tpl.html | 40 ++ .../cdnChart/WidgetCDNChartController.js | 189 +++++++ .../widget/cdnChart/_widget.cdnChart.scss | 30 ++ .../common/modules/widget/cdnChart/index.js | 21 + .../widget/cdnChart/widget.cdnChart.tpl.html | 37 ++ .../changeLogs/WidgetChangeLogsController.js | 37 ++ .../common/modules/widget/changeLogs/index.js | 21 + .../changeLogs/widget.changeLogs.tpl.html | 26 + .../widget/routing/WidgetRoutingController.js | 33 ++ .../common/modules/widget/routing/index.js | 21 + .../widget/routing/widget.routing.tpl.html | 88 +++ .../app/src/common/service/utils/DateUtils.js | 131 +++++ .../src/common/service/utils/NumberUtils.js | 80 +++ .../ui/app/src/common/service/utils/index.js | 2 + .../monitor/dashboard/DashboardController.js | 33 +- .../monitor/dashboard/dashboard.tpl.html | 509 ++---------------- .../private/monitor/dashboard/index.js | 11 +- .../private/monitor/dashboard/view/index.js | 53 ++ .../ui/app/src/scripts/shared-libs.js | 8 + .../experimental/ui/app/src/styles/main.scss | 2 + .../experimental/ui/app/src/styles/theme.scss | 2 +- .../experimental/ui/grunt/browserify2.js | 60 +++ 35 files changed, 1296 insertions(+), 509 deletions(-) create mode 100644 traffic_ops/experimental/ui/app/src/common/api/CacheStatsService.js create mode 100644 traffic_ops/experimental/ui/app/src/common/filters/PercentFilter.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/WidgetCacheGroupsController.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/index.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/WidgetCapacityController.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/_widget.capacity.scss create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/index.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/widget.capacity.tpl.html create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/WidgetCDNChartController.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/_widget.cdnChart.scss create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/index.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/WidgetChangeLogsController.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/index.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/routing/WidgetRoutingController.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/routing/index.js create mode 100644 traffic_ops/experimental/ui/app/src/common/modules/widget/routing/widget.routing.tpl.html create mode 100644 traffic_ops/experimental/ui/app/src/common/service/utils/DateUtils.js create mode 100644 traffic_ops/experimental/ui/app/src/common/service/utils/NumberUtils.js create mode 100644 traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/view/index.js diff --git a/traffic_ops/experimental/ui/app/src/app.js b/traffic_ops/experimental/ui/app/src/app.js index ac4a99d555..082872c354 100644 --- a/traffic_ops/experimental/ui/app/src/app.js +++ b/traffic_ops/experimental/ui/app/src/app.js @@ -155,6 +155,7 @@ var trafficOps = angular.module('trafficOps', [ // dashboards require('./modules/private/monitor/dashboard').name, + require('./modules/private/monitor/dashboard/view').name, require('./modules/private/monitor/map').name, // common modules @@ -264,6 +265,13 @@ var trafficOps = angular.module('trafficOps', [ require('./common/modules/table/users').name, require('./common/modules/table/userDeliveryServices').name, + // widgets + require('./common/modules/widget/cacheGroups').name, + require('./common/modules/widget/capacity').name, + require('./common/modules/widget/cdnChart').name, + require('./common/modules/widget/changeLogs').name, + require('./common/modules/widget/routing').name, + // models require('./common/models').name, require('./common/api').name, diff --git a/traffic_ops/experimental/ui/app/src/common/api/AuthService.js b/traffic_ops/experimental/ui/app/src/common/api/AuthService.js index d1b7c9c476..e302de4b99 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/AuthService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/AuthService.js @@ -30,7 +30,7 @@ var AuthService = function($rootScope, $http, $state, $location, $q, $state, htt $location.search('redirect', null); // remove the redirect query param $location.url(redirect); } else { - $location.url('/monitor/map'); + $location.url('/monitor/dashboard'); } }, function(fault) { diff --git a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js index 2616c802c8..b24f412a91 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js @@ -17,7 +17,7 @@ * under the License. */ -var CDNService = function(Restangular, locationUtils, messageModel) { +var CDNService = function($http, $q, Restangular, locationUtils, messageModel, ENV) { this.getCDNs = function(queryParams) { return Restangular.all('cdns').getList(queryParams); @@ -88,7 +88,39 @@ var CDNService = function(Restangular, locationUtils, messageModel) { ); }; + this.getCapacity = function() { + var request = $q.defer(); + + $http.get(ENV.api['root'] + "cdns/capacity") + .then( + function(result) { + request.resolve(result.data.response); + }, + function(fault) { + request.reject(); + } + ); + + return request.promise; + }; + + this.getCurrentStats = function() { + var request = $q.defer(); + + $http.get(ENV.api['root'] + "current_stats") + .then( + function(result) { + request.resolve(result.data.response); + }, + function(fault) { + request.reject(); + } + ); + + return request.promise; + }; + }; -CDNService.$inject = ['Restangular', 'locationUtils', 'messageModel']; +CDNService.$inject = ['$http', '$q', 'Restangular', 'locationUtils', 'messageModel', 'ENV']; module.exports = CDNService; diff --git a/traffic_ops/experimental/ui/app/src/common/api/CacheStatsService.js b/traffic_ops/experimental/ui/app/src/common/api/CacheStatsService.js new file mode 100644 index 0000000000..3bcd97a374 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/api/CacheStatsService.js @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var CacheStatsService = function($http, $q, httpService, ENV) { + + this.getBandwidth = function(cdnName, start, end) { + var request = $q.defer(); + + var url = ENV.api['root'] + "cache_stats", + params = { cdnName: cdnName, metricType: 'bandwidth', startDate: start.seconds(00).format(), endDate: end.seconds(00).format()}; + + $http.get(url, { params: params }) + .then( + function(result) { + request.resolve(result.data.response); + }, + function(fault) { + request.reject(); + } + ); + + return request.promise; + }; + + this.getConnections = function(cdnName, start, end) { + var request = $q.defer(); + + var url = ENV.api['root'] + "cache_stats", + params = { cdnName: cdnName, metricType: 'connections', startDate: start.seconds(00).format(), endDate: end.seconds(00).format()}; + + $http.get(url, { params: params }) + .then( + function(result) { + request.resolve(result.data.response); + }, + function(fault) { + request.reject(); + } + ); + + return request.promise; + }; + +}; + +CacheStatsService.$inject = ['$http', '$q', 'httpService', 'ENV']; +module.exports = CacheStatsService; diff --git a/traffic_ops/experimental/ui/app/src/common/api/index.js b/traffic_ops/experimental/ui/app/src/common/api/index.js index 042cd93629..1e6c59762f 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/index.js +++ b/traffic_ops/experimental/ui/app/src/common/api/index.js @@ -22,7 +22,8 @@ module.exports = angular.module('trafficOps.api', []) .service('asnService', require('./ASNService')) .service('cacheGroupService', require('./CacheGroupService')) .service('cacheGroupParameterService', require('./CacheGroupParameterService')) - .service('cdnService', require('./CDNService')) + .service('cacheStatsService', require('./CacheStatsService')) + .service('cdnService', require('./CDNService')) .service('changeLogService', require('./ChangeLogService')) .service('deliveryServiceService', require('./DeliveryServiceService')) .service('deliveryServiceRegexService', require('./DeliveryServiceRegexService')) diff --git a/traffic_ops/experimental/ui/app/src/common/filters/PercentFilter.js b/traffic_ops/experimental/ui/app/src/common/filters/PercentFilter.js new file mode 100644 index 0000000000..21951d97bd --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/filters/PercentFilter.js @@ -0,0 +1,16 @@ +var PercentFilter = function() { + return function(input) { + input = parseFloat(input); + input *= 100; + if(input % 1 === 0) { + input = input.toFixed(0); + } + else { + input = input.toFixed(2); + } + return input + '%'; + }; +}; + +PercentFilter.$inject = []; +module.exports = PercentFilter; diff --git a/traffic_ops/experimental/ui/app/src/common/filters/index.js b/traffic_ops/experimental/ui/app/src/common/filters/index.js index 93c6a6c88e..f912a6c831 100644 --- a/traffic_ops/experimental/ui/app/src/common/filters/index.js +++ b/traffic_ops/experimental/ui/app/src/common/filters/index.js @@ -19,4 +19,5 @@ module.exports = angular.module('trafficOps.filters', []) .filter('offsetFilter', require('./OffsetFilter')) + .filter('percentFilter', require('./PercentFilter')) ; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/WidgetCacheGroupsController.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/WidgetCacheGroupsController.js new file mode 100644 index 0000000000..c5c0f541cd --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/WidgetCacheGroupsController.js @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var WidgetCacheGroupsController = function(cacheGroupHealth, $scope) { + + // pagination + $scope.currentLocationPage = 1; + $scope.cacheGroupsPerPage = 10; + + $scope.onlinePercent = function(location) { + return (location.online / (location.online + location.offline)) * 100; + }; + + var init = function() { + if (cacheGroupHealth) { + // only set this if it's passed in + $scope.cacheGroupHealth = cacheGroupHealth; + } + }; + init(); + +}; + +WidgetCacheGroupsController.$inject = ['cacheGroupHealth', '$scope']; +module.exports = WidgetCacheGroupsController; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/index.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/index.js new file mode 100644 index 0000000000..21abb6871f --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/index.js @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficOps.widget.cacheGroups', []) + .controller('WidgetCacheGroupsController', require('./WidgetCacheGroupsController')); diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html new file mode 100644 index 0000000000..eeb0fe5aca --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html @@ -0,0 +1,44 @@ +
            +

            Cache Groups {{cacheGroupHealth.totalOnline/(cacheGroupHealth.totalOnline + cacheGroupHealth.totalOffline) | percentFilter}} online

            +
            +
            + +
            diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/WidgetCapacityController.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/WidgetCapacityController.js new file mode 100644 index 0000000000..6a0227a69a --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/WidgetCapacityController.js @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var WidgetCapacityController = function($scope, cdnService) { + + var getCapacity = function() { + cdnService.getCapacity() + .then(function(response) { + $scope.availablePercent = Math.round(response.availablePercent * 100) / 100; + $scope.utilizedPercent = Math.round(response.utilizedPercent * 100) / 100; + $scope.maintenancePercent = Math.round(response.maintenancePercent * 100) / 100; + $scope.unavailablePercent = Math.round(response.unavailablePercent * 100) / 100; + + var data = []; + + data.push({ + label: "Available", + color: '#1ABB9C', + data: $scope.availablePercent + }); + data.push({ + label: "Utilized", + color: '#3498DB', + data: $scope.utilizedPercent + }); + data.push({ + label: "Maintenance", + color: '#73879C', + data: $scope.maintenancePercent + }); + data.push({ + label: "Down", + color: '#E74C3C', + data: $scope.unavailablePercent + }); + + buildGraph(data); + }); + + }; + + var buildGraph = function(graphData) { + + var options = { + series: { + pie: { + show: true, + innerRadius: 0.5, + radius: 1, + label: { + show: false + } + } + }, + grid: { + hoverable: true + }, + tooltip: true, + tooltipOpts: { + cssClass: "capacityChartTooltip", + content: "%s: %p.2%", + defaultTheme: false + }, + legend: { + show: false + } + }; + + $.plot($("#capacityChart"), graphData, options); + }; + + $scope.availablePercent = 0; + $scope.utilizedPercent = 0; + $scope.maintenancePercent = 0; + $scope.unavailablePercent = 0; + + var init = function() { + getCapacity(); + }; + init(); + +}; + +WidgetCapacityController.$inject = ['$scope', 'cdnService']; +module.exports = WidgetCapacityController; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/_widget.capacity.scss b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/_widget.capacity.scss new file mode 100644 index 0000000000..33723c8b56 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/_widget.capacity.scss @@ -0,0 +1,14 @@ +#capacityChart { + left: 0px; + top: 0px; + width: 200px; + height: 200px; +} +.capacityChartTooltip { + padding: 3px 5px; + background-color: #000; + z-index: 100; + color: #fff; + opacity: .80; + filter: alpha(opacity=85); +} \ No newline at end of file diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/index.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/index.js new file mode 100644 index 0000000000..cecf0729ab --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/index.js @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficOps.widget.capacity', []) + .controller('WidgetCapacityController', require('./WidgetCapacityController')); diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/widget.capacity.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/widget.capacity.tpl.html new file mode 100644 index 0000000000..96f1fb5fb2 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/capacity/widget.capacity.tpl.html @@ -0,0 +1,40 @@ +
            +

            Overall Capacity

            +
            +
            + + + + + +
            +
            +             		+ + + + + + + + + + + + + + + + + +
            +

            Available

            +             		{{availablePercent}}%
            +

            Utilized

            +             		{{utilizedPercent}}%
            +

            Maint

            +             		{{maintenancePercent}}%
            +

            Down

            +             		{{unavailablePercent}}%
            +
            +
            diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/WidgetCDNChartController.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/WidgetCDNChartController.js new file mode 100644 index 0000000000..22e2a64ccf --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/WidgetCDNChartController.js @@ -0,0 +1,189 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var WidgetCDNChartController = function(cdn, $scope, $timeout, $filter, $q, cdnService, cacheStatsService, dateUtils, locationUtils, numberUtils) { + + var getCDN = function(id) { + cdnService.getCDN(id) + .then(function(result) { + $scope.cdn = result; + getCurrentStats($scope.cdn.name); + getChartData($scope.cdn.name, moment().subtract(1, 'days'), moment().subtract(10, 'seconds')); + }); + }; + + var getCurrentStats = function(cdnName) { + cdnService.getCurrentStats() + .then(function(result) { + $scope.currentStats = _.find(result.currentStats, function(item) { + return item.cdn == cdnName; + }); + }); + }; + + var getChartData = function(cdnName, start, end) { + var promises = []; + + // get cdn bandwidth + promises.push(cacheStatsService.getBandwidth(cdnName, start, end)); + + // get cdn connections + promises.push(cacheStatsService.getConnections(cdnName, start, end)); + + $q.all(promises) + .then( + function(responses) { + // set chart data + var bandwidthChartData = buildBandwidthChartData(responses[0], start), + connectionsChartData = buildConnectionsChartData(responses[1], start); + + $timeout(function () { + buildChart(bandwidthChartData, connectionsChartData); + }, 100); + }, + function(fault) { + buildChart([], []); // build an empty chart + }); + + }; + + var buildBandwidthChartData = function(result, start) { + var normalizedChartData = [], + series = result.series; + + if (angular.isDefined(series)) { + _.each(series.values, function(seriesItem) { + if (moment(seriesItem[0]).isSame(start) || moment(seriesItem[0]).isAfter(start)) { + normalizedChartData.push([ moment(seriesItem[0]).valueOf(), numberUtils.convertTo(seriesItem[1], $scope.unitSize) ]); // converts data to appropriate unit + } + }); + } + + return normalizedChartData; + }; + + var buildConnectionsChartData = function(result, start) { + var normalizedChartData = [], + series = result.series; + + if (angular.isDefined(series)) { + _.each(series.values, function(seriesItem) { + if (moment(seriesItem[0]).isSame(start) || moment(seriesItem[0]).isAfter(start)) { + if (_.isNumber(seriesItem[1])) { + normalizedChartData.push([ moment(seriesItem[0]).valueOf(), seriesItem[1] ]); + } + } + }); + } + + return normalizedChartData; + }; + + var buildChart = function(bandwidthChartData, connectionsChartData) { + + var options = { + xaxis: { + mode: "time", + timezone: "utc", + twelveHourClock: false + }, + yaxes: [ + { + position: "left", + axisLabel: "Bandwidth (Gbps)", + axisLabelUseCanvas: true, + axisLabelFontSizePixels: 12, + axisLabelFontFamily: 'Verdana, Arial', + axisLabelPadding: 3 + }, + { + position: "right", + axisLabel: "Connections", + axisLabelUseCanvas: true, + axisLabelFontSizePixels: 12, + axisLabelFontFamily: 'Verdana, Arial', + axisLabelPadding: 3 + } + ], + grid: { + hoverable: true, + axisMargin: 20 + }, + tooltip: { + show: true, + content: function(label, xval, yval, flotItem){ + var tooltipString = dateUtils.dateFormat(xval, "UTC: ddd mmm d yyyy H:MM:ss tt (Z)") + '
            '; + tooltipString += '' + label + ': ' + $filter('number')(yval, 2) + '
            ' + return tooltipString; + } + } + }; + + var series = [ + { label: "Bandwidth", yaxis: 1, color: colors[Math.floor(Math.random() * 17) + 1], data: bandwidthChartData }, + { label: "Connections", yaxis: 2, color: colors[Math.floor(Math.random() * 17) + 1], data: connectionsChartData } + ]; + + $.plot($("#bps-chart-" + $scope.cdn.id), series, options); + + }; + + var colors = [ + '#1ABB9C', + '#3498DB', + '#73879C', + '#E74C3C', + '#946E83', + '#615055', + '#000000', + '#9FD356', + '#3A6B3D', + '#405672', + '#FF5000', + '#E39878', + '#6D6B6D', + '#54000B', + '#077187', + '#0D295E', + '#5B0554' + ]; + + $scope.cdn; + + $scope.unitSize = 'Gb'; + + $scope.randomId = '_' + Math.random().toString(36).substr(2, 9); + + $scope.navigateToPath = locationUtils.navigateToPath; + + angular.element(document).ready(function () { + var cdnId; + if (cdn) { + cdnId = cdn.id; + } else { + // cdn wasn't passed in. we need to figure it out on our own + cdnId = $('#' + $scope.randomId).closest('.chartContainer').data('cdnid'); + } + getCDN(cdnId); + }); + +}; + +WidgetCDNChartController.$inject = ['cdn', '$scope', '$timeout', '$filter', '$q', 'cdnService', 'cacheStatsService', 'dateUtils', 'locationUtils', 'numberUtils']; +module.exports = WidgetCDNChartController; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/_widget.cdnChart.scss b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/_widget.cdnChart.scss new file mode 100644 index 0000000000..e5ff8b2d05 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/_widget.cdnChart.scss @@ -0,0 +1,30 @@ +/* + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + +.bps-chart-container { + position: relative; + text-align: center; + background-color: transparent; + padding: 30px 60px; + + .bps-chart { + height: 200px; + min-width: 310px; + } + +} + diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/index.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/index.js new file mode 100644 index 0000000000..710095179f --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/index.js @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficOps.widget.cdnChart', []) + .controller('WidgetCDNChartController', require('./WidgetCDNChartController')); diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html new file mode 100644 index 0000000000..c1bef77fd9 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html @@ -0,0 +1,37 @@ +
            +
            +
            +

            {{::cdn.name}}

            +
            +
            +
            +
            +
            +
            +
            +
            +
            +

            Statistics

            +
            +
            +
            + + + + + + + + + + + + + + + +
            Utilization %{{currentStats.bandwidth/currentStats.capacity | percentFilter}} of {{currentStats.capacity | number:0}} Gbps
            Current Bandwidth{{currentStats.bandwidth | number:2}} Gbps
            Current Connections{{currentStats.connections | number:0}}
            +
            +
            +
            +
            diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/WidgetChangeLogsController.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/WidgetChangeLogsController.js new file mode 100644 index 0000000000..335fac5e47 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/WidgetChangeLogsController.js @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var WidgetChangeLogsController = function(changeLogs, $scope) { + + $scope.getRelativeTime = function(date) { + return moment(date).fromNow(); + }; + + var init = function() { + if (changeLogs) { + // only set this if it's passed in + $scope.changeLogs = changeLogs; + } + }; + init(); + +}; + +WidgetChangeLogsController.$inject = ['changeLogs', '$scope']; +module.exports = WidgetChangeLogsController; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/index.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/index.js new file mode 100644 index 0000000000..e71fb2cea6 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/index.js @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficOps.widget.changeLogs', []) + .controller('WidgetChangeLogsController', require('./WidgetChangeLogsController')); diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html new file mode 100644 index 0000000000..a3ceba2f26 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html @@ -0,0 +1,26 @@ +
            +

            Change Logs

            +
            +
            +
            +
              +
            • +
              +
              +

              {{::changeLog.level}}

              +
              + {{::getRelativeTime(changeLog.lastUpdated)}} by {{::changeLog.user}} +
              +

              {{::changeLog.message}}

              +
              +
              +
              • +
            +
            +
            + + See All Change Logs + + +
            +
            diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/WidgetRoutingController.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/WidgetRoutingController.js new file mode 100644 index 0000000000..dc8f03cfc8 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/WidgetRoutingController.js @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var WidgetRoutingController = function(routing, $scope) { + + var init = function() { + if (routing) { + // only set this if it's passed in + $scope.routing = routing; + } + }; + init(); + +}; + +WidgetRoutingController.$inject = ['routing', '$scope']; +module.exports = WidgetRoutingController; diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/index.js b/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/index.js new file mode 100644 index 0000000000..b7b3e94812 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/index.js @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficOps.widget.routing', []) + .controller('WidgetRoutingController', require('./WidgetRoutingController')); diff --git a/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/widget.routing.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/widget.routing.tpl.html new file mode 100644 index 0000000000..d45372c18c --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/modules/widget/routing/widget.routing.tpl.html @@ -0,0 +1,88 @@ +
            +

            Routing Methods

            +
            +
            +
            +
            + Native +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 60% +
            +
            +
            + +
            +
            + 3rd Party +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 20% +
            +
            +
            +
            +
            + DSR +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 10% +
            +
            +
            +
            +
            + Static +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 5% +
            +
            +
            +
            +
            + Federated +
            +
            +
            +
            + 60% Complete +
            +
            +
            +
            + 5% +
            +
            +
            + +
            + diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/DateUtils.js b/traffic_ops/experimental/ui/app/src/common/service/utils/DateUtils.js new file mode 100644 index 0000000000..e554d029f6 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/service/utils/DateUtils.js @@ -0,0 +1,131 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DateUtils = function() { + + this.dateFormat = function () { + // source: http://blog.stevenlevithan.com/archives/date-time-format + var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g, + timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g, + timezoneClip = /[^-+\dA-Z]/g, + pad = function (val, len) { + val = String(val); + len = len || 2; + while (val.length < len) val = "0" + val; + return val; + }; + + // Regexes and supporting functions are cached through closure + return function (date, mask, utc) { + var dF = this.dateFormat; + + // You can't provide utc if you skip other args (use the "UTC:" mask prefix) + if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) { + mask = date; + date = undefined; + } + + // Passing date through Date applies Date.parse, if necessary + date = date ? new Date(date) : new Date; + if (isNaN(date)) throw SyntaxError("invalid date"); + + mask = String(dF.masks[mask] || mask || dF.masks["default"]); + + // Allow setting the utc argument via the mask + if (mask.slice(0, 4) == "UTC:") { + mask = mask.slice(4); + utc = true; + } + + var _ = utc ? "getUTC" : "get", + d = date[_ + "Date"](), + D = date[_ + "Day"](), + m = date[_ + "Month"](), + y = date[_ + "FullYear"](), + H = date[_ + "Hours"](), + M = date[_ + "Minutes"](), + s = date[_ + "Seconds"](), + L = date[_ + "Milliseconds"](), + o = utc ? 0 : date.getTimezoneOffset(), + flags = { + d: d, + dd: pad(d), + ddd: dF.i18n.dayNames[D], + dddd: dF.i18n.dayNames[D + 7], + m: m + 1, + mm: pad(m + 1), + mmm: dF.i18n.monthNames[m], + mmmm: dF.i18n.monthNames[m + 12], + yy: String(y).slice(2), + yyyy: y, + h: H % 12 || 12, + hh: pad(H % 12 || 12), + H: H, + HH: pad(H), + M: M, + MM: pad(M), + s: s, + ss: pad(s), + l: pad(L, 3), + L: pad(L > 99 ? Math.round(L / 10) : L), + t: H < 12 ? "a" : "p", + tt: H < 12 ? "am" : "pm", + T: H < 12 ? "A" : "P", + TT: H < 12 ? "AM" : "PM", + Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""), + o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4), + S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10] + }; + + return mask.replace(token, function ($0) { + return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1); + }); + }; + }(); + + this.dateFormat.masks = { + "default": "ddd mmm dd yyyy HH:MM:ss", + shortDate: "m/d/yy", + mediumDate: "mmm d, yyyy", + longDate: "mmmm d, yyyy", + fullDate: "dddd, mmmm d, yyyy", + shortTime: "h:MM TT", + mediumTime: "h:MM:ss TT", + longTime: "h:MM:ss TT Z", + isoDate: "yyyy-mm-dd", + isoTime: "HH:MM:ss", + isoDateTime: "yyyy-mm-dd'T'HH:MM:ss", + isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'" + }; + + this.dateFormat.i18n = { + dayNames: [ + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", + "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" + ], + monthNames: [ + "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", + "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" + ] + }; + +}; + +DateUtils.$inject = []; +module.exports = DateUtils; diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/NumberUtils.js b/traffic_ops/experimental/ui/app/src/common/service/utils/NumberUtils.js new file mode 100644 index 0000000000..9a66563d9b --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/common/service/utils/NumberUtils.js @@ -0,0 +1,80 @@ +/* + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ + +var NumberUtils = function($filter) { + + var k = 1000, + sizes = ['B', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb']; + + this.addCommas = function(nStr) + { + nStr += ''; + x = nStr.split('.'); + x1 = x[0]; + x2 = x.length > 1 ? '.' + x[1] : ''; + var rgx = /(\d+)(\d{3})/; + while (rgx.test(x1)) { + x1 = x1.replace(rgx, '$1' + ',' + '$2'); + } + return x1 + x2; + }; + + /** + * This function takes big scary kilobit numbers and 'shrinks' them to a friendly version + * i.e. 10,000 kilobits is easier read as 10 megabits... + */ + this.shrink = function(kilounits) { + if (!angular.isNumber(kilounits) || kilounits == 0) return [ 0, 'Kb' ]; + var units = kilounits * 1000; + var i = Math.floor(Math.log(units) / Math.log(k)); + if (i < 1) { i = 1 } // kilobits is the lowest we will go + if (i > 5) { i = 5 } // petabits is the highest we will go + return [ Math.round((units / Math.pow(k, i)) * 100) / 100, sizes[i] ]; + }; + + this.convertTo = function(kilounits, size) { + if (!angular.isNumber(kilounits)) return null; + if (kilounits == 0) return 0; + var units = kilounits * 1000; + var i = sizes.indexOf(size); + if (i == -1) { + return 0; + } + return Math.round((units / Math.pow(k, i)) * 100) / 100; + }; + + this.average = function(arr) + { + if (!angular.isArray(arr) || arr.length == 0 ) return 0; + return _.reduce(arr, function(memo, num) { + return memo + num; + }, 0) / arr.length; + } + + this.ratio = function(numerator, denominator) + { + if (numerator === 0 || denominator === 0) { + return 'N/A'; + } else { + return $filter('number')(numerator/denominator, 2) + ':1'; + } + } + +}; + +NumberUtils.$inject = ['$filter']; +module.exports = NumberUtils; diff --git a/traffic_ops/experimental/ui/app/src/common/service/utils/index.js b/traffic_ops/experimental/ui/app/src/common/service/utils/index.js index 0eaa2d1e5d..1420100950 100644 --- a/traffic_ops/experimental/ui/app/src/common/service/utils/index.js +++ b/traffic_ops/experimental/ui/app/src/common/service/utils/index.js @@ -18,7 +18,9 @@ */ module.exports = angular.module('trafficOps.utils', []) + .service('dateUtils', require('./DateUtils')) .service('formUtils', require('./FormUtils')) .service('locationUtils', require('./LocationUtils')) + .service('numberUtils', require('./NumberUtils')) .service('serverUtils', require('./ServerUtils')) .service('stringUtils', require('./StringUtils')); diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js index 2abe7029b6..e4715d36e1 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js @@ -17,32 +17,21 @@ * under the License. */ -var DashboardController = function(changeLogs, cacheGroupHealth, $scope, locationUtils) { +var DashboardController = function(cacheGroupHealth, cdns, currentStats, $scope) { - $scope.changeLogs = changeLogs; + $scope.cacheGroupHealth = cacheGroupHealth; - $scope.getRelativeTime = function(date) { - return moment(date).fromNow(); - }; + $scope.cdns = _.filter(cdns, function(cdn) { + // we don't want the "ALL" cdn which is not really a cdn + return cdn.name != 'ALL'; + }); - $scope.navigateToPath = locationUtils.navigateToPath; - - - $scope.locationHealth = { - totalOnline: cacheGroupHealth.totalOnline, - totalOffline: cacheGroupHealth.totalOffline, - locations: cacheGroupHealth.cachegroups - }; - - // pagination - $scope.currentLocationPage = 1; - $scope.locationsPerPage = 10; - - $scope.onlinePercent = function(location) { - return location.online / (location.online + location.offline); - }; + $scope.totalStats = _.find(currentStats.currentStats, function(item) { + // total stats are buried in a hash where cdn = total + return item.cdn == 'total'; + }); }; -DashboardController.$inject = ['changeLogs', 'cacheGroupHealth', '$scope', 'locationUtils']; +DashboardController.$inject = ['cacheGroupHealth', 'cdns', 'currentStats', '$scope']; module.exports = DashboardController; diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html index ffee368f90..5254378576 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/dashboard.tpl.html @@ -17,299 +17,79 @@ under the License. --> -
            - Total Users -
            2500
            - 4% From last Week + Total Bandwidth +
            {{totalStats.bandwidth | number:2}} Gbps
            - Average Time -
            123.50
            - 3% From last Week + Total Connections +
            {{totalStats.connections | number:0}}
            - Total Males -
            2,500
            - 34% From last Week + Total Online Caches +
            {{cacheGroupHealth.totalOnline}}
            - Total Females -
            4,567
            - 12% From last Week + Total Offline Caches +
            {{cacheGroupHealth.totalOffline}}
            - Total Collections -
            2,315
            - 34% From last Week + Another Metric +
            999
            - Total Connections -
            7,325
            - 34% From last Week + Another Metric +
            999
            -
            -
            -
            - -
            -
            -

            Network Activities Graph title sub-title

            -
            -
            -
            - - December 30, 2014 - January 28, 2015 -
            -
            -
            - -
            -
            -
            -
            -
            -

            Top Campaign Performance

            -
            -
            - -
            -
            -

            Facebook Campaign

            -
            -
            -
            -
            -
            -
            -
            -

            Twitter Campaign

            -
            -
            -
            -
            -
            -
            -
            -
            -
            -

            Conventional Media

            -
            -
            -
            -
            -
            -
            -
            -

            Bill boards

            -
            -
            -
            -
            -
            -
            -
            - -
            - -
            -
            + +
            +
            +
            - +
            -
            +
            -
            -
            -

            App Versions

            -
            -
            -

            App Usage across versions

            -
            -
            - 0.1.5.2 -
            -
            -
            -
            - 60% Complete -
            -
            -
            -
            - 123k -
            -
            -
            - -
            -
            - 0.1.5.3 -
            -
            -
            -
            - 60% Complete -
            -
            -
            -
            - 53k -
            -
            -
            -
            -
            - 0.1.5.4 -
            -
            -
            -
            - 60% Complete -
            -
            -
            -
            - 23k -
            -
            -
            -
            -
            - 0.1.5.5 -
            -
            -
            -
            - 60% Complete -
            -
            -
            -
            - 3k -
            -
            -
            -
            -
            - 0.1.5.6 -
            -
            -
            -
            - 60% Complete -
            -
            -
            -
            - 1k -
            -
            -
            - -
            -
            +
            -
            -
            -

            Device Usage

            -
            -
            - - - - - - - - - -
            -

            Top 5

            -             		-
            -

            Device

            -
            -
            -

            Progress

            -
            -
            - - - - - - - - - - - - - - - - - - - - - - - -
            -

            IOS

            -             		30%
            -

            Android

            -             		10%
            -

            Blackberry

            -             		20%
            -

            Symbian

            -             		15%
            -

            Others

            -             		30%
            -
            -
            -
            +
            - -
            -

            Quick Settings

            +

            Something Else

            -

            Profile Completion

            +

            Something

            0 @@ -321,243 +101,16 @@

            Profile Completion

            -
            - -
            -
            -
            -

            Change Logs

            -
            -
            -
            -
              -
            • -
              -
              -

              {{::changeLog.level}}

              -
              - {{::getRelativeTime(changeLog.lastUpdated)}} by {{::changeLog.user}} -
              -

              {{::changeLog.message}}

              -
              -
              -
              • -
            -
            -
            - - See All Change Logs - - -
            -
            -
            +
            - -
            - - -
            -
            -
            -
            -

            Cache Groups 100% online

            -
            -
            -
            -
            -

            Cache Groups {{locationHealth.totalOnline/(locationHealth.totalOnline + locationHealth.totalOffline) | percentFilter}} online

            -
            - -
            -
            - -
            -
            - - - - -
            -
            -
            -
            -
            -
            - -
            -
            - - - -
            -
            -
            -

            To Do List Sample tasks

            -
            -
            - -
            -
              -
            • -

              - Schedule meeting with new client

              -
              • -
            • -

              - Create email address for new intern

              -
              • -
            • -

              - Have IT fix the network printer

              -
              • -
            • -

              - Copy backups to offsite location

              -
              • -
            • -

              - Food truck fixie locavors mcsweeney

              -
              • -
            • -

              - Food truck fixie locavors mcsweeney

              -
              • -
            • -

              - Create email address for new intern

              -
              • -
            • -

              - Have IT fix the network printer

              -
              • -
            • -

              - Copy backups to offsite location

              -
              • -
            -
            -
            -
            -
            - - - -
            -
            -
            -

            Daily active users Sessions

            -
            -
            -
            -
            -
            Monday, 07:30 AM - F - C -
            -
            -
            -
            -
            -
            - -
            -
            -
            -
            -

            Texas
            Partly Cloudy Day

            -
            -
            -
            -
            -
            -

            23

            -
            -
            - -
            - -
            -
            -
            -

            Mon

            -

            25

            - -
            15 km/h
            -
            -
            -
            -
            -

            Tue

            -

            25

            - -
            12 km/h
            -
            -
            -
            -
            -

            Wed

            -

            27

            - -
            14 km/h
            -
            -
            -
            -
            -

            Thu

            -

            28

            - -
            15 km/h
            -
            -
            -
            -
            -

            Fri

            -

            28

            - -
            11 km/h
            -
            -
            -
            -
            -

            Sat

            -

            26

            - -
            10 km/h
            -
            -
            -
            -
            -
            -
            - +
            -
            diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js index 2b887f7dc4..b1e13122f6 100644 --- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/index.js @@ -23,17 +23,20 @@ module.exports = angular.module('trafficOps.private.monitor.dashboard', []) $stateProvider .state('trafficOps.private.monitor.dashboard', { url: '/dashboard', + abstract: true, views: { monitorContent: { templateUrl: 'modules/private/monitor/dashboard/dashboard.tpl.html', controller: 'DashboardController', resolve: { - changeLogs: function(changeLogService) { - return []; - // return changeLogService.getChangeLogs({ limit: 6 }); - }, cacheGroupHealth: function(cacheGroupService) { return cacheGroupService.getCacheGroupHealth(); + }, + cdns: function(cdnService) { + return cdnService.getCDNs(); + }, + currentStats: function(cdnService) { + return cdnService.getCurrentStats(); } } diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/view/index.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/view/index.js new file mode 100644 index 0000000000..3076a70fd9 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/view/index.js @@ -0,0 +1,53 @@ +module.exports = angular.module('trafficOps.private.monitor.dashboard.view', []) + .config(function($stateProvider, $urlRouterProvider) { + $stateProvider + .state('trafficOps.private.monitor.dashboard.view', { + url: '', + views: { + cacheGroupsContent: { + templateUrl: 'common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html', + controller: 'WidgetCacheGroupsController', + resolve: { + cacheGroupHealth: function() { + // this is already defined in a parent template that shares the $scope + return null; + } + } + }, + capacityContent: { + templateUrl: 'common/modules/widget/capacity/widget.capacity.tpl.html', + controller: 'WidgetCapacityController' + }, + cdnChartContent: { + templateUrl: 'common/modules/widget/cdnChart/widget.cdnChart.tpl.html', + controller: 'WidgetCDNChartController', + resolve: { + cdn: function() { + // the controller will take care of fetching the cdn + return null; + } + } + }, + changeLogsContent: { + templateUrl: 'common/modules/widget/changeLogs/widget.changeLogs.tpl.html', + controller: 'WidgetChangeLogsController', + resolve: { + changeLogs: function(changeLogService) { + return changeLogService.getChangeLogs({ limit: 5 }); + } + } + }, + routingContent: { + templateUrl: 'common/modules/widget/routing/widget.routing.tpl.html', + controller: 'WidgetRoutingController', + resolve: { + routing: function() { + return []; + } + } + }, + } + }) + ; + $urlRouterProvider.otherwise('/'); + }); diff --git a/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js b/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js index 87e28cbaa1..06c68f23fd 100644 --- a/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js +++ b/traffic_ops/experimental/ui/app/src/scripts/shared-libs.js @@ -45,6 +45,14 @@ require('restangular'); // jquery require('jquery'); +// flot charts +require('jquery-flot'); +require('jquery-flot-pie'); +require('jquery-flot-stack'); +require('jquery-flot-time'); +require('jquery-flot-tooltip'); +require('jquery-flot-axislabels'); + // misc require('es5-shim'); require('json3'); diff --git a/traffic_ops/experimental/ui/app/src/styles/main.scss b/traffic_ops/experimental/ui/app/src/styles/main.scss index c79d6bd226..b981edbed8 100755 --- a/traffic_ops/experimental/ui/app/src/styles/main.scss +++ b/traffic_ops/experimental/ui/app/src/styles/main.scss @@ -33,6 +33,8 @@ $fa-font-path: "../assets/fonts"; @import "../common/modules/navigation/navigation"; @import "../common/modules/table/table"; @import "../common/modules/release/release"; +@import "../common/modules/widget/capacity/widget.capacity"; +@import "../common/modules/widget/cdnChart/widget.cdnChart"; // public @import "../modules/public/login/login"; diff --git a/traffic_ops/experimental/ui/app/src/styles/theme.scss b/traffic_ops/experimental/ui/app/src/styles/theme.scss index 8de46f64ac..f78a16d94d 100644 --- a/traffic_ops/experimental/ui/app/src/styles/theme.scss +++ b/traffic_ops/experimental/ui/app/src/styles/theme.scss @@ -1715,7 +1715,7 @@ span.right { } @media (min-width: 768px) { .tile_count .tile_stats_count .count { - font-size: 40px + font-size: 30px } } @media (min-width: 992px) and (max-width: 1100px) { diff --git a/traffic_ops/experimental/ui/grunt/browserify2.js b/traffic_ops/experimental/ui/grunt/browserify2.js index 9bb4376812..2528df48cf 100644 --- a/traffic_ops/experimental/ui/grunt/browserify2.js +++ b/traffic_ops/experimental/ui/grunt/browserify2.js @@ -44,6 +44,36 @@ module.exports = { 'json3/lib/json3.min.js', 'restangular/dist/restangular.min.js' ] + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.js' ], + rename: function () { return 'jquery-flot.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.pie.js' ], + rename: function () { return 'jquery-flot-pie.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.stack.js' ], + rename: function () { return 'jquery-flot-stack.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.time.js' ], + rename: function () { return 'jquery-flot-time.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot.tooltip/js/jquery.flot.tooltip.min.js' ], + rename: function () { return 'jquery-flot-tooltip.min.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot-axislabels/jquery.flot.axislabels.js' ], + rename: function () { return 'jquery-flot-axislabels.js'; } } ] } @@ -75,6 +105,36 @@ module.exports = { 'json3/lib/json3.js', 'restangular/dist/restangular.js' ] + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.js' ], + rename: function () { return 'jquery-flot.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.pie.js' ], + rename: function () { return 'jquery-flot-pie.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.stack.js' ], + rename: function () { return 'jquery-flot-stack.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot/jquery.flot.time.js' ], + rename: function () { return 'jquery-flot-time.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot.tooltip/js/jquery.flot.tooltip.js' ], + rename: function () { return 'jquery-flot-tooltip.js'; } + }, + { + cwd: '<%= globalConfig.app %>/bower_components/', + src: [ 'flot-axislabels/jquery.flot.axislabels.js' ], + rename: function () { return 'jquery-flot-axislabels.js'; } } ] }