Browse Source

Adjustments based on comments

pull/3218/head
Nicolas Fedor 1 year ago
parent
commit
967fa9ae4a
  1. 14
      apps/api/src/app/admin/admin.service.ts
  2. 2
      apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
  3. 15
      apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

14
apps/api/src/app/admin/admin.service.ts

@ -25,7 +25,7 @@ import { MarketDataPreset } from '@ghostfolio/common/types';
import { BadRequestException, Injectable } from '@nestjs/common';
import {
$Enums,
AssetClass,
AssetSubClass,
DataSource,
Prisma,
@ -336,10 +336,10 @@ export class AdminService {
symbolMapping,
url
}: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
const symbolProfileOverride = {
const symbolProfileOverrides = {
assetClass: assetClass as AssetClass,
assetSubClass: assetSubClass as AssetSubClass,
name: name as string,
assetClass: assetClass as $Enums.AssetClass,
assetSubClass: assetSubClass as $Enums.AssetSubClass,
url: url as string
};
@ -354,12 +354,12 @@ export class AdminService {
symbol,
symbolMapping,
...(dataSource === 'MANUAL'
? { name, assetClass, assetSubClass, url }
? { assetClass, assetSubClass, name, url }
: {
SymbolProfileOverrides: {
upsert: {
create: symbolProfileOverride,
update: symbolProfileOverride
create: symbolProfileOverrides,
update: symbolProfileOverrides
}
}
})

2
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts

@ -165,7 +165,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
),
sectors: JSON.stringify(this.assetProfile?.sectors ?? []),
symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {}),
url: this.assetProfile?.url
url: this.assetProfile?.url ?? ''
});
this.assetProfileForm.markAsPristine();

15
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@ -7,9 +7,6 @@
<div class="d-flex mb-3">
<h1 class="flex-grow-1 m-0" mat-dialog-title>
{{ assetProfile?.name ?? data.symbol }}
<small *ngIf="assetProfile?.url" class="text-body-secondary"
><a target="_blank" [href]="assetProfile?.url">Go to webpage</a></small
>
</h1>
<button
class="mx-1 no-min-width px-2"
@ -218,12 +215,6 @@
<input formControlName="name" matInput type="text" />
</mat-form-field>
</div>
<div class="mt-3">
<mat-form-field appearance="outline" class="w-100 without-hint">
<mat-label i18n>URL</mat-label>
<input formControlName="url" matInput type="text" />
</mat-form-field>
</div>
<div *ngIf="assetProfile?.dataSource === 'MANUAL'" class="mt-3">
<mat-form-field appearance="outline" class="w-100 without-hint">
<mat-label i18n>Currency</mat-label>
@ -339,6 +330,12 @@
</mat-form-field>
</div>
<div>
<mat-form-field appearance="outline" class="w-100 without-hint">
<mat-label i18n>URL</mat-label>
<input formControlName="url" matInput type="text" />
</mat-form-field>
</div>
<div class="mt-3">
<mat-form-field appearance="outline" class="w-100">
<mat-label i18n>Note</mat-label>
<textarea

Loading…
Cancel
Save