Merge branch 'main' into task/add-loading-indicator-to-platform-and-tag-management-of-admin-panel

CHANGELOG.md

@@ -11,11 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added a loading indicator to the platform management of the admin control panel
 - Added a loading indicator to the tag management of the admin control panel
+- Added a _Refresh_ action to the user detail dialog menu in the admin control panel
 - Added the total column to the table of the tag management in the admin control panel
 
 ### Changed
 
 - Extended the emergency fund dialog in the portfolio summary to include the currency suffix
+- Extended the user detail dialog in the users section of the admin control panel to include the last request
 - Migrated the client to the code generated by the new `prisma-client` generator of _Prisma_
 - Migrated from `lodash` to `lodash-es`
 
@@ -24,10 +26,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed the colors of the investment chart component (dark mode)
 - Fixed the colors of the charts if the appearance is set to light and the operating system uses dark mode
 - Fixed the allocation column of the top holdings of ETFs on the allocations page after a change of the user settings
+- Fixed the allocation column of the top holdings of funds other than ETFs on the allocations page
 - Fixed the value column of the top holdings of ETFs on the allocations page in the _Presenter View_
 - Fixed the projected sustainable retirement income on the _FIRE_ page for a projected total amount of zero (experimental)
+- Fixed the sustainable retirement income on the _FIRE_ page for redacted values
 - Fixed the emergency fund in the portfolio summary for redacted values
 - Fixed the redaction of `valueInBaseCurrency` in the holdings of ETFs in a restricted view
+- Fixed the redaction of `comment`, `scraperConfiguration` and `symbolMapping` in the asset profile relation of the activities in a restricted view
+- Resolved the data source transformation in the asset profile relation of the activities
 
 ## 3.75.0 - 2026-09-28
 

apps/api/src/helper/object.helper.spec.ts

@@ -3082,6 +3082,20 @@ describe('redactAttributes', () => {
           feeInBaseCurrency: 18.2,
           id: '8c623328-6035-4b5f-b6d5-702cc1c9c56b',
           quantity: 50,
+          // The relation of the database is part of the response next to the
+          // asset profile
+          SymbolProfile: {
+            comment: 'Reviewed by the administrator',
+            name: 'Apple Inc',
+            scraperConfiguration: {
+              headers: { Authorization: 'Bearer TOKEN' },
+              mode: 'lazy',
+              selector: '.price',
+              url: 'https://example.org/get_price'
+            },
+            symbol: 'AAPL',
+            symbolMapping: { YAHOO: 'AAPL' }
+          },
           type: 'BUY',
           unitPrice: 220.79,
           value: 11039.5,
@@ -3111,6 +3125,13 @@ describe('redactAttributes', () => {
       feeInBaseCurrency: null,
       id: '8c623328-6035-4b5f-b6d5-702cc1c9c56b',
       quantity: null,
+      SymbolProfile: {
+        comment: null,
+        name: 'Apple Inc',
+        scraperConfiguration: null,
+        symbol: 'AAPL',
+        symbolMapping: null
+      },
       type: 'BUY',
       // A price per unit stays visible, like the average price and the market
       // price of a holding
@@ -3169,6 +3190,18 @@ describe('redactAttributes', () => {
               currency: 'USD',
               fee: 19.9,
               quantity: 50,
+              SymbolProfile: {
+                comment: 'Reviewed by the administrator',
+                name: 'Apple Inc',
+                scraperConfiguration: {
+                  headers: { Authorization: 'Bearer TOKEN' },
+                  mode: 'lazy',
+                  selector: '.price',
+                  url: 'https://example.org/get_price'
+                },
+                symbol: 'AAPL',
+                symbolMapping: { YAHOO: 'AAPL' }
+              },
               type: 'BUY',
               unitPrice: 220.79,
               value: 11039.5,
@@ -3194,6 +3227,13 @@ describe('redactAttributes', () => {
           currency: 'USD',
           fee: null,
           quantity: null,
+          SymbolProfile: {
+            comment: null,
+            name: 'Apple Inc',
+            scraperConfiguration: null,
+            symbol: 'AAPL',
+            symbolMapping: null
+          },
           type: 'BUY',
           unitPrice: 220.79,
           value: null,

apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts

@@ -83,6 +83,7 @@ export class TransformDataSourceInResponseInterceptor<
               '["filters.dataSource"]',
               'activities[*].assetProfile.dataSource',
               'activities[*].dataSource',
+              'activities[*].SymbolProfile.dataSource',
               'assetProfile.dataSource',
               'benchmarks[*].dataSource',
               'errors[*].dataSource',
@@ -93,6 +94,7 @@ export class TransformDataSourceInResponseInterceptor<
               'items[*].dataSource',
               'latestActivities[*].assetProfile.dataSource',
               'settings["filters.dataSource"]',
+              'SymbolProfile.dataSource',
               'watchlist[*].dataSource'
             ]
           });

apps/client/src/app/components/admin-overview/admin-overview.component.ts

@@ -48,12 +48,7 @@ import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTableDataSource, MatTableModule } from '@angular/material/table';
 import { RouterModule } from '@angular/router';
 import { IonIcon } from '@ionic/angular/standalone';
-import {
-  addMilliseconds,
-  differenceInSeconds,
-  formatDistanceToNowStrict,
-  parseISO
-} from 'date-fns';
+import { addMilliseconds, formatDistanceToNowStrict } from 'date-fns';
 import { addIcons } from 'ionicons';
 import {
   closeCircleOutline,
@@ -187,21 +182,6 @@ export class GfAdminOverviewComponent implements OnInit {
     this.fetchAdminData();
   }
 
-  protected formatDistanceToNow(aDateString: string) {
-    if (aDateString) {
-      const distanceString = formatDistanceToNowStrict(parseISO(aDateString), {
-        addSuffix: true
-      });
-
-      return Math.abs(differenceInSeconds(parseISO(aDateString), new Date())) <
-        60
-        ? 'just now'
-        : distanceString;
-    }
-
-    return '';
-  }
-
   protected formatStringValue(aStringValue: StringValue) {
     return formatDistanceToNowStrict(
       addMilliseconds(new Date(), ms(aStringValue)),

apps/client/src/app/components/admin-users/admin-users.component.ts

@@ -5,12 +5,12 @@ import {
 import { GfUserDetailDialogComponent } from '@ghostfolio/client/components/user-detail-dialog/user-detail-dialog.component';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { formatRelativeTime } from '@ghostfolio/client/util/date.util';
 import { DEFAULT_LOCALE, DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import {
   canDeleteUser,
   getCountryName,
-  getDateFnsLocale,
   getDateFormatString,
   getEmojiFlag
 } from '@ghostfolio/common/helper';
@@ -49,11 +49,6 @@ import {
 import { MatTableDataSource, MatTableModule } from '@angular/material/table';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { IonIcon } from '@ionic/angular/standalone';
-import {
-  differenceInSeconds,
-  formatDistanceToNowStrict,
-  parseISO
-} from 'date-fns';
 import { addIcons } from 'ionicons';
 import {
   contractOutline,
@@ -93,6 +88,7 @@ export class GfAdminUsersComponent implements OnInit {
   protected defaultDateFormat: string;
   protected displayedColumns: string[] = [];
   protected readonly canDeleteUser = canDeleteUser;
+  protected readonly formatRelativeTime = formatRelativeTime;
   protected readonly getCountryName = getCountryName;
   protected readonly getEmojiFlag = getEmojiFlag;
   protected hasPermissionForSubscription: boolean;
@@ -209,22 +205,6 @@ export class GfAdminUsersComponent implements OnInit {
       });
   }
 
-  protected formatDistanceToNow(aDateString: string) {
-    if (aDateString) {
-      const distanceString = formatDistanceToNowStrict(parseISO(aDateString), {
-        addSuffix: true,
-        locale: getDateFnsLocale(this.user?.settings?.language)
-      });
-
-      return Math.abs(differenceInSeconds(parseISO(aDateString), new Date())) <
-        60
-        ? $localize`just now`
-        : distanceString;
-    }
-
-    return '';
-  }
-
   protected onChangePage(page: PageEvent) {
     this.fetchUsers({
       pageIndex: page.pageIndex
@@ -332,6 +312,7 @@ export class GfAdminUsersComponent implements OnInit {
         currentUserId: this.user?.id,
         deviceType: this.deviceType(),
         hasPermissionForSubscription: this.hasPermissionForSubscription,
+        language: this.user?.settings?.language,
         locale: this.user?.settings?.locale ?? DEFAULT_LOCALE,
         userId: aUserId
       } satisfies UserDetailDialogParams,

apps/client/src/app/components/admin-users/admin-users.html

@@ -32,7 +32,10 @@
                     class="ml-1"
                     i18n-title
                     title="Expires {{
-                      formatDistanceToNow(element.subscription.expiresAt)
+                      formatRelativeTime({
+                        date: element.subscription.expiresAt,
+                        language: user?.settings?.language
+                      })
                     }} ({{
                       element.subscription.expiresAt | date: defaultDateFormat
                     }})"
@@ -79,7 +82,12 @@
               class="mat-mdc-cell px-1 py-2 text-nowrap"
               mat-cell
             >
-              {{ formatDistanceToNow(element.createdAt) }}
+              {{
+                formatRelativeTime({
+                  date: element.createdAt,
+                  language: user?.settings?.language
+                })
+              }}
             </td>
           </ng-container>
 
@@ -175,17 +183,21 @@
               <th
                 *matHeaderCellDef
                 class="mat-mdc-header-cell px-1 py-2"
-                i18n
                 mat-header-cell
               >
-                Last Request
+                <ng-container i18n>Last Request</ng-container>
               </th>
               <td
                 *matCellDef="let element"
                 class="mat-mdc-cell px-1 py-2 text-nowrap"
                 mat-cell
               >
-                {{ formatDistanceToNow(element.lastActivity) }}
+                {{
+                  formatRelativeTime({
+                    date: element.lastActivity,
+                    language: user?.settings?.language
+                  })
+                }}
               </td>
             </ng-container>
           }

apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts

@@ -2,6 +2,7 @@ export interface UserDetailDialogParams {
   currentUserId: string;
   deviceType: string;
   hasPermissionForSubscription: boolean;
+  language?: string;
   locale: string;
   userId: string;
 }

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts

@@ -1,3 +1,4 @@
+import { formatRelativeTime } from '@ghostfolio/client/util/date.util';
 import {
   canDeleteUser,
   getCountryName,
@@ -55,6 +56,7 @@ import {
 export class GfUserDetailDialogComponent implements OnInit {
   protected readonly baseCurrency: string;
   protected readonly canDeleteUser = canDeleteUser;
+  protected readonly formatRelativeTime = formatRelativeTime;
   protected readonly getCountryName = getCountryName;
   protected isLoading = true;
 
@@ -91,25 +93,7 @@ export class GfUserDetailDialogComponent implements OnInit {
   }
 
   public ngOnInit() {
-    this.adminService
-      .fetchUserById(this.data.userId)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        catchError(() => {
-          this.dialogRef.close();
-
-          return EMPTY;
-        })
-      )
-      .subscribe((user) => {
-        this.user = user;
-
-        this.subscriptionsDataSource.data = this.user.subscriptions ?? [];
-
-        this.isLoading = false;
-
-        this.changeDetectorRef.markForCheck();
-      });
+    this.initialize();
   }
 
   protected deleteUser() {
@@ -141,6 +125,30 @@ export class GfUserDetailDialogComponent implements OnInit {
       : $localize`Coupon`;
   }
 
+  protected initialize() {
+    this.isLoading = true;
+
+    this.adminService
+      .fetchUserById(this.data.userId)
+      .pipe(
+        takeUntilDestroyed(this.destroyRef),
+        catchError(() => {
+          this.dialogRef.close();
+
+          return EMPTY;
+        })
+      )
+      .subscribe((user) => {
+        this.user = user;
+
+        this.subscriptionsDataSource.data = this.user.subscriptions ?? [];
+
+        this.isLoading = false;
+
+        this.changeDetectorRef.markForCheck();
+      });
+  }
+
   protected onClose() {
     this.dialogRef.close();
   }

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@@ -13,6 +13,10 @@
     class="no-max-width"
     xPosition="before"
   >
+    <button mat-menu-item type="button" (click)="initialize()">
+      <ng-container i18n>Refresh</ng-container>
+    </button>
+    <hr class="m-0" />
     <button
       mat-menu-item
       type="button"
@@ -150,6 +154,23 @@
         </div>
       </div>
 
+      <div class="mb-3 row">
+        <div class="col-6 mb-3">
+          <gf-value
+            i18n
+            size="medium"
+            [isLoading]="isLoading"
+            [value]="
+              formatRelativeTime({
+                date: user?.lastActivity,
+                language: data.language
+              }) || '-'
+            "
+            >Last Request</gf-value
+          >
+        </div>
+      </div>
+
       @if (subscriptionsDataSource.data.length > 0) {
         <div class="row">
           <div class="col">

apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts

@@ -130,7 +130,7 @@ export class GfAllocationsPageComponent implements OnInit {
       value: number;
     };
   };
-  protected topHoldings: HoldingWithParents[];
+  protected topHoldings: HoldingWithParents[] | undefined;
   protected readonly UNKNOWN_KEY = UNKNOWN_KEY;
   protected user: User;
 
@@ -360,6 +360,7 @@ export class GfAllocationsPageComponent implements OnInit {
         value: 0
       }
     };
+    this.topHoldings = undefined;
   }
 
   private initializeAllocationsData() {
@@ -387,7 +388,7 @@ export class GfAllocationsPageComponent implements OnInit {
     } = {};
 
     let totalValueExcludingCashPositions = 0;
-    let totalValueInEtf = 0;
+    let totalValueInFunds = 0;
 
     for (const position of this.portfolioDetails.holdings) {
       const assetProfileIdentifier = getAssetProfileIdentifier(
@@ -463,6 +464,8 @@ export class GfAllocationsPageComponent implements OnInit {
         }
 
         if (position.assetProfile.holdings.length > 0) {
+          totalValueInFunds += this.holdings[assetProfileIdentifier].value;
+
           for (const {
             allocationInPercentage,
             name,
@@ -513,10 +516,6 @@ export class GfAllocationsPageComponent implements OnInit {
         }
       }
 
-      if (this.holdings[assetProfileIdentifier].assetSubClass === 'ETF') {
-        totalValueInEtf += this.holdings[assetProfileIdentifier].value;
-      }
-
       const symbol = position.assetProfile.symbol;
 
       const value = this.extractValue(position);
@@ -593,7 +592,7 @@ export class GfAllocationsPageComponent implements OnInit {
         return {
           name,
           allocationInPercentage:
-            totalValueInEtf > 0 ? value / totalValueInEtf : 0,
+            totalValueInFunds > 0 ? value / totalValueInFunds : 0,
           parents: this.portfolioDetails.holdings
             .map((holding) => {
               if (holding.assetProfile.holdings.length > 0) {
@@ -610,7 +609,9 @@ export class GfAllocationsPageComponent implements OnInit {
                   isNumber(currentParentHolding.valueInBaseCurrency)
                   ? {
                       allocationInPercentage:
-                        currentParentHolding.valueInBaseCurrency / value,
+                        value > 0
+                          ? currentParentHolding.valueInBaseCurrency / value
+                          : 0,
                       name: holding.assetProfile.name ?? '',
                       position: holding,
                       symbol: holding.assetProfile.symbol,

apps/client/src/app/pages/portfolio/fire/fire-page.component.ts

@@ -8,6 +8,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { hasScope, scopes } from '@ghostfolio/common/scopes';
 import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
 import { DataService } from '@ghostfolio/ui/services';
@@ -53,6 +54,7 @@ export class GfFirePageComponent implements OnInit {
 
   protected fireWealth: FireWealth;
   protected hasImpersonationId: boolean;
+  protected hasPermissionToShowValues: boolean;
   protected hasPermissionToUpdateUserSettings: boolean;
   protected isLoading = false;
   protected retirementDate: Date;
@@ -142,6 +144,10 @@ export class GfFirePageComponent implements OnInit {
         if (state?.user) {
           this.user = state.user;
 
+          this.hasPermissionToShowValues =
+            hasScope(this.user.scopes, scopes.portfolioReadValues) &&
+            !this.user.settings.isRestrictedView;
+
           this.hasPermissionToUpdateUserSettings =
             this.user.subscription?.type === SubscriptionType.Basic
               ? false

apps/client/src/app/pages/portfolio/fire/fire-page.html

@@ -73,7 +73,11 @@
                 [isCurrency]="true"
                 [locale]="user?.settings?.locale"
                 [unit]="user?.settings?.baseCurrency"
-                [value]="withdrawalRatePerYear?.toNumber()"
+                [value]="
+                  hasPermissionToShowValues
+                    ? withdrawalRatePerYear?.toNumber()
+                    : null
+                "
               />
               per year</span
             >
@@ -84,7 +88,11 @@
                 [isCurrency]="true"
                 [locale]="user?.settings?.locale"
                 [unit]="user?.settings?.baseCurrency"
-                [value]="withdrawalRatePerMonth?.toNumber()"
+                [value]="
+                  hasPermissionToShowValues
+                    ? withdrawalRatePerMonth?.toNumber()
+                    : null
+                "
               />
               per month</span
             >, based on your total assets of
@@ -94,7 +102,11 @@
                 [isCurrency]="true"
                 [locale]="user?.settings?.locale"
                 [unit]="user?.settings?.baseCurrency"
-                [value]="fireWealth?.today.valueInBaseCurrency"
+                [value]="
+                  hasPermissionToShowValues
+                    ? fireWealth?.today.valueInBaseCurrency
+                    : null
+                "
             /></span>
             and a safe withdrawal rate (SWR) of</ng-container
           >
@@ -137,7 +149,11 @@
                   [isCurrency]="true"
                   [locale]="user?.settings?.locale"
                   [unit]="user?.settings?.baseCurrency"
-                  [value]="withdrawalRatePerYearProjected?.toNumber()"
+                  [value]="
+                    hasPermissionToShowValues
+                      ? withdrawalRatePerYearProjected?.toNumber()
+                      : null
+                  "
                 />
                 per year</span
               >
@@ -148,7 +164,11 @@
                   [isCurrency]="true"
                   [locale]="user?.settings?.locale"
                   [unit]="user?.settings?.baseCurrency"
-                  [value]="withdrawalRatePerMonthProjected?.toNumber()"
+                  [value]="
+                    hasPermissionToShowValues
+                      ? withdrawalRatePerMonthProjected?.toNumber()
+                      : null
+                  "
                 />
                 per month</span
               >, assuming a

apps/client/src/app/util/date.util.ts

@@ -0,0 +1,28 @@
+import { getDateFnsLocale } from '@ghostfolio/common/helper';
+
+import {
+  differenceInSeconds,
+  formatDistanceToNowStrict,
+  parseISO
+} from 'date-fns';
+
+export function formatRelativeTime({
+  date,
+  language
+}: {
+  date: string;
+  language?: string;
+}) {
+  if (date) {
+    const distanceString = formatDistanceToNowStrict(parseISO(date), {
+      addSuffix: true,
+      locale: getDateFnsLocale(language)
+    });
+
+    return Math.abs(differenceInSeconds(parseISO(date), new Date())) < 60
+      ? $localize`just now`
+      : distanceString;
+  }
+
+  return '';
+}

libs/common/src/lib/config.ts

@@ -138,6 +138,9 @@ export const DEFAULT_REDACTED_PATHS = [
   'activities[*].feeInAssetProfileCurrency',
   'activities[*].feeInBaseCurrency',
   'activities[*].quantity',
+  'activities[*].SymbolProfile.comment',
+  'activities[*].SymbolProfile.scraperConfiguration',
+  'activities[*].SymbolProfile.symbolMapping',
   'activities[*].value',
   'activities[*].valueInBaseCurrency',
   'assetProfile.comment',
@@ -180,6 +183,9 @@ export const DEFAULT_REDACTED_PATHS = [
   'settings.emergencyFund',
   'settings.projectedTotalAmount',
   'settings.savingsRate',
+  'SymbolProfile.comment',
+  'SymbolProfile.scraperConfiguration',
+  'SymbolProfile.symbolMapping',
   'totalBalanceInBaseCurrency',
   'totalDividendInBaseCurrency',
   'totalInterestInBaseCurrency',