From 829b75ce56a6c101b9858d5d4d06ae91778897af Mon Sep 17 00:00:00 2001
From: Dan <dan@ddev.ch>
Date: Tue, 11 Feb 2025 13:24:54 +0100
Subject: [PATCH] Added Marketprice to holdings table and sticky end to sorted
 table + Reduced column width of name column

---
 .../holdings-table.component.html             | 48 +++++++++++++++++--
 .../holdings-table.component.scss             | 20 ++++++++
 .../holdings-table.component.ts               |  1 +
 3 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.html
index 5e4526fdc..0fb8b9b0a 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html
@@ -21,13 +21,17 @@
     <ng-container matColumnDef="nameWithSymbol">
       <th
         *matHeaderCellDef
-        class="px-1"
+        class="px-1 name-col"
         mat-header-cell
         mat-sort-header="symbol"
       >
         <ng-container i18n>Name</ng-container>
       </th>
-      <td *matCellDef="let element" class="line-height-1 px-1" mat-cell>
+      <td
+        *matCellDef="let element"
+        class="line-height-1 px-1 name-col"
+        mat-cell
+      >
         <div class="text-truncate">
           {{ element.name }}
           @if (element.name === element.symbol) {
@@ -63,8 +67,34 @@
         </div>
       </td>
     </ng-container>
+    <ng-container
+      matColumnDef="marketPrice"
+      [stickyEnd]="dataSource?.sort?.active === 'marketPrice'"
+    >
+      <th
+        *matHeaderCellDef
+        class="justify-content-end px-1"
+        mat-header-cell
+        mat-sort-header
+      >
+        <span class="d-none d-sm-block" i18n>Marketprice</span>
+        <span class="d-block d-sm-none" i18n>Price</span>
+      </th>
+      <td *matCellDef="let element" class="px-1" mat-cell>
+        <div class="d-flex justify-content-end">
+          <gf-value
+            [isCurrency]="true"
+            [locale]="locale"
+            [value]="isLoading ? undefined : element.marketPrice"
+          />
+        </div>
+      </td>
+    </ng-container>
 
-    <ng-container matColumnDef="valueInBaseCurrency">
+    <ng-container
+      matColumnDef="valueInBaseCurrency"
+      [stickyEnd]="dataSource?.sort?.active === 'valueInBaseCurrency'"
+    >
       <th
         *matHeaderCellDef
         class="d-none d-lg-table-cell justify-content-end px-1"
@@ -88,7 +118,10 @@
       </td>
     </ng-container>
 
-    <ng-container matColumnDef="allocationInPercentage">
+    <ng-container
+      matColumnDef="allocationInPercentage"
+      [stickyEnd]="dataSource?.sort?.active === 'allocationInPercentage'"
+    >
       <th
         *matHeaderCellDef
         class="justify-content-end px-1"
@@ -109,7 +142,12 @@
       </td>
     </ng-container>
 
-    <ng-container matColumnDef="performance">
+    <ng-container
+      matColumnDef="performance"
+      [stickyEnd]="
+        dataSource?.sort?.active === 'netPerformanceWithCurrencyEffect'
+      "
+    >
       <th
         *matHeaderCellDef
         class="justify-content-end px-1"
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.scss b/libs/ui/src/lib/holdings-table/holdings-table.component.scss
index 990b8b294..3ff7041c1 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.scss
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.scss
@@ -1,6 +1,22 @@
 :host {
   display: block;
 
+  .mat-column-nameWithSymbol {
+    word-wrap: break-word !important;
+    white-space: unset !important;
+    max-width: 250px;
+    width: 60%;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+
+    word-break: break-word;
+
+    -ms-hyphens: auto;
+    -moz-hyphens: auto;
+    -webkit-hyphens: auto;
+    hyphens: auto;
+  }
+
   .gf-table {
     th {
       ::ng-deep {
@@ -11,3 +27,7 @@
     }
   }
 }
+
+.mat-sort-header-sorted {
+  position: sticky !important;
+}
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index 14382f420..7aa40e9f9 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -80,6 +80,7 @@ export class GfHoldingsTableComponent implements OnChanges, OnDestroy {
     }
 
     this.displayedColumns.push('allocationInPercentage');
+    this.displayedColumns.push('marketPrice');
 
     if (this.hasPermissionToShowValues) {
       this.displayedColumns.push('performance');