Skip to content

Resolved QA Bugs & Added an entry for Seed Data - Composite. #677

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 2 commits into from
Aug 30, 2016
Merged

Resolved QA Bugs & Added an entry for Seed Data - Composite. #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
860771c
Resolved QA Bugs, Added Composite template type as part of seed data
srikanthv02 Aug 29, 2016
e7c8c2b
Added composite template type for new org
srikanthv02 Aug 29, 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
3 changes: 2 additions & 1 deletion client/cat3/src/factory/workzoneServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,8 @@
return $http.post(fullUrl(url),compositeBlueprint,Auth.getHeaderObject());
},
getAllCompsiteBlueprint:function () {
var url ='/composite-blueprints';
var p = workzoneEnvironment.getEnvParams();
var url ='/composite-blueprints?filterBy=organizationId:'+p.org+'+businessGroupId:'+p.bg+'+projectId:'+p.proj;
return $http.get(fullUrl(url),Auth.getHeaderObject());
},
getCompsiteBlueprintInfo:function (compositeBlueprintId) {
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="alert alert-info text-center" ng-show="blueprints.length===0">
No Blueprints Available
</div>
<div class="container" ng-init="getAllCompsiteBlueprint();">
<div class="container">
<accordion>
<div ng-if="blueprints.software_stack.length>0">
<accordion-group ng-init="accGroupStatus = {opened: isFirstOpen}" is-open="accGroupStatus.opened">
Expand Down
1 change: 1 addition & 0 deletions client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprintCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
$scope.requestParams=requestParams;
$scope.isBlueprintPageLoading = true;
$scope.blueprintListCards();
$scope.getAllCompsiteBlueprint();
});

angular.extend($scope, {
Expand Down
2 changes: 1 addition & 1 deletion client/htmls/private/ajax/Settings/CreateConfigManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
<div class="col-lg-6 col-md-6">
<label for="name">User Name:<span class="control-label redSpan">&nbsp;*</span></label>
<!-- <i class="icon-append fa fa-building"></i> -->
<input name="ctl00$MainContent$orgname" value="" id="loginname" class="form-control" type="text" cdata="catalyst" cat-validation="required,max15">
<input name="ctl00$MainContent$orgname" value="" id="loginname" class="form-control" type="text" cdata="catalyst" cat-validation="required">
</div>
<hr>

Expand Down
1 change: 1 addition & 0 deletions client/htmls/private/ajax/Settings/CreateDesignTemplateTypes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ <h4 class="widget-margin" style="color:black;">Design Template Type</h4>
<option value="arm">ARMTemplate</option>
<option value="ami">OS Image</option>
<option value="docker">Docker</option>
<option value="composite">Composite</option>
</select>

</div>
Expand Down
2 changes: 1 addition & 1 deletion client/htmls/private/ajax/Settings/CreateTemplates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h4 class="widget-margin" style="color:black;">Create Templates <span id="spnbui

<div class="col-lg-6 col-md-6" style="margin-top:5px;">
<label for="">Template Type:<span class="control-label redSpan">&nbsp;*</span></label>
<select id="templatetypename" ignoreoption="OSImage" class="choosetemplateType width-100" sourcepath="16" cdata="catalyst" datapath="masterjson.rows.row" onChange="if($(this).val().indexOf('Docker') >= 0) {$('.forDocker').show(); $('.notforDocker').hide();$('.notCFT').hide();}else {$('.forDocker').hide();$('.notforDocker').show();$('.forCFT').hide();}if($(this).val().indexOf('CloudFormation') >=0 || $(this).val().indexOf('ARMTemplate') >=0){$('.forDocker').hide(); $('.notforDocker').hide(); $('.forCFT').show();}">
<select id="templatetypename" ignoreoption="OSImage" class="choosetemplateType width-100" sourcepath="16" ignoreComposite="Composite" cdata="catalyst" datapath="masterjson.rows.row" onChange="if($(this).val().indexOf('Docker') >= 0) {$('.forDocker').show(); $('.notforDocker').hide();$('.notCFT').hide();}else {$('.forDocker').hide();$('.notforDocker').show();$('.forCFT').hide();}if($(this).val().indexOf('CloudFormation') >=0 || $(this).val().indexOf('ARMTemplate') >=0){$('.forDocker').hide(); $('.notforDocker').hide(); $('.forCFT').show();}">
</select>
</div>
<div class="col-lg-6 col-md-6" hidden>
Expand Down
24 changes: 0 additions & 24 deletions client/htmls/private/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,31 +1060,7 @@ <h4 class="modal-title">
"selectable": false,
"href": "javascript:void(0);",
"icon": "fa-lg fa-fw fa fa-tachometer"
}, {
"name": "userguide",
"text": "User Information",
"borderColor": "#000",
"nodes": [{
"name": "Guide",
"text": "User Guide",
"borderColor": "#000",
"href": "ajax/Settings/Catalyst-Guide.html",
"selectable": true,
"icon": "fa fa-lg fa-fw fa-file-pdf-o",
"target": "_blank",
}, {
"name": "Guide",
"text": "Videos",
"borderColor": "#000",
"href": "#ajax/Settings/videos.html",
"selectable": true,
"icon": "fa fa-lg fa-fw fa-file-video-o",
}],
"selectable": false,
"href": "javascript:void(0);",
"icon": "fa-lg fa-fw fa fa-book"
}

];

function loadSettingsTree() {
Expand Down
14 changes: 1 addition & 13 deletions client/htmls/private/js/dev/awsProduction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,18 +995,6 @@ $(document).ready(function() {

$.get('/d4dMasters/readmasterjsonnew/16', function(data) {
data = JSON.parse(data);
data.push({
_id: "54bde11187f86fa0130c7563",
templatetypename: "Composite",
designtemplateicon_filename: "Docker.png",
rowid: "b02de7dd-6101-4f0e-a95e-68d74cec86c0",
id: "16",
__v: 0,
active: true,
templatetype: "composite",
orgname_rowid: ["46d1da9a-d927-41dc-8e9e-7e926d927537"],
orgname: ["Phoenix"]
});
var rowLength = data.length;
var containerTemp = "";
var selectedrow = false;
Expand Down Expand Up @@ -1054,7 +1042,7 @@ $(document).ready(function() {
getDesignTypeImg = '/d4dMasters/image/4fdda07b-c1bd-4bad-b1f4-aca3a3d7ebd9__designtemplateicon__Cloudformation.png';
break;
case "composite":
getDesignTypeImg = 'img/composite.png';
getDesignTypeImg = '/d4dMasters/image/ba52a37d-c1e4-47bd-9391-327a95008a61__designtemplateicon__composite.png';
break;
}
getDesignTypeRowID = data[i]['rowid'];
Expand Down
9 changes: 7 additions & 2 deletions client/htmls/private/js/settingscommon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,9 @@ function CreateTableFromJson(formID, idFieldName, createFileName) {
case "CloudFormation":
imgpath = '/d4dMasters/image/4fdda07b-c1bd-4bad-b1f4-aca3a3d7ebd9__designtemplateicon__Cloudformation.png';
break;
case "Composite":
imgpath = '/d4dMasters/image/ba52a37d-c1e4-47bd-9391-327a95008a61__designtemplateicon__composite.png';
break;
}
}
} else {
Expand All @@ -652,6 +655,9 @@ function CreateTableFromJson(formID, idFieldName, createFileName) {
case "CloudFormation":
imgpath = '/d4dMasters/image/4fdda07b-c1bd-4bad-b1f4-aca3a3d7ebd9__designtemplateicon__Cloudformation.png';
break;
case "Composite":
imgpath = '/d4dMasters/image/ba52a37d-c1e4-47bd-9391-327a95008a61__designtemplateicon__composite.png';
break;
}
}
imageTD.html('');
Expand Down Expand Up @@ -1277,8 +1283,7 @@ function readform(formID) {
$.each(tempJSON, function(i, item) {
_rowid = item['rowid'];
$.each(item, function(k, v) { //columns
//console.log('1 k:' + k + ' 1 v :' + JSON.stringify(v));
if (k == curSelect.attr("id") && curSelect.attr("ignoreoption") != v) {
if (k == curSelect.attr("id") && curSelect.attr("ignoreoption") != v && curSelect.attr("ignoreComposite") != v) {
curSelect.append('<option value="' + v + '" rowid = "' + _rowid + '">' + v + '</option>');
}
});
Expand Down
Binary file modified seed/mongodump/devops_new/d4dmastersnew.bson
View file
Open in desktop
Binary file not shown.
8 changes: 6 additions & 2 deletions server/app/routes/v1.0/routes_d4dMasters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2351,7 +2351,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
res.status(500).send("Failed to save Org.");
return;
}
for (var x1 = 0; x1 < 5; x1++) {
for (var x1 = 0; x1 < 6; x1++) {
(function(x1) {
var templatetypename;
var designtemplateicon_filename;
Expand All @@ -2373,10 +2373,14 @@ module.exports.setRoutes = function(app, sessionVerification) {
templatetypename = "ARMTemplate";
designtemplateicon_filename = "CloudFormation.png";
templatetype = "arm";
} else {
} else if(x1 === 4) {
templatetypename = "Docker";
designtemplateicon_filename = "Docker.png";
templatetype = "docker";
} else {
templatetypename = "Composite";
designtemplateicon_filename = "composite.png";
templatetype = "composite";
}

var templateTypeData = {
Expand Down