Merge remote-tracking branch 'origin/main' into feature/extend-holdings-endpoint-for-cash

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 2.206.0 - 2025-10-04
 
 ### Added
 
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Localized the number formatting in the settings dialog to customize the rule thresholds of the _X-ray_ page
+- Improved the usability of the assistant by preselecting the first search result
 - Improved the usability of the _Cancel_ / _Close_ buttons in the create watchlist item dialog
 - Refactored the `fireWealth` from `number` type to a structured object in the summary of the portfolio details endpoint
 - Refactored the _Open Startup_ (`/open`) page to standalone
@@ -22,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Handled an exception in the get asset profile functionality of the _Financial Modeling Prep_ service
+- Added the missing `CommonModule` import in the import activities dialog
 
 ## 2.205.0 - 2025-10-01
 

apps/client/src/app/components/rule/rule-settings-dialog/interfaces/interfaces.ts

@@ -5,6 +5,7 @@ import {
 
 export interface IRuleSettingsDialogParams {
   categoryName: string;
+  locale: string;
   rule: PortfolioReportRule;
   settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
 }

apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.component.ts

@@ -1,4 +1,5 @@
 import { XRayRulesSettings } from '@ghostfolio/common/interfaces';
+import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { CommonModule } from '@angular/common';
 import { Component, Inject } from '@angular/core';
@@ -17,6 +18,7 @@ import { IRuleSettingsDialogParams } from './interfaces/interfaces';
   imports: [
     CommonModule,
     FormsModule,
+    GfValueComponent,
     MatButtonModule,
     MatDialogModule,
     MatSliderModule

apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html

@@ -5,28 +5,30 @@
     data.rule.configuration.thresholdMin && data.rule.configuration.thresholdMax
   ) {
     <div class="w-100">
-      <h6 class="mb-0">
+      <h6 class="d-flex mb-0">
         <ng-container i18n>Threshold range</ng-container>:
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          {{ data.settings.thresholdMin | percent: '1.2-2' }}
+          class="ml-1"
-        } @else {
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-          {{ data.settings.thresholdMin }}
+          [locale]="data.locale"
-        }
+          [precision]="2"
-        -
+          [value]="data.settings.thresholdMin"
-        @if (data.rule.configuration.threshold.unit === '%') {
+        />
-          {{ data.settings.thresholdMax | percent: '1.2-2' }}
+        <span class="mx-1">-</span>
-        } @else {
+        <gf-value
-          {{ data.settings.thresholdMax }}
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-        }
+          [locale]="data.locale"
+          [precision]="2"
+          [value]="data.settings.thresholdMax"
+        />
       </h6>
       <div class="align-items-center d-flex w-100">
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          <label>{{
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-            data.rule.configuration.threshold.min | percent: '1.2-2'
+          [locale]="data.locale"
-          }}</label>
+          [precision]="2"
-        } @else {
+          [value]="data.rule.configuration.threshold.min"
-          <label>{{ data.rule.configuration.threshold.min }}</label>
+        />
-        }
         <mat-slider
           class="flex-grow-1"
           [max]="data.rule.configuration.threshold.max"
@@ -36,13 +38,12 @@
           <input matSliderStartThumb [(ngModel)]="data.settings.thresholdMin" />
           <input matSliderEndThumb [(ngModel)]="data.settings.thresholdMax" />
         </mat-slider>
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          <label>{{
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-            data.rule.configuration.threshold.max | percent: '1.2-2'
+          [locale]="data.locale"
-          }}</label>
+          [precision]="2"
-        } @else {
+          [value]="data.rule.configuration.threshold.max"
-          <label>{{ data.rule.configuration.threshold.max }}</label>
+        />
-        }
       </div>
     </div>
   } @else {
@@ -50,22 +51,23 @@
       class="w-100"
       [ngClass]="{ 'd-none': !data.rule.configuration.thresholdMin }"
     >
-      <h6 class="mb-0">
+      <h6 class="d-flex mb-0">
         <ng-container i18n>Threshold Min</ng-container>:
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          {{ data.settings.thresholdMin | percent: '1.2-2' }}
+          class="ml-1"
-        } @else {
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-          {{ data.settings.thresholdMin }}
+          [locale]="data.locale"
-        }
+          [precision]="2"
+          [value]="data.settings.thresholdMin"
+        />
       </h6>
       <div class="align-items-center d-flex w-100">
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          <label>{{
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-            data.rule.configuration.threshold.min | percent: '1.2-2'
+          [locale]="data.locale"
-          }}</label>
+          [precision]="2"
-        } @else {
+          [value]="data.rule.configuration.threshold.min"
-          <label>{{ data.rule.configuration.threshold.min }}</label>
+        />
-        }
         <mat-slider
           class="flex-grow-1"
           name="thresholdMin"
@@ -75,35 +77,35 @@
         >
           <input matSliderThumb [(ngModel)]="data.settings.thresholdMin" />
         </mat-slider>
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          <label>{{
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-            data.rule.configuration.threshold.max | percent: '1.2-2'
+          [locale]="data.locale"
-          }}</label>
+          [precision]="2"
-        } @else {
+          [value]="data.rule.configuration.threshold.max"
-          <label>{{ data.rule.configuration.threshold.max }}</label>
+        />
-        }
       </div>
     </div>
     <div
       class="w-100"
       [ngClass]="{ 'd-none': !data.rule.configuration.thresholdMax }"
     >
-      <h6 class="mb-0">
+      <h6 class="d-flex mb-0">
         <ng-container i18n>Threshold Max</ng-container>:
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          {{ data.settings.thresholdMax | percent: '1.2-2' }}
+          class="ml-1"
-        } @else {
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-          {{ data.settings.thresholdMax }}
+          [locale]="data.locale"
-        }
+          [precision]="2"
+          [value]="data.settings.thresholdMax"
+        />
       </h6>
       <div class="align-items-center d-flex w-100">
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          <label>{{
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-            data.rule.configuration.threshold.min | percent: '1.2-2'
+          [locale]="data.locale"
-          }}</label>
+          [precision]="2"
-        } @else {
+          [value]="data.rule.configuration.threshold.min"
-          <label>{{ data.rule.configuration.threshold.min }}</label>
+        />
-        }
         <mat-slider
           class="flex-grow-1"
           name="thresholdMax"
@@ -113,13 +115,12 @@
         >
           <input matSliderThumb [(ngModel)]="data.settings.thresholdMax" />
         </mat-slider>
-        @if (data.rule.configuration.threshold.unit === '%') {
+        <gf-value
-          <label>{{
+          [isPercent]="data.rule.configuration.threshold.unit === '%'"
-            data.rule.configuration.threshold.max | percent: '1.2-2'
+          [locale]="data.locale"
-          }}</label>
+          [precision]="2"
-        } @else {
+          [value]="data.rule.configuration.threshold.max"
-          <label>{{ data.rule.configuration.threshold.max }}</label>
+        />
-        }
       </div>
     </div>
   }

apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@@ -15,6 +15,7 @@ import {
   StepperOrientation,
   StepperSelectionEvent
 } from '@angular/cdk/stepper';
+import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -59,6 +60,7 @@ import { ImportActivitiesDialogParams } from './interfaces/interfaces';
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: { class: 'd-flex flex-column h-100' },
   imports: [
+    CommonModule,
     GfActivitiesTableComponent,
     GfDialogFooterComponent,
     GfDialogHeaderComponent,

libs/ui/src/lib/assistant/assistant.component.ts

@@ -169,6 +169,8 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
   };
   public tags: Filter[] = [];
 
+  private readonly PRESELECTION_DELAY = 100;
+
   private filterTypes: Filter['type'][] = [
     'ACCOUNT',
     'ASSET_CLASS',
@@ -176,7 +178,9 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
     'SYMBOL',
     'TAG'
   ];
+
   private keyManager: FocusKeyManager<GfAssistantListItemComponent>;
+  private preselectionTimeout: ReturnType<typeof setTimeout>;
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
@@ -344,6 +348,9 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       .subscribe({
         next: (searchResults) => {
           this.searchResults = searchResults;
+
+          this.preselectFirstItem();
+
           this.changeDetectorRef.markForCheck();
         },
         error: (error) => {
@@ -585,6 +592,10 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
   }
 
   public ngOnDestroy() {
+    if (this.preselectionTimeout) {
+      clearTimeout(this.preselectionTimeout);
+    }
+
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();
   }
@@ -595,6 +606,58 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
     });
   }
 
+  private getFirstSearchResultItem() {
+    if (this.searchResults.quickLinks?.length > 0) {
+      return this.searchResults.quickLinks[0];
+    }
+
+    if (this.searchResults.accounts?.length > 0) {
+      return this.searchResults.accounts[0];
+    }
+
+    if (this.searchResults.holdings?.length > 0) {
+      return this.searchResults.holdings[0];
+    }
+
+    if (this.searchResults.assetProfiles?.length > 0) {
+      return this.searchResults.assetProfiles[0];
+    }
+
+    return null;
+  }
+
+  private preselectFirstItem() {
+    if (this.preselectionTimeout) {
+      clearTimeout(this.preselectionTimeout);
+    }
+
+    this.preselectionTimeout = setTimeout(() => {
+      if (!this.isOpen || !this.searchFormControl.value) {
+        return;
+      }
+
+      const firstItem = this.getFirstSearchResultItem();
+
+      if (!firstItem) {
+        return;
+      }
+
+      for (const item of this.assistantListItems) {
+        item.removeFocus();
+      }
+
+      this.keyManager.setFirstItemActive();
+
+      const currentFocusedItem = this.getCurrentAssistantListItem();
+
+      if (currentFocusedItem) {
+        currentFocusedItem.focus();
+      }
+
+      this.changeDetectorRef.markForCheck();
+    }, this.PRESELECTION_DELAY);
+  }
+
   private searchAccounts(aSearchTerm: string): Observable<ISearchResultItem[]> {
     return this.dataService
       .fetchAccounts({

libs/ui/src/lib/holdings-table/holdings-table.component.ts

@@ -1,4 +1,3 @@
-import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { getLocale } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
@@ -34,7 +33,6 @@ import { GfValueComponent } from '../value/value.component';
   imports: [
     CommonModule,
     GfEntityLogoComponent,
-    GfSymbolPipe,
     GfValueComponent,
     MatButtonModule,
     MatDialogModule,

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ghostfolio",
-  "version": "2.205.0",
+  "version": "2.206.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ghostfolio",
-      "version": "2.205.0",
+      "version": "2.206.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "2.205.0",
+  "version": "2.206.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",