From 724f5bc9b2a7ac7bbe45b6f7027d6b9e262ee510 Mon Sep 17 00:00:00 2001
From: “Kruthi <krutbhat@att.com>
Date: Fri, 22 May 2020 14:58:20 +0530
Subject: Veracode vulnerabilities - Removed jsp files, commented in js/html
 files, commented console.log in ts files

Change-Id: Ib88a33d0577c7c704d7e7c419641a530017e3650
Issue-ID: PORTAL-899
Signed-off-by: krutbhat@att.com
---
 .../webapp/WEB-INF/fusion/jsp/broadcast_list.jsp   | 219 ---------
 .../WEB-INF/fusion/jsp/webrtc/collaboration.jsp    | 505 ---------------------
 .../src/app/template/customSettingsTemplate.html   |   4 +-
 .../widget-settings-raptor-report-template.html    |  13 +-
 .../dashboard/widget-settings-template.html        |   4 +-
 .../fusion/scripts/webrtc/RTCMultiConnection.js    |   6 +-
 .../new-role-function.component.ts                 |   6 +-
 .../role-functions/role-functions.component.ts     |   2 +-
 .../admin/role-functions/role-functions.service.ts |  10 +-
 .../Report/security/security.component.ts          |  52 +--
 .../Report_List/Report/sql/sql.component.ts        |   2 +-
 .../app/pages/ext/profile/self/self.component.ts   |   4 +-
 12 files changed, 51 insertions(+), 776 deletions(-)
 delete mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
 delete mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
deleted file mode 100644
index 85c7ee8d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
+++ /dev/null
@@ -1,219 +0,0 @@
-<%--
-  ============LICENSE_START==========================================
-  ONAP Portal SDK
-  ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  ===================================================================
- 
-  Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
-  you may not use this software except in compliance with the License.
-  You may obtain a copy of the License at
- 
-              http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
-  Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
-  you may not use this documentation except in compliance with the License.
-  You may obtain a copy of the License at
- 
-              https://creativecommons.org/licenses/by/4.0/
- 
-  Unless required by applicable law or agreed to in writing, documentation
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
-  ============LICENSE_END============================================
- 
-  
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="com.fasterxml.jackson.databind.ObjectMapper" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ page import="java.io.StringWriter" %>
-<%@ page import="org.onap.portalsdk.core.web.support.ControllerProperties" %>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-  <script src="static/fusion/raptor/dy3/js/moment.min.js"></script>
-  <script>
-    function editMessage(messageLocationId, messageLocation, messageId) {
-      window.location='broadcast.htm?message_location_id='+messageLocationId + '&message_location=' + messageLocation + ((messageId != null) ? '&message_id=' + messageId : '');
-    }
-  </script>
-
-  <div class="pageTitle">
-  <h3>
-    Broadcast Messages
-    </h3>
-  </div>
-
-  <%-- Display a table for the broadcast messages of each message location --%>
-<div ng-controller="broadcastListController" > 	
-
-	<div ng-repeat="location in messageLocations" >
-		{{location.label}} Messages
-		<div title="{{location.label}} Messages" >
-
-		  	<table att-table table-data="location.messages" current-page="1">
-			  	<thead att-table-row type="header">
-			  		<tr>
-			  			<th att-table-header sortable="false" width="10%">No.</th>
-			  			<th att-table-header sortable="false" width="30%">Message Text</th>
-			  			<th att-table-header sortable="false" width="10%">Start Date</th>
-			  			<th att-table-header sortable="false" width="10%">End Date</th>
-			  			<th att-table-header sortable="false" width="10%">Sort Order</th>
-			  			<th att-table-header sortable="false" width="10%">Server</th>
-			  			<th att-table-header sortable="false" width="10%">Active?</th>
-			  			<th att-table-header sortable="false" width="10%">Delete?</th>
-			  		</tr>
-			  	</thead>
-			  	<tbody att-table-row type="body" row-repeat="message in location.messages" style="max-height: 980px;" ><!-- background colors will alternate not properly with multiple tbody-->
-				  <tr>
-				   {{message.id}}
-				    <td width="10%"><a href="javascript:editMessage({{location.value}},'{{location.label}}',{{message.id}});">{{$index+1}}</a></td>
-				    <td width="30%">{{message.messageText}}</td>
-				    <td width="10%">
-				    	{{message.displayStartDate}}
-				    </td>
-				    <td width="10%">{{message.displayEndDate}}</td>
-				    <td width="10%">{{message.sortOrder}}</td>
-				    <td width="10%">{{message.siteCd}}</td>
-				    <td width="10%">
-				    	<div ng-click="toggleActive(message);">
-				    		<input type="checkbox" ng-model="message.active" att-toggle-main>
-				    	</div>
-				    </td>
-				     <td att-table-body width="10%">
-					    <div ng-click="remove(message);" style="font-size:20px;"><a href="javascript:void(0)" class="icon-trash"></a></div>
-				     </td>
-				  </tr>
-				 
-				</tbody>
-			</table>
-		</div>
-		<input att-button btn-type="primary" size="small" class="button" type="button" value="Add" ng-click="editMessage(location);"/>
-  	  <br/><br/><br/>
-	</div>
-</div>
-
-<script>
-app.controller('broadcastListController', function ($scope){
-	//$scope.model.messagesList=${model.messagesList};
-	var messagesMap = {};
-	<%
-		ObjectMapper mapper = new ObjectMapper();
-		HashMap hmMessages = new HashMap();
-	    
-		HashMap objModel = (HashMap)request.getAttribute("model");
-		
-	    Object objMessages = objModel.get("messagesList");
-	    //System.out.println("messagesList: "+objMessages);
-	    if((objMessages!=null) && (objMessages instanceof HashMap))
-	    {
-	    	hmMessages= (HashMap)objMessages;
-	      Iterator it = hmMessages.entrySet().iterator();
-	      while (it.hasNext()) {
-	          Map.Entry pair = (Map.Entry)it.next();
-	          //System.out.println(pair.getKey() + " = " + pair.getValue());
-	          String pairValue = mapper.writeValueAsString(pair.getValue());
-	          //System.out.println(pairValue);
-	          %>
-	          messagesMap['<%=pair.getKey()%>'] = '<%=pairValue%>'
-	          <%
-	      }
-	    }
-	    
-	    Object messageLocationsObject =  objModel.get("messageLocations");
-	    //System.out.println("messageLocations: "+messageLocationsObject);
-		String messageLocationsString = mapper.writeValueAsString(messageLocationsObject);
-		//System.out.println(messageLocationsString);
-	%>
-	$scope.messagesList=messagesMap;	
-	$scope.messageLocations=<%=messageLocationsString%>;
-	console.log($scope.messageLocations);
-	
-	$.each($scope.messageLocations, function(i, a){ 
-		//var result = [];
-	    angular.forEach($scope.messagesList, function(value, key) {
-	    	if (key+'' === a.value+'') {
-	    		var objsJSON = JSON.parse(value);
-	    		
-	    		$.each(objsJSON, function(i, a){ 
-	    			var startDateLong = a.startDate;
-	    			var tempStartDate = new Date(startDateLong);
-	    			tempStartDate = moment(tempStartDate).format('DD MMM YYYY');//03 Jun 2013 04:15PM EDT - 'DD MMM YYYY hh:mmA zz'
-	    			a.displayStartDate=tempStartDate.toString();
-	    			
-	    			var endDateLong = a.endDate;
-	    			var tempEndDate = new Date(endDateLong);
-	    			tempEndDate = moment(tempEndDate).format('DD MMM YYYY');//03 Jun 2013 04:15PM EDT
-	    			a.displayEndDate=tempEndDate.toString();
-	    		});
-	    		a.messages = objsJSON;
-	        }
-	    }); 
-	    console.log(a.messages);
-	});	
-	;
-	
-	$scope.editMessage = function(location) {
-		editMessage(location.value, location.label);
-	};
-	
-	$scope.toggleActive = function(broadcastMessage) {
-
-		//alert('deleted'+role.name);
-		var uuu = "broadcast_list/toggleActive";
-		  var postData={broadcastMessage:broadcastMessage};
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			//window.location.reload();  
-			 },
-			 error : function(data){
-				 console.log(data);
-				 alert("Error while toggling: "+ data.responseText);
-			 }
-	  	  });
-	
-	
-	};
-	
-	$scope.remove = function(broadcastMessage) {
-
-			//alert('deleted'+role.name);
-			var uuu = "broadcast_list/remove";
-			  var postData={broadcastMessage:broadcastMessage};
-		  	  $.ajax({
-		  		 type : 'POST',
-		  		 url : uuu,
-		  		 dataType: 'json',
-		  		 contentType: 'application/json',
-		  		 data: JSON.stringify(postData),
-		  		 success : function(data){
-		  			window.location.reload();  
-				 },
-				 error : function(data){
-					 console.log(data);
-					 alert("Error while deleting: "+ data.responseText);
-				 }
-		  	  });
-		
-		
-	};
-});
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp
deleted file mode 100644
index 6c5342d4..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp
+++ /dev/null
@@ -1,505 +0,0 @@
-<%--
-  ============LICENSE_START==========================================
-  ONAP Portal SDK
-  ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  ===================================================================
- 
-  Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
-  you may not use this software except in compliance with the License.
-  You may obtain a copy of the License at
- 
-              http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
-  Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
-  you may not use this documentation except in compliance with the License.
-  You may obtain a copy of the License at
- 
-              https://creativecommons.org/licenses/by/4.0/
- 
-  Unless required by applicable law or agreed to in writing, documentation
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
-  ============LICENSE_END============================================
- 
-  
-  --%>
-
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml" ng-app="abs">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<link type="text/css" rel="stylesheet" href="app/fusion/styles/layout/layout-default-latest.css" />
-    <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/btn.css" >
-    <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/fn-ebz.css" >
-		<style type="text/css">
-	/*
-	 *	NOTE: All CSS is purely cosmetic - it does not affect functionality
-	 *  http://layout.jquery-dev.com/demos.cfm
-	 */
-
-	/* customize borders to avoid double-borders around inner-layouts */
-	.ui-layout-pane {
-		border:			0; /* override layout-default-latest.css */
-		border-top:		1px solid #BBB;
-		border-bottom:	1px solid #BBB;
-	}
-	.ui-layout-pane-north ,
-	.ui-layout-pane-south {
-		border:			1px solid #BBB;
-		overflow:		auto;
-	}
-	.ui-layout-pane-west ,
-	.ui-layout-pane-east {
-	}
-	.ui-layout-pane-center	{
-		border-left:	0;
-		border-right:	0;
-		}
-		.inner-center {
-			border:		1px solid #BBB;
-		}
-
-	/* add shading to outer sidebar-panes */
-	.outer-west ,
-	.outer-east {
-		background-color: #EEE;
-	}
-	.middle-west ,
-	.middle-east {
-		background-color: #F8F8F8;
-	}
-
-	/* remove padding & scrolling from panes that are 'containers' for nested layouts */
-	.outer-center ,
-	.middle-center {
-		border:			0; /* cosmetic */
-		padding:		0;
-		overflow:		auto;
-	}
-
-	/*
-	 *	customize borders on panes/resizers to make pretty
-	 */
-	.ui-layout-pane-west		{ border-right:		0; }
-	.ui-layout-resizer-west		{ border-left:		1px solid #BBB; }
-	.ui-layout-pane-east		{ border-left:		0; }
-	.ui-layout-resizer-east		{ border-right:		1px solid #BBB; }
-	.ui-layout-pane-north		{ border-bottom:	0; }
-	.ui-layout-resizer-north	{ border-top:		1px solid #BBB; }
-	.ui-layout-pane-south		{ border-top:		0; }
-	.ui-layout-resizer-south	{ border-bottom: 	1px solid #BBB; }
-	/*
-	 *	add borders to resizers when pane is 'closed'
-	 *
-	 *.ui-layout-resizer-closed	{ border:			1px solid #BBB; }
-	 */
-	/*
-	 *	show both borders when the resizer is 'dragging'
-	 */
-	.ui-layout-resizer-west-dragging ,
-	.ui-layout-resizer-east-dragging {
-		border-left:		1px solid #BBB;
-		border-right:		1px solid #BBB;
-	}
-	.ui-layout-resizer-north-dragging ,
-	.ui-layout-resizer-south-dragging {
-		border-top:		1px solid #BBB;
-		border-bottom:	1px solid #BBB;
-	}
-	
-	
-	/*
-	layout toggler background image
-	*/
-	.ui-layout-toggler-west, .ui-layout-toggler-east {
-	border-width: 1px 0;
-	background-image: url("static/fusion/images/layout/panel-e-w-toggle.png");
-	background-size: 10px 10px;
-    background-repeat: no-repeat;
-    background-position: center; 
-	}
-	
-	.ui-layout-toggler-north, .ui-layout-toggler-south {
-	border-width: 0 1px;
-	background-image: url("static/fusion/images/layout/panel-n-s-toggle.png");
-	background-size: 10px 10px;
-	background-repeat: no-repeat;
-	 background-position: center; 
-	}
-	
-	body{background-color:#fff;font-size:14px;font-size:.875rem;margin:0;padding:0px 0 20px;position:relative}
-
-	</style>
-
-
-	<!-- LAYOUT v 1.3.0 -->
-	<script type="text/javascript" src="app/fusion/scripts/layout/jquery-latest.js"></script>
-	<script type="text/javascript" src="app/fusion/scripts/layout/jquery-ui-latest.js"></script>
-	<script type="text/javascript" src="app/fusion/scripts/layout/jquery.layout-latest.js"></script>
-	<script type="text/javascript" src="app/fusion/scripts/webrtc/RTCMultiConnection.js"></script>
-    <script type="text/javascript" src="app/fusion/scripts/socket/peerBroadcast.js"></script>
-	<script type="text/javascript" src="app/fusion/scripts/layout/debug.js"></script>
-	
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/fn-ebz.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
-
-	<script src= "app/fusion/external/ebz/angular_js/angular.js"></script> 
-	<script src= "app/fusion/external/ebz/angular_js/angular-route.min.js"></script>
-	<script src= "app/fusion/external/ebz/angular_js/angular-sanitize.js"></script>
-	<script src= "app/fusion/external/ebz/angular_js/app.js"></script>
-	<script src= "app/fusion/external/ebz/angular_js/gestures.js"></script>
-	
-	<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-	<script src="app/fusion/scripts/modalService.js"></script>
-	<script src="app/fusion/scripts/att_angular_gridster/ui-gridster-tpls.js"></script>
-	<script src="app/fusion/scripts/att_angular_gridster/angular-gridster.js"></script>
-	<script src= "app/fusion/external/ebz/angular_js/checklist-model.js"></script>
-	<script type="text/javascript" src= "app/fusion/external/ebz/angular_js/angular-cookies.js"></script>
-	<style>
-		body{background-color:#fff;font-size:14px;font-size:.875rem;margin:0;padding:0px 0 20px;position:relative}
-	</style>
-
-	<script type="text/javascript">
-
-	
-	var popupModalService;
-	
-	app.controller("collaborationController", function ($scope,$http,modalService, $modal) { 
-		popupModalService = modalService;
-		   
-		});
-	
-
-	$(document).ready(function () {
-
-		// OUTER-LAYOUT
-		panelLayout = $('body').layout({
-			center__paneSelector:	".outer-center"
-		,	west__paneSelector:		".outer-west"
-		,	east__paneSelector:		".outer-east"
-		//,	west__size:				800
-		//,	east__size:				125
-		,	spacing_open:			8  // ALL panes
-		,	spacing_closed:			12 // ALL panes
-	
-		,	center__childOptions: {
-			center__paneSelector:	".inner-center"
-		,	west__paneSelector:		".inner-west"
-		,	east__paneSelector:		".inner-east"
-		,	west__size:				75
-		,	east__size:				75
-		,	spacing_open:			8  // ALL panes
-		,	spacing_closed:			8  // ALL panes
-		,	west__spacing_closed:	12
-		,	east__spacing_closed:	12
-		}
-
-		 
-
-		
-		});
-		
-	
-		function initializeConnections() {
-	    	
-	    	var channelId = null;
-			channelId = location.href.replace(/\/|:|#|%|\.|\[|\]/g, '');
-			var videoChannelId = channelId.concat("video");
-			var screenChannelId = channelId.concat("screen");
-			
-			videoConnection = new RTCMultiConnection(videoChannelId);
-			screenConnection = new RTCMultiConnection(screenChannelId);
-			
-			configConnection(videoConnection,true,true,false,true,false);
-		    configConnection(screenConnection,false,false,true,false,true);
-	    	
-	    };
-	    
-	    function configConnection(_connection, _audio, _video, _screen, _data, _oneway) {
-	    	 _connection.session = {
-	                 audio:     _audio, // by default, it is true
-	                 video:     _video, // by default, it is true
-	                 screen:    _screen,
-	                 data:      _data,
-	                 oneway:    _oneway,
-	                 broadcast: false
-	            };
-	    	 
-	    	 _connection.direction = "one-to-one";
-	    	 
-	    	 if( _data == true ) {
-	    	 _connection.onmessage = function(e) {
-	             appendDIV(e.data);
-
-	             console.debug(e.userid, 'posted', e.data);
-	             console.log('latency:', e.latency, 'ms');
-	         };
-	    	 }
-	    
-	     
-	    }; 
-	    
-	    function assignStreamToDom() {
-	    	
-	    	
-	    	screenConnection.screenbody = document.querySelector('.screenContainer1'); 
-	    	screenConnection.videobody = document.querySelector('.videoContainer2'); 
-	    	
-	    	videoConnection.screenbody = document.querySelector('.screenContainer2'); 
-	    	videoConnection.videobody = document.querySelector('.videoContainer1'); 
-	    };
-	    
-		function maximizeLayout() {
-	    	
-			// open the panes and maximize the window.
-		     top.window.resizeTo(screen.availWidth,screen.availHeight);
-		     panelLayout.open('west');
-		     // panelLayout.open('south'); is not working due to state initialization problem; debug to find out. so replacing the call with work around below - hack.
-	    	 $(".ui-layout-toggler-south-closed").first().click();
-		     
-		 };
-	    
-	   function minimizeLayout() {
-	    	
-			// close the panes and minimize the window.
-		     top.window.resizeTo(screen.availWidth - 2*screen.availWidth/3, screen.availHeight - screen.availHeight/2);
-		     panelLayout.close('west');
-		     // panelLayout.close('south'); is not working due to state initialization problem; debug to find out. so replacing the call with work around below - hack.
-	    	 $(".ui-layout-toggler-south-opened").first().click();
-	    };
-	    
-	    function emptyContainers() {
-	    	 $('.screenContainer1').empty(); 
-		     $('.videoContainer2').empty(); 
-		    	
-		     $('.screenContainer2').empty();  
-		     $('.videoContainer1').empty(); 
-	    };
-	    
-	    function appendDIV(div, parent) {
-	        if (typeof div === 'string') {
-	            var content = div;
-	            div = document.createElement('div');
-	            div.innerHTML =  content;
-	          };
-	          
-	          var chatOutput = document.getElementById('chat-output'),
-	            fileProgress = document.getElementById('file-progress');
-	    
-	          if (!parent) chatOutput.insertBefore(div, chatOutput.firstChild);
-	            else fileProgress.insertBefore(div, fileProgress.firstChild);
-
-	            div.tabIndex = 0;
-	            $('#chat-input').focus();
-	     };
-	     
-	     function confirmClose() {
-	    	 var message = "Are you sure you want to close the session?";
-	    	 
-	    	 if(popupModalService != undefined) {
-	    		 popupModalService.popupConfirmWin("Confirm", message, function(){ location.reload();});
-	    	 }
-	    	 
-	    	 else if (confirm(message) == true) {
-	    		     location.reload();
-	    		    //window.opener.location.reload(); // go to the parent window
-	    			//close();
-	    	    } else {
-	    	        // do nothing
-	    	    }
-	    	 
-	     };
-	     
-	     function notifyOthers() {
-	    	 
-	    	// var websocket = localStorage.getItem('notifySocket');
-	    	 //if( websocket != null) {
-	    		 // handling websocket peer broadcast session 
-	    		 var currentUser = "${sessionScope.user.sbcid}";
-	    		 var initialPageVisit = "${sessionScope.initialPageVisit}";
-	    		 var remoteUser = '';
-	    		 
-	    		 var userList = location.search.split('chat_id=')[1].split('-');
-	    		 for(var i=0;i<userList.length;i++) {
-	    			 if(userList[i] !== currentUser) {
-	    				 remoteUser = userList[i];
-	    				 break;
-	    			 }
-	    		 }
-	    		
-	    		socketSetup(initialPageVisit, currentUser, remoteUser,"socketSend");
-	    		
-	    		 
-	    		 
-	    		 
-	    	
-	    	 
-	     };
-	     
-	     function makeChatVisible() {
-	    	 
-	    	 $('#chat-input').css("visibility", 'visible');    	 
-	     };
-	    
-	    
-	    
-	     /* on click button enabled*/
-	     document.getElementById('share-screen').onclick = function() {
-	    
-	     emptyContainers();	 
-	     videoConnection.close();
-		 screenConnection.close();	 
-	     
-	     maximizeLayout();
-	     emptyContainers();
-	     makeChatVisible();
-	     
-	     videoConnection.open();
-	     screenConnection.open();
-	     
-	     
-	     notifyOthers();
-	     
-	    
-	    
-		};
-
-		 document.getElementById('stop-share-screen').onclick = function() {
-		 
-		 emptyContainers();
-		 
-		 videoConnection.close();
-		 screenConnection.close();
-		 
-		 confirmClose();
-		 
-		};
-
-		 document.getElementById('view-screen').onclick = function() {
-		
-		 maximizeLayout();
-		 emptyContainers();
-		 makeChatVisible();
-		 
-		 // timeout is required for the sharing to properly work
-		 setTimeout(function() { 
-			 screenConnection.connect();
-		 },2000);
-		 setTimeout(function() { 
-			 videoConnection.connect();
-		 },1000);
-		
-		 
-		};
-		
-		document.getElementById('chat-input').onkeypress = function(e) {
-	        if (e.keyCode !== 13 || !this.value) return;
-	        var message = "<b>${model.name}</b>: " + this.value;
-	        appendDIV(message);
-
-	        // sending text message
-	        videoConnection.send(message);
-
-	        this.value = '';
-	    };
-	    
-	    /*
-	    document.getElementById('file').onchange = function() {
-	    	videoConnection.send(this.files[0]);
-        };
-		*/
-		
-		
-		//document.querySelector('.screenContainerPane').appenChild(document.querySelector('.screenContainer'));
-		//document.querySelector('.videoContainerPane').appendChild(document.querySelector('.videoContainer'));
-		
-		//panelLayout.bindButton($('#share-screen'), 'open', 'outer-west');
-		//panelLayout.bindButton($('#stop-share-screen'), 'close', 'outer-west');
-		var videoConnection = null, screenConnection = null;
-		initializeConnections();
-		assignStreamToDom();
-		
-		// start the share
-		//document.getElementById('share-screen').click();
-		//
-		});
-	
-
-</script>
-
-
-</head>
-
-<body>
-<!--  
-	<button id="share-screen" hidden="true" style="display: none;" class="setup">Share Your Screen</button>
-    <button id="stop-share-screen" hidden="true" style="display: none;" class="setup">Stop Share Your Screen</button>
-    <button id="view-screen" hidden="true" style="display: none;" class="setup">View My Screen</button>   
-    
-    -->    
- 
-<div class="outer-center" style="position: absolute; left: 12px; right: 0px; top: 0px;bottom: 0px;">
-	<div class="inner-center">
-	
-	<!-- 	<jsp:include page="/WEB-INF/fusion/zul/chatOne.zul" /> -->
-	
-	
-	
-	<table style="width: 100%;">
-				<tbody><tr>
-                    <td>
-                        <button id="share-screen"  class="button button--primary button--small setup">Start Session</button>
-    				    <button id="stop-share-screen"  class="button button--primary button--small setup">Stop Session</button>
-    					<button id="view-screen" class="button button--primary button--small setup">View</button>       
-	
-                    </td>
-    
-                </tr>
-            </tbody>
-	
-                <tbody><tr>
-                    <td>
-                         <input type="text" id="chat-input" style="font-size: 1.2em;visibility:collapse;" placeholder="type here.."/>
-                         <div id="chat-output"></div>
-                    </td>
-                </tr>
-            </tbody>
-    </table>
-	
-		
-	</div>
-	<div id="inner-south" class="ui-layout-south">
-		<div class="videoContainer1"></div>
-		<div class="videoContainer2"></div>
- 		
-	</div>
-</div>
-
-<div class="outer-west">
-   <div class="screenContainer1"></div>
-   <div class="screenContainer2"></div>
-   <div ng-controller="collaborationController">
-   </div>
-</div>
-
-
-
-
-
-</body>
-</html>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/template/customSettingsTemplate.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/template/customSettingsTemplate.html
index be13a89b..e08e873b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/template/customSettingsTemplate.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/template/customSettingsTemplate.html
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<!--<div class="modal-header">
   <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="cancel()">&times;</button>
   <h3>Custom Settings Dialog for <small>{{widget.title}}</small></h3>
 </div>
@@ -16,4 +16,4 @@
 <div class="modal-footer">
   <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
   <button type="button" class="btn btn-primary" ng-click="ok()">OK</button>
-</div>
\ No newline at end of file
+</div> -->
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-raptor-report-template.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-raptor-report-template.html
index 7a533c3f..23f6d59e 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-raptor-report-template.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-raptor-report-template.html
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<!--<div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="cancel()">&times;</button>
   <h3>Widget Options <small>{{widget.title}}</small></h3>
 </div>
@@ -10,12 +10,12 @@
             <div style="margin-left:120px" class="col-sm-10">
                 <input type="text" class="form-control" name="widgetTitle" ng-model="result.title">
             </div>
-        </div> -->
+        </div> 
 
 <!-- <div>{{showFormFieldIds}}</div>
 <div>{{formFieldSelectedValues}}</div>
 <div>{{JSON.strigify(widget.reportData.formFieldList)}}</div>
- --> 	
+
 <form ng-show="true" class="row section-row" style="margin: 10px">        
 	    <form-builder ng-form-fields="reportData.formFieldList" ng-show-field-id="showFormFieldIds" ng-num-form-cols="reportData.numFormCols" ng-model="formFieldSelectedValues" ng-trigger-method="triggerOtherFormFields"></form-builder>
 </form>
@@ -33,8 +33,7 @@
             <div style="margin-left:120px" class="col-sm-10">
                 <input type="text" class="form-control" name="widgetTitle" ng-model="formfield_value">
             </div>
-        </div> -->
-	
+        </div> 
 
         <div ng-if="widget.settingsModalOptions.partialTemplateUrl"
              ng-include="widget.settingsModalOptions.partialTemplateUrl"></div>
@@ -47,7 +46,7 @@
 	      		</div>
 		    </div>
 	 	</div>
- -->              
+               
     </form>
     
 </div>
@@ -55,4 +54,4 @@
 <div class="modal-footer">
     <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
     <button type="button" class="btn btn-primary" ng-click="ok()">OK</button>
-</div>
\ No newline at end of file
+</div>-->
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-template.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-template.html
index a57d4366..13e652b9 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-template.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/components/directives/dashboard/widget-settings-template.html
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<!--<div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="cancel()">&times;</button>
   <h3>Widget Options <small>{{widget.title}}</small></h3>
 </div>
@@ -19,4 +19,4 @@
 <div class="modal-footer">
     <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
     <button type="button" class="btn btn-primary" ng-click="ok()">OK</button>
-</div>
\ No newline at end of file
+</div>-->
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js
index daf64413..a5fe1db7 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js
@@ -5978,8 +5978,8 @@
 
         //  CUSTOM CODE  // 
         // these servers are provided by research
-        iceServers.push({
-            url: '' /*TODO To test this WebRTC with some open stun and turn test servers*/
+        /*iceServers.push({
+            url: '' /*TODO To test this WebRTC with some open stun and turn test servers
         });
 
         iceServers.push({
@@ -5992,7 +5992,7 @@
             url: 'turn:207.140.168.120:443?transport=tcp',
             credential: 'harmfulmustard',
             username: 'ambient'
-        });
+        });*/
         
 
          //  CUSTOM CODE  // 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.ts
index 82d353d1..d0be5145 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/new-role-function/new-role-function.component.ts
@@ -136,11 +136,11 @@ export class NewRoleFunctionComponent implements OnInit {
         
         if (!exists && this.roleFunction.name.trim() != '' && this.roleFunction.code.trim() != '') {
           var postData = this.roleFunction;
-          console.log("saveRoleFunction post data :: ",postData);
+          //console.log("saveRoleFunction post data :: ",postData);
           this.adminService.saveRoleFunction(JSON.stringify(postData))
           .subscribe(_data => {
             this.showSpinner = false;
-            console.log("saveRoleFunction response",_data);
+            //console.log("saveRoleFunction response",_data);
             if (this.editRoleFunction) {
               this.editRoleFunction.name = this.roleFunction.name;
               this.passBackRoleFunctionPopup.emit(this.editRoleFunction);
@@ -153,7 +153,7 @@ export class NewRoleFunctionComponent implements OnInit {
               this.openConfirmationModal('Success', "Role function created successfully.");
             }  
           }, error =>{
-            console.log(error);
+            //console.log(error);
             this.showSpinner = false;
             this.openConfirmationModal('Error', error.message);
           });
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.component.ts
index 7170df50..118225d2 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.component.ts
@@ -105,7 +105,7 @@ export class RoleFunctionsComponent implements OnInit {
       this.result = JSON.parse(response.data);
       this.availableRoleFunctions = this.result.availableRoleFunctions;
       this.tableData = JSON.parse(this.result.availableRoleFunctions);
-      console.log("Table data : ", this.tableData);
+      //console.log("Table data : ", this.tableData);
       this.columns.push(new Column("name", "Name", ColumnTypes.TEXT, true, null));
       this.columns.push(new Column("code", "Code", ColumnTypes.TEXT, true, null));
       this.columns.push(new Column("type", "Type", ColumnTypes.RADIO, true, this.typeOptions));
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.service.ts
index b0595361..bd44a63d 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.service.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/role-functions/role-functions.service.ts
@@ -21,14 +21,14 @@ export class RoleFunctionsService implements RdpCrudInterface {
   constructor(private adminService: AdminService) { }
 
   add(data: any) {
-    console.log("Add method is getting called from RoleFunctionService data:: ", data);
+    //console.log("Add method is getting called from RoleFunctionService data:: ", data);
   }
 
 
   update(data: any): any {
     console.log("Update method is getting called from RoleFunctionService data:: ", data);
     return this.adminService.saveRoleFunction(data).subscribe(response => {
-      console.log("Success Response ", response);
+      //console.log("Success Response ", response);
       this.statusResponse.next("200");
     }, error => {
       console.log("Error ", error);
@@ -36,9 +36,9 @@ export class RoleFunctionsService implements RdpCrudInterface {
   }
 
   delete(data: any) {
-    console.log("Delete method is getting called from RoleFunctionService data::>> " + JSON.stringify(data));
+    //console.log("Delete method is getting called from RoleFunctionService data::>> " + JSON.stringify(data));
     this.adminService.deleteRoleFunction(data).subscribe(response => {
-      console.log("Repsonse : ", response);
+      //console.log("Repsonse : ", response);
       this.statusResponse.next("200");
 
     })
@@ -50,7 +50,7 @@ export class RoleFunctionsService implements RdpCrudInterface {
     response.subscribe(res => {
       editedData = res;
       let data = JSON.parse(JSON.parse(editedData.data).availableRoleFunctions);
-      console.log("Get Method called : ", data);
+      //console.log("Get Method called : ", data);
       this.updatedData.next(data);
     })
   }
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/security/security.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/security/security.component.ts
index b7e14bc6..6c994723 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/security/security.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/security/security.component.ts
@@ -71,7 +71,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseSecurityInfo) => {
       this.reportSecurityInfo = responseSecurityInfo;
 
-      console.log(this.reportSecurityInfo);
+      //console.log(this.reportSecurityInfo);
 
       this.reportOwnerId = this.reportSecurityInfo["ownerId"];
 
@@ -107,7 +107,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseUserList) => {
       this.reportUserList = responseUserList;
 
-      console.log(this.reportUserList);
+      //console.log(this.reportUserList);
 
       for(let ru=0; ru<this.reportUserList.length; ru++)
       {
@@ -132,7 +132,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseSecurityRoles) => {
       this.reportSecurityRoles = responseSecurityRoles;
 
-      console.log(this.reportSecurityRoles);
+      //console.log(this.reportSecurityRoles);
 
       for(let sr=0; sr<this.reportSecurityRoles.length; sr++)
       {
@@ -145,13 +145,13 @@ export class SecurityComponent implements OnInit {
           this.addRoleEditAccessArr[sr] = true;
         }
       }
-      console.log(this.reportSecurityRoles);
+      //console.log(this.reportSecurityRoles);
 
       this._securityService.getReportRoleList()
     .subscribe((responseRoleList) => {
       this.reportRoleList = responseRoleList;
 
-      console.log(this.reportRoleList);
+      //console.log(this.reportRoleList);
 
       for(let m=0; m<this.reportSecurityRoles.length; m++)
       {
@@ -194,7 +194,7 @@ export class SecurityComponent implements OnInit {
       }
     }
 
-    console.log(reportUserId);
+    //console.log(reportUserId);
 
     this._securityService.addReportUser(reportUserId)
     .subscribe((responseAddUser) => {
@@ -204,7 +204,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseUserList) => {
       this.reportUserList = responseUserList;
 
-      console.log(this.reportUserList);
+      //console.log(this.reportUserList);
 
       this.showUserListSpinner = false;
       });
@@ -227,7 +227,7 @@ export class SecurityComponent implements OnInit {
       }
     }
 
-    console.log(reportUserId);
+    //console.log(reportUserId);
 
     this._securityService.removeReportUser(reportUserId)
     .subscribe((responseRemoveUser) => {
@@ -237,7 +237,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseUserList) => {
       this.reportUserList = responseUserList;
 
-      console.log(this.reportUserList);
+      //console.log(this.reportUserList);
 
       this.showUserListSpinner = false;
       });
@@ -248,8 +248,8 @@ export class SecurityComponent implements OnInit {
 
   addUserEditAccess(reportUserId : string, reportUserIndex : number)
   {
-    console.log(reportUserId, reportUserIndex);
-    console.log(this.userEditAccessArr);
+    //console.log(reportUserId, reportUserIndex);
+    //console.log(this.userEditAccessArr);
     let readOnly="";
 
    if(this.userEditAccessArr[reportUserIndex] === true)
@@ -273,7 +273,7 @@ export class SecurityComponent implements OnInit {
     let roleId;
     this.showRoleListSpinner = true;
 
-    console.log(this.reportRoleList);
+    //console.log(this.reportRoleList);
 
     for(let ro=0; ro<this.reportRoleList.length; ro++)
     {
@@ -283,7 +283,7 @@ export class SecurityComponent implements OnInit {
       }
     }
 
-    console.log(roleId);
+    //console.log(roleId);
 
     this._securityService.addReportRole(roleId)
     .subscribe((addRoleResponse) => {
@@ -292,13 +292,13 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseSecurityRoles) => {
       this.reportSecurityRoles = responseSecurityRoles;
 
-      console.log(this.reportSecurityRoles);
+      //console.log(this.reportSecurityRoles);
 
       this._securityService.getReportRoleList()
     .subscribe((responseRoleList) => {
       this.reportRoleList = responseRoleList;
 
-      console.log(this.reportRoleList);
+      //console.log(this.reportRoleList);
 
       for(let m=0; m<this.reportSecurityRoles.length; m++)
       {
@@ -338,13 +338,13 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseSecurityRoles) => {
       this.reportSecurityRoles = responseSecurityRoles;
 
-      console.log(this.reportSecurityRoles);
+      //console.log(this.reportSecurityRoles);
 
       this._securityService.getReportRoleList()
     .subscribe((responseRoleList) => {
       this.reportRoleList = responseRoleList;
 
-      console.log(this.reportRoleList);
+      //console.log(this.reportRoleList);
 
       for(let m=0; m<this.reportSecurityRoles.length; m++)
       {
@@ -366,7 +366,7 @@ export class SecurityComponent implements OnInit {
 
   addRoleEditAccess(roleId : string, roleIndex : number)
   {
-    console.log(this.addRoleEditAccessArr);
+    //console.log(this.addRoleEditAccessArr);
     let readOnly = "";
 
     if(this.addRoleEditAccessArr[roleIndex] === true)
@@ -391,7 +391,7 @@ export class SecurityComponent implements OnInit {
     this.fetchCnt = 0;
     let finalPostObj = new Object();
 
-    // console.log(this.reportOwnerList);
+    // //console.log(this.reportOwnerList);
     for(let kl=0; kl<this.reportOwnerList.length; kl++)
     {
       if(this.reportOwnerList[kl]["name"] == this.reportOwner)
@@ -408,7 +408,7 @@ export class SecurityComponent implements OnInit {
     {
       finalPostObj["isPublic"] = "false";
     }
-    // console.log(finalPostObj);
+     //console.log(finalPostObj);
 
     this._securityService.saveSecurityTabInfo(finalPostObj)
     .subscribe((responseFinalPost) => {
@@ -420,13 +420,13 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseOwnerList) => {
       this.reportOwnerList = responseOwnerList;
 
-      console.log(this.reportOwnerList);
+      //console.log(this.reportOwnerList);
 
       this._securityService.getReportSecurityInfo()
     .subscribe((responseSecurityInfo) => {
       this.reportSecurityInfo = responseSecurityInfo;
 
-      console.log(this.reportSecurityInfo);
+      //console.log(this.reportSecurityInfo);
 
       this.reportOwnerId = this.reportSecurityInfo["ownerId"];
 
@@ -462,7 +462,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseUserList) => {
       this.reportUserList = responseUserList;
 
-      console.log(this.reportUserList);
+      //console.log(this.reportUserList);
 
       for(let ru=0; ru<this.reportUserList.length; ru++)
       {
@@ -487,7 +487,7 @@ export class SecurityComponent implements OnInit {
     .subscribe((responseSecurityRoles) => {
       this.reportSecurityRoles = responseSecurityRoles;
 
-      console.log(this.reportSecurityRoles);
+      //console.log(this.reportSecurityRoles);
 
       for(let sr=0; sr<this.reportSecurityRoles.length; sr++)
       {
@@ -500,13 +500,13 @@ export class SecurityComponent implements OnInit {
           this.addRoleEditAccessArr[sr] = true;
         }
       }
-      console.log(this.reportSecurityRoles);
+      //console.log(this.reportSecurityRoles);
 
       this._securityService.getReportRoleList()
     .subscribe((responseRoleList) => {
       this.reportRoleList = responseRoleList;
 
-      console.log(this.reportRoleList);
+      //console.log(this.reportRoleList);
 
       for(let m=0; m<this.reportSecurityRoles.length; m++)
       {
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts
index f8aa1ab6..62c7d7a4 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.ts
@@ -135,7 +135,7 @@ export class SQLComponent implements OnInit {
             } else {
                 this._http.get(environment.baseUrl + 'report/wizard/retrieve_def_tab_wise_data/InSession')
                     .subscribe((response) => {
-                        console.log(response);
+                       // console.log(response);
                         this._router.navigate(['v2/reports', 'Edit', response['reportId']]);
                     });
             }
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.ts
index 61b2a343..7396b23c 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.ts
@@ -103,7 +103,7 @@ export class SelfComponent implements OnInit {
 
   ngOnInit() {
     this.profileId = "";
-    console.log("ngOnInit called ",this.profileId);
+    //console.log("ngOnInit called ",this.profileId);
     if(this.route.snapshot.queryParams['profile_id']){
       this.profileId = this.route.snapshot.queryParams['profile_id'];
     }
@@ -155,7 +155,7 @@ export class SelfComponent implements OnInit {
 
     this.profileId = this.profile.id;
     this.ociavailableRoles = this.profile.roles;
-    console.log("Profile specific roles : ", this.ociavailableRoles);
+    //console.log("Profile specific roles : ", this.ociavailableRoles);
     this.ociTimeZones = JSON.parse(this.result.timeZones);
     this.ociCountries = JSON.parse(this.result.countries);
     this.stateList = JSON.parse(this.result.stateList);
-- 
cgit 1.2.3-korg