From 860771ccf53ea358b5c5e9734d2bf55d9a74e022 Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Mon, 29 Aug 2016 17:59:39 +0530
Subject: [PATCH 1/2] Resolved QA Bugs, Added Composite template type as part
 of seed data

---
 client/cat3/src/factory/workzoneServices.js   |   3 ++-
 .../workzone/blueprint/blueprint.html         |   2 +-
 .../workzone/blueprint/blueprintCtrl.js       |   1 +
 .../ajax/Settings/CreateConfigManagement.html |   2 +-
 .../Settings/CreateDesignTemplateTypes.html   |   1 +
 .../ajax/Settings/CreateTemplates.html        |   2 +-
 client/htmls/private/index.html               |  24 ------------------
 client/htmls/private/js/dev/awsProduction.js  |  14 +---------
 client/htmls/private/js/settingscommon.js     |   9 +++++--
 seed/mongodump/devops_new/d4dmastersnew.bson  | Bin 6164 -> 6454 bytes
 10 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js
index 345a160d1..bb660eabf 100644
--- a/client/cat3/src/factory/workzoneServices.js
+++ b/client/cat3/src/factory/workzoneServices.js
@@ -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) {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.html
index 594d028e5..3d5794062 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.html
@@ -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">
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprintCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprintCtrl.js
index 98284eb2b..3724ea945 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprintCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprintCtrl.js
@@ -75,6 +75,7 @@
 				$scope.requestParams=requestParams;
 				$scope.isBlueprintPageLoading = true;
 				$scope.blueprintListCards();
+				$scope.getAllCompsiteBlueprint();
 			});
 			
 			angular.extend($scope, {
diff --git a/client/htmls/private/ajax/Settings/CreateConfigManagement.html b/client/htmls/private/ajax/Settings/CreateConfigManagement.html
index d80aab7a6..c1433e5ad 100755
--- a/client/htmls/private/ajax/Settings/CreateConfigManagement.html
+++ b/client/htmls/private/ajax/Settings/CreateConfigManagement.html
@@ -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>
                                           
diff --git a/client/htmls/private/ajax/Settings/CreateDesignTemplateTypes.html b/client/htmls/private/ajax/Settings/CreateDesignTemplateTypes.html
index 3aabc9865..6c70b18a9 100755
--- a/client/htmls/private/ajax/Settings/CreateDesignTemplateTypes.html
+++ b/client/htmls/private/ajax/Settings/CreateDesignTemplateTypes.html
@@ -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>
diff --git a/client/htmls/private/ajax/Settings/CreateTemplates.html b/client/htmls/private/ajax/Settings/CreateTemplates.html
index 5417134a9..452103221 100755
--- a/client/htmls/private/ajax/Settings/CreateTemplates.html
+++ b/client/htmls/private/ajax/Settings/CreateTemplates.html
@@ -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>
diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html
index c97388058..bdbf09039 100644
--- a/client/htmls/private/index.html
+++ b/client/htmls/private/index.html
@@ -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() {
diff --git a/client/htmls/private/js/dev/awsProduction.js b/client/htmls/private/js/dev/awsProduction.js
index a51c7ef4a..7fee0e0eb 100644
--- a/client/htmls/private/js/dev/awsProduction.js
+++ b/client/htmls/private/js/dev/awsProduction.js
@@ -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;
@@ -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'];
diff --git a/client/htmls/private/js/settingscommon.js b/client/htmls/private/js/settingscommon.js
index accf746e2..f930a4106 100755
--- a/client/htmls/private/js/settingscommon.js
+++ b/client/htmls/private/js/settingscommon.js
@@ -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 {
@@ -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('');
@@ -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>');
 							}
 						});
diff --git a/seed/mongodump/devops_new/d4dmastersnew.bson b/seed/mongodump/devops_new/d4dmastersnew.bson
index 30dd92ec23496cb2acb0242b0d32c9032095818b..e8ca9e56ddf61385fd623c5f6f5d74b307ae8168 100644
GIT binary patch
delta 161
zcmbPYu+3<Lh=j2cBLf3_d}azm_z_u$1TK5qx(9WlOeLwg1v!Z&sU?*Ksd<UHsSI2U
z3=Gcsxdr*fnI)6=3(Lpy0R@tw0;zfhdFc!&n!p<1@(fHx`Q<=6RDqh35>1T~jm=YZ
klMPc%bWO~YQgkhiEe&;zjm#4*O$`hz63q-JCyEvW0F|vTfB*mh

delta 7
OcmdmHG{s<phy(x(Ap(g2


From e7c8c2b2f9d2dc14aace5b38b05f724e1e3e198a Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Mon, 29 Aug 2016 19:44:14 +0530
Subject: [PATCH 2/2] Added composite template type for new org

---
 server/app/routes/v1.0/routes_d4dMasters.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index f4a2f1dee..3d56b1bfc 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -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;
@@ -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 = {