table colum issue fixed (#1238)

Crown-Commercial-Service · Apr 12, 2023 · 1e0a664 · 1e0a664
1 parent 2bd93ca
commit 1e0a664
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/app/components/govuk-table/govuk-table.component.html b/src/app/components/govuk-table/govuk-table.component.html
@@ -3,7 +3,7 @@
     <thead class="govuk-table__head">
       <tr class="govuk-table__row">
         <th *ngFor="let header of headerTextKeys" scope="col" class="govuk-table__header">
-          {{ header | translate }}
+          <span [ngClass]="{'hide_dots': header  === '.'}">{{ header | translate }}</span>
         </th>
         <th class="govuk-table__header govuk-link-adjust" *ngIf="hyperArrayVisible == true">.</th>
         <th class="govuk-table__header govuk-link-adjust" *ngIf="!isHyperLinkVisible">.</th>
@@ -92,7 +92,7 @@
           </fieldset>
         </td>
         <td class="tablular" *ngIf="!isHyperLinkVisible">
-          <a class="tablular" tabindex="0">.</a>
+          <a class="tablular govuk-table__cell" tabindex="0">.</a>
         </td>
       </tr>
     </tbody>

diff --git a/src/app/components/govuk-table/govuk-table.component.scss b/src/app/components/govuk-table/govuk-table.component.scss
@@ -99,4 +99,7 @@ a {
 }
 .role_group_table {
   padding: 0px 0px 0px 0 !important;
+}
+.hide_dots{
+  display: none;
 }
diff --git a/...s/manage-group/manage-group-operation-success/manage-group-operation-success-component.ts b/...s/manage-group/manage-group-operation-success/manage-group-operation-success-component.ts
@@ -120,9 +120,17 @@ export class ManageGroupOperationSuccessComponent
         break;
     }
     this.titleService.setTitle(`Success - ${area} - Manage Groups - CCS`);
-    this.getListOfUserRequiredAccess();
+    this.getUserList()
+  }
+
+  getUserList(){
+    const isGroupOperation = [this.operationEnum.GroupRoleUpdate, this.operationEnum.GroupAdd,this.operationEnum.GroupUserUpdate].includes(this.operation);
+    if(isGroupOperation){
+      this.getListOfUserRequiredAccess();
+    }
   }
 
+
   onNavigateToGroupClick() {
     let data = {
       isEdit: true,

diff --git a/src/app/pages/user-profile/user-profile-component.ts b/src/app/pages/user-profile/user-profile-component.ts
@@ -33,8 +33,8 @@ export class UserProfileComponent extends FormBaseComponent implements OnInit {
   public showRoleView:boolean = environment.appSetting.hideSimplifyRole
   submitted!: boolean;
   formGroup!: FormGroup;
-  userGroupTableHeaders = ['GROUPS'];
-  userGroupColumnsToDisplay = ['group'];
+  userGroupTableHeaders = ['GROUPS','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.','.'];
+  userGroupColumnsToDisplay = ['group','','','','','','','','','','','','','','','',''];
   userServiceTableHeaders = ['NAME'];
   userRoleTableHeaders = ['ROLES', 'SERVICE'];
   userServiceColumnsToDisplay = ['accessRoleName',]