Fixed the Refresh cache issue.
Fixed the Popup modal css issue.
Fixed the cosmetic issues.
Issue-Id: POLICY-310
Change-Id: Ib41713a6f9a6573667d7b4ae6836e411dc32c854
Signed-off-by: rb7147 <rb7147@att.com>
16 files changed:
case clVarbind :
VarbindDictionary varbindDictionary = (VarbindDictionary)mapper.readValue(root.get("data").toString(), VarbindDictionary.class);
value = varbindDictionary.getVarbindName();
case clVarbind :
VarbindDictionary varbindDictionary = (VarbindDictionary)mapper.readValue(root.get("data").toString(), VarbindDictionary.class);
value = varbindDictionary.getVarbindName();
- policyList = searchElkDatabase(closedloop, "jsonBodyData.triggerSignaturesUsedForUI.signatures",value);
+ policyList = searchElkDatabase(closedloop, "jsonBodyData","*"+value+"*");
break;
case clVnf :
VNFType vNFType = (VNFType)mapper.readValue(root.get("data").toString(), VNFType.class);
value = vNFType.getVnftype();
break;
case clVnf :
VNFType vNFType = (VNFType)mapper.readValue(root.get("data").toString(), VNFType.class);
value = vNFType.getVnftype();
- policyList = searchElkDatabase(closedloop, "jsonBodyData.vnfType",value);
+ policyList = searchElkDatabase(closedloop, "jsonBodyData","*"+value+"*");
break;
case clVSCL :
VSCLAction vsclAction = (VSCLAction)mapper.readValue(root.get("data").toString(), VSCLAction.class);
value = vsclAction.getVsclaction();
break;
case clVSCL :
VSCLAction vsclAction = (VSCLAction)mapper.readValue(root.get("data").toString(), VSCLAction.class);
value = vsclAction.getVsclaction();
- policyList = searchElkDatabase(closedloop, "jsonBodyData.actions",value);
+ policyList = searchElkDatabase(closedloop, "jsonBodyData","*"+value+"*");
break;
case decision :
DecisionSettings decisionSettings = (DecisionSettings)mapper.readValue(root.get("data").toString(), DecisionSettings.class);
break;
case decision :
DecisionSettings decisionSettings = (DecisionSettings)mapper.readValue(root.get("data").toString(), DecisionSettings.class);
</div>
<div class="form-group row">
<div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.varbindOID.$invalid && !formdata.varbindOID.$pristine }">
</div>
<div class="form-group row">
<div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.varbindOID.$invalid && !formdata.varbindOID.$pristine }">
- <label>Varbind OID:</label><br>
+ <label>Varbind OID:<sup><b>*</b></sup></label><br>
<input type="text" ng-model="editCLVarbind.varbindOID" class="form-control" name= "varbindOID" required/>
<p ng-show="formdata.varbindOID.$invalid && !formdata.varbindOID.$pristine" class="help-block">Varbind OID is required.</p>
</div>
<input type="text" ng-model="editCLVarbind.varbindOID" class="form-control" name= "varbindOID" required/>
<p ng-show="formdata.varbindOID.$invalid && !formdata.varbindOID.$pristine" class="help-block">Varbind OID is required.</p>
</div>
<div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.name.$invalid && !formdata.name.$pristine }">
<label>UUID:<sup><b>*</b></sup></label><br>
<input type="text" ng-model="editDCAEuuid.name" class="form-control" name= "name" required/>
<div class="form-group col-sm-6" ng-class="{ 'has-error' : formdata.name.$invalid && !formdata.name.$pristine }">
<label>UUID:<sup><b>*</b></sup></label><br>
<input type="text" ng-model="editDCAEuuid.name" class="form-control" name= "name" required/>
- <p ng-show="formdata.name.$invalid && !formdata.name.$pristine" class="help-block">Onap Name is required.</p>
+ <p ng-show="formdata.name.$invalid && !formdata.name.$pristine" class="help-block">UUID field is required.</p>
</div>
</div>
<div class="form-group row">
</div>
</div>
<div class="form-group row">
$scope.deleteVnfType = function(data) {
var uuu = "searchDictionary";
$scope.deleteVnfType = function(data) {
var uuu = "searchDictionary";
- var postData={data: data, type: "attribute"};
+ var postData={data: data, type: "clVnf"};
var searchString = "\n";
$.ajax({
type : 'POST',
var searchString = "\n";
$.ajax({
type : 'POST',
<link rel="stylesheet" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
<link rel="stylesheet" href="app/fusion/styles/ecomp.css">
<link rel="stylesheet" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
<link rel="stylesheet" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
<link rel="stylesheet" href="app/fusion/styles/ecomp.css">
<link rel="stylesheet" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
- <script src= "app/policyApp/CSS/UIGrid/ui-grid.eot"></script>
- <link rel="stylesheet" href="app/policyApp/CSS/UIGrid/ui-grid.svg">
- <script src= "app/policyApp/CSS/UIGrid/ui-grid.woff"></script>
- <script src= "app/policyApp/CSS/UIGrid/ui-grid.ttf"></script>
</head>
<body class="appBody" ng-app="abs" style="padding-top: 0px;">
</head>
<body class="appBody" ng-app="abs" style="padding-top: 0px;">
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Action"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "BRMS_Param"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "BRMS_Raw"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "Base"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "ClosedLoop_Fault"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.policyNavigator;
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.policyNavigator;
$scope.savebutton = true;
$scope.refreshCheck = false;
+
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "ClosedLoop_PM"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "Micro Service"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Decision"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.savebutton = true;
$scope.refreshCheck = false;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.temp.policy = {
+ policyType : "Config",
+ configPolicyType : "Firewall Config"
+ }
+ };
+
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
$scope.refresh = function(){
if($scope.refreshCheck){
$scope.policyNavigator.refresh();
path: path || [],
type: model && model.type || 'file',
size: model && parseInt(model.size || 0),
path: path || [],
type: model && model.type || 'file',
size: model && parseInt(model.size || 0),
- date: parseMySQLDate(model && model.date),
+ date: model && model.date,
version: model && model.version || '',
createdBy: model && model.createdBy || '',
modifiedBy: model && model.modifiedBy || '',
version: model && model.version || '',
createdBy: model && model.createdBy || '',
modifiedBy: model && model.modifiedBy || '',
self.inprocess = true;
self.error = '';
$http.post(policyManagerConfig.renameUrl, data).success(function(data) {
self.inprocess = true;
self.error = '';
$http.post(policyManagerConfig.renameUrl, data).success(function(data) {
+ if(data.result.error != undefined){
+ var value = data.result.error;
+ value = value.replace("rename" , "move");
+ data.result.error = value;
+ }
self.deferredHandler(data, deferred);
}).error(function(data) {
self.deferredHandler(data, deferred, 'Error Occured While Moving');
self.deferredHandler(data, deferred);
}).error(function(data) {
self.deferredHandler(data, deferred, 'Error Occured While Moving');
-<div class="modal animated fadeIn" id="delete" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="delete" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="remove(temp)">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="remove(temp)">
-<div class="modal animated fadeIn" id="deletePolicy" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="deletePolicy" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="removePolicy(temp)">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="removePolicy(temp)">
-<div class="modal animated fadeIn" id="rename" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="rename" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="rename(temp)">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="rename(temp)">
-<div class="modal animated fadeIn" id="searchWindow" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="searchWindow" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form>
<div class="modal-dialog">
<div class="modal-content">
<form>
-<div class="modal animated fadeIn" id="move" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="move" 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-dialog">
<div class="modal-content">
<form ng-submit="move(temp)">
-<div class="modal animated fadeIn" id="switchVersion" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="switchVersion" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="switchVersion(temp)">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="switchVersion(temp)">
-<div class="modal animated fadeIn" id="copy" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="copy" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="copy(temp)">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="copy(temp)">
<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">
<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">
-
- <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-disabled="temp.inprocess">Cancel</button>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-pedefault" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
-<div class="modal animated fadeIn" id="addSubScope" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="addSubScope" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="subScopeFolder(temp)">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="subScopeFolder(temp)">
-<div class="modal animated fadeIn" id="uploadfile" data-toggle="modal" data-backdrop="static" data-keyboard="false">
+<div class="modal" id="uploadfile" data-toggle="modal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="uploadFiles()">
<div class="modal-dialog">
<div class="modal-content">
<form ng-submit="uploadFiles()">
-<div class="modal animated fadeIn" id="selector" ng-controller="PolicyManagerModalCtrl">
+<div class="modal" id="selector" ng-controller="PolicyManagerModalCtrl">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">