Merge branch 'NAE-2115' into NAE-2119

renczesstefan · renczesstefan · commit c61a9ab33adc · 2025-06-03T14:38:33.000+02:00
diff --git a/projects/netgrif-components-core/src/lib/authorization/permission/permission.service.spec.ts b/projects/netgrif-components-core/src/lib/authorization/permission/permission.service.spec.ts
@@ -49,7 +49,7 @@ describe('PermissionService', () => {
             title: 'string',
             caseColor: 'string',
             caseTitle: 'string',
-            user: undefined,
+            userId: undefined,
             roles: {
                 assignRole: {
                     assign: true,
@@ -83,7 +83,7 @@ describe('PermissionService', () => {
             title: 'string',
             caseColor: 'string',
             caseTitle: 'string',
-            user: undefined,
+            userId: undefined,
             roles: {
                 assignRole: {
                     assign: false,
@@ -117,7 +117,7 @@ describe('PermissionService', () => {
             title: 'string',
             caseColor: 'string',
             caseTitle: 'string',
-            user: undefined,
+            userId: undefined,
             roles: {},
             startDate: undefined,
             finishDate: undefined,
@@ -155,7 +155,7 @@ describe('PermissionService', () => {
             title: 'string',
             caseColor: 'string',
             caseTitle: 'string',
-            user: undefined,
+            userId: undefined,
             roles: {},
             startDate: undefined,
             finishDate: undefined,
diff --git a/projects/netgrif-components-core/src/lib/authorization/permission/permission.service.ts b/projects/netgrif-components-core/src/lib/authorization/permission/permission.service.ts
@@ -61,30 +61,30 @@ export class PermissionService {
             && (
                 (
                     task.assignPolicy === AssignPolicy.manual
-                    && !task.user
+                    && !task.userId
                     && this.hasTaskPermission(task, PermissionType.ASSIGN)
                 )
             );
     }
 
     public canCancel(task: Task | undefined): boolean {
-        return !!task && !!task.user
+        return !!task && !!task.userId
             && this.hasTaskPermission(task, PermissionType.CANCEL)
             && ((task.assignedUserPolicy === undefined || task.assignedUserPolicy.cancel === undefined)
                 || task.assignedUserPolicy.cancel);
     }
 
     public canReassign(task: Task | undefined): boolean {
-        return !!task && !!task.user && this.userComparator.compareUsers(task.user)
+        return !!task && !!task.userId && this.userComparator.compareUsers(task.userId)
             && this.hasTaskPermission(task, PermissionType.DELEGATE)
             && ((task.assignedUserPolicy === undefined || task.assignedUserPolicy.reassign === undefined)
                 || task.assignedUserPolicy.reassign);
     }
 
     public canFinish(task: Task | undefined): boolean {
         return !!task
-            && !!task.user
-            && this.userComparator.compareUsers(task.user)
+            && !!task.userId
+            && this.userComparator.compareUsers(task.userId)
             && this.hasTaskPermission(task, PermissionType.FINISH);
     }
 
diff --git a/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts b/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts
@@ -242,7 +242,7 @@ class TestWrapperComponent {
             delegateTitle: 'string',
             caseColor: 'string',
             caseTitle: 'string',
-            user: undefined,
+            userId: undefined,
             roles: {},
             startDate: undefined,
             finishDate: undefined,
@@ -293,7 +293,7 @@ class MyTaskResources {
                         title: 'string',
                         caseColor: 'string',
                         caseTitle: 'string',
-                        user: undefined,
+                        userId: undefined,
                         roles: {},
                         startDate: undefined,
                         finishDate: undefined,
@@ -344,7 +344,7 @@ class MyTaskResources {
                         title: 'string',
                         caseColor: 'string',
                         caseTitle: 'string',
-                        user: undefined,
+                        userId: undefined,
                         roles: {},
                         startDate: undefined,
                         finishDate: undefined,
diff --git a/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.ts b/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.ts
@@ -406,7 +406,7 @@ export abstract class AbstractTaskPanelComponent extends AbstractPanelWithImmedi
                 }
                 return {value: 'low', icon: 'south', type: 'meta'};
             case TaskMetaField.USER:
-                return {value: task.user ? task.user.fullName : '', icon: 'account_circle', type: 'meta'};
+                return {value: task.userId ? task.userId : '', icon: 'account_circle', type: 'meta'};
             case TaskMetaField.ASSIGN_DATE:
                 return {
                     value: task.startDate ? toMoment(task.startDate).format(DATE_TIME_FORMAT_STRING) : '',
diff --git a/projects/netgrif-components-core/src/lib/resources/interface/task.ts b/projects/netgrif-components-core/src/lib/resources/interface/task.ts
@@ -29,7 +29,7 @@ export interface Task {
     /**
      * See [UserSmall]{@link UserResourceSmall#}
      */
-    user: UserResourceSmall;
+    userId: string;
     /**
      * ***Example:***
      *
diff --git a/projects/netgrif-components-core/src/lib/task-content/services/task-content.service.ts b/projects/netgrif-components-core/src/lib/task-content/services/task-content.service.ts
@@ -208,7 +208,7 @@ export abstract class TaskContentService implements OnDestroy {
      */
     public updateStateData(eventOutcome: TaskEventOutcome): void {
         if (this._task) {
-            this._task.user = eventOutcome.task.user;
+            this._task.userId = eventOutcome.task.userId;
             this._task.startDate = eventOutcome.task.startDate;
             this._task.finishDate = eventOutcome.task.finishDate;
         }
diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-policy.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/assign-policy.service.spec.ts
@@ -72,7 +72,7 @@ describe('AssignPolicyService', () => {
             title: 'string',
             caseColor: 'string',
             caseTitle: 'string',
-            user: undefined,
+            userId: undefined,
             userRefs: undefined,
             roles: {
                 assignRole: {
diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-policy.service.ts b/projects/netgrif-components-core/src/lib/task/services/assign-policy.service.ts
@@ -134,7 +134,7 @@ export class AssignPolicyService extends TaskHandlingService {
      * @param afterAction the action that should be performed when the assign policy (and all following policies) finishes
      */
     protected autoAssignClosedPolicy(afterAction: Subject<boolean>): void {
-        if (!this._userComparatorService.compareUsers(this._task.user)) {
+        if (!this._userComparatorService.compareUsers(this._task.userId)) {
             this._taskOperations.close();
             afterAction.next(false);
             afterAction.complete();
diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.spec.ts
@@ -77,7 +77,7 @@ describe('AssignTaskService', () => {
             title: '',
             caseColor: '',
             caseTitle: '',
-            user: undefined,
+            userId: undefined,
             userRefs: undefined,
             roles: {},
             startDate: [1],
@@ -123,7 +123,7 @@ describe('AssignTaskService', () => {
                     title: '',
                     caseColor: '',
                     caseTitle: '',
-                    user: null,
+                    userId: null,
                     roles: {
                         role: 'perform'
                     },
diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts
@@ -65,7 +65,7 @@ export class AssignTaskService extends TaskHandlingService {
     public assign(afterAction: AfterAction = new AfterAction()): void {
         this._eventQueue.scheduleEvent(new QueuedEvent(
             () => {
-                return !this._safeTask.user;
+                return !this._safeTask.userId;
             },
             nextEvent => {
                 this.performAssignRequest(afterAction, nextEvent, this._taskViewService !== null && !this._taskViewService.allowMultiOpen);
diff --git a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.spec.ts
@@ -76,17 +76,7 @@ describe('CancelTaskService', () => {
             title: '',
             caseColor: '',
             caseTitle: '',
-            user: {
-                id: '',
-                username: '',
-                realmId: '',
-                email: 'mail',
-                name: '',
-                surname: '',
-                fullName: '',
-                firstName: '',
-                lastName: ''
-            },
+            userId: 'id',
             roles: {
                 role: {
                     assign: true,
@@ -121,7 +111,7 @@ describe('CancelTaskService', () => {
 
     it('should cancel successfully', done => {
         expect(testTask.startDate).toBeTruthy();
-        expect(testTask.user).toBeTruthy();
+        expect(testTask.userId).toBeTruthy();
         resourceService.response = {
             success: 'success',
             outcome: {
@@ -133,7 +123,7 @@ describe('CancelTaskService', () => {
                     title: '',
                     caseColor: '',
                     caseTitle: '',
-                    user: null,
+                    userId: '',
                     roles: {
                         role: {
                             assign: true,
@@ -168,7 +158,7 @@ describe('CancelTaskService', () => {
         service.cancel(callChainService.create((result) => {
             expect(result).toBeTrue();
             expect(testTask.startDate).toBeFalsy();
-            expect(testTask.user).toBeFalsy();
+            expect(testTask.userId).toBeFalsy();
 
             expect(taskEvent).toBeTruthy();
             expect(taskEvent.taskId).toEqual('taskId');
@@ -181,7 +171,7 @@ describe('CancelTaskService', () => {
 
     it('should cancel unsuccessful', done => {
         expect(testTask.startDate).toBeTruthy();
-        expect(testTask.user).toBeTruthy();
+        expect(testTask.userId).toBeTruthy();
         resourceService.response = {
             error: 'error',
             outcome: {}
@@ -195,7 +185,7 @@ describe('CancelTaskService', () => {
         service.cancel(callChainService.create((result) => {
             expect(result).toBeFalse();
             expect(testTask.startDate).toBeTruthy();
-            expect(testTask.user).toBeTruthy();
+            expect(testTask.userId).toBeTruthy();
 
             expect(taskEvent).toBeTruthy();
             expect(taskEvent.taskId).toEqual('taskId');
@@ -208,7 +198,7 @@ describe('CancelTaskService', () => {
 
     it('should cancel error', done => {
         expect(testTask.startDate).toBeTruthy();
-        expect(testTask.user).toBeTruthy();
+        expect(testTask.userId).toBeTruthy();
         resourceService.response = {error: 'throw'};
 
         let taskEvent: TaskEventNotification;
@@ -219,7 +209,7 @@ describe('CancelTaskService', () => {
         service.cancel(callChainService.create((result) => {
             expect(result).toBeFalse();
             expect(testTask.startDate).toBeTruthy();
-            expect(testTask.user).toBeTruthy();
+            expect(testTask.userId).toBeTruthy();
 
             expect(taskEvent).toBeTruthy();
             expect(taskEvent.taskId).toEqual('taskId');
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
@@ -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.name, this._safeTask.user.surname, this._safeTask.user.email
+                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'])
diff --git a/projects/netgrif-components-core/src/lib/task/services/finish-policy.service.ts b/projects/netgrif-components-core/src/lib/task/services/finish-policy.service.ts
@@ -27,7 +27,7 @@ export class FinishPolicyService extends TaskHandlingService {
      * @param afterAction the action that should be performed when the finish policy finishes
      */
     public performFinishPolicy(afterAction: AfterAction = new AfterAction()): void {
-        if (this._safeTask.finishPolicy === FinishPolicy.autoNoData && !!this._safeTask.user) {
+        if (this._safeTask.finishPolicy === FinishPolicy.autoNoData && !!this._safeTask.userId) {
             this.autoNoDataFinishPolicy(afterAction);
         } else {
             this.manualFinishPolicy(afterAction);
diff --git a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.spec.ts
@@ -75,7 +75,7 @@ describe('FinishTaskService', () => {
             title: '',
             caseColor: '',
             caseTitle: '',
-            user: undefined,
+            userId: undefined,
             userRefs: undefined,
             roles: {},
             startDate: [1],
@@ -116,7 +116,7 @@ describe('FinishTaskService', () => {
                     title: '',
                     caseColor: '',
                     caseTitle: '',
-                    user: null,
+                    userId: null,
                     roles: {
                         role: {
                             assign: true,
diff --git a/projects/netgrif-components-core/src/lib/task/services/task-data.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/task-data.service.spec.ts
@@ -151,17 +151,7 @@ describe('TaskDataService', () => {
                     done();
                 });
 
-                taskContentService.task.user = {
-                    email: '',
-                    id: '',
-                    username: '',
-                    realmId: '',
-                    name: '',
-                    surname: '',
-                    fullName: '',
-                    firstName: '',
-                    lastName: '',
-                };
+                taskContentService.task.userId = '';
 
                 mockField.value = !mockField.value;
             }
@@ -206,17 +196,7 @@ describe('TaskDataService', () => {
                     }
                 });
 
-                taskContentService.task.user = {
-                    email: '',
-                    id: '',
-                    username: '',
-                    realmId: '',
-                    name: '',
-                    surname: '',
-                    fullName: '',
-                    firstName: '',
-                    lastName: '',
-                };
+                taskContentService.task.userId = '';
 
                 mockField1.value = !mockField1.value;
                 mockField2.value = !mockField2.value;
diff --git a/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts b/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts
@@ -282,7 +282,7 @@ export class TaskDataService extends TaskHandlingService implements OnDestroy {
             return;
         }
 
-        if (this._safeTask.user === undefined) {
+        if (this._safeTask.userId === undefined) {
             this._log.debug('current task is not assigned...');
             afterAction.resolve(false);
             return;
@@ -367,10 +367,10 @@ export class TaskDataService extends TaskHandlingService implements OnDestroy {
         if (!this.isTaskPresent()) {
             return false;
         }
-        if (this._safeTask.user === undefined) {
+        if (this._safeTask.userId === undefined) {
             return false;
         }
-        if (!this._userComparator.compareUsers(this._safeTask.user)) {
+        if (!this._userComparator.compareUsers(this._safeTask.userId)) {
             return false;
         }
         const taskIdsInRequest: Array<string> = Object.keys(request);
diff --git a/projects/netgrif-components-core/src/lib/user/services/user-comparator.service.ts b/projects/netgrif-components-core/src/lib/user/services/user-comparator.service.ts
@@ -9,9 +9,8 @@ export class UserComparatorService {
 
   constructor(private _userService: UserService) { }
 
-  public compareUsers(user: IUser, acceptImpersonator: boolean = true): boolean {
+  public compareUsers(userId: string, acceptImpersonator: boolean = true): boolean {
       const loggedUser = acceptImpersonator ? this._userService.user.getSelfOrImpersonated() : this._userService.user;
-      return user.email === loggedUser.email ||
-          user.email.includes('anonymous') && this._userService.user.email.includes('anonymous');
+      return userId === loggedUser.id || this._userService.user.email.includes('anonymous');
   }
 }
diff --git a/projects/netgrif-components-core/src/lib/utility/tests/utility/create-mock-task.ts b/projects/netgrif-components-core/src/lib/utility/tests/utility/create-mock-task.ts
@@ -17,7 +17,7 @@ export function createMockTask(stringId = 'stringId',
         title,
         caseColor: 'string',
         caseTitle: 'string',
-        user: undefined,
+        userId: undefined,
         roles: {},
         users: {},
         userRefs: {},
diff --git a/projects/netgrif-components-core/src/lib/view/task-view/service/task-view.service.ts b/projects/netgrif-components-core/src/lib/view/task-view/service/task-view.service.ts
diff --git a/projects/netgrif-components-core/src/lib/view/tree-case-view/tree-task-content/tree-task-content.service.ts b/projects/netgrif-components-core/src/lib/view/tree-case-view/tree-task-content/tree-task-content.service.ts

Original file line number	Diff line number	Diff line change
`@@ -61,30 +61,30 @@ export class PermissionService {`
`61`	`61`	`&& (`
`62`	`62`	`(`
`63`	`63`	`task.assignPolicy === AssignPolicy.manual`
`64`		`- && !task.user`
	`64`	`+ && !task.userId`
`65`	`65`	`&& this.hasTaskPermission(task, PermissionType.ASSIGN)`
`66`	`66`	`)`
`67`	`67`	`);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public canCancel(task: Task \| undefined): boolean {`
`71`		`- return !!task && !!task.user`
	`71`	`+ return !!task && !!task.userId`
`72`	`72`	`&& this.hasTaskPermission(task, PermissionType.CANCEL)`
`73`	`73`	`&& ((task.assignedUserPolicy === undefined \|\| task.assignedUserPolicy.cancel === undefined)`
`74`	`74`	`\|\| task.assignedUserPolicy.cancel);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public canReassign(task: Task \| undefined): boolean {`
`78`		`- return !!task && !!task.user && this.userComparator.compareUsers(task.user)`
	`78`	`+ return !!task && !!task.userId && this.userComparator.compareUsers(task.userId)`
`79`	`79`	`&& this.hasTaskPermission(task, PermissionType.DELEGATE)`
`80`	`80`	`&& ((task.assignedUserPolicy === undefined \|\| task.assignedUserPolicy.reassign === undefined)`
`81`	`81`	`\|\| task.assignedUserPolicy.reassign);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public canFinish(task: Task \| undefined): boolean {`
`85`	`85`	`return !!task`
`86`		`- && !!task.user`
`87`		`- && this.userComparator.compareUsers(task.user)`
	`86`	`+ && !!task.userId`
	`87`	`+ && this.userComparator.compareUsers(task.userId)`
`88`	`88`	`&& this.hasTaskPermission(task, PermissionType.FINISH);`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ export abstract class AbstractTaskPanelComponent extends AbstractPanelWithImmedi`
`406`	`406`	`}`
`407`	`407`	`return {value: 'low', icon: 'south', type: 'meta'};`
`408`	`408`	`case TaskMetaField.USER:`
`409`		`- return {value: task.user ? task.user.fullName : '', icon: 'account_circle', type: 'meta'};`
	`409`	`+ return {value: task.userId ? task.userId : '', icon: 'account_circle', type: 'meta'};`
`410`	`410`	`case TaskMetaField.ASSIGN_DATE:`
`411`	`411`	`return {`
`412`	`412`	`value: task.startDate ? toMoment(task.startDate).format(DATE_TIME_FORMAT_STRING) : '',`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export interface Task {`
`29`	`29`	`/**`
`30`	`30`	`* See [UserSmall]{@link UserResourceSmall#}`
`31`	`31`	`*/`
`32`		`- user: UserResourceSmall;`
	`32`	`+ userId: string;`
`33`	`33`	`/**`
`34`	`34`	`* *Example:*`
`35`	`35`	`*`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ export abstract class TaskContentService implements OnDestroy {`
`208`	`208`	`*/`
`209`	`209`	`public updateStateData(eventOutcome: TaskEventOutcome): void {`
`210`	`210`	`if (this._task) {`
`211`		`- this._task.user = eventOutcome.task.user;`
	`211`	`+ this._task.userId = eventOutcome.task.userId;`
`212`	`212`	`this._task.startDate = eventOutcome.task.startDate;`
`213`	`213`	`this._task.finishDate = eventOutcome.task.finishDate;`
`214`	`214`	`}`