From 68ce154b5968f5c5f976d6c5576a2f901098a498 Mon Sep 17 00:00:00 2001
From: VILLAN3LL3 <development@gutfrau.de>
Date: Thu, 4 Jan 2024 16:12:17 +0100
Subject: [PATCH] ARPA-930 Show avatar in person list

---
 src/@arpa/components/avatar/avatar.component.ts          | 2 +-
 src/@arpa/components/table/table.component.html          | 9 ++++++++-
 src/@arpa/components/table/table.component.ts            | 2 +-
 src/@arpa/components/table/table.module.ts               | 2 ++
 .../dashboard/user-widget/user-widget.component.html     | 2 +-
 .../persons/person-list/person-list.component.ts         | 1 +
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/@arpa/components/avatar/avatar.component.ts b/src/@arpa/components/avatar/avatar.component.ts
index 0c8d6f5c..9648199e 100644
--- a/src/@arpa/components/avatar/avatar.component.ts
+++ b/src/@arpa/components/avatar/avatar.component.ts
@@ -115,7 +115,7 @@ export class AvatarComponent implements OnInit, OnDestroy {
     if (this.useCurrentUserAvatar) {
       return this.currentUserPersonId;
     }
-    return this.user.personId || this.user?.person?.id;
+    return this.user.personId || this.user?.person?.id || this.user?.id;
   }
 
   ngOnDestroy(): void {
diff --git a/src/@arpa/components/table/table.component.html b/src/@arpa/components/table/table.component.html
index d357cf29..175a0a3e 100644
--- a/src/@arpa/components/table/table.component.html
+++ b/src/@arpa/components/table/table.component.html
@@ -132,8 +132,10 @@ <h4>{{ feed.totalCount | async }} {{ 'RESULTS' | translate }}</h4>
             </div>
           </th>
         </ng-container>
+        <ng-container *ngIf="column.type === 'avatar'">
+          <th pResizableColumn [classList]="column.cssClasses"></th>
+        </ng-container>
       </ng-container>
-
       <!-- Render an additional column if an action template was provided -->
       <ng-container *ngIf="actionsTemplateRef">
         <th class="end"></th>
@@ -181,6 +183,11 @@ <h4>{{ feed.totalCount | async }} {{ 'RESULTS' | translate }}</h4>
               <p-rating [cancel]="false" [stars]="5" [readonly]="true" [ngModel]="resolveValue(column.property, row)"></p-rating>
             </td>
           </ng-container>
+          <ng-container *ngIf="column.type === 'avatar'">
+            <td [classList]="column.cssClasses">
+              <arpa-avatar [user]="row" [image]="true" size="small"></arpa-avatar>
+            </td>
+          </ng-container>
         </ng-container>
       </ng-container>
 
diff --git a/src/@arpa/components/table/table.component.ts b/src/@arpa/components/table/table.component.ts
index 3fa3e338..0045b905 100644
--- a/src/@arpa/components/table/table.component.ts
+++ b/src/@arpa/components/table/table.component.ts
@@ -23,7 +23,7 @@ import { SelectValueService } from '@arpa/services';
 export interface ColumnDefinition<T extends Record<string, any>> {
   label: string;
   property: string | Extract<keyof T, string>;
-  type: 'text' | 'date' | 'image' | 'badge' | 'state' | 'progress' | 'checkbox' | 'button' | 'template' | 'rating' | 'number';
+  type: 'text' | 'date' | 'image' | 'badge' | 'state' | 'progress' | 'checkbox' | 'button' | 'template' | 'rating' | 'number' | 'avatar';
   show?: boolean;
   cssClasses?: string[];
   template?: string;
diff --git a/src/@arpa/components/table/table.module.ts b/src/@arpa/components/table/table.module.ts
index bca9439e..b4beba44 100644
--- a/src/@arpa/components/table/table.module.ts
+++ b/src/@arpa/components/table/table.module.ts
@@ -12,6 +12,7 @@ import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-m
 import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
 import { StateBadgeModule } from '../status-badge/state-badge.module';
 import { RatingModule } from 'primeng/rating';
+import { AvatarModule } from '../avatar/avatar.module';
 
 @NgModule({
   declarations: [TableComponent, ArpaTableColumnDirective],
@@ -27,6 +28,7 @@ import { RatingModule } from 'primeng/rating';
     MatMenuModule,
     MatCheckboxModule,
     RatingModule,
+    AvatarModule,
   ],
   exports: [NgTableModule, TableComponent, ArpaTableColumnDirective],
 })
diff --git a/src/app/features/dashboard/user-widget/user-widget.component.html b/src/app/features/dashboard/user-widget/user-widget.component.html
index 395843d5..22682594 100644
--- a/src/app/features/dashboard/user-widget/user-widget.component.html
+++ b/src/app/features/dashboard/user-widget/user-widget.component.html
@@ -57,7 +57,7 @@
   <ng-template let-user pTemplate="body">
     <tr>
       <td class="start">
-        <arpa-avatar [user]="user" [image]="true" size="large"></arpa-avatar>
+        <arpa-avatar [user]="user" [image]="true" size="small"></arpa-avatar>
       </td>
       <td>
         {{ user.displayName }}
diff --git a/src/app/features/persons/person-list/person-list.component.ts b/src/app/features/persons/person-list/person-list.component.ts
index b1362215..6b60c57b 100644
--- a/src/app/features/persons/person-list/person-list.component.ts
+++ b/src/app/features/persons/person-list/person-list.component.ts
@@ -26,6 +26,7 @@ export class PersonListComponent implements OnInit {
   private routeEventsSubscription: Subscription = Subscription.EMPTY;
 
   columns: ColumnDefinition<PersonDto>[] = [
+    { label: '', property: '', type: 'avatar' },
     { label: 'SURNAME', property: 'surname', type: 'text' },
     { label: 'GIVEN_NAME', property: 'givenName', type: 'text' },
     { label: 'ABOUT_ME', property: 'aboutMe', type: 'text', show: true },