Merge "Fixed Portal-SDK Role Active-Inactive toggle Issue"

4 files changed, 19 insertions, 2 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleController.java
index d555ba46..6ee84dd5 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleController.java
@@ -171,6 +171,7 @@ public class RoleController extends RestrictedBaseController {
 				domainRole = roleService.getRole(user.getOrgUserId(), role.getId());
 				domainRole.setName(role.getName());
 				domainRole.setPriority(role.getPriority());
+				domainRole.setActive(role.getActive());
 			} else {
 				doAuditLog("saveRole: creating new role", role.getName());
 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.html
index 4d8fcec8..17ceff86 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.html
@@ -41,11 +41,18 @@
         <h1 class="heading-page">Roles</h1>
         <span class= "heading-small" *ngIf="isAppCentralized=='true'"><b>Please go to portal to Manage Roles.</b></span>
     </div>
-    <button type="button" *ngIf="isAppCentralized=='false'" style="float: right;" class="btn btn-primary" (click)="openAddNewRoleModal('')">
+
+    <button type="button" *ngIf="isAppCentralized=='false'" class="btn btn-primary new-role-button" (click)="openAddNewRoleModal('')">
         <i class="icon ion-md-person-add"></i>Add New Role
     </button>
-    <span class="heading-small" *ngIf="isAppCentralized=='false'">Click on a Role to view its details.</span>        
+            
     <span class="ecomp-spinner" *ngIf="showSpinner"></span>
+    
+    <div class="role-search">
+      <mat-form-field>
+        <input matInput type="text" (keyup)="applyFilter($event.target.value)" placeholder="Search in entire table">
+      </mat-form-field>
+    </div>    
   
     <table mat-table [dataSource]="dataSource" matSort>
         <ng-container matColumnDef="name">
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.scss
index ddbbf15d..fa026996 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.scss
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.scss
@@ -99,4 +99,9 @@ body {
 
 .icon-trash{
   cursor: pointer;
+}
+
+.new-role-button{
+  margin-left: 15px;
+  float: right;
 }
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.ts
index ada77e3d..b2d8fed4 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/roles/roles.component.ts
@@ -204,4 +204,8 @@ export class RolesComponent implements OnInit {
 
     })
   }
+
+  applyFilter(filterValue: string) {
+    this.dataSource.filter = filterValue.trim().toLowerCase();
+  }
 }
\ No newline at end of file