From 4cc1e4b946aedcf6c34550d1903e9bd13e6e160b Mon Sep 17 00:00:00 2001
From: "Chinthakayala, Sheshashailavas" <sc2914@att.com>
Date: Fri, 7 Apr 2017 08:18:56 -0900
Subject: [SDNC-5] added yang upload

and added break node

Change-Id: I8d36b5d400a51a6ebc248b100f04284cf27abcad
Signed-off-by: Chinthakayala, Sheshashailavas <sc2914@att.com>

Former-commit-id: ae6804f3c5805f78198b26de88ceb6dfa9bb335b
---
 dgbuilder/public/red/main.js         | 15 ++++++++++-----
 dgbuilder/public/red/ui/view.js      |  2 +-
 dgbuilder/public/util/js/dgeToXml.js |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'dgbuilder/public')

diff --git a/dgbuilder/public/red/main.js b/dgbuilder/public/red/main.js
index 77b5cdfe..27032a26 100644
--- a/dgbuilder/public/red/main.js
+++ b/dgbuilder/public/red/main.js
@@ -392,8 +392,7 @@ var RED = (function() {
                                  .always(function() {
 				});
 	}
-		
-	/*
+	/*	
 	function  listYangFiles(){
 		yangFilesList=[];
 		var divStyle="<style>#list-yang-data-container a { color: #067ab4; font-size: 0.75em;} #list-yang-data-container a:hover { text-decoration: underline; padding: -15px -15px -15px 15px; } .header { height: 40px; border-bottom: 1px solid #EEE; background-color: #ffffff; height: 40px; -webkit-border-top-left-radius: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-topleft: 5px; -moz-border-radius-topright: 5px; border-top-left-radius: 5px; border-top-right-radius: 5px; } .footer { height: 40px; background-color: whiteSmoke; border-top: 1px solid #DDD; -webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-right-radius: 5px; -moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomright: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }</style>";
@@ -1547,16 +1546,22 @@ Added this logic because , when the configuration item is choosen in the menu th
             options: [
                 {id:"btn-sidebar",icon:"fa fa-columns",label:"Sidebar   (Ctrl+Space)",toggle:true,onselect:RED.sidebar.toggleSidebar},
                 null,
+                {id:"btn-manage-yang-modules-menu",icon:"fa fa-sign-in",label:"Manage Yang Modules",options:[
+                    {id:"btn-yang-upload",icon:"fa fa-clipboard",label:"Upload Yang File",onselect:RED.view.showYangUploadDialog},
+                    {id:"btn-available-yang-modules",icon:"fa fa-clipboard",label:"Available Yang Modules",onselect:showAvailableYangModules},
+                    {id:"btn-list-yang-files",icon:"fa fa-clipboard",label:"List Yang Files",onselect:listYangFiles},
+                ]},
+                null,
                 {id:"btn-configure-upload",icon:"fa fa-book",label:"Configuration",toggle:false,onselect:updateConfiguration},
                 null,
                 {id:"btn-manage-tabs",icon:"fa fa-info",label:"Manage Tabs",toggle:false,onselect:showSelectedTabs},
                 null,
-                {id:"btn-find-dgnumber",icon:"fa fa-info",label:"Search Text (Ctrl+[)",toggle:false,onselect:RED.view.showSearchTextDialog},
+                {id:"btn-search-text",icon:"fa fa-info",label:"Search Text (Ctrl+[)",toggle:false,onselect:RED.view.showSearchTextDialog},
                 null,
                 {id:"btn-find-dgnumber",icon:"fa fa-info",label:"Find Node (Ctrl+B)",toggle:false,onselect:RED.view.showDgNumberDialog},
                 null,
-                /*{id:"btn-loop-detection",icon:"fa fa-info",label:"Loop Detection",toggle:true,onselect:performLoopDetection},
-               null ,*/
+		{id:"btn-request-input",icon:"fa fa-info",label:"RPC Input (Ctrl+O)",toggle:false,onselect:RED.view.showRequestTemplateDialog},
+                null,
                 {id:"btn-node-status",icon:"fa fa-info",label:"Node Status",toggle:true,onselect:toggleStatus},
                 null,
                 {id:"btn-node-dgnumber",icon:"fa fa-info",label:"Show Node Numbers",toggle:true,onselect:toggleDgNumberDisplay},
diff --git a/dgbuilder/public/red/ui/view.js b/dgbuilder/public/red/ui/view.js
index 0109d1ed..707bde9e 100644
--- a/dgbuilder/public/red/ui/view.js
+++ b/dgbuilder/public/red/ui/view.js
@@ -1700,7 +1700,7 @@ RED.view = (function() {
 		$(function() {
 			var htmlStr= "<div id='yang-upload-div' style='width:375;height:225'>" +
 			'<form id="uploadForm" name="uploadForm" enctype="multipart/form-data" action="/api/uploadyang" method="post" >' + 
-			"<input id='yang-file-id' name='yangFile' type='file' accept='.yang,.zip'><p style='font-size:0.7em'><i>For Module depending on multiple yang files, zip them and upload the zip file</i</p><br><br><br><br><br><p id='yang-upload-status'></p>" +
+			"<input id='yang-file-id' name='yangFile' type='file' accept='.yang,.zip'><p style='font-size:0.7em'><i>For Module depending on multiple yang files, zip them and upload the zip file. The zip file name should match the exact name of the module with .zip extension</i</p><br><br><br><br><br><p id='yang-upload-status'></p>" +
 			//'<input id="upload-yang-button-id"  style="font-size:1em;font-weight:bold" type="button" value="Upload Yang" name="upload-yang-button">' +
 			"</form></div>";
 
diff --git a/dgbuilder/public/util/js/dgeToXml.js b/dgbuilder/public/util/js/dgeToXml.js
index 2bbb0c15..7582d275 100644
--- a/dgbuilder/public/util/js/dgeToXml.js
+++ b/dgbuilder/public/util/js/dgeToXml.js
@@ -522,7 +522,7 @@ function customValidation(currNodeSet){
 				}
 
 				//console.log("parentNodeType:" + parentNodeType);
-				if(countChildLogicNodes >1 && parentNodeType != 'block' ){
+				if(countChildLogicNodes >1 && parentNodeType != 'block' && parentNodeType != 'for' ){
 					if(node.dgnumber != undefined &&  node.dgnumber){
 						flowDesignErrors.push("Warning:May need a block Node after Node. <br><span style='color:red'>Node Name:</span>" + node.name + "<br><span style='color:red'>DG Number:</span>" + node.dgnumber[0] );
 					}else{
-- 
cgit 1.2.3-korg