From de9c4cb45af870f53faa3ef571593551f3215128 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 18 Apr 2023 19:35:59 +0200
Subject: [PATCH] Rename to ETF provider

---
 .../allocations/allocations-page.component.ts | 23 ++++-----
 .../allocations/allocations-page.html         | 48 ++++++++++---------
 2 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
index 728eb42ba..7d541553f 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
@@ -65,7 +65,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
       | 'exchange'
       | 'name'
       | 'value'
-    > & { organization: string };
+    > & { etfProvider: string };
   };
   public sectors: {
     [name: string]: { name: string; value: number };
@@ -249,7 +249,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
   public initializeAnalysisData() {
     this.initialize();
 
-    for (const [id, { current, name, original }] of Object.entries(
+    for (const [id, { current, name }] of Object.entries(
       this.portfolioDetails.accounts
     )) {
       this.accounts[id] = {
@@ -275,13 +275,12 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
         assetClass: position.assetClass,
         assetSubClass: position.assetSubClass,
         currency: position.currency,
-        exchange: position.exchange,
-        name: position.name,
-        organization: this.nameToOrganization({
-          assetClass: position.assetClass,
+        etfProvider: this.extractEtfProvider({
           assetSubClass: position.assetSubClass,
           name: position.name
-        })
+        }),
+        exchange: position.exchange,
+        name: position.name
       };
 
       if (position.assetClass !== AssetClass.CASH) {
@@ -458,22 +457,18 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
       });
   }
 
-  private nameToOrganization({
-    assetClass,
+  private extractEtfProvider({
     assetSubClass,
     name
   }: {
-    assetClass: AssetClass;
     assetSubClass: PortfolioPosition['assetSubClass'];
     name: string;
   }) {
-    if (assetClass.toUpperCase() === 'CASH') {
-      return UNKNOWN_KEY;
-    } else if (assetSubClass === 'ETF' || name.includes('ETF')) {
+    if (assetSubClass === 'ETF') {
       const [firstWord] = name.split(' ');
       return firstWord;
     }
 
-    return name;
+    return UNKNOWN_KEY;
   }
 }
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index 92b1a65fe..e618a3db5 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -100,29 +100,6 @@
         </mat-card-content>
       </mat-card>
     </div>
-    <div class="col-md-4">
-      <mat-card appearance="outlined" class="mb-3">
-        <mat-card-header class="overflow-hidden w-100">
-          <mat-card-title class="align-items-center d-flex text-truncate"
-            ><span i18n>By Organization</span
-            ><gf-premium-indicator
-              *ngIf="user?.subscription?.type === 'Basic'"
-              class="ml-1"
-            ></gf-premium-indicator
-          ></mat-card-title>
-        </mat-card-header>
-        <mat-card-content>
-          <gf-portfolio-proportion-chart
-            [baseCurrency]="user?.settings?.baseCurrency"
-            [colorScheme]="user?.settings?.colorScheme"
-            [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
-            [keys]="['organization']"
-            [locale]="user?.settings?.locale"
-            [positions]="positions"
-          ></gf-portfolio-proportion-chart>
-        </mat-card-content>
-      </mat-card>
-    </div>
     <div class="col-md-12 allocations-by-symbol">
       <mat-card appearance="outlined" class="mb-3">
         <mat-card-header class="overflow-hidden w-100">
@@ -272,4 +249,29 @@
       </mat-card>
     </div>
   </div>
+  <div class="row">
+    <div class="col-md-4">
+      <mat-card appearance="outlined" class="mb-3">
+        <mat-card-header class="overflow-hidden w-100">
+          <mat-card-title class="align-items-center d-flex text-truncate"
+            ><span i18n>By ETF Provider</span
+            ><gf-premium-indicator
+              *ngIf="user?.subscription?.type === 'Basic'"
+              class="ml-1"
+            ></gf-premium-indicator
+          ></mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+          <gf-portfolio-proportion-chart
+            [baseCurrency]="user?.settings?.baseCurrency"
+            [colorScheme]="user?.settings?.colorScheme"
+            [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
+            [keys]="['etfProvider']"
+            [locale]="user?.settings?.locale"
+            [positions]="positions"
+          ></gf-portfolio-proportion-chart>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </div>
 </div>