From a01b465cdaa87ba98c391a598cdc85b1e9079306 Mon Sep 17 00:00:00 2001 From: Jozef Daxner Date: Thu, 22 May 2025 15:10:21 +0200 Subject: [PATCH 1/8] [NAE-2085] Refactor User - user rework changes --- .../user-field/models/user-field.ts | 2 +- .../user-field/models/user-value.spec.ts | 6 ++--- .../user-field/models/user-value.ts | 27 +++++++++++-------- .../models/user-list-value.spec.ts | 6 ++--- .../user-list-field/models/user-list-value.ts | 2 +- ...stract-multi-user-assign-list.component.ts | 4 +-- .../abstract-user-assign-list.component.ts | 2 +- .../services/field-converter.service.ts | 6 ++--- .../task/services/delegate-task.service.ts | 2 +- 9 files changed, 31 insertions(+), 26 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-field.ts b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-field.ts index 6e55c551d9..f479a86118 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-field.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-field.ts @@ -21,6 +21,6 @@ export class UserField extends DataField { } protected valueEquality(a: UserValue, b: UserValue): boolean { - return (!a && !b) || (!!a && !!b && a.email === b.email); + return (!a && !b) || (!!a && !!b && a.username === b.username); } } diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts index e92c4c5175..200818b35d 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts @@ -6,10 +6,10 @@ describe('UserValue', () => { let user: UserValue; user = new UserValue('0', 'name', 'surname', 'mail'); expect(user.id).toEqual('0'); - expect(user.name).toEqual('name'); - expect(user.surname).toEqual('surname'); + expect(user.firstName).toEqual('name'); + expect(user.lastName).toEqual('surname'); expect(user.fullName).toEqual('name surname'); - expect(user.email).toEqual('mail'); + expect(user.username).toEqual('mail'); }); afterEach(() => { diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.ts b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.ts index b650e3e4df..0100b736a9 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.ts @@ -7,30 +7,35 @@ export class UserValue { /** * An object that represents the selected user in {@link UserField} and [UserAssignComponent]{@link AbstractUserAssignComponent}. * @param _id the id of the selected user - * @param _name the first name of the selected user - * @param _surname the surname of the selected user - * @param _email email of the selected user + * @param _realmId the id of the selected user realm + * @param _firstName the first name of the selected user + * @param _lastName the surname of the selected user + * @param _username email of the selected user */ - constructor(private _id: string, private _name: string, private _surname: string, private _email: string) { + constructor(private _id: string, private _realmId: string, private _firstName: string, private _lastName: string, private _username: string) { } get id(): string { return this._id; } - get name(): string { - return this._name; + get realmId(): string { + return this._realmId; } - get surname(): string { - return this._surname; + get firstName(): string { + return this._firstName; + } + + get lastName(): string { + return this._lastName; } get fullName(): string { - return this._name + ' ' + this._surname; + return this._firstName + ' ' + this._lastName; } - get email(): string { - return this._email; + get username(): string { + return this._username; } } diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts index 83b58679c2..93c43b029c 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts @@ -8,10 +8,10 @@ describe('UserListValue', () => { let user: UserListValue; user = new UserListValue(new Map([['0', new UserValue('0', 'name', 'surname', 'mail')]])); expect(user.userValues.get('0').id).toEqual('0'); - expect(user.userValues.get('0').name).toEqual('name'); - expect(user.userValues.get('0').surname).toEqual('surname'); + expect(user.userValues.get('0').firstName).toEqual('name'); + expect(user.userValues.get('0').lastName).toEqual('surname'); expect(user.userValues.get('0').fullName).toEqual('name surname'); - expect(user.userValues.get('0').email).toEqual('mail'); + expect(user.userValues.get('0').username).toEqual('mail'); }); it('should get last', () => { diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.ts b/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.ts index e68c3d7821..8c70a5898b 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.ts @@ -31,7 +31,7 @@ export class UserListValue { public getLast(): UserValue { if (this._userValues.size == 0) { - return new UserValue('', '', '', ''); + return new UserValue('', '', '', '', ''); } return Array.from(this._userValues.values()).pop(); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.ts index 0bd137ea23..e22369ef45 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.ts @@ -59,10 +59,10 @@ export abstract class AbstractMultiUserAssignListComponent extends AbstractBaseU const index = this._currentlySelectedUsers.indexOf(selectedUser.id); if (index > -1) { this._currentlySelectedUsers.splice(index, 1); - this.userUnselected.emit(new UserValue(selectedUser.id, selectedUser.name, selectedUser.surname, selectedUser.email)); + this.userUnselected.emit(new UserValue(selectedUser.id, selectedUser.realmId, selectedUser.firstName, selectedUser.lastName, selectedUser.username)); } else { this._currentlySelectedUsers.push(selectedUser.id); - this.userSelected.emit(new UserValue(selectedUser.id, selectedUser.name, selectedUser.surname, selectedUser.email)); + this.userSelected.emit(new UserValue(selectedUser.id, selectedUser.realmId, selectedUser.firstName, selectedUser.lastName, selectedUser.username)); } this._selectedUsers$.next([...this._currentlySelectedUsers]); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.ts index 1e1b68a4fd..378ff8d260 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.ts @@ -74,7 +74,7 @@ export abstract class AbstractUserAssignListComponent extends AbstractBaseUserAs * @param selectedUser [UserValue]{@link UserValue} */ public select(selectedUser: UserListItem): void { - this.userSelected.emit(new UserValue(selectedUser.id, selectedUser.name, selectedUser.surname, selectedUser.email)); + this.userSelected.emit(new UserValue(selectedUser.id, selectedUser.realmId, selectedUser.firstName, selectedUser.lastName, selectedUser.username)); this._markSelectedUser(selectedUser); } diff --git a/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts b/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts index bdf5730c1d..62cda72dd4 100644 --- a/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts +++ b/projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts @@ -79,14 +79,14 @@ export class FieldConverterService { case FieldTypeResource.USER: let user; if (item.value) { - user = new UserValue(item.value.id, item.value.firstName, item.value.lastName, item.value.email); + user = new UserValue(item.value.id, item.value.realmId, item.value.firstName, item.value.lastName, item.value.username); } return new UserField(item.stringId, item.name, item.behavior, user, item.roles, item.placeholder, item.description, item.layout, item.validations, item.component, item.parentTaskId); case FieldTypeResource.USER_LIST: let userListValue = new UserListValue(new Map()); if (item.value) { - item.value.userValues.forEach(u => userListValue.addUserValue(new UserValue(u.id, u.firstName, u.lastName, u.email))); + item.value.userValues.forEach(u => userListValue.addUserValue(new UserValue(u.id, u.realmId, u.firstName, u.lastName, u.username))); } return new UserListField(item.stringId, item.name, item.behavior, userListValue, item.roles, item.placeholder, item.description, item.layout, item.validations, item.component, item.parentTaskId); @@ -288,7 +288,7 @@ export class FieldConverterService { return moment(new Date(value[0], value[1] - 1, value[2])); } if (this.resolveType(field) === FieldTypeResource.USER) { - return new UserValue(value.id, value.firstName, value.lastName, value.email); + return new UserValue(value.id, value.realmId, value.firstName, value.lastName, value.username); } if (this.resolveType(field) === FieldTypeResource.DATE_TIME) { return moment(new Date(value[0], value[1] - 1, value[2], value[3], value[4])); diff --git a/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts index 13897ad9e5..cec4ca4d18 100644 --- a/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts @@ -78,7 +78,7 @@ export class DelegateTaskService extends TaskHandlingService { roles: Object.keys(this._safeTask.roles).filter(role => this._safeTask.roles[role]['assign'] !== undefined && this._safeTask.roles[role]['assign']), value: !this._safeTask.user ? undefined : new UserValue( - this._safeTask.user.id, this._safeTask.user.name, this._safeTask.user.surname, this._safeTask.user.email + this._safeTask.user.id, this._safeTask.user.realmId, this._safeTask.user.firstName, this._safeTask.user.lastName, this._safeTask.user.username ), negativeRoles: Object.keys(this._safeTask.roles).filter(role => this._safeTask.roles[role]['assign'] !== undefined && !this._safeTask.roles[role]['assign']) From 00bb71ea4c8b9b2b15bc5975b9e17861b16863e6 Mon Sep 17 00:00:00 2001 From: Jozef Daxner Date: Wed, 9 Jul 2025 11:56:56 +0200 Subject: [PATCH 2/8] [NAE-2085] Refactor User - fixes/changes after merging with the newest version --- .../src/lib/task/services/delegate-task.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts index cec4ca4d18..544ba6c152 100644 --- a/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts @@ -77,8 +77,8 @@ export class DelegateTaskService extends TaskHandlingService { { roles: Object.keys(this._safeTask.roles).filter(role => this._safeTask.roles[role]['assign'] !== undefined && this._safeTask.roles[role]['assign']), - value: !this._safeTask.user ? undefined : new UserValue( - this._safeTask.user.id, this._safeTask.user.realmId, this._safeTask.user.firstName, this._safeTask.user.lastName, this._safeTask.user.username + value: !this._safeTask.userId ? undefined : new UserValue( + this._safeTask.userId, '', '', '', '' ), negativeRoles: Object.keys(this._safeTask.roles).filter(role => this._safeTask.roles[role]['assign'] !== undefined && !this._safeTask.roles[role]['assign']) From fd05a1c6d28f991d0b34d5ed70733b3e42eaa77f Mon Sep 17 00:00:00 2001 From: Machac Date: Wed, 9 Jul 2025 16:08:26 +0200 Subject: [PATCH 3/8] 7.0.0-rc.4 --- .../src/lib/authentication/models/user.transformer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/authentication/models/user.transformer.ts b/projects/netgrif-components-core/src/lib/authentication/models/user.transformer.ts index 9bc4b572e5..1fb77ba406 100644 --- a/projects/netgrif-components-core/src/lib/authentication/models/user.transformer.ts +++ b/projects/netgrif-components-core/src/lib/authentication/models/user.transformer.ts @@ -21,8 +21,8 @@ export class UserTransformer implements Transformer { user.username, user.email, user.realmId, - user.name, - user.surname, + user.firstName, + user.lastName, this.transformAuthorities(user.authorities), user.processRoles, groups, From 86dc2cc180c4e44bb48e8146befb4c5af7662d26 Mon Sep 17 00:00:00 2001 From: Machac Date: Wed, 9 Jul 2025 16:11:49 +0200 Subject: [PATCH 4/8] 7.0.0-rc.4 --- .../task/services/delegate-task.service.ts | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts index 1d7842bbaf..052f2a661a 100644 --- a/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/delegate-task.service.ts @@ -81,7 +81,7 @@ export class DelegateTaskService extends TaskHandlingService { // this._safeTask.user.id, this._safeTask.user.realmId, this._safeTask.user.firstName, this._safeTask.user.lastName, this._safeTask.user.username // ), value: !this._safeTask.userId ? undefined : new UserValue( - this._safeTask.userId, '', '', '', '' + this._safeTask.userId, '', '', '', '' ), negativeRoles: Object.keys(this._safeTask.roles).filter(role => this._safeTask.roles[role]['assign'] !== undefined && !this._safeTask.roles[role]['assign']) @@ -118,39 +118,39 @@ export class DelegateTaskService extends TaskHandlingService { this._taskState.startLoading(delegatedTaskId); this._taskResourceService.delegateTask(this._safeTask.stringId, delegatedUserId).pipe(take(1)).subscribe( (outcomeResource: EventOutcomeMessageResource) => { - this._taskState.stopLoading(delegatedTaskId); - if (!this.isTaskRelevant(delegatedTaskId)) { - this._log.debug('current task changed before the delegate response could be received, discarding...'); - nextEvent.resolve(false); - return; - } + this._taskState.stopLoading(delegatedTaskId); + if (!this.isTaskRelevant(delegatedTaskId)) { + this._log.debug('current task changed before the delegate response could be received, discarding...'); + nextEvent.resolve(false); + return; + } - if (outcomeResource.success) { - this._taskContentService.updateStateData(outcomeResource.outcome as DelegateTaskEventOutcome); - const changedFieldsMap: ChangedFieldsMap = this._eventService - .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); - if (!!changedFieldsMap) { - this._changedFieldsService.emitChangedFields(changedFieldsMap); + if (outcomeResource.success) { + this._taskContentService.updateStateData(outcomeResource.outcome as DelegateTaskEventOutcome); + const changedFieldsMap: ChangedFieldsMap = this._eventService + .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); + if (!!changedFieldsMap) { + this._changedFieldsService.emitChangedFields(changedFieldsMap); + } + this.completeSuccess(afterAction, nextEvent, outcomeResource.outcome as DelegateTaskEventOutcome); + } else if (outcomeResource.error) { + this._snackBar.openErrorSnackBar(outcomeResource.error); + this.completeActions(afterAction, nextEvent, false); } - this.completeSuccess(afterAction, nextEvent, outcomeResource.outcome as DelegateTaskEventOutcome); - } else if (outcomeResource.error) { - this._snackBar.openErrorSnackBar(outcomeResource.error); - this.completeActions(afterAction, nextEvent, false); - } - }, error => { - this._taskState.stopLoading(delegatedTaskId); - this._log.debug('getting task data failed', error); + }, error => { + this._taskState.stopLoading(delegatedTaskId); + this._log.debug('getting task data failed', error); - if (!this.isTaskRelevant(delegatedTaskId)) { - this._log.debug('current task changed before the delegate error could be received'); - nextEvent.resolve(false); - return; - } + if (!this.isTaskRelevant(delegatedTaskId)) { + this._log.debug('current task changed before the delegate error could be received'); + nextEvent.resolve(false); + return; + } - this._snackBar.openErrorSnackBar(`${this._translate.instant('tasks.snackbar.assignTask')} + this._snackBar.openErrorSnackBar(`${this._translate.instant('tasks.snackbar.assignTask')} ${this._task} ${this._translate.instant('tasks.snackbar.failed')}`); - this.completeActions(afterAction, nextEvent, false); - }); + this.completeActions(afterAction, nextEvent, false); + }); } /** From 594157fc523b956c87565e4bafba7d9fb2e9bc89 Mon Sep 17 00:00:00 2001 From: Machac Date: Wed, 9 Jul 2025 16:21:14 +0200 Subject: [PATCH 5/8] merge 0.4.0 --- .../lib/data-fields/user-field/models/user-value.spec.ts | 2 +- .../user-list-field/models/user-list-value.spec.ts | 6 +++--- .../search-mode/abstract-search-mode.component.spec.ts | 2 +- .../abstract-multi-user-assign.component.spec.ts | 6 +++--- .../abstract-base-user-assign-list.component.spec.ts | 2 +- .../abstract-multi-user-assign-list.component.spec.ts | 2 +- .../abstract-multi-user-assign-item.component.spec.ts | 2 +- .../abstract-user-assign-item.component.spec.ts | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts index 200818b35d..6598e8f5db 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts @@ -4,7 +4,7 @@ import {TestBed} from '@angular/core/testing'; describe('UserValue', () => { it('should create an instance', () => { let user: UserValue; - user = new UserValue('0', 'name', 'surname', 'mail'); + user = new UserValue('0', 'realmID0','name', 'surname', 'mail'); expect(user.id).toEqual('0'); expect(user.firstName).toEqual('name'); expect(user.lastName).toEqual('surname'); diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts index 93c43b029c..9d7a3ac0e8 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-list-field/models/user-list-value.spec.ts @@ -6,7 +6,7 @@ import {expect} from "@ngbracket/ngx-layout/_private-utils/testing"; describe('UserListValue', () => { it('should create an instance', () => { let user: UserListValue; - user = new UserListValue(new Map([['0', new UserValue('0', 'name', 'surname', 'mail')]])); + user = new UserListValue(new Map([['0', new UserValue('0', 'realmID0','name', 'surname', 'mail')]])); expect(user.userValues.get('0').id).toEqual('0'); expect(user.userValues.get('0').firstName).toEqual('name'); expect(user.userValues.get('0').lastName).toEqual('surname'); @@ -16,13 +16,13 @@ describe('UserListValue', () => { it('should get last', () => { let user: UserListValue; - user = new UserListValue(new Map([['0', new UserValue('0', 'name', 'surname', 'mail')]])); + user = new UserListValue(new Map([['0', new UserValue('0', 'realmID0','name', 'surname', 'mail')]])); expect(user.getLast().id === '0').toBeTruthy(); }); it('should remove', () => { let user: UserListValue; - user = new UserListValue(new Map([['0', new UserValue('0', 'name', 'surname', 'mail')]])); + user = new UserListValue(new Map([['0', new UserValue('0', 'realmID0','name', 'surname', 'mail')]])); expect(user.userValues.size === 1).toBeTruthy(); user.removeUserValue('0'); expect(user.userValues.size === 0).toBeTruthy(); diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts index 65c854add3..cc135a12c9 100644 --- a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts @@ -80,7 +80,7 @@ describe('AbstractSearchModeComponent', () => { })); it('should transform UserValue into id', fakeAsync(() => { - component.formControls[0].setValue(new UserValue('7', '', '', '')); + component.formControls[0].setValue(new UserValue('7', 'realmID0','', '', '')); tick(600); expect(headerSpy).toHaveBeenCalledWith(0, '7'); })); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts index 198de58404..5287dbd383 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts @@ -51,16 +51,16 @@ describe('AbstractMultiUserAssignComponent', () => { }); it('should select', () => { - component.userWasSelected(new UserValue('0', '', '', '')); + component.userWasSelected(new UserValue('0', 'realmID0','', '', '')); expect(component.currentUsers).toBeTruthy(); expect(component.currentUsers.find(u => u.id === '0')).toBeTruthy() }); it('should unselect', () => { - component.userWasSelected(new UserValue('0', '', '', '')); + component.userWasSelected(new UserValue('0', 'realmID0','', '', '')); expect(component.currentUsers).toBeTruthy(); expect(component.currentUsers.find(u => u.id === '0')).toBeTruthy() - component.userWasUnselected(new UserValue('0', '', '', '')); + component.userWasUnselected(new UserValue('0', 'realmID0', '', '', '')); expect(component.currentUsers.length === 0).toBeTruthy(); }); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts index 08ef2f691f..8fd5852575 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts @@ -81,6 +81,6 @@ class TestUserComponent extends AbstractBaseUserAssignListComponent implements O template: '' }) class TestWrapperComponent { - injectedData = {roles: [], value: new UserValue('5', 'admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; + injectedData = {roles: [], value: new UserValue('5', 'realmID0','admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; formControl = new FormControl(); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.spec.ts index 58d2db77fe..124444e5ca 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/abstract-multi-user-assign-list.component.spec.ts @@ -75,6 +75,6 @@ class TestUserComponent extends AbstractMultiUserAssignListComponent { template: '' }) class TestWrapperComponent { - injectedData = {roles: [], value: new UserValue('5', 'admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; + injectedData = {roles: [], value: new UserValue('5', 'realmID0', 'admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; formControl = new FormControl(); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts index 78768e1ed5..fdd424554e 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts @@ -53,5 +53,5 @@ class TestUserComponent extends AbstractMultiUserAssignItemComponent { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', ''); + user = new UserValue('0', '', '', '', ''); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts index 955771d7ea..b00f0070c0 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts @@ -53,5 +53,5 @@ class TestUserComponent extends AbstractUserAssignItemComponent { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', ''); + user = new UserValue('0', '', '', '', ''); } From 7b05e6c5d7a5c4810cdd1e449c3b451edf2053d8 Mon Sep 17 00:00:00 2001 From: Machac Date: Wed, 9 Jul 2025 16:24:33 +0200 Subject: [PATCH 6/8] merge 0.4.0 --- .../abstract-user-assign-list.component.spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts index 641391ad9d..bb6c152041 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts @@ -68,6 +68,9 @@ class TestUserComponent extends AbstractUserAssignListComponent { template: '' }) class TestWrapperComponent { - injectedData = {roles: [], value: new UserValue('5', 'admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; + injectedData = { + roles: [], + value: new UserValue('5', 'realmID0', 'admin', 'netgrif', 'super@netgrif.com') + } as UserListInjectedData; formControl = new FormControl(); } From fe2273040cd22a601fc9171a3790104f952d3cfe Mon Sep 17 00:00:00 2001 From: Machac Date: Wed, 9 Jul 2025 16:40:53 +0200 Subject: [PATCH 7/8] merge 0.4.0 --- .../data-fields/user-field/models/user-value.spec.ts | 2 +- .../abstract-search-mode.component.spec.ts | 8 ++++++-- .../abstract-multi-user-assign.component.spec.ts | 12 +++++++----- ...abstract-multi-user-assign-item.component.spec.ts | 2 +- .../abstract-user-assign-item.component.spec.ts | 2 +- .../admin-impersonate-item.component.spec.ts | 2 +- .../admin-impersonate-list.component.spec.ts | 5 ++++- .../multi-user-assign-item.component.spec.ts | 2 +- .../user-assign-item.component.spec.ts | 2 +- .../user-assign-list.component.spec.ts | 5 ++++- 10 files changed, 27 insertions(+), 15 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts index 6598e8f5db..b843c45d1f 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/user-field/models/user-value.spec.ts @@ -4,7 +4,7 @@ import {TestBed} from '@angular/core/testing'; describe('UserValue', () => { it('should create an instance', () => { let user: UserValue; - user = new UserValue('0', 'realmID0','name', 'surname', 'mail'); + user = new UserValue('0', 'realmID0', 'name', 'surname', 'mail'); expect(user.id).toEqual('0'); expect(user.firstName).toEqual('name'); expect(user.lastName).toEqual('surname'); diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts index cc135a12c9..9acd103e83 100644 --- a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts @@ -56,7 +56,11 @@ describe('AbstractSearchModeComponent', () => { {provide: ConfigurationService, useClass: TestConfigurationService}, {provide: ViewService, useClass: TestViewService}, CaseHeaderService, - {provide: AllowedNetsService, useFactory: TestCaseViewAllowedNetsFactory, deps: [AllowedNetsServiceFactory]} + { + provide: AllowedNetsService, + useFactory: TestCaseViewAllowedNetsFactory, + deps: [AllowedNetsServiceFactory] + } ], declarations: [TestSeaarchModeComponent, TestWrapperComponent], }).compileComponents(); @@ -80,7 +84,7 @@ describe('AbstractSearchModeComponent', () => { })); it('should transform UserValue into id', fakeAsync(() => { - component.formControls[0].setValue(new UserValue('7', 'realmID0','', '', '')); + component.formControls[0].setValue(new UserValue('7', 'realmID0', '', '', '')); tick(600); expect(headerSpy).toHaveBeenCalledWith(0, '7'); })); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts index 5287dbd383..4b67dbdf35 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/abstract-multi-user-assign.component.spec.ts @@ -30,8 +30,10 @@ describe('AbstractMultiUserAssignComponent', () => { ], providers: [ UserListService, - {provide: NAE_SIDE_MENU_CONTROL, useValue: new SideMenuControl(() => { - }, new Observable(), null)}, + { + provide: NAE_SIDE_MENU_CONTROL, useValue: new SideMenuControl(() => { + }, new Observable(), null) + }, {provide: ConfigurationService, useClass: TestConfigurationService} ], declarations: [ @@ -51,16 +53,16 @@ describe('AbstractMultiUserAssignComponent', () => { }); it('should select', () => { - component.userWasSelected(new UserValue('0', 'realmID0','', '', '')); + component.userWasSelected(new UserValue('0', 'realmID0', '', '', '')); expect(component.currentUsers).toBeTruthy(); expect(component.currentUsers.find(u => u.id === '0')).toBeTruthy() }); it('should unselect', () => { - component.userWasSelected(new UserValue('0', 'realmID0','', '', '')); + component.userWasSelected(new UserValue('0', 'realmID0', '', '', '')); expect(component.currentUsers).toBeTruthy(); expect(component.currentUsers.find(u => u.id === '0')).toBeTruthy() - component.userWasUnselected(new UserValue('0', 'realmID0', '', '', '')); + component.userWasUnselected(new UserValue('0', 'realmID0', '', '', '')); expect(component.currentUsers.length === 0).toBeTruthy(); }); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts index fdd424554e..49c241db0f 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/multi-user-assign-list/multi-user-assign-item/abstract-multi-user-assign-item.component.spec.ts @@ -53,5 +53,5 @@ class TestUserComponent extends AbstractMultiUserAssignItemComponent { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', '', ''); + user = new UserValue('0', 'realmID0', '', '', ''); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts index b00f0070c0..3c27635c4b 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/abstract-user-assign-item.component.spec.ts @@ -53,5 +53,5 @@ class TestUserComponent extends AbstractUserAssignItemComponent { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', '', ''); + user = new UserValue('0', 'realmID0', '', '', ''); } diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-item/admin-impersonate-item.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-item/admin-impersonate-item.component.spec.ts index 2673bfa873..84785daaa7 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-item/admin-impersonate-item.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-item/admin-impersonate-item.component.spec.ts @@ -39,5 +39,5 @@ describe('AdminImpersonateItemComponent', () => { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', ''); + user = new UserValue('0', 'realmID0', '', '', ''); } diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts index d505a9ad42..b4a50d6cb5 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts @@ -61,6 +61,9 @@ describe('AdminImpersonateListComponent', () => { template: '' }) class TestWrapperComponent { - injectedData = {roles: [], value: new UserValue('5', 'admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; + injectedData = { + roles: [], + value: new UserValue('5', 'realmID0', 'admin', 'netgrif', 'super@netgrif.com') + } as UserListInjectedData; formControl = new FormControl(); } diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-item/multi-user-assign-item.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-item/multi-user-assign-item.component.spec.ts index 9831af4252..98737085af 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-item/multi-user-assign-item.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-item/multi-user-assign-item.component.spec.ts @@ -42,5 +42,5 @@ describe('MultiUserAssignItemComponent', () => { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', ''); + user = new UserValue('0', 'realmID0', '', '', ''); } diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts index 7d101548da..3907f8006d 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts @@ -39,5 +39,5 @@ describe('UserAssignItemComponent', () => { template: '' }) class TestWrapperComponent { - user = new UserValue('0', '', '', ''); + user = new UserValue('0', 'realmID0','', '', ''); } diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts index 1619f102b2..096f76f53e 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts @@ -61,6 +61,9 @@ describe('UserAssignListComponent', () => { template: '' }) class TestWrapperComponent { - injectedData = {roles: [], value: new UserValue('5', 'admin', 'netgrif', 'super@netgrif.com')} as UserListInjectedData; + injectedData = { + roles: [], + value: new UserValue('5', 'realmID0', 'admin', 'netgrif', 'super@netgrif.com') + } as UserListInjectedData; formControl = new FormControl(); } From 03a560d10b486fb8a0e5310b672b4e1a4598ced4 Mon Sep 17 00:00:00 2001 From: Machac Date: Wed, 9 Jul 2025 16:47:32 +0200 Subject: [PATCH 8/8] merge 0.4.0 --- .../multi-user-assign-list.component.spec.ts | 2 +- .../user-assign-item/user-assign-item.component.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts index c740482d4d..46abacd1b5 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts @@ -63,7 +63,7 @@ describe('MultiUserAssignListComponent', () => { class TestWrapperComponent { injectedData = { roles: [], - value: new UserListValue(new Map([['5', new UserValue('5', 'admin', 'netgrif', 'super@netgrif.com')]])) + value: new UserListValue(new Map([['5', new UserValue('5', 'realmID0', 'admin', 'netgrif', 'super@netgrif.com')]])) } as UserListInjectedData; formControl = new FormControl(); } diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts index 3907f8006d..9da6c5e6b2 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-item/user-assign-item.component.spec.ts @@ -39,5 +39,5 @@ describe('UserAssignItemComponent', () => { template: '' }) class TestWrapperComponent { - user = new UserValue('0', 'realmID0','', '', ''); + user = new UserValue('0', 'realmID0', '', '', ''); }