diff --git a/client/cat3/Gruntfile.js b/client/cat3/Gruntfile.js
index 8619729ba..06a759423 100644
--- a/client/cat3/Gruntfile.js
+++ b/client/cat3/Gruntfile.js
@@ -89,6 +89,7 @@ module.exports = function(grunt) {
{'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'},
{'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'},
{'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
+ {'catalyst/partials/sections/dashboard/bots/bots.css':'src/partials/sections/dashboard/bots/bots.scss'},
{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
]
}
diff --git a/client/cat3/main.html b/client/cat3/main.html
index 310ebd6b4..476a55985 100644
--- a/client/cat3/main.html
+++ b/client/cat3/main.html
@@ -102,6 +102,8 @@
+
+
@@ -144,6 +146,7 @@
+
diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js
index 131f202c3..d9a6198b2 100644
--- a/client/cat3/src/clientRoutes.js
+++ b/client/cat3/src/clientRoutes.js
@@ -88,6 +88,23 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
}]
}
+ }).state('dashboard.bots', {
+ url: "/bots",
+ templateUrl: "src/partials/sections/dashboard/bots/bots.html",
+ controller: "botsCtrl as bts",
+ resolve: {
+ auth: ["$q", function ($q) {
+ var deferred = $q.defer();
+ // instead, go to a different page
+ if (modulePerms.serviceBool()) {
+ // everything is fine, proceed
+ deferred.resolve();
+ } else {
+ deferred.reject({redirectTo: 'dashboard'});
+ }
+ return deferred.promise;
+ }]
+ }
}).state('dashboard.settings', {
url: "/settings",
templateUrl: "src/partials/sections/dashboard/setting/setting.html",
diff --git a/client/cat3/src/factory/appPermissionServices.js b/client/cat3/src/factory/appPermissionServices.js
index f7430023e..747b9e66c 100755
--- a/client/cat3/src/factory/appPermissionServices.js
+++ b/client/cat3/src/factory/appPermissionServices.js
@@ -27,5 +27,10 @@
//return uac.hasPermission('track','read','module');
return true;
};
+ this.serviceBool = function() {
+ //permission response not available in the api response.
+ //return uac.hasPermission('track','read','module');
+ return true;
+ };
}]);
})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js
index c3bca326a..d69a6bcb8 100644
--- a/client/cat3/src/factory/workzoneServices.js
+++ b/client/cat3/src/factory/workzoneServices.js
@@ -99,9 +99,9 @@
var url = '/blueprints/' + blueprintID;
return $http.delete(fullUrl(url), Auth.getHeaderObject());
},
- launchBlueprint: function (blueprintID, version, envId, stackName,domainName) {
+ launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer) {
var url = '/blueprints/' + blueprintID + '/launch?version=' + version +
- '&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName;
+ '&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer;
return $http.get(fullUrl(url), Auth.getHeaderObject());
},
getBlueprintById: function(blueprintId) {
@@ -527,6 +527,14 @@
getUnassignedInstances:function (providerId) {
var url ='/providers/'+providerId+'/unassigned-instances';
return $http.get(fullUrl(url),Auth.getHeaderObject());
+ },
+ getBotTypeList:function () {
+ var url ='/config-data/bot-type';
+ return $http.get(fullUrl(url),Auth.getHeaderObject());
+ },
+ getTaggingServer:function () {
+ var url ='/config-data/tagging-server';
+ return $http.get(fullUrl(url),Auth.getHeaderObject());
}
};
return serviceInterface;
diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js
index e8a2bf542..d1ee21288 100644
--- a/client/cat3/src/main.js
+++ b/client/cat3/src/main.js
@@ -84,13 +84,15 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l
design: modulePerms.designAccess(),
settings: modulePerms.settingsAccess(),
track: modulePerms.trackAccess(),
- analyticsBool: modulePerms.analyticsBool()
+ analyticsBool: modulePerms.analyticsBool(),
+ serviceBool: modulePerms.serviceBool()
};
$rootScope.workZoneBool = _permSet.workzone;
$rootScope.designBool = _permSet.design;
$rootScope.settingsBool = _permSet.settings;
$rootScope.trackBool = _permSet.track;
$rootScope.analyticsBool = _permSet.analyticsBool;
+ $rootScope.serviceBool = _permSet.serviceBool;
});
$rootScope.$emit('SET_HEADER', $rootScope.appDetails);
$scope.showLogoutConfirmationSection = false;
@@ -111,4 +113,4 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l
$rootScope.$on('USER_LOGOUT', function () {
$scope.doLogout();
});
-}]);
+}]);
\ No newline at end of file
diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
index 7a29b39c0..0cdca8e50 100644
--- a/client/cat3/src/partials/global.scss
+++ b/client/cat3/src/partials/global.scss
@@ -112,6 +112,7 @@ $imagePath : "../../../../../../cat3/images";
z-index: 10;
transition: all .4s ease 0s;
left: -254px;
+ height: 100%;
&.show-left-tree {
left: 0px;
@@ -121,6 +122,7 @@ $imagePath : "../../../../../../cat3/images";
background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
color: #fff;
overflow-y: auto;
+ height: 100%;
}
div[data-angular-treeview] {
@@ -1102,7 +1104,7 @@ option.script {
background-color: #E49C25 !important;
}
.ui-grid-menu-button{
- height: 28px !important;
+ height: 36px !important;
background-color: #5bc0de !important;
border-color: #46b8da !important;
display: inline-block;
@@ -1161,4 +1163,23 @@ option.script {
}
.loading-body{
opacity: 0.4;
+}
+#bots .control-panel-button {
+ border-radius: 17px;
+ padding: 2px 0px 0 5px;
+ width: 25px;
+ height: 25px;
+}
+
+// ui grid style
+.ui-grid-header-cell-row{
+ background: #636363 !important;
+ color: #FBFBFB !important;
+}
+.ui-grid-cell-contents.ui-grid-header-cell-primary-focus{
+ min-height: 36px;
+ line-height: 25px;
+}
+.ui-grid-column-menu-button{
+ top:5px !important;
}
\ No newline at end of file
diff --git a/client/cat3/src/partials/globals/header/header.scss b/client/cat3/src/partials/globals/header/header.scss
index 208df0beb..481632dd3 100755
--- a/client/cat3/src/partials/globals/header/header.scss
+++ b/client/cat3/src/partials/globals/header/header.scss
@@ -176,6 +176,30 @@
}
}
+.header-right {
+ .dropdown {
+ margin: 11px 0px 0 10px;
+ }
+
+ .dropdown-toggle {
+ font-size: 18px;
+ margin-top: 5px;
+ }
+
+ .dropdown-menu {
+ color: #000;
+ background: #fff;
+ padding: 6px;
+ min-width: 100px;
+ line-height: 2;
+ }
+
+ a {
+ color: #000;
+ text-decoration: none;
+ }
+}
+
/*Styles for Logout Confirmation starts here*/
.divMessageBox {
width: 100%;
diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html
index 382f778c3..ee4fd54a6 100644
--- a/client/cat3/src/partials/globals/header/headerDashboard.html
+++ b/client/cat3/src/partials/globals/header/headerDashboard.html
@@ -39,6 +39,11 @@
ANALYTICS
+
+
+ BOTS
+
+