-
- {{ 'USER_ROLE_PERMISSIONS.TABS.ROLES.TITLE' | translate }} {{ roles.length }}
+
+
+
+
+
+ {{ 'USER_ROLE_PERMISSIONS.TABS.ROLES.TITLE' | translate }} {{ roles.length }}
+
+
-
+
-
-
-
-
- {{ 'USER_ROLE_PERMISSIONS.TABS.PRODUCTS.TITLE' | translate }} {{ products[0] }}
+
+
+
+
+ {{ 'USER_ROLE_PERMISSIONS.TABS.PRODUCTS.TITLE' | translate }} {{ products[0] }}
+
-
-
- {{ 'USER_ROLE_PERMISSIONS.TABS.PRODUCTS.TITLE' | translate }} {{ products.length }}
+
+
+ {{ 'USER_ROLE_PERMISSIONS.TABS.PRODUCTS.TITLE' | translate }} {{ products.length }}
+
+
-
-
-
-
-
-
+
+
diff --git a/src/app/remotes/user-roles-permissions/user-roles-permissions.component.scss b/src/app/remotes/user-roles-permissions/user-roles-permissions.component.scss
index 33e75cb..5f029a6 100644
--- a/src/app/remotes/user-roles-permissions/user-roles-permissions.component.scss
+++ b/src/app/remotes/user-roles-permissions/user-roles-permissions.component.scss
@@ -10,7 +10,6 @@
background-color: rgba(var(--primary-color-rgb), 0.12);
}
}
-
:host ::ng-deep {
.p-dialog .p-dialog-content {
border-bottom-left-radius: var(--border-radius) !important;
@@ -24,12 +23,16 @@
font-size: var(--dialog-header-font-size);
}
- // reduce on all panels
+ // reduce on all panels (tab content)
.p-tabview .p-tabview-panels {
padding: 0;
}
- .p-datatable .p-datatable-thead > tr > th {
+ .p-datatable .p-datatable-thead > tr:nth-child(2) > th {
border-bottom-width: 2px;
}
+
+ .p-datatable .p-datatable-tbody > tr > td {
+ padding: 0.5rem;
+ }
}
diff --git a/src/app/remotes/user-roles-permissions/user-roles-permissions.component.spec.ts b/src/app/remotes/user-roles-permissions/user-roles-permissions.component.spec.ts
index 22c7744..819966e 100644
--- a/src/app/remotes/user-roles-permissions/user-roles-permissions.component.spec.ts
+++ b/src/app/remotes/user-roles-permissions/user-roles-permissions.component.spec.ts
@@ -93,6 +93,7 @@ describe('OneCXUserRolesPermissionsComponent', () => {
function initializeComponent() {
fixture = TestBed.createComponent(OneCXUserRolesPermissionsComponent)
component = fixture.componentInstance
+ component.active = true
fixture.detectChanges()
}
@@ -135,7 +136,7 @@ describe('OneCXUserRolesPermissionsComponent', () => {
initializeComponent()
})
- it('should search user assignments', () => {
+ it('should search user assignments on reload', () => {
spyOn(component, 'searchUserAssignments')
component.onReload()
@@ -171,16 +172,34 @@ describe('OneCXUserRolesPermissionsComponent', () => {
})
it('should handle error when trying to get another users assignments', () => {
- const err = { error: 'error', status: 403 }
- assgnmtApiSpy.searchUserAssignments.and.returnValue(throwError(() => err))
+ const errorResponse = { error: 'error', status: 403, statusText: 'No permissions' }
+ assgnmtApiSpy.searchUserAssignments.and.returnValue(throwError(() => errorResponse))
spyOn(console, 'error')
component.userId = 'id'
component.ngOnChanges()
component.userAssignments$.subscribe(() => {
- expect(console.error).toHaveBeenCalledWith('searchUserAssignments():', err)
- expect(component.exceptionKey).toEqual('EXCEPTIONS.HTTP_STATUS_' + err.status + '.PERMISSIONS')
+ expect(console.error).toHaveBeenCalledWith('searchUserAssignments', errorResponse)
+ expect(component.exceptionKey).toEqual('EXCEPTIONS.HTTP_STATUS_' + errorResponse.status + '.PERMISSIONS')
+ })
+ })
+
+ it('should handle error when user not longer exist in IAM', () => {
+ const errorResponse = {
+ error: { errorCode: '400', detail: 'USER_NOT_FOUND' },
+ status: 400,
+ statusText: 'User does not exist'
+ }
+ assgnmtApiSpy.searchUserAssignments.and.returnValue(throwError(() => errorResponse))
+ spyOn(console, 'error')
+ component.userId = 'id'
+
+ component.ngOnChanges()
+
+ component.userAssignments$.subscribe(() => {
+ expect(console.error).toHaveBeenCalledWith('searchUserAssignments', errorResponse)
+ expect(component.exceptionKey).toEqual('EXCEPTIONS.NOT_FOUND.USER')
})
})
diff --git a/src/app/remotes/user-roles-permissions/user-roles-permissions.component.ts b/src/app/remotes/user-roles-permissions/user-roles-permissions.component.ts
index 6e53143..29ace58 100644
--- a/src/app/remotes/user-roles-permissions/user-roles-permissions.component.ts
+++ b/src/app/remotes/user-roles-permissions/user-roles-permissions.component.ts
@@ -6,6 +6,8 @@ import {
Inject,
Input,
ViewChild,
+ Renderer2,
+ AfterViewInit,
OnChanges
} from '@angular/core'
import { CommonModule, Location } from '@angular/common'
@@ -61,9 +63,12 @@ type PROPERTY_NAME = 'productName' | 'roleName' | 'resource' | 'action'
],
schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA]
})
-export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, ocxRemoteWebcomponent, OnChanges {
+export class OneCXUserRolesPermissionsComponent
+ implements ocxRemoteComponent, ocxRemoteWebcomponent, OnChanges, AfterViewInit
+{
@Input() userId: string | undefined = undefined
@Input() displayName: string | undefined = undefined
+ @Input() active: boolean | undefined = undefined // this is set actively on call the component
@Input() set ocxRemoteComponentConfig(config: RemoteComponentConfig) {
this.ocxInitRemoteComponent(config)
}
@@ -73,7 +78,7 @@ export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, o
public userAssignments$: Observable
= of([])
public columns
public environment = environment
- public exceptionKey = ''
+ public exceptionKey: string | undefined = undefined
public loading = false
constructor(
@@ -81,41 +86,13 @@ export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, o
private readonly userService: UserService,
private readonly userApi: UserAPIService,
private readonly assgnmtApi: AssignmentAPIService,
- private readonly translate: TranslateService
+ private readonly translate: TranslateService,
+ private readonly renderer: Renderer2,
+ private readonly elem: ElementRef
) {
this.userService.lang$.subscribe((lang) => this.translate.use(lang))
- this.columns = [
- {
- field: 'resource',
- header: 'USER_ROLE_PERMISSIONS.RESOURCE',
- tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.RESOURCE',
- filter: true,
- value: null
- },
- {
- field: 'action',
- header: 'USER_ROLE_PERMISSIONS.ACTION',
- tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.ACTION',
- filter: true,
- value: null
- },
- {
- field: 'productName',
- header: 'USER_ROLE_PERMISSIONS.PRODUCT',
- tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.PRODUCT',
- filter: true,
- value: null
- },
- {
- field: 'roleName',
- header: 'USER_ROLE_PERMISSIONS.ROLE',
- tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.ROLE',
- filter: true,
- value: null
- }
- ]
+ this.columns = this.prepareColumn()
}
-
public ocxInitRemoteComponent(remoteComponentConfig: RemoteComponentConfig) {
this.loading = true
this.baseUrl.next(remoteComponentConfig.baseUrl)
@@ -127,8 +104,20 @@ export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, o
})
}
+ // remove styles set by lib (why ever)
+ public ngAfterViewInit() {
+ try {
+ const el = this.renderer.selectRootElement('.buttonDialogScrollableContent', true)
+ if (el) {
+ this.renderer.setStyle(el, 'overflow', 'unset')
+ this.renderer.setStyle(el, 'max-height', 'unset')
+ this.renderer.setStyle(el, 'margin-bottom', '10px')
+ }
+ } catch (err) {} // ignore runtime error if component not used within dialog
+ }
+
public ngOnChanges(): void {
- this.onReload()
+ if (this.active !== undefined) this.onReload()
}
public onReload() {
@@ -137,6 +126,7 @@ export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, o
public searchUserAssignments(): Observable {
this.loading = true
+ this.exceptionKey = undefined
// on admin view the userId is set, otherwise the me services are used
if (this.userId) {
return this.assgnmtApi
@@ -146,8 +136,10 @@ export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, o
return pageResult.stream ?? []
}),
catchError((err) => {
- this.exceptionKey = 'EXCEPTIONS.HTTP_STATUS_' + err.status + '.PERMISSIONS'
- console.error('searchUserAssignments():', err)
+ if (err.error?.errorCode === '400' && err.error?.detail === 'USER_NOT_FOUND')
+ this.exceptionKey = 'EXCEPTIONS.NOT_FOUND.USER'
+ else this.exceptionKey = 'EXCEPTIONS.HTTP_STATUS_' + err.status + '.PERMISSIONS'
+ console.error('searchUserAssignments', err)
return of([])
}),
finalize(() => (this.loading = false))
@@ -200,4 +192,37 @@ export class OneCXUserRolesPermissionsComponent implements ocxRemoteComponent, o
this.permissionTableFilter.nativeElement.value = ''
}
}
+
+ private prepareColumn() {
+ return [
+ {
+ field: 'resource',
+ header: 'USER_ROLE_PERMISSIONS.RESOURCE',
+ tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.RESOURCE',
+ filter: true,
+ value: null
+ },
+ {
+ field: 'action',
+ header: 'USER_ROLE_PERMISSIONS.ACTION',
+ tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.ACTION',
+ filter: true,
+ value: null
+ },
+ {
+ field: 'productName',
+ header: 'USER_ROLE_PERMISSIONS.PRODUCT',
+ tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.PRODUCT',
+ filter: true,
+ value: null
+ },
+ {
+ field: 'roleName',
+ header: 'USER_ROLE_PERMISSIONS.ROLE',
+ tooltip: 'USER_ROLE_PERMISSIONS.TOOLTIPS.ROLE',
+ filter: true,
+ value: null
+ }
+ ]
+ }
}
diff --git a/src/app/shared/generated/model/assignmentUserSearchCriteria.ts b/src/app/shared/generated/model/assignmentUserSearchCriteria.ts
index 896895f..c8d0e02 100644
--- a/src/app/shared/generated/model/assignmentUserSearchCriteria.ts
+++ b/src/app/shared/generated/model/assignmentUserSearchCriteria.ts
@@ -12,7 +12,7 @@
export interface AssignmentUserSearchCriteria {
- userId?: string;
+ userId: string;
/**
* The number of page.
*/
diff --git a/src/assets/api/openapi-bff.yaml b/src/assets/api/openapi-bff.yaml
index bc8eb69..3d5164a 100644
--- a/src/assets/api/openapi-bff.yaml
+++ b/src/assets/api/openapi-bff.yaml
@@ -1158,6 +1158,8 @@ components:
type: integer
AssignmentUserSearchCriteria:
type: object
+ required:
+ - userId
properties:
userId:
type: string
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 3e27940..1cc0039 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -331,6 +331,7 @@
"EXCEPTIONS": {
"NOT_FOUND": {
"PRODUCT": "Es konnten keine Daten zu dieser Applikation gefunden werden.",
+ "USER": "Der Benutzer existiert nicht mehr im IAM (Identity Access Management).",
"WORKSPACE": "Es konnten keine Daten zu diesem Workspace gefunden werden."
},
"HTTP_MISSING_PARAMETER": "Parameter aus der URL konnten nicht ermittelt werden",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 0fbea19..b9eb23e 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -331,6 +331,7 @@
"EXCEPTIONS": {
"NOT_FOUND": {
"PRODUCT": "No data could be found for this Application.",
+ "USER": "The user no longer exist in IAM (Identity Access Management).",
"WORKSPACE": "No data could be found for this Workspace."
},
"HTTP_MISSING_PARAMETER": "Parameters from the URL could not be determined",
diff --git a/src/bootstrap.ts b/src/bootstrap.ts
index 075c949..84b5b44 100644
--- a/src/bootstrap.ts
+++ b/src/bootstrap.ts
@@ -1,5 +1,6 @@
+import { bootstrapModule } from '@onecx/angular-webcomponents'
+
import { environment } from 'src/environments/environment'
import { OneCXPermissionModule } from './app/onecx-permission-remote.module'
-import { bootstrapModule } from '@onecx/angular-webcomponents'
bootstrapModule(OneCXPermissionModule, 'microfrontend', environment.production)
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index a366065..0907110 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -11,5 +11,5 @@
},
"files": ["src/test.ts", "src/polyfills.ts"],
"exclude": ["src/app/shared/generated/**/*", "node_modules"],
- "include": ["**/*.spec.ts", "**/*.d.ts"]
+ "include": ["**/*.spec.ts"]
}