From 7019f6d9af89b6fadc72d3d9f1f303b5278e7555 Mon Sep 17 00:00:00 2001 From: "Kotagiri, Ramprasad (rp5662)" Date: Thu, 13 Feb 2020 16:39:57 -0500 Subject: DCAE dashboard updates ver 1.3.0 Update DB Schema to include new menu items for API doc Update the page footer for latest copyright Issue-ID: DCAEGEN2-1856 Issue-ID: DCAEGEN2-1556 Change-Id: Ia7f52b6f0151db62f2155fa26d0f50a1157e7481 Signed-off-by: Kotagiri, Ramprasad (rp5662) --- .../src/main/webapp/app/ccsdk/home/oom-router.js | 4 ++++ .../webapp/app/ccsdk/inventory/deployment-controllers.js | 6 ++++-- .../app/ccsdk/inventory/inventory_blueprint_table.html | 3 ++- .../app/fusion/scripts/DS2-view-models/footer.html | 13 ------------- .../app/fusion/scripts/DS2-view-models/header-logo.html | 3 --- .../app/fusion/scripts/DS2-view-models/welcome.html | 16 ---------------- 6 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html delete mode 100644 ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html delete mode 100644 ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html (limited to 'ccsdk-app-overlay/src') diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js index 592ab15..0b43341 100644 --- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js +++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js @@ -36,6 +36,10 @@ appDS2.config(function($routeProvider) { templateUrl: 'app/ccsdk/inventory/inventory_deployment_table.html', controller : 'inventoryDeploymentTableController' }) + .when('/idep/:depId', { + templateUrl: 'app/ccsdk/inventory/inventory_deployment_table.html', + controller : 'inventoryDeploymentTableController' + }) .when('/sh', { templateUrl: 'app/ccsdk/consul/service_health_table.html', controller : 'serviceHealthTableController' diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js index 714528c..e17dcae 100644 --- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js +++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js @@ -1,5 +1,7 @@ appDS2.controller('inventoryDeploymentTableController', function( - $rootScope, $scope, $interval, $log, $modal, modalService, InventoryDeploymentService, InventoryBlueprintService) { + $rootScope, $scope, $routeParams, $route, + $interval, $log, $modal, modalService, + InventoryDeploymentService, InventoryBlueprintService) { 'use strict'; @@ -19,7 +21,7 @@ appDS2.controller('inventoryDeploymentTableController', function( // sorting $scope.ecdapp.sortBy = null; // searching - $scope.ecdapp.searchBy = null; + $scope.ecdapp.searchBy = $routeParams.depId; $scope.ecdapp.selectedRow = null; // initialize our variable to null $scope.ecdapp.setClickedRow = function(index){ //function that sets the value of selectedRow to current index $scope.ecdapp.selectedRow = index; diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html index 6dd0f07..763d956 100644 --- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html +++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html @@ -143,7 +143,8 @@
{{$index+1}}
Deployment ID - + + {{srvcData.serviceId}}
Created timestamp diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html deleted file mode 100644 index 65ac372..0000000 --- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
- -
-
\ No newline at end of file diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html deleted file mode 100644 index 942af9b..0000000 --- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html +++ /dev/null @@ -1,3 +0,0 @@ -
- DCAE Dashboard -
\ No newline at end of file diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html deleted file mode 100644 index 1c90f97..0000000 --- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html +++ /dev/null @@ -1,16 +0,0 @@ - - - Redirecting - - - - -

- Redirecting to the DCAE Dashboard.. -

- - -- cgit 1.2.3-korg