Add reference for deleted user (#5494)

Author: Elblinator

client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts

@@ -291,7 +291,7 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
         const agendaTitle: AgendaListTitle = { title };
 
         if (viewMotion.submitterNames && viewMotion.submitterNames.length) {
-            agendaTitle.subtitle = `${this.translate.instant(`by`)} ${viewMotion.submitterNames.join(`, `)}`;
+            agendaTitle.subtitle = `${this.translate.instant(`by`)} ${viewMotion.submitterNames.map(sub => (sub === undefined ? this.translate.instant(`Deleted user`) : sub)).join(`, `)}`;
         }
         return agendaTitle;
     };

client/src/app/gateways/repositories/motions/util.ts

@@ -26,7 +26,7 @@ export abstract class BaseMotionMeetingUserRepositoryService<
         super(repositoryServiceCollector, constructor);
     }
 
-    public getTitle = (model: V): string => model?.user?.getTitle() || this.translate.instant(`Unknown participant`);
+    public getTitle = (model: V): string => model?.user?.getTitle() || this.translate.instant(`Deleted user`);
 
     public create(motion: Identifiable, ...meetingUsers: Identifiable[]): Action<Identifiable[]> {
         const payload = meetingUsers.map(user => ({

client/src/app/site/base/base-filter.service/base-filter-list.service.ts

@@ -292,20 +292,30 @@ export abstract class BaseFilterListService<V extends BaseViewModel> implements
                     if (viewModels && viewModels.length) {
                         let models: FilterModel[] = viewModels.filter(filterFn ?? ((): boolean => true));
                         if (mapFn) {
-                            models = Object.values(models.map(mapFn).mapToObject(model => ({ [model.id]: model })));
+                            models = Object.values(
+                                models.map(mapFn).mapToObject(model => {
+                                    if (!model) {
+                                        // This is [undefined]: undefined
+                                        // That is only relevant for models which were deleted but should still be displayed
+                                        // That is (so far) only the case for a meeting user who was assigned as editor/speaker and is now deleted)
+                                        return { [model?.id]: undefined };
+                                    }
+                                    return { [model.id]: model };
+                                })
+                            );
                         }
                         filterProperties = models
                             .map((model: FilterModel) => ({
-                                condition: model.id,
-                                label: model.getTitle(),
-                                isChild: !!model.parent,
+                                condition: model?.id,
+                                label: model?.getTitle() ?? `Deleted user`,
+                                isChild: !!model?.parent,
                                 isActive: (
                                     filter.options.find(
-                                        f => (f as OsFilterOption)?.condition === model.id
+                                        f => (f as OsFilterOption)?.condition === model?.id
                                     ) as OsFilterOption
                                 )?.isActive,
-                                skipTranslate: true,
-                                children: model.children?.length
+                                skipTranslate: model?.getTitle() ? true : false,
+                                children: model?.children?.length
                                     ? model.children.map((child: any) => ({
                                           label: child.getTitle(),
                                           condition: child.id

client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.ts

@@ -163,10 +163,10 @@ export class ParticipantSearchSelectorComponent extends BaseUiComponent implemen
 
     public async createNewSelectedUser(name: string): Promise<void> {
         const newUserObj = await this.userRepo.createFromString(name);
-        this.emitSelectedUser({ userId: newUserObj.id, user: newUserObj });
         const user = await firstValueFrom(
             this.userRepo.getViewModelObservable(newUserObj.id).pipe(filter(user => !!user))
         );
+        this.emitSelectedUser({ userId: newUserObj.id, user });
         this.snackBar.open(
             this.translate
                 .instant(`A user with the username '%username%' and the first name '%first_name%' was created.`)

client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/components/motion-forward-dialog/motion-forward-dialog.component.html

@@ -121,7 +121,7 @@
                                     <span class="data-preview">
                                         <os-comma-separated-listing [list]="data.motion[0].submitterNames">
                                             <ng-template let-submitter>
-                                                {{ submitter }}
+                                                {{ getSubmitterOrDeletedUser(submitter) }}
                                             </ng-template>
                                         </os-comma-separated-listing>
                                     </span>

client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/components/motion-forward-dialog/motion-forward-dialog.component.ts

@@ -1,6 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { MatCheckboxChange } from '@angular/material/checkbox';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { Id, Ids } from 'src/app/domain/definitions/key-types';
 import { GetForwardingMeetingsPresenter, GetForwardingMeetingsPresenterMeeting } from 'src/app/gateways/presenter';
@@ -59,7 +60,8 @@ export class MotionForwardDialogComponent implements OnInit {
         @Inject(MAT_DIALOG_DATA)
         public data: { motion: ViewMotion[]; forwardingMeetings: GetForwardingMeetingsPresenter[] },
         private dialogRef: MatDialogRef<MotionForwardDialogComponent, MotionForwardDialogReturnData>,
-        private activeMeeting: ActiveMeetingService
+        private activeMeeting: ActiveMeetingService,
+        private translate: TranslateService
     ) {}
 
     public async ngOnInit(): Promise<void> {
@@ -134,4 +136,8 @@ export class MotionForwardDialogComponent implements OnInit {
         const hasAmend: (element: ViewMotion) => boolean = element => element.amendments.length > 0;
         return this.data.motion.some(hasAmend);
     }
+
+    public getSubmitterOrDeletedUser(submitter: string): string {
+        return submitter ?? this.translate.instant(`Deleted user`);
+    }
 }

client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list/amendment-list.component.html

@@ -74,7 +74,7 @@ <h2>
                     @if (motion.submitterNames.length) {
                         <span>
                             <span>{{ 'by' | translate }}</span>
-                            {{ motion.submitterNames }}
+                            {{ getSubmitterListWithDeletedUsers(motion.submitterNames) }}
                         </span>
                     }
                     @if (showSequentialNumber) {

client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list/amendment-list.component.ts

@@ -159,4 +159,8 @@ export class AmendmentListComponent extends BaseMeetingListViewComponent<ViewMot
     public getChangedLinesFromAmendment(amendment: ViewMotion): string | null {
         return amendment.getChangedLines();
     }
+
+    public getSubmitterListWithDeletedUsers(submitters: string[]): string[] {
+        return submitters.map(sub => sub ?? this.translate.instant(`Deleted user`));
+    }
 }

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.html

@@ -123,7 +123,9 @@
                                     </mat-icon>
                                 }
                                 <i class="grey">&nbsp;- {{ change.amendment.state!.name }}</i>
-                                <i class="grey">&nbsp;- {{ change.amendment.submitterNames }}</i>
+                                <i class="grey">
+                                    &nbsp;- {{ getSubmitterListWithDeletedUsers(change.amendment.submitterNames) }}
+                                </i>
                             </div>
                         }
                     </div>

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts

@@ -586,4 +586,8 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
             behavior: `smooth`
         });
     }
+
+    public getSubmitterListWithDeletedUsers(submitters: string[]): string[] {
+        return submitters.map(sub => sub ?? this.translate.instant(`Deleted user`));
+    }
 }