Added Unknown Mode disabled so that users can get cleaner graphs when some assets are not classified with country or sector.

3 years ago · d9e8cade6d
14 changed files with 102 additions and 14 deletions
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@ -85,6 +85,8 @@ import {
 } from './interfaces/portfolio-position-detail.interface';
 import { PortfolioCalculator } from './portfolio-calculator';
 import { RulesService } from './rules.service';
+import {countries} from "countries-list";
+import {Country} from "@ghostfolio/common/interfaces/country.interface";

 const developedMarkets = require('../../assets/countries/developed-markets.json');
 const emergingMarkets = require('../../assets/countries/emerging-markets.json');
@ -462,7 +464,7 @@ export class PortfolioService {
    });

    const holdings: PortfolioDetails['holdings'] = {};
-    const totalInvestmentInBaseCurrency = currentPositions.totalInvestment.plus(
+    currentPositions.totalInvestment.plus(
      cashDetails.balanceInBaseCurrency
    );
    let filteredValueInBaseCurrency = currentPositions.currentValue;
@ -1269,10 +1271,24 @@ export class PortfolioService {
      cashPositions[symbol].allocationInPercentage = value.gt(0)
        ? new Big(cashPositions[symbol].value).div(value).toNumber()
        : 0;
+      cashPositions[symbol].sectors = [                {
+        "name": "OTHER",
+        "weight": 1
+      }]
+      cashPositions[symbol].countries = this.matchCurrencyToCountries(symbol)
    }

    return cashPositions;
  }
+  private matchCurrencyToCountries(aString: string): Country[] {
+    const csformat = []
+    switch (aString) {
+      case 'USD':
+        csformat.push(countries.US)
+        break;
+    }
+    return csformat;
+  }

  private getDividend({
    activities,
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@ -1,7 +1,8 @@
 import type {
  ColorScheme,
  DateRange,
-  ViewMode
+  ViewMode,
+  UnknownMode
 } from '@ghostfolio/common/types';
 import {
  IsBoolean,
@ -55,4 +56,8 @@ export class UpdateUserSettingDto {
  @IsIn(<ViewMode[]>['DEFAULT', 'ZEN'])
  @IsOptional()
  viewMode?: ViewMode;
+
+  @IsIn(<UnknownMode[]>['DEFAULT', 'OFF'])
+  @IsOptional()
+  unknownMode?: UnknownMode;
 }
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -163,6 +163,10 @@ export class UserService {
      (user.Settings.settings as UserSettings).viewMode = 'DEFAULT';
    }

+    if (!(user.Settings.settings as UserSettings).unknownMode) {
+      (user.Settings.settings as UserSettings).unknownMode = 'DEFAULT';
+    }
+
    let currentPermissions = getPermissions(user.role);

    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
@ -117,7 +117,7 @@ export class YahooFinanceService implements DataProviderInterface {
      });
      response.symbol = aSymbol;

-      if (assetSubClass === AssetSubClass.MUTUALFUND) {
+      if (assetSubClass === AssetSubClass.MUTUALFUND || assetSubClass === AssetSubClass.ETF) {
        response.sectors = [];

        for (const sectorWeighting of assetProfile.topHoldings
--- a/apps/client/src/app/pages/account/account-page.component.ts
+++ b/apps/client/src/app/pages/account/account-page.component.ts
@ -53,6 +53,7 @@ export class AccountPageComponent implements OnDestroy, OnInit {
  public hasPermissionToCreateAccess: boolean;
  public hasPermissionToDeleteAccess: boolean;
  public hasPermissionToUpdateViewMode: boolean;
+  public hasPermissionToUpdateUnknownMode: boolean;
  public hasPermissionToUpdateUserSettings: boolean;
  public language = document.documentElement.lang;
  public locales = [
@ -138,6 +139,11 @@ export class AccountPageComponent implements OnDestroy, OnInit {
            permissions.updateViewMode
          );

+          this.hasPermissionToUpdateUnknownMode = hasPermission(
+            this.user.permissions,
+            permissions.updateUnknownMode
+          );
+
          this.locales.push(this.user.settings.locale);
          this.locales = uniq(this.locales.sort());

@ -330,6 +336,22 @@ export class AccountPageComponent implements OnDestroy, OnInit {
          });
      });
  }
+  public onUnknownChange(aEvent: MatSlideToggleChange) {
+    this.dataService
+      .putUserSetting({ unknownMode: aEvent.checked === true ? 'DEFAULT' : 'OFF'})
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        this.userService.remove();
+
+        this.userService
+          .get()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe((user) => {
+            this.user = user;
+            this.changeDetectorRef.markForCheck();
+          });
+      });
+  }

  public ngOnDestroy() {
    this.unsubscribeSubject.next();
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@ -225,6 +225,22 @@
              ></mat-slide-toggle>
            </div>
          </div>
+          <div class="d-flex mt-4 py-1">
+            <div class="pr-1 w-50">
+              <div i18n>Unknown Mode</div>
+              <div class="hint-text text-muted" i18n>
+                Show Unknown categories in Portfolio Allocation View
+              </div>
+            </div>
+            <div class="pl-1 w-50">
+              <mat-slide-toggle
+                color="primary"
+                [checked]="user.settings.unknownMode === 'DEFAULT'"
+                [disabled]="!hasPermissionToUpdateUnknownMode"
+                (change)="onUnknownChange($event)"
+              ></mat-slide-toggle>
+            </div>
+          </div>
          <div class="align-items-center d-flex mt-4 py-1">
            <div class="pr-1 w-50" i18n>Sign in with fingerprint</div>
            <div class="pl-1 w-50">
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
@ -309,7 +309,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
              };
            }
          }
-        } else {
+        } else if (this.user.settings.unknownMode === "DEFAULT") {
          this.continents[UNKNOWN_KEY].value +=
            this.portfolioDetails.holdings[symbol].value;

@ -330,7 +330,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
              };
            }
          }
-        } else {
+        } else if (this.user.settings.unknownMode === "DEFAULT") {
          this.sectors[UNKNOWN_KEY].value +=
            this.portfolioDetails.holdings[symbol].value;
        }
--- a/apps/client/src/app/pages/public/public-page.component.ts
+++ b/apps/client/src/app/pages/public/public-page.component.ts
@ -5,7 +5,7 @@ import { UNKNOWN_KEY } from '@ghostfolio/common/config';
 import { prettifySymbol } from '@ghostfolio/common/helper';
 import {
  PortfolioPosition,
-  PortfolioPublicDetails
+  PortfolioPublicDetails, User
 } from '@ghostfolio/common/interfaces';
 import { Market } from '@ghostfolio/common/types';
 import { StatusCodes } from 'http-status-codes';
@ -13,6 +13,7 @@ import { isNumber } from 'lodash';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { EMPTY, Subject } from 'rxjs';
 import { catchError, takeUntil } from 'rxjs/operators';
+import { UserService } from '@ghostfolio/client/services/user/user.service';

@Component({
  host: { class: 'page' },
@ -47,23 +48,34 @@ export class PublicPageComponent implements OnInit {
  };

  private id: string;
+
+  private user: User;
+
  private unsubscribeSubject = new Subject<void>();

  public constructor(
    private activatedRoute: ActivatedRoute,
    private changeDetectorRef: ChangeDetectorRef,
    private dataService: DataService,
+    private userService: UserService,
    private deviceService: DeviceDetectorService,
    private router: Router
  ) {
    this.activatedRoute.params.subscribe((params) => {
      this.id = params['id'];
    });
+    this.userService.stateChanged
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((state) => {
+        if (state?.user) {
+          this.user = state.user;
+          this.initializeAnalysisData()
+        }
+      });
  }

  public ngOnInit() {
    this.deviceType = this.deviceService.getDeviceInfo().deviceType;
-
    this.dataService
      .fetchPortfolioPublic(this.id)
      .pipe(
@ -191,7 +203,7 @@ export class PublicPageComponent implements OnInit {
            };
          }
        }
-      } else {
+      } else if (this.user.settings.unknownMode === "DEFAULT") {
        this.sectors[UNKNOWN_KEY].value +=
          this.portfolioPublicDetails.holdings[symbol].value;
      }
--- a/libs/common/src/lib/interfaces/user-settings.interface.ts
+++ b/libs/common/src/lib/interfaces/user-settings.interface.ts
@ -1,4 +1,4 @@
-import { ColorScheme, DateRange, ViewMode } from '@ghostfolio/common/types';
+import {ColorScheme, DateRange, UnknownMode, ViewMode} from '@ghostfolio/common/types';

 export interface UserSettings {
  baseCurrency?: string;
@ -12,4 +12,5 @@ export interface UserSettings {
  locale?: string;
  savingsRate?: number;
  viewMode?: ViewMode;
+  unknownMode?: UnknownMode;
 }
--- a/libs/common/src/lib/permissions.ts
+++ b/libs/common/src/lib/permissions.ts
@ -27,7 +27,8 @@ export const permissions = {
  updateAuthDevice: 'updateAuthDevice',
  updateOrder: 'updateOrder',
  updateUserSettings: 'updateUserSettings',
-  updateViewMode: 'updateViewMode'
+  updateViewMode: 'updateViewMode',
+  updateUnknownMode: 'updateUnknownMode'
 };

 export function getPermissions(aRole: Role): string[] {
@ -47,7 +48,8 @@ export function getPermissions(aRole: Role): string[] {
        permissions.updateAuthDevice,
        permissions.updateOrder,
        permissions.updateUserSettings,
-        permissions.updateViewMode
+        permissions.updateViewMode,
+        permissions.updateUnknownMode
      ];

    case 'DEMO':
@ -66,7 +68,8 @@ export function getPermissions(aRole: Role): string[] {
        permissions.updateAuthDevice,
        permissions.updateOrder,
        permissions.updateUserSettings,
-        permissions.updateViewMode
+        permissions.updateViewMode,
+        permissions.updateUnknownMode
      ];

    default:
--- a/libs/common/src/lib/types/index.ts
+++ b/libs/common/src/lib/types/index.ts
@ -10,7 +10,7 @@ import { Market } from './market.type';
 import type { OrderWithAccount } from './order-with-account.type';
 import type { RequestWithUser } from './request-with-user.type';
 import { ToggleOption } from './toggle-option.type';
-import type { ViewMode } from './view-mode.type';
+import type { ViewMode, UnknownMode } from './view-mode.type';

 export type {
  AccessWithGranteeUser,
@ -25,5 +25,6 @@ export type {
  OrderWithAccount,
  RequestWithUser,
  ToggleOption,
-  ViewMode
+  ViewMode,
+  UnknownMode
 };
--- a/libs/common/src/lib/types/view-mode.type.ts
+++ b/libs/common/src/lib/types/view-mode.type.ts
@ -1 +1,2 @@
 export type ViewMode = 'DEFAULT' | 'ZEN';
+export type UnknownMode = 'DEFAULT' | 'OFF';
--- a/prisma/migrations/20230212232240_added_unknown_mode/migration.sql
+++ b/prisma/migrations/20230212232240_added_unknown_mode/migration.sql
@ -0,0 +1,2 @@
+-- CreateEnum
+CREATE TYPE "UnknownMode" AS ENUM ('DEFAULT', 'OFF');
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@ -218,6 +218,11 @@ enum ViewMode {
  ZEN
 }

+enum UnknownMode {
+  DEFAULT
+  OFF
+}
+
 enum Provider {
  ANONYMOUS
  GOOGLE