diff options
author | Sunder Tattavarada <statta@research.att.com> | 2020-03-26 15:02:53 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-03-26 15:02:53 +0000 |
commit | 7d3ad2425c0a774179ddb522e741d977c3bcf992 (patch) | |
tree | 7c74326fa58f1db18af774bbc822abca3fca29db /ecomp-sdk/epsdk-app-overlay/src | |
parent | c69a85ad86fd8c1050b0758a241a4a4b1931e432 (diff) | |
parent | 2a21098c4799dc4245d9079e9235e950ec37318a (diff) |
Merge "Fixed Portal-SDK Role Active-Inactive toggle Issue"
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src')
3 files changed, 18 insertions, 2 deletions
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 |