From 1e0a664ee6e0e1a133bd051aeb466106989d85a9 Mon Sep 17 00:00:00 2001 From: ajithmuthukumar-bc <99731656+ajithmuthukumar-bc@users.noreply.github.com> Date: Wed, 12 Apr 2023 19:17:47 +0530 Subject: [PATCH] table colum issue fixed (#1238) --- .../components/govuk-table/govuk-table.component.html | 4 ++-- .../components/govuk-table/govuk-table.component.scss | 3 +++ .../manage-group-operation-success-component.ts | 10 +++++++++- src/app/pages/user-profile/user-profile-component.ts | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/app/components/govuk-table/govuk-table.component.html b/src/app/components/govuk-table/govuk-table.component.html index 03535008b..c46b12c5e 100644 --- a/src/app/components/govuk-table/govuk-table.component.html +++ b/src/app/components/govuk-table/govuk-table.component.html @@ -3,7 +3,7 @@ - {{ header | translate }} + {{ header | translate }} . . @@ -92,7 +92,7 @@ - . + . diff --git a/src/app/components/govuk-table/govuk-table.component.scss b/src/app/components/govuk-table/govuk-table.component.scss index 7e612a664..e9802a6a8 100644 --- 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; } \ No newline at end of file diff --git a/src/app/pages/manage-group/manage-group-operation-success/manage-group-operation-success-component.ts b/src/app/pages/manage-group/manage-group-operation-success/manage-group-operation-success-component.ts index 3e727fa8b..43c51909e 100644 --- a/src/app/pages/manage-group/manage-group-operation-success/manage-group-operation-success-component.ts +++ b/src/app/pages/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 index b339bca88..7ac527ad7 100644 --- 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',]