- {{item}} {{$last ? "" : " » "}}
'+
+ '
'+
+ '
'+
+ '
',cellTooltip: true},
{ name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'},
{ name: 'Status',field:'status',
cellTemplate:'
' +
@@ -51,7 +57,7 @@
keyboard: false,
resolve: {
items: function() {
- return hist
+ return hist;
}
}
});
@@ -64,10 +70,12 @@
audit.init =function(){
audit.gridOptions.data=[];
- var url = '/audit-trail?filterBy=auditType:BOTs';
- $http.get(url).then(function (data) {
- angular.forEach(data,function () {
- audit.gridOptions.data=data.data.auditTrails;
+ var param={
+ url:'/audit-trail?filterBy=auditType:BOTs'
+ };
+ genSevs.promiseGet(param).then(function (response) {
+ angular.forEach(response,function () {
+ audit.gridOptions.data=response.auditTrails;
});
});
};
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
index 7802b2c20..57d1ca9f3 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
@@ -8,7 +8,7 @@
(function (angular) {
"use strict";
angular.module('library.bots',[])
- .controller('botLogsCtrl',['$scope', '$rootScope', '$http', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, $http, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
+ .controller('botLogsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
$scope.botName = items.auditTrailConfig.name;
$scope.nodeIds = items.auditTrailConfig.nodeIds;
$scope.taskType = items.auditTrailConfig.executionType;
@@ -34,9 +34,11 @@
};
$scope.instanceChange =function(){
$scope.botLogs=[];
- var url = '/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs';
- $http.get(url).then(function (result) {
- $scope.botLogs = result.data;
+ var param={
+ url:'/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs'
+ };
+ genSevs.promiseGet(param).then(function (response) {
+ $scope.botLogs = response;
$scope.isBotLogsLoading = false;
});
};
@@ -45,14 +47,12 @@
var requestObj = {
"instanceIds": nodeIds
};
- var bluePrintJob = false;
workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) {
var _jobInstances = response.data;
for (var k = 0; k < $scope.nodeIdsWithActionLog.length; k++) {
for (var l = 0; l < _jobInstances.length; l++) {
if ($scope.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) {
$scope.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name;
- console.log($scope.nodeIdsWithActionLog[k].uiNodeName);
}
}
}
@@ -64,13 +64,15 @@
console.log(error);
});
if($scope.taskType === 'jenkins') {
- var url = '/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output';
- $http.get(url).then(function (result) {
- if (result.data) {
- $scope.jenkinsLogs = helper.formatLogs(result.data.output);
+ var param={
+ url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output'
+ };
+ genSevs.promiseGet(param).then(function (response) {
+ if (response.data) {
+ $scope.jenkinsLogs = helper.formatLogs(response.data.output);
$scope.isBotLogsLoading = false;
} else {
- $scope.jenkinsLogs = helper.formatLogs(result.output);
+ $scope.jenkinsLogs = helper.formatLogs(response.output);
$scope.isBotLogsLoading = false;
}
});
@@ -78,6 +80,6 @@
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
- }
+ };
}]);
})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
index 8d8895967..1454f81c4 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
@@ -70,7 +70,6 @@
$scope.jenkinsparams = items.taskConfig.parameterized;
$scope.scriptparams = items.taskConfig.scriptDetails;
$scope.parameters=[''];
- var taskData={};
var cookbookAttributes = [];
var scriptParams = [];
var choiceParam = {};
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 7465e3e7f..dd78cb560 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -8,10 +8,11 @@
(function (angular) {
"use strict";
angular.module('dashboard.bots')
- .controller('libraryCtrl',['$scope', '$rootScope', '$http', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', function ($scope, $rootScope, $http, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils) {
+ .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils) {
var treeNames = ['Bots','Library'];
$rootScope.$emit('treeNameUpdate', treeNames);
var lib=this;
+ $scope.totalBotsSelected = true;
lib.gridOptions={
gridOption:{
paginationPageSizes: [10, 25, 50, 75],
@@ -37,7 +38,7 @@
],
data:[]
};
- var gridBottomSpace = 210;
+ var gridBottomSpace = 190;
$scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace;
$scope.launchInstance = function(launch){
if(launch.launcType === 'task'){
@@ -49,7 +50,7 @@
$scope.botLogs = function(bot){
genSevs.botHistory(bot);
};
- $scope.deleteBotTask = function(bot) {
+ $scope.deleteBotTask = function(task) {
var modalOptions = {
closeButtonText: 'Cancel',
actionButtonText: 'Delete',
@@ -58,7 +59,10 @@
bodyText: 'Are you sure you want to delete this bot?'
};
confirmbox.showModal({}, modalOptions).then(function() {
- workzoneServices.deleteBotTask(bot._id).then(function(response) {
+ var param={
+ url:'/tasks/serviceDelivery/' + task._id
+ };
+ genSevs.promiseDelete(param).then(function (response) {
if (response) {
toastr.success('Successfully deleted');
lib.init();
@@ -68,7 +72,7 @@
});
});
};
- $scope.deleteBotBP = function(bot) {
+ $scope.deleteBotBP = function(blueprint) {
var modalOptions = {
closeButtonText: 'Cancel',
actionButtonText: 'Delete',
@@ -77,7 +81,10 @@
bodyText: 'Are you sure you want to delete this bot?'
};
confirmbox.showModal({}, modalOptions).then(function() {
- workzoneServices.deleteBotBP(bot._id).then(function(response) {
+ var param={
+ url:'/blueprints/serviceDelivery/' + blueprint._id
+ };
+ genSevs.promiseDelete(param).then(function (response) {
if (response) {
toastr.success('Successfully deleted');
lib.init();
@@ -90,20 +97,56 @@
$rootScope.$on('BOTS_LIBRARY_REFRESH', function() {
lib.init();
});
+ $scope.RefreshBotsLibrary = function() {
+ $scope.totalBotsSelected = true;
+ $scope.runningBotsselected = false;
+ $scope.failedBotsselected = false;
+ lib.init();
+ };
+ $scope.showBotsRunning = function() {
+ $scope.runningBotsselected = true;
+ $scope.totalBotsSelected = false;
+ $scope.failedBotsselected = false;
+ lib.gridOptions.data=[];
+ var param={
+ url:'/tasks?serviceDeliveryCheck=true&actionStatus=running'
+ };
+ genSevs.promiseGet(param).then(function (result) {
+ angular.forEach(result,function (val) {
+ lib.gridOptions.data.push(val);
+ });
+ });
+ lib.summary();
+ };
+ $scope.showFailedBots = function() {
+ $scope.failedBotsselected = true;
+ $scope.runningBotsselected = false;
+ $scope.totalBotsSelected = false;
+ lib.gridOptions.data=[];
+ var param={
+ url:'/tasks?serviceDeliveryCheck=true&actionStatus=failed'
+ };
+ genSevs.promiseGet(param).then(function (result) {
+ angular.forEach(result,function (val) {
+ lib.gridOptions.data.push(val);
+ });
+ });
+ lib.summary();
+ };
lib.summary = function() {
$scope.botSummary=[];
- var url = '/audit-trail/bot-summary';
- $http.get(url).then(function (response) {
- $scope.botSummary = response.data;
- console.log($scope.botSummary);
+ var param={
+ url:'/audit-trail/bot-summary'
+ };
+ genSevs.promiseGet(param).then(function (response) {
+ $scope.botSummary = response;
});
- }
+ };
lib.summary();
lib.init =function(){
lib.gridOptions.data=[];
var param={
- url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true'
- //url:'src/partials/sections/dashboard/bots/data/bp.json'
+ url:'/blueprints?serviceDeliveryCheck=true'
};
genSevs.promiseGet(param).then(function (result) {
angular.forEach(result,function (val) {
@@ -112,8 +155,7 @@
});
});
var param2={
- url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true'
- // url:'src/partials/sections/dashboard/bots/data/t.json'
+ url:'/tasks?serviceDeliveryCheck=true'
};
genSevs.promiseGet(param2).then(function (resultTask) {
angular.forEach(resultTask,function (val) {
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
index 526c3be29..460bf2417 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
@@ -1,58 +1,57 @@
+
+ BOTs Library
+
+
+
-
-
-
-
{{botSummary.totalNoOfBots}}
-Total
Number of BOTs
+
-
+
+
+ Total Number of BOTs
+ {{botSummary.totalNoOfBots}}
-
-
-
-
-
-
-
- {{botSummary.totalNoOfRunningBots}}
-Total
Number of BOTs running
-
+
+
-
+
+
+ Number of BOTs running
+ {{botSummary.totalNoOfRunningBots}}
-
-
-
-
{{botSummary.totalSavedTimeForBots}} mins
-Total
Time saved
+
-
+
+
+ Total Time saved
+ {{botSummary.totalSavedTimeForBots}} mins
-
-
-
-
-
- ' +
' ' +
' ' +
- ' '}
+ ' '}
];
bpcolumnDefs = dockerOptions;
} else if(val.templateType === 'chef' || val.templateType === 'ami'){
var bpOptions = [
- { name:'Name',minWidth:150,field:'name' },
- { name:'InstanceOs',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceOS'},
- { name:'vpcId',minWidth:150,field:'blueprintConfig.cloudProviderData.vpcId'},
+ { name:'Name',minWidth:150,field:'name',cellTooltip: true },
+ { name:'InstanceOs',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceOS',cellTooltip: true},
+ { name:'vpcId',minWidth:150,field:'blueprintConfig.cloudProviderData.vpcId',cellTooltip: true},
{ name:'Region',minWidth:150,field:'blueprintConfig.cloudProviderData.region',visible: false},
{ name:'Template Type',minWidth:150,cellTemplate:' New
New
-
diff --git a/client/cat3/src/partials/sections/dashboard/design/design.scss b/client/cat3/src/partials/sections/dashboard/design/design.scss
index 18c3297ea..a748de6be 100755
--- a/client/cat3/src/partials/sections/dashboard/design/design.scss
+++ b/client/cat3/src/partials/sections/dashboard/design/design.scss
@@ -169,9 +169,6 @@ label {
.activeLi{
background: #E2E2E2 !important;
}
-.bpListComp :hover{
- cursor:move !important;
-}
.badge :hover{
cursor: pointer !important;
}
@@ -284,127 +281,6 @@ label {
}
}
-
-
-#crumbs{
- margin: auto;
- width: 100%;
-}
-.stp{
- font-size: 25px;
-}
-#crumbs ul {
- list-style: none; display: block;
-
-}
-#crumbs ul li {
- background: rgb(242, 242, 242); margin: 0px 20px; display: inline-block;
- margin-bottom: 5px;
-}
-#crumbs ul li div {
- margin: 0px 10px 0px 0px; text-align: left; color: rgb(0, 0, 0); font-size: 12px; text-decoration: none; float: left; display: block; position: relative;
-}
-#crumbs ul li div br {
- color: rgb(255, 255, 255);
-}
-#crumbs ul li div {
- padding: 0px 0 0 7px;
- font-size: 14px;
- font-weight: 600;
- width: 102%;
-}
-#crumbs ul li div::after {
- top: 0px;
- right: -34px;
- border-top-color: transparent;
- border-bottom-color: transparent;
- border-left-color: rgb(242, 242, 242);
- border-top-width: 22px;
- border-bottom-width: 20px;
- border-left-width: 24px;
- border-top-style: solid;
- border-bottom-style: solid;
- border-left-style: solid;
- position: absolute;
- z-index: 1;
- content: "";
-}
-#crumbs ul .active div::after{
- border-top-width: 18px !important;
- border-bottom-width: 32px !important;
-}
-#crumbs ul li div::before {
- left: 0px; top: 0px; position: absolute; content: "";
-}
-#crumbs ul li:hover {
- background: rgb(0, 158, 224); color: rgb(255, 255, 255);
-}
-#crumbs ul li div:hover::after {
- border-left-color: rgb(0, 158, 224);
-}
-
-
-#crumbs ul li.finished {
- background: #5cb85c;
-}
-#crumbs ul li.finished {
- color: rgb(255, 255, 255);
-}
-#crumbs ul li.finished div {
- color: rgb(255, 255, 255);
-}
-#crumbs ul li.finished div::after {
- border-left-color: #5cb85c;
-}
-#crumbs ul li.finished:hover {
- background: #40BAF1;
-}
-#crumbs ul li.finished:hover div::after {
- border-left-color: #40BAF1;
-}
-ul.simple-list > li.finished::before {
- color: rgb(255, 255, 255);
-}
-
-
-
-#crumbs ul li.selected {
- background: #40BAF1;
-}
-#crumbs ul li.selected {
- color: rgb(255, 255, 255);
-}
-#crumbs ul li.selected div {
- color: rgb(255, 255, 255);
-}
-#crumbs ul li.selected div::after {
- border-left-color: #40BAF1;
-}
-
-ul.simple-list > li:hover::before {
- color: rgb(255, 255, 255);
-}
-ul.simple-list > li.selected::before {
- color: rgb(255, 255, 255);
-}
-ul.simple-list {
- padding: 0px; list-style-type: none; counter-reset: li-counter;
-}
-ul.simple-list > li {
- margin-bottom: 20px; position: relative; min-height: 3em;
-}
-ul.simple-list > li:hover::before {
- color: rgb(255, 255, 255);
-}
-ul.simple-list > li::after {
- height: 0px; clear: both; display: block; visibility: hidden; content: "";
-}
-#crumbs ul.simple-list > li:hover div {
- color: rgb(255, 255, 255);
-}
-#crumbs ul.simple-list > li:hover div::after {
-
-}
.disabled{
cursor:not-allowed !important;
box-shadow: none;
@@ -454,3 +330,21 @@ fieldset#compBlueprint legend {
margin-left: 10px;
width: 98%;
}
+
+.listPageView {
+ height: 450px;
+ overflow-y:auto;
+}
+
+.bpCardDetails {
+ width: 160px;
+ padding: 0px;
+ position: relative;
+ float: left;
+ margin-bottom: 5px;
+ margin-right: 8px;
+}
+
+.layersClassComposite {
+ margin-left: 10px;
+}
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
index 6d6d6be13..a88be966f 100755
--- a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
+++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
@@ -86,6 +86,7 @@
};
genericServices.promisePost(params).then(function () {
toastr.success('Successfully copied.');
+ $rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT');
});
});
};
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
index a9b966b47..2616b32ca 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
@@ -32,7 +32,8 @@
@@ -106,7 +106,7 @@
{{val.value}}
-
+
@@ -123,5 +123,5 @@
-
- {{botSummary.totalNoOfFailedBots}}
-Total
Number of failed runs
-
+
diff --git a/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js b/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
index a167a9146..8ff45cb85 100644
--- a/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
@@ -56,7 +56,7 @@
return deferred.promise;
}]
}
- })
+ });
}]).filter('inArray',['$filter', function($filter){
return function(list, arrayFilter, element){
if(arrayFilter){
@@ -126,7 +126,7 @@
$rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT');
return genericServices.promiseGet(params);
}
- }
+ };
design.providersList();
return design;
}]);
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
index 5397a2c88..ab34f6454 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
@@ -14,7 +14,7 @@
var dockerTemplates = $scope.dockerTemplateList;
for(var j=0;j
+
+
+
+ Number of failed runs
+ {{botSummary.totalNoOfFailedBots}}
-
{{grid.appScope.getTemplate(row.entity.templateType)}}
'},
{ name:'Instance Type',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceType'},
- { name:'Keypair',minWidth:150,field:'blueprintConfig.cloudProviderData.keyPairId',visible: false},
{ name:'Subnet',minWidth:150,field:'blueprintConfig.cloudProviderData.subnetId',visible: false},
- { name:'Security Group',width:150,field:'blueprintConfig.cloudProviderData.securityGroupIds[0]'},
+ { name:'Security Group',width:150,field:'blueprintConfig.cloudProviderData.securityGroupIds[0]',cellTooltip: true},
{ name:'Action',minWidth:200,cellTemplate:' ' +
' ' +
' ' +
- ' '}
+ ' '}
];
bpcolumnDefs = bpOptions;
} else if(val.templateType === 'cft') {
var cftOptions = [
- { name:'Name',minWidth:150,field:'name' },
+ { name:'Name',minWidth:150,field:'name',cellTooltip: true },
{ name:'Cloud Provider',minWidth:150,field:'blueprintConfig.cloudProviderType'},
{ name:'Region',minWidth:150,field:'blueprintConfig.region'},
{ name:'Template Type',minWidth:150,cellTemplate:'{{grid.appScope.getTemplate(row.entity.templateType)}}
'},
{ name:'Action',minWidth:150,cellTemplate:' ' +
' ' +
' ' +
- ' '}
+ ' '}
];
bpcolumnDefs = cftOptions;
} else if(val.templateType === 'arm') {
var cftOptions = [
- { name:'Name',minWidth:150,field:'name' },
+ { name:'Name',minWidth:150,field:'name',cellTooltip: true },
{ name:'Infra Manager Type',minWidth:150,field:'blueprintConfig.infraMangerType'},
- { name:'Resource Group',minWidth:150,field:'blueprintConfig.resourceGroup'},
+ { name:'Resource Group',minWidth:150,field:'blueprintConfig.resourceGroup',cellTooltip: true},
{ name:'Template Type',minWidth:150,cellTemplate:'{{grid.appScope.getTemplate(row.entity.templateType)}}
'},
{ name:'Action',minWidth:150,cellTemplate:' ' +
' ' +
' ' +
- ' '}
+ ' '}
];
bpcolumnDefs = cftOptions;
}
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
index d16febcab..2b4d766b4 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
@@ -10,6 +10,7 @@
createCBP.compositeBPType='chef';
$scope.chefrunlist,$scope.cookbookAttributes = [];
createCBP.onSubmit =false;
+ $scope.compositeEnabled = true;
createCBP.newEnt={
bpName:''
};
@@ -65,6 +66,7 @@
};
$scope.compositeSave =function () {
createCBP.onSubmit =true;
+ $scope.compositeEnabled = false;
if(!createCBP.newEnt.bpName || !createCBP.SelectedBPList.length > 0){
return true;
}
@@ -72,7 +74,7 @@
createCBP.newEnt.org =$rootScope.organNewEnt.org.rowid;
createCBP.newEnt.buss=$rootScope.organNewEnt.buss.rowid;
createCBP.newEnt.proj=$rootScope.organNewEnt.proj.rowId;
- };
+ }
$scope.blueprintList = [];
angular.forEach(createCBP.SelectedBPList, function(val){
var blueprintObj={
@@ -94,6 +96,7 @@
gencSers.promisePost(params).then(function () {
toastr.success('Successfully Created.');
$state.go('dashboard.design.list',{providerName:$state.params.providerName,templateObj:$state.params.templateObj});
+ $scope.compositeEnabled = true;
});
};
createCBP.createList();
diff --git a/client/cat3/src/partials/sections/dashboard/design/design.html b/client/cat3/src/partials/sections/dashboard/design/design.html
index 2823d9978..b0b0ea747 100644
--- a/client/cat3/src/partials/sections/dashboard/design/design.html
+++ b/client/cat3/src/partials/sections/dashboard/design/design.html
@@ -79,7 +79,7 @@
-
-
+
+
-
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html b/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html index 0916798ee..ccfcc7f56 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html @@ -37,8 +37,8 @@ No Data Found!
-
-
-
+
+
{{bp.name}}
{{selectedp.name}}
+
+
+
+ {{(+createCBP.SelectedBPList.indexOf(selectedp)) +1}} {{selectedp.name}}
-
-
-
+
+
-
+
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
index 38f656b00..7a1ca48fc 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
@@ -5,18 +5,18 @@
-
-
+
+
No Data Found!
-
-
+
+
@@ -28,7 +28,7 @@
- +
@@ -37,8 +37,8 @@
- +
-
-
+
+
@@ -50,7 +50,7 @@
-
+
diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js
index 754495528..bf52eb924 100644
--- a/client/cat3/src/partials/sections/dashboard/genericServices.js
+++ b/client/cat3/src/partials/sections/dashboard/genericServices.js
@@ -275,8 +275,8 @@
}
}
})
- .result.then(function(selectedItem) {
- //$scope.selected = selectedItem;
+ .result.then(function() {
+
}, function() {
});
diff --git a/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js b/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
index efc8e99d0..f9f9b6488 100644
--- a/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
@@ -19,7 +19,7 @@
$scope.allCBAttributes = [];
$scope.editRunListAttributes = [];
- $scope.getCookBookListForOrg = function(getCookBooks) {
+ $scope.getCookBookListForOrg = function() {
var p = workzoneEnvironment.getEnvParams();
genericServices.getTreeNew().then(function (orgs) {
$scope.organObject=orgs;
@@ -33,7 +33,7 @@
} else {
param = {
url: '/organizations/' + $scope.organObject[0].orgid + '/chefRunlist'
- }
+ };
}
genericServices.promiseGet(param).then(function (result) {
$scope.getCookBooks = result;
@@ -41,11 +41,11 @@
if(p){
params = {
url: '/d4dMasters/org/' + p.org + '/templateType/SoftwareStack/templates'
- }
+ };
}else {
params = {
url: '/d4dMasters/org/' + $scope.organObject[0].orgid + '/templateType/SoftwareStack/templates'
- }
+ };
}
genericServices.promiseGet(params).then(function (result) {
$scope.getTemplates = result;
@@ -78,11 +78,11 @@
$scope.isOrchestrationUpdateChefRunLoading = false;
$scope.init();
});
- }
+ };
$scope.getCookBookListForOrg();
function registerUpdateEvent(obj) {
obj.addListUpdateListener('updateList', $scope.updateAttributeList);
- };
+ }
$scope.init = function () {
$timeout(function () {
diff --git a/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js b/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
index 443a19070..369cb178c 100644
--- a/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
@@ -27,7 +27,7 @@
sch.interval[i].days.splice(sch.interval[i].days.indexOf(d),1);
}
if(sch.interval[i].days.length >0){
- sch.interval[i].daySelect=1
+ sch.interval[i].daySelect=1;
} else{
sch.interval[i].daySelect='';
}
@@ -44,7 +44,7 @@
var params={
url:'/instances/'+sch.instanceIds[0]
//url:'src/partials/sections/dashboard/workzone/data/oneIns.json'
- }
+ };
genericServices.promiseGet(params).then(function (result) {
sch.isScheduled=result.isScheduled;
sch.schedulerStartOn=moment(result.schedulerStartOn).format('MM/DD/YYYY');
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss
index 2eaccb24e..3b62220a4 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss
@@ -46,6 +46,10 @@
overflow-y: auto;
}
+ .titleName {
+ word-wrap: break-word;
+ }
+
.td-padding {
padding-left: 18px;
padding-top:16px;
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html
index 1e24c6147..21b542d0d 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html
@@ -1,7 +1,7 @@
-
@@ -306,9 +303,9 @@
×
-
Blueprint Information - {{blueprintInfo.name}}
+Blueprint Information - {{blueprintInfo.name}}
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
index ee04b891a..140d5f3e9 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
@@ -136,8 +136,6 @@
$scope.launchResponse = {error:message};
$scope.launchMessage = messageHelper.launchMessage();
});
- } else {
-
}
}
]);
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
index d7db20466..b9fd89e7e 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
@@ -70,7 +70,7 @@
};
workzoneServices.launchCompsiteBlueprint(compBlue).success(function() {
toastr.success('Successfully launched composite blueprint');
- return false;
+ $modalInstance.close(compBlue);
}).error(function(data) {
toastr.error(data.message, 'Error');
});
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
index a13dc1d31..7c8f1210f 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
@@ -250,7 +250,6 @@
so that it gets replaced with instanceIP*/
helper.setHostToIp(result.data.instances);
$scope.tabData = $scope.instanceList;
- console.log($scope.instanceList);
if ($scope.totalCards > $scope.paginationParams.pageSize) {
$scope.cardsAvailable = true;
} else {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
index 755cfba78..caabfde42 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
@@ -77,7 +77,7 @@
var params={
url:'/instances/'+cpInstance._id
//url:'src/partials/sections/dashboard/workzone/data/oneIns.json'
- }
+ };
genericServices.promiseGet(params).then(function (result) {
$scope.schedule={
instanceIds:[cpInstance._id],
@@ -98,7 +98,7 @@
$scope.schedule.interval[i].days.splice($scope.schedule.interval[i].days.indexOf(d),1);
}
if($scope.schedule.interval[i].days.length >0){
- $scope.schedule.interval[i].daySelect=1
+ $scope.schedule.interval[i].daySelect=1;
} else{
$scope.schedule.interval[i].daySelect='';
}
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss
index 5d6abad7e..e4e5f05e9 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss
@@ -208,6 +208,13 @@ $imagePath : "../../../../../../images";
padding: 12px 0;
}
+ .jenkins-job-links {
+ max-width: 225px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ height: 18px;
+ }
+
.chef-details-top {
width: 100%;
min-height: 184px;
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
index 92a85d5a5..502f64228 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
@@ -283,7 +283,7 @@
Jenkins
+
@@ -296,9 +296,6 @@
- Jenkins
-
-
Jenkins
-
-
-
+
+
+