Skip to content

UI Modifications and QA Bugs resolved #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 25, 2016
Merged

UI Modifications and QA Bugs resolved #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcfb1d9
QA Bugs fixed and enhancements
srikanthv02 Nov 24, 2016
597b997
Changed delete button color in design
srikanthv02 Nov 24, 2016
79f29ca
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 24, 2016
ec0a81b
After copy of blueprint
srikanthv02 Nov 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/cat3/src/partials/sections/card/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,12 @@ $imagePath : "/cat3/images";

.bp-version-dropdown-wrapper {
height: 40px;
margin: 4px 0 0 19px;
margin: 4px 0 0 36px;
}

.bp-version-dropdown-wrapper-docker {
height: 31px;
margin: -3px 0 0 19px;
margin: -3px 0 0 36px;
}

.btnicons {
Expand Down Expand Up @@ -392,11 +392,11 @@ $imagePath : "/cat3/images";
}

.blueprint-buttons {
margin: 0 0 0 32px;
margin: 0 0 0 45px;
}

.blueprint-buttons-docker {
margin: 5px 0 0 32px;
margin: 5px 0 0 45px;
}

.bp-version-dropdown {
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
var dockerTemplates = $scope.dockerTemplateList;
for(var j=0;j<dockerTemplates.length;j++){
if(dockerTemplates[j]._id === $scope.dockerTemplateForTag){
$scope.dockerTemplateName = dockerTemplates[j].dockercontainerpaths.replace(/\//g, "$$$");
$scope.dockerTemplateName = dockerTemplates[j].dockercontainerpaths;
$scope.dockerTemplateTypeName = dockerTemplates[j].templatename;
$scope.dockerLaunchParameters = ' --name ' + dockerTemplates[j].templatename;
if(dockerTemplates[j].dockerreponame !== ''){
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@
providerId:blueprintCreation.newEnt.providers,
region:blueprintCreation.newEnt.region,
templateType:$state.params.templateObj.templatetype,
domainNameCheck:blueprintCreation.newEnt.domainCheck,
name:blueprintCreation.newEnt.blueprintName
};
if($scope.bpTypeName === 'OSImage'){
Expand All @@ -720,7 +721,6 @@

if($scope.bpTypeName === 'OSImage' || $scope.bpTypeName === 'SoftwareStack') {
if($scope.providerType === 'AWS'){
blueprintCreateJSON.domainNameCheck = blueprintCreation.newEnt.domainCheck
blueprintCreateJSON.blueprintType = 'instance_launch';
blueprintCreateJSON.instanceCount = blueprintCreation.newEnt.instanceCount;
} else if($scope.providerType === 'AZURE'){
Expand Down
31 changes: 15 additions & 16 deletions client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,55 +28,54 @@
angular.forEach(pbList.blueprintList.list.data, function(val){
if(val.templateType === 'docker'){
var dockerOptions = [
{ name:'Name',minWidth:150,field:'name'},
{ name:'Docker Path',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpaths'},
{ name:'Docker Path Title',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpathstitle'},
{ name:'Docker RepoTag',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockerrepotags'},
{ name:'Name',minWidth:150,field:'name',cellTooltip: true},
{ name:'Docker Path',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpaths',cellTooltip: true},
{ name:'Docker Path Title',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpathstitle',cellTooltip: true},
{ name:'Docker RepoTag',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockerrepotags',cellTooltip: true},
{ name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch" ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
'&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
];
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:'<div>{{grid.appScope.getTemplate(row.entity.templateType)}}</div>'},
{ 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:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch" ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
'&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
];
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:'<div>{{grid.appScope.getTemplate(row.entity.templateType)}}</div>'},
{ name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch" ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
'&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
];
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:'<div>{{grid.appScope.getTemplate(row.entity.templateType)}}</div>'},
{ name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch" ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
'&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
'&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete" ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
];
bpcolumnDefs = cftOptions;
}
Expand Down
3 changes: 3 additions & 0 deletions client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
createCBP.compositeBPType='chef';
$scope.chefrunlist,$scope.cookbookAttributes = [];
createCBP.onSubmit =false;
$scope.compositeEnabled = true;
createCBP.newEnt={
bpName:''
};
Expand Down Expand Up @@ -65,6 +66,7 @@
};
$scope.compositeSave =function () {
createCBP.onSubmit =true;
$scope.compositeEnabled = false;
if(!createCBP.newEnt.bpName || !createCBP.SelectedBPList.length > 0){
return true;
}
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/design/design.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<li ng-if="state.params.templateObj.templatetypename !== 'Composite'" ng-class="{'active':state.current.name === 'dashboard.design.add'}" ui-sref="dashboard.design.add({providerName:state.params.providerName,templateObj:state.params.templateObj})"><a style="font-weight:600" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> New</a></li>
<li ng-if="state.params.templateObj.templatetypename === 'Composite'" ng-class="{'active':state.current.name === 'dashboard.design.compositeNew'}" ui-sref="dashboard.design.compositeNew({providerName:state.params.providerName,templateObj:state.params.templateObj})"><a style="font-weight:600" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> New</a></li>
<li class="form-group pull-right filter-btn" style="padding: 8px;" >
<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
<button type="button" title="Filter" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
</button>
</li>
Expand Down
142 changes: 18 additions & 124 deletions client/cat3/src/partials/sections/dashboard/design/design.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@ label {
.activeLi{
background: #E2E2E2 !important;
}
.bpListComp :hover{
cursor:move !important;
}
.badge :hover{
cursor: pointer !important;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
1 change: 1 addition & 0 deletions client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
};
genericServices.promisePost(params).then(function () {
toastr.success('Successfully copied.');
$rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT');
});
});
};
Expand Down
3 changes: 2 additions & 1 deletion client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
<div class="col-sm-2 col-lg-2 col-md-2 blueprintTemplate blueprintTemplateSelected" ng-show="templateSelected.templatetypename !== 'Docker'">
<ul class="list-unstyled system-prop" style="text-align:center;">
<li ng-if="templateSelected.templatetypename === 'SoftwareStack' || templateSelected.templatetypename === 'CloudFormation' || templateSelected.templatetypename === 'ARMTemplate'">
<img style="height:40px;width:auto;" alt="templateLogo" ng-src="{{logo}}">
<img style="height:40px;width:auto;" ng-if="templateSelected.templatesicon_filePath" alt="templateLogo" ng-src="{{filePath}}">
<img style="height:40px;width:auto;" ng-if="!templateSelected.templatesicon_filePath" ng-src="{{logo}}">
</li>
<li ng-if="templateSelected.osType">
<img style="height:40px;width:auto;" alt="OSImage" ng-src="{{osImageLogo}}">
Expand Down
Loading