From 1148834bc4b10d00c1b1830b087357e63af8293f Mon Sep 17 00:00:00 2001
From: rb7147 <rb7147@att.com>
Date: Thu, 1 Feb 2018 12:07:13 -0500
Subject: Included Policy GUI Enhancements and validations

Added hover messages for all policy templates.
Resolved few sonar issues.
Added fixes for Policy GUI Validations.

Issue-ID: POLICY-597
Change-Id: I74abb92dd6ac8722d7869b6a316fad1d8db11d9c
Signed-off-by: rb7147 <rb7147@att.com>
---
 .../Editor/templates/item-context-menu.html        |  2 +-
 .../policy-models/Editor/templates/modals.html     | 63 +++++++++++++++-------
 .../policy-models/Editor/templates/navbar.html     |  8 +--
 .../Editor/templates/searchNavbar.html             | 30 +++++------
 4 files changed, 63 insertions(+), 40 deletions(-)

(limited to 'POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates')

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html
index 3c41fbc1d..732b99baa 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html
@@ -27,7 +27,7 @@
             </a>
         </li>
          <li ng-show="config.allowedActions.rename && temp.isFolder()">
-            <a href="" tabindex="-1" data-toggle="modal" data-target="#move" ng-show="renameId">
+            <a href="" tabindex="-1" data-toggle="modal" data-target="#moveScope" ng-show="renameId">
                 <i class="glyphicon glyphicon-edit"></i> Move Scope
             </a>
         </li>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html
index 1c33839f2..e50802090 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html
@@ -13,8 +13,8 @@
         <div ng-include data-src="'error-bar'" class="clearfix"></div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess">Cancel</button>
-        <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" autofocus="autofocus">Delete</button>
+        <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess" title="Close the Delete Scope Window.">Cancel</button>
+        <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" autofocus="autofocus" title="OnClick you can delete the Scopes.">Delete</button>
       </div>
       </form>
     </div>
@@ -42,8 +42,8 @@
         <div ng-include data-src="'error-bar'" class="clearfix"></div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess">Cancel</button>
-        <button type="submit" class="btn btn-primary" ng-disabled="!temp.model.versions" autofocus="autofocus">Delete</button>
+        <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess" title="Close the Delete Policy Window.">Cancel</button>
+        <button type="submit" class="btn btn-primary" ng-disabled="!temp.model.versions" autofocus="autofocus" title="OnClick you can delete the Policies.">Delete</button>
       </div>
       </form>
     </div>
@@ -62,7 +62,7 @@
             </div>
             <div class="modal-body">
               <label class="radio">Enter New Name : <b>{{temp.model.name}}</b></label>
-              <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus">
+              <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus" title="Enter the value without space or special characters.">
 
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
@@ -119,6 +119,29 @@
   </div>
 </div>  
 
+<div class="modal" id="moveScope" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+  <div class="modal-dialog">
+    <div class="modal-content">
+        <form ng-submit="move(temp)">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal">
+                  <span class="sr-only">Close</span>
+              </button>
+              <h4 class="modal-title">Move Scope</h4>
+            </div>
+            <div class="modal-body">
+              <div ng-include data-src="'path-selector'" class="clearfix"></div>
+              <div ng-include data-src="'error-bar'" class="clearfix"></div>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess">Cancel</button>
+              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess">Move</button>
+            </div>
+        </form>
+    </div>
+  </div>
+</div>  
+
 <div class="modal" id="switchVersion" data-toggle="modal" data-backdrop="static" data-keyboard="false">
   <div class="modal-dialog">
     <div class="modal-content">
@@ -131,16 +154,16 @@
             </div>
             <div class="modal-body">
               <label class="radio">Highest Version <b></b></label>
-              <input class="form-control" ng-disabled="true" ng-model="temp.tempModel.content.highestVersion" autofocus="autofocus">
+              <input class="form-control" ng-disabled="true" ng-model="temp.tempModel.content.highestVersion" autofocus="autofocus" title="The Field shows highest version of Policy.">
             </div>
              <div class="modal-body">
               <label class="radio">Active Version <b></b></label>
-              <select class="form-control" ng-model="temp.tempModel.content.activeVersion" ng-options="option for option in temp.tempModel.content.availableVersions" autofocus="autofocus"></select>
+              <select class="form-control" ng-model="temp.tempModel.content.activeVersion" ng-options="option for option in temp.tempModel.content.availableVersions" autofocus="autofocus" title="Enter the value not greater than highest version to switch policy."></select>
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
-              <button type="submit" class="btn btn-primary" ng-disabled="temp.tempModel.content.highestVersion === temp.tempModel.content.activeVersion">Save</button>
+              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess" title="OnClick SwitchVersion Window is closed.">Cancel</button>
+              <button type="submit" class="btn btn-primary" ng-disabled="temp.tempModel.content.highestVersion === temp.tempModel.content.activeVersion" title="OnClick Policy Version will be Switched.">Save</button>
             </div>
         </form>
     </div>
@@ -159,12 +182,12 @@
             </div>
             <div class="modal-body">
               <label class="radio">Enter new Policy Name to Clone <b>{{temp.model.name}}</b></label>
-              <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus">
+              <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus" title="Enter the PolicyName without space or special characters.">
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
-              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess">Clone</button>
+              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess" title="OnClick Clone Window is closed.">Cancel</button>
+              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" title="OnClick the Policy will be cloned.">Clone</button>
             </div>
         </form>
     </div>
@@ -183,12 +206,12 @@
             </div>
             <div class="modal-body">
               <label class="radio">Scope Name</label>
-              <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus">
+              <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus" title="Enter the ScopeName without space or special characters.">
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
             <div class="modal-footer">
-              <button id = "cancel" type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
-              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess">Create</button>
+              <button id = "cancel" type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess" title="OnClick Scope Window is closed.">Cancel</button>
+              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" title="OnClick Scope is created.">Create</button>
             </div>
         </form>
     </div>
@@ -207,12 +230,12 @@
             </div>
             <div class="modal-body">
               <label class="radio">Scope Name</label>
-              <input class="form-control" ng-model="temp.tempModel.subScopename" autofocus="autofocus">
+              <input class="form-control" ng-model="temp.tempModel.subScopename" autofocus="autofocus" title="Enter the SubScopeName without space or special characters.">
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
-              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess">Create</button>
+              <button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess" title="OnClick SubScope Window is closed.">Cancel</button>
+              <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" title="OnClick SubScope is created.">Create</button>
             </div>
         </form>
     </div>
@@ -236,8 +259,8 @@
             </div>
             <div class="modal-footer">
               <div ng-show="!fileUploader.requesting">
-                  <button type="button" class="btn btn-pedefault" data-dismiss="modal">Cancel</button>
-                  <button type="submit" class="btn btn-primary" ng-disabled="!uploadFileList.length || fileUploader.requesting">{{'upload' | translate}}</button>
+                  <button type="button" class="btn btn-pedefault" data-dismiss="modal" title="OnClick Import window is closed.">Cancel</button>
+                  <button type="submit" class="btn btn-primary" ng-disabled="!uploadFileList.length || fileUploader.requesting" title="OnClick Policy will be Imported.">{{'upload' | translate}}</button>
               </div>
               <div ng-show="fileUploader.requesting">
                   <span class="label label-warning">Uploading......</span>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/navbar.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/navbar.html
index dfac651ae..54c48da25 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/navbar.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/navbar.html
@@ -10,10 +10,10 @@
 		<div class="form-group col-sm-5" style="margin-top: 2%"></div>
 		<div class="form-group col-sm-4" style="margin-top: 2%" align="right" ng-hide="isDisabled">
 			<div class="btn-group">
-  				<button type="button" class="btn btn-primary" ng-show="superAdminId" data-toggle="modal" data-target="#newfolder" ng-click="touch()"><i class="glyphicon glyphicon-plus"></i>Add Scope</button>
-  				<button type="button" class="btn btn-primary" ng-show="importPolicyId" data-toggle="modal" data-target="#uploadfile" ng-show="config.allowedActions.upload" ng-click="touch()"> <i class="glyphicon glyphicon-upload"></i>Import</button>
-  				<button type="button" class="btn btn-primary" ng-show="exportPolicyId" data-toggle="modal" data-target="#exportPolicy" ng-show="config.allowedActions.exportPolicy"> <i class="glyphicon glyphicon-download"></i>Export</button>
-				<button class="btn btn-secondary" type="button" onClick="window.location='policy#/policy_SearchFilter';">Filter</button>
+  				<button type="button" class="btn btn-primary" ng-show="superAdminId" data-toggle="modal" data-target="#newfolder" ng-click="touch()" title="Create Scope for adding policies"><i class="glyphicon glyphicon-plus"></i>Add Scope</button>
+  				<button type="button" class="btn btn-primary" ng-show="importPolicyId" data-toggle="modal" data-target="#uploadfile" ng-show="config.allowedActions.upload" ng-click="touch()" title="On Click Popup will open to Import policies"> <i class="glyphicon glyphicon-upload"></i>Import</button>
+  				<button type="button" class="btn btn-primary" ng-show="exportPolicyId" data-toggle="modal" data-target="#exportPolicy" ng-show="config.allowedActions.exportPolicy" title="On Click Popup will open to Export policies"> <i class="glyphicon glyphicon-download"></i>Export</button>
+				<button class="btn btn-secondary" type="button" onClick="window.location='policy#/policy_SearchFilter';" title="On Click Navigaate to Search window">Filter</button> 
 			</div>
 		</div>
 	</div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
index 891e27b9c..f46c5b5dc 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
@@ -58,7 +58,7 @@ body {
 					<div class="input-group">
 						<div class="input-group" id="adv-search">
 							<input type="text" class="form-control"
-								placeholder="{{'search'}}..." ng-model="search.query" />
+								placeholder="{{'search'}}..." ng-model="search.query" title="Enter the value to filter policies."/>
 							<div class="input-group-btn">
 								<div class="btn-group" role="group">
 									<div class="dropdown dropdown-lg">
@@ -71,7 +71,7 @@ body {
 												<div class="form-group row">
 													<div class="form-group col-sm-4">
 														<label for="filter">Policy Type:</label> <select
-															class="form-control" ng-model="search.policyType">
+															class="form-control" ng-model="search.policyType" title="Select the PolicyType value.">
 															<option>action</option>
 															<option>config</option>
 															<option>closedLoop</option>
@@ -82,7 +82,7 @@ body {
 													<div class="form-group col-sm-8">
 														<label for="filter">Descriptive Type:</label> <select
 															class="form-control" ng-model="search.descriptiveScope"
-															ng-options="option for option in descriptiveScopeDictionaryDatas track by option"></select>
+															ng-options="option for option in descriptiveScopeDictionaryDatas track by option" title="Select Descriptive Scope value driven from Descriptive Scope dictionary."></select>
 													</div>
 												</div>
 												<div ng-if="search.policyType == 'closedLoop'">
@@ -90,21 +90,21 @@ body {
 														<div class="form-group col-sm-6">
 															<label>ClosedLoop Policy Type:</label><BR> <select
 																class="form-control"
-																ng-model="search.closedLooppolicyType">
+																ng-model="search.closedLooppolicyType" title="Select the ClosedLoop Policy Type value.">
 																<option>Config_Fault</option>
 																<option>Config_PM</option>
 															</select>
 														</div>
 														<div class="form-group col-sm-6">
 															<label>Onap Name:</label><BR> <select
-																class="form-control" ng-model="search.onapName"
+																class="form-control" ng-model="search.onapName" title="Select the dropdown value driven from ONAP (Common)Dictionary."
 																ng-options="option for option in onapNameDictionaryDatas track by option"></select>
 														</div>
 													</div>
 													<div class="form-group row">
 														<div class="form-group col-sm-6" ng-if="search.closedLooppolicyType == 'Config_PM'">
 															<label>D2 Service:</label><BR> <select
-																class="form-control" ng-model="search.d2Service">
+																class="form-control" ng-model="search.d2Service" title="Select the ClosedLoop D2 Service value.">
 																<option>Hosted Voice(Trinity)</option>
 																<option>vUSP</option>
 																<option>MCR</option>
@@ -115,7 +115,7 @@ body {
 														<div class="form-group col-sm-6"
 															ng-if="search.closedLooppolicyType == 'Config_PM'">
 															<label>Service Type:</label><BR> <select
-																class="form-control" ng-model="search.serviceType">
+																class="form-control" ng-model="search.serviceType" title="Select the Service Type Value.">
 																<option>Registration Failure(Trinity)</option>
 																<option>International Fraud(Trinity)</option>
 																<option>No Dial Tone(Trinity)</option>
@@ -128,13 +128,13 @@ body {
 														<div class="form-group col-sm-6"
 															ng-if="search.closedLooppolicyType == 'Config_Fault'">
 															<label>VNF Type:</label><BR> <select
-																class="form-control" ng-model="search.vnfType"
+																class="form-control" ng-model="search.vnfType" title="Select the ClosedLoop VNF Type value."
 																ng-options="option for option in vnfTypeDictionaryDatas track by option"></select>
 														</div>
 														<div class="form-group col-sm-6"
 															ng-if="search.closedLooppolicyType == 'Config_Fault'">
 															<label>Policy Status:</label><BR> <select
-																class="form-control" ng-model="search.policyStatus">
+																class="form-control" ng-model="search.policyStatus" title="Select the Policy Status value.">
 																<option>Active</option>
 																<option>InActive</option>
 															</select>
@@ -145,11 +145,11 @@ body {
 															ng-if="search.closedLooppolicyType == 'Config_Fault'">
 															<label>vPRO Action:</label><BR> <select
 																class="form-control" ng-model="search.vproAction"
-																ng-options="option for option in vsclActionDictionaryDatas track by option"></select>
+																ng-options="option for option in vsclActionDictionaryDatas track by option" title="Select vPRO Action value."></select>
 														</div>
 														<div class="form-group col-sm-6" ng-if="search.closedLooppolicyType == 'Config_Fault'">
 															<label>Bind Text Search to:</label><BR> <select
-																class="form-control" ng-model="search.bindTextSearch">
+																class="form-control" ng-model="search.bindTextSearch" title="Select the Bind Text Search value.">
 																<option>Email Address</option>
 																<option>Trigger Signature</option>
 																<option>Connect All Traps</option>
@@ -167,11 +167,11 @@ body {
 										</div>
 									</div>
 									<button type="button" class="btn btn-pedefault"
-										ng-click="refresh(search = null);">
+										ng-click="refresh(search = null);" title="Clear the selected values.">
 										<span aria-hidden="true">Clear</span>
 									</button>
 									<button type="button" class="btn btn-primary"
-										ng-click="searchPolicy(search);">
+										ng-click="searchPolicy(search);" title="Click on the button to search for policies after entering the fields.">
 										<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
 									</button>
 								</div>
@@ -183,8 +183,8 @@ body {
 		</div>
 		<div class="form-group col-sm-4" style="margin-top: 2%" align="right">
 			<div class="btn-group">
-  				<button class="btn btn-secondary" type="button" onClick="window.location='policy#/Editor';">Editor</button>
-				<button class="btn btn-primary" type="button" onClick="window.location='policy#/policy_SearchFilter';">Filter</button>
+  				<button class="btn btn-secondary" type="button" onClick="window.location='policy#/Editor';" title="OnClick navigate to Editor tab.">Editor</button>
+				<button class="btn btn-primary" type="button" onClick="window.location='policy#/policy_SearchFilter';" title="Search Policy window">Filter</button>
 			</div>
 		</div>
 	</div>
-- 
cgit 1.2.3-korg