Merge branch 'main' into feat/transfer-endpoint

CHANGELOG.md

@@ -5,6 +5,28 @@ 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
+
+### Added
+
+- Extended the markets overview by benchmarks (date of last all time high)
+
+### Changed
+
+- Improved the language localization for German (`de`)
+
+## 2.10.0 - 2023-10-09
+
+### Added
+
+- Supported enter key press to submit the form of the create or update access dialog
+
+### Changed
+
+- Improved the display of the results in the search for a holding
+- Changed the queue jobs view in the admin control panel to an `@angular/material` data table
+- Improved the symbol conversion in the _EOD Historical Data_ service
+
 ## 2.9.0 - 2023-10-08
 
 ### Added

apps/api/src/app/access/create-access.dto.ts

@@ -8,4 +8,8 @@ export class CreateAccessDto {
   @IsOptional()
   @IsString()
   granteeUserId?: string;
+
+  @IsOptional()
+  @IsString()
+  type?: 'PUBLIC';
 }

apps/api/src/app/benchmark/benchmark.service.ts

@@ -64,7 +64,7 @@ export class BenchmarkService {
 
     const benchmarkAssetProfiles = await this.getBenchmarkAssetProfiles();
 
-    const promises: Promise<number>[] = [];
+    const promises: Promise<{ date: Date; marketPrice: number }>[] = [];
 
     const quotes = await this.dataProviderService.getQuotes({
       items: benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
@@ -85,15 +85,14 @@ export class BenchmarkService {
 
       let performancePercentFromAllTimeHigh = 0;
 
-      if (allTimeHigh && marketPrice) {
+      if (allTimeHigh?.marketPrice && marketPrice) {
         performancePercentFromAllTimeHigh = this.calculateChangeInPercentage(
-          allTimeHigh,
+          allTimeHigh.marketPrice,
           marketPrice
         );
       } else {
         storeInCache = false;
       }
-
       return {
         marketCondition: this.getMarketCondition(
           performancePercentFromAllTimeHigh
@@ -101,6 +100,7 @@ export class BenchmarkService {
         name: benchmarkAssetProfiles[index].name,
         performances: {
           allTimeHigh: {
+            date: allTimeHigh.date,
             performancePercent: performancePercentFromAllTimeHigh
           }
         }

apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts

@@ -283,7 +283,6 @@ export class EodHistoricalDataService implements DataProviderInterface {
     if (symbol.endsWith('.FOREX')) {
       symbol = symbol.replace('GBX', 'GBp');
       symbol = symbol.replace('.FOREX', '');
-      symbol = `${DEFAULT_CURRENCY}${symbol}`;
     }
 
     return symbol;
@@ -292,7 +291,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
   /**
    * Converts a symbol to a EOD symbol
    *
-   * Currency:  USDCHF  -> CHF.FOREX
+   * Currency:  USDCHF  -> USDCHF.FOREX
    */
   private convertToEodSymbol(aSymbol: string) {
     if (
@@ -304,9 +303,10 @@ export class EodHistoricalDataService implements DataProviderInterface {
           aSymbol.substring(0, aSymbol.length - DEFAULT_CURRENCY.length)
         )
       ) {
-        return `${aSymbol
-          .replace('GBp', 'GBX')
-          .replace(DEFAULT_CURRENCY, '')}.FOREX`;
+        let symbol = aSymbol;
+        symbol = symbol.replace('GBp', 'GBX');
+
+        return `${symbol}.FOREX`;
       }
     }
 

apps/api/src/services/market-data/market-data.service.ts

@@ -39,18 +39,22 @@ export class MarketDataService {
     });
   }
 
-  public async getMax({ dataSource, symbol }: UniqueAsset): Promise<number> {
-    const aggregations = await this.prismaService.marketData.aggregate({
-      _max: {
+  public async getMax({ dataSource, symbol }: UniqueAsset) {
+    return this.prismaService.marketData.findFirst({
+      select: {
+        date: true,
         marketPrice: true
       },
+      orderBy: [
+        {
+          marketPrice: 'desc'
+        }
+      ],
       where: {
         dataSource,
         symbol
       }
     });
-
-    return aggregations._max.marketPrice;
   }
 
   public async getRange({

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

@@ -6,6 +6,7 @@ import {
   OnInit
 } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
+import { MatTableDataSource } from '@angular/material/table';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { QUEUE_JOB_STATUS_LIST } from '@ghostfolio/common/config';
@@ -24,7 +25,19 @@ import { takeUntil } from 'rxjs/operators';
 export class AdminJobsComponent implements OnDestroy, OnInit {
   public defaultDateTimeFormat: string;
   public filterForm: FormGroup;
-  public jobs: AdminJobs['jobs'] = [];
+  public dataSource: MatTableDataSource<AdminJobs['jobs'][0]> =
+    new MatTableDataSource();
+  public displayedColumns = [
+    'index',
+    'type',
+    'symbol',
+    'dataSource',
+    'attempts',
+    'created',
+    'finished',
+    'status',
+    'actions'
+  ];
   public statusFilterOptions = QUEUE_JOB_STATUS_LIST;
   public user: User;
 
@@ -102,7 +115,7 @@ export class AdminJobsComponent implements OnDestroy, OnInit {
       .fetchJobs({ status: aStatus })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ jobs }) => {
-        this.jobs = jobs;
+        this.dataSource = new MatTableDataSource(jobs);
 
         this.changeDetectorRef.markForCheck();
       });

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

@@ -13,95 +13,135 @@
           </mat-select>
         </mat-form-field>
       </form>
-      <table class="gf-table w-100">
-        <thead>
-          <tr class="mat-header-row">
-            <th class="mat-header-cell px-1 py-2 text-right">#</th>
-            <th class="mat-header-cell px-1 py-2" i18n>Type</th>
-            <th class="mat-header-cell px-1 py-2" i18n>Symbol</th>
-            <th class="mat-header-cell px-1 py-2" i18n>Data Source</th>
-            <th class="mat-header-cell px-1 py-2 text-right" i18n>Attempts</th>
-            <th class="mat-header-cell px-1 py-2" i18n>Created</th>
-            <th class="mat-header-cell px-1 py-2" i18n>Finished</th>
-            <th class="mat-header-cell px-1 py-2" i18n>Status</th>
-            <th class="mat-header-cell px-1 py-2">
-              <button
-                class="mx-1 no-min-width px-2"
-                mat-button
-                [matMenuTriggerFor]="jobsActionsMenu"
-                (click)="$event.stopPropagation()"
-              >
-                <ion-icon name="ellipsis-vertical"></ion-icon>
-              </button>
-              <mat-menu #jobsActionsMenu="matMenu" xPosition="before">
-                <button mat-menu-item (click)="onDeleteJobs()">
-                  <ng-container i18n>Delete Jobs</ng-container>
-                </button>
-              </mat-menu>
+      <table class="gf-table w-100" mat-table [dataSource]="dataSource">
+        <ng-container matColumnDef="index">
+          <th *matHeaderCellDef class="px-1 py-2 text-right" mat-header-cell>
+            #
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2 text-right" mat-cell>
+            {{ element.id }}
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="type">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <ng-container i18n>Type</ng-container>
           </th>
-          </tr>
-        </thead>
-        <tbody>
-          <ng-container *ngFor="let job of jobs">
-            <tr class="mat-row">
-              <td class="mat-cell px-1 py-2 text-right">{{ job.id }}</td>
-              <td class="mat-cell px-1 py-2">
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
             <span class="align-items-center d-flex">
               <ion-icon
                 class="mr-1"
                 name="arrow-down-circle-outline"
               ></ion-icon>
-                  <ng-container *ngIf="job.name === 'GATHER_ASSET_PROFILE'">
+              <ng-container *ngIf="element.name === 'GATHER_ASSET_PROFILE'">
                 <span i18n>Asset Profile</span>
               </ng-container>
               <ng-container
-                    *ngIf="job.name === 'GATHER_HISTORICAL_MARKET_DATA'"
+                *ngIf="element.name === 'GATHER_HISTORICAL_MARKET_DATA'"
               >
                 <span i18n>Historical Market Data</span>
               </ng-container>
             </span>
           </td>
-              <td class="mat-cell px-1 py-2">{{ job.data?.symbol }}</td>
-              <td class="mat-cell px-1 py-2">{{ job.data?.dataSource }}</td>
-              <td class="mat-cell px-1 py-2 text-right">
-                {{ job.attemptsMade }}
+        </ng-container>
+
+        <ng-container matColumnDef="symbol">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <ng-container i18n>Symbol</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
+            {{ element.data?.symbol }}
           </td>
-              <td class="mat-cell px-1 py-2">
-                {{ job.timestamp | date: defaultDateTimeFormat }}
+        </ng-container>
+
+        <ng-container matColumnDef="dataSource">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <ng-container i18n>Data Source</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
+            {{ element.data?.dataSource }}
           </td>
-              <td class="mat-cell px-1 py-2">
-                {{ job.finishedOn | date: defaultDateTimeFormat }}
+        </ng-container>
+
+        <ng-container matColumnDef="attempts">
+          <th *matHeaderCellDef class="px-1 py-2 text-right" mat-header-cell>
+            <ng-container i18n>Attempts</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2 text-right" mat-cell>
+            {{ element.attemptsMade }}
           </td>
-              <td class="mat-cell px-1 py-2">
+        </ng-container>
+
+        <ng-container matColumnDef="created">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <ng-container i18n>Created</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
+            {{ element.timestamp | date: defaultDateTimeFormat }}
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="finished">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <ng-container i18n>Finished</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
+            {{ element.finishedOn | date: defaultDateTimeFormat }}
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="status">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <ng-container i18n>Status</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
             <ion-icon
-                  *ngIf="job.state === 'active'"
+              *ngIf="element.state === 'active'"
               name="play-outline"
             ></ion-icon>
             <ion-icon
-                  *ngIf="job.state === 'completed'"
+              *ngIf="element.state === 'completed'"
               class="text-success"
               name="checkmark-circle-outline"
             ></ion-icon>
             <ion-icon
-                  *ngIf="job.state === 'delayed'"
+              *ngIf="element.state === 'delayed'"
               name="time-outline"
-                  [ngClass]="{ 'text-danger': job.stacktrace?.length > 0 }"
+              [ngClass]="{ 'text-danger': element.stacktrace?.length > 0 }"
             ></ion-icon>
             <ion-icon
-                  *ngIf="job.state === 'failed'"
+              *ngIf="element.state === 'failed'"
               class="text-danger"
               name="alert-circle-outline"
             ></ion-icon>
             <ion-icon
-                  *ngIf="job.state === 'paused'"
+              *ngIf="element.state === 'paused'"
               name="pause-outline"
             ></ion-icon>
             <ion-icon
-                  *ngIf="job.state === 'waiting'"
+              *ngIf="element.state === 'waiting'"
               name="cafe-outline"
             ></ion-icon>
           </td>
-              <td class="mat-cell px-1 py-2">
+        </ng-container>
+
+        <ng-container matColumnDef="actions">
+          <th *matHeaderCellDef class="px-1 py-2" mat-header-cell>
+            <button
+              class="mx-1 no-min-width px-2"
+              mat-button
+              [matMenuTriggerFor]="jobsActionsMenu"
+              (click)="$event.stopPropagation()"
+            >
+              <ion-icon name="ellipsis-vertical"></ion-icon>
+            </button>
+            <mat-menu #jobsActionsMenu="matMenu" xPosition="before">
+              <button mat-menu-item (click)="onDeleteJobs()">
+                <ng-container i18n>Delete Jobs</ng-container>
+              </button>
+            </mat-menu>
+          </th>
+          <td *matCellDef="let element" class="px-1 py-2" mat-cell>
             <button
               class="mx-1 no-min-width px-2"
               mat-button
@@ -111,24 +151,25 @@
               <ion-icon name="ellipsis-horizontal"></ion-icon>
             </button>
             <mat-menu #jobActionsMenu="matMenu" xPosition="before">
-                  <button mat-menu-item (click)="onViewData(job.data)">
+              <button mat-menu-item (click)="onViewData(element.data)">
                 <ng-container i18n>View Data</ng-container>
               </button>
               <button
                 mat-menu-item
-                    [disabled]="job.stacktrace?.length <= 0"
-                    (click)="onViewStacktrace(job.stacktrace)"
+                [disabled]="element.stacktrace?.length <= 0"
+                (click)="onViewStacktrace(element.stacktrace)"
               >
                 <ng-container i18n>View Stacktrace</ng-container>
               </button>
-                  <button mat-menu-item (click)="onDeleteJob(job.id)">
+              <button mat-menu-item (click)="onDeleteJob(element.id)">
                 <ng-container i18n>Delete Job</ng-container>
               </button>
             </mat-menu>
           </td>
-            </tr>
         </ng-container>
-        </tbody>
+
+        <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>
+        <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
       </table>
     </div>
   </div>

apps/client/src/app/components/admin-jobs/admin-jobs.module.ts

@@ -4,6 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatSelectModule } from '@angular/material/select';
+import { MatTableModule } from '@angular/material/table';
 
 import { AdminJobsComponent } from './admin-jobs.component';
 
@@ -15,6 +16,7 @@ import { AdminJobsComponent } from './admin-jobs.component';
     MatButtonModule,
     MatMenuModule,
     MatSelectModule,
+    MatTableModule,
     ReactiveFormsModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]

apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts

@@ -4,7 +4,9 @@ import {
   Inject,
   OnDestroy
 } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { CreateAccessDto } from '@ghostfolio/api/app/access/create-access.dto';
 import { Subject } from 'rxjs';
 
 import { CreateOrUpdateAccessDialogParams } from './interfaces/interfaces';
@@ -17,19 +19,36 @@ import { CreateOrUpdateAccessDialogParams } from './interfaces/interfaces';
   templateUrl: 'create-or-update-access-dialog.html'
 })
 export class CreateOrUpdateAccessDialog implements OnDestroy {
+  public accessForm: FormGroup;
+
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
+    @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdateAccessDialogParams,
     public dialogRef: MatDialogRef<CreateOrUpdateAccessDialog>,
-    @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdateAccessDialogParams
+    private formBuilder: FormBuilder
   ) {}
 
-  ngOnInit() {}
+  ngOnInit() {
+    this.accessForm = this.formBuilder.group({
+      alias: [this.data.access.alias],
+      type: [this.data.access.type, Validators.required]
+    });
+  }
 
   public onCancel() {
     this.dialogRef.close();
   }
 
+  public onSubmit() {
+    const access: CreateAccessDto = {
+      alias: this.accessForm.controls['alias'].value,
+      type: this.accessForm.controls['type'].value
+    };
+
+    this.dialogRef.close({ access });
+  }
+
   public ngOnDestroy() {
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();

apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html

@@ -1,33 +1,38 @@
-<form #addAccessForm="ngForm" class="d-flex flex-column h-100">
+<form
+  class="d-flex flex-column h-100"
+  [formGroup]="accessForm"
+  (keyup.enter)="accessForm.valid && onSubmit()"
+  (ngSubmit)="onSubmit()"
+>
   <h1 i18n mat-dialog-title>Grant access</h1>
   <div class="flex-grow-1 py-3" mat-dialog-content>
     <div>
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Alias</mat-label>
         <input
+          formControlName="alias"
           matInput
-          name="alias"
           type="text"
-          [(ngModel)]="data.access.alias"
+          (keydown.enter)="$event.stopPropagation()"
         />
       </mat-form-field>
     </div>
     <div>
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Type</mat-label>
-        <mat-select name="type" required [(value)]="data.access.type">
+        <mat-select formControlName="type">
           <mat-option i18n value="PUBLIC">Public</mat-option>
         </mat-select>
       </mat-form-field>
     </div>
   </div>
   <div class="justify-content-end" mat-dialog-actions>
-    <button i18n mat-button (click)="onCancel()">Cancel</button>
+    <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>
     <button
       color="primary"
       mat-flat-button
-      [disabled]="!addAccessForm.form.valid"
-      [mat-dialog-close]="data"
+      type="submit"
+      [disabled]="!accessForm.valid"
     >
       <ng-container i18n>Save</ng-container>
     </button>

libs/common/src/lib/interfaces/benchmark.interface.ts

@@ -5,6 +5,7 @@ export interface Benchmark {
   name: EnhancedSymbolProfile['name'];
   performances: {
     allTimeHigh: {
+      date: Date;
       performancePercent: number;
     };
   };

libs/ui/src/lib/assistant/assistant.html

@@ -38,7 +38,10 @@
       <ion-icon class="m-0" name="close-outline"></ion-icon>
     </button>
   </div>
-  <div class="overflow-auto py-3 result-container">
+  <div
+    *ngIf="isLoading || searchFormControl.value"
+    class="overflow-auto py-3 result-container"
+  >
     <div>
       <div class="h6 mb-1 px-2" i18n>Holdings</div>
       <gf-assistant-list-item

package.json

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