Merge branch 'main' of gitea.suda.codes:giteauser/ghostfolio-mirror
This commit is contained in:
commit
8e2e73137c
@ -142,13 +142,8 @@
|
||||
|
||||
// The following rules are part of @typescript-eslint/stylistic-type-checked
|
||||
// and can be remove once solved
|
||||
"@typescript-eslint/consistent-type-definitions": "warn",
|
||||
"@typescript-eslint/prefer-function-type": "warn",
|
||||
"@typescript-eslint/prefer-nullish-coalescing": "warn", // TODO: Requires strictNullChecks: true
|
||||
"@typescript-eslint/consistent-type-assertions": "warn",
|
||||
"@typescript-eslint/prefer-optional-chain": "warn",
|
||||
"@typescript-eslint/consistent-indexed-object-style": "warn",
|
||||
"@typescript-eslint/consistent-generic-constructors": "warn"
|
||||
"@typescript-eslint/consistent-indexed-object-style": "warn"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
13
CHANGELOG.md
13
CHANGELOG.md
@ -9,13 +9,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
### Changed
|
||||
|
||||
- Switched the `consistent-generic-constructors` rule from `warn` to `error` in the `eslint` configuration
|
||||
- Switched the `consistent-type-assertions` rule from `warn` to `error` in the `eslint` configuration
|
||||
- Switched the `prefer-optional-chain` rule from `warn` to `error` in the `eslint` configuration
|
||||
|
||||
## 2.119.0 - 2024-10-26
|
||||
|
||||
### Changed
|
||||
|
||||
- Switched the `consistent-type-definitions` rule from `warn` to `error` in the `eslint` configuration
|
||||
- Switched the `no-empty-function` rule from `warn` to `error` in the `eslint` configuration
|
||||
- Switched the `prefer-function-type` rule from `warn` to `error` in the `eslint` configuration
|
||||
- Upgraded `prisma` from version `5.20.0` to `5.21.1`
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed an issue with the X-axis scale of the dividend timeline on the analysis page
|
||||
- Fixed an issue with the X-axis scale of the investment timeline on the analysis page
|
||||
- Fixed an issue with the X-axis scale of the portfolio evolution chart on the analysis page
|
||||
- Fixed an issue in the calculation of the static portfolio analysis rule: Allocation Cluster Risk (Developed Markets)
|
||||
- Fixed an issue in the calculation of the static portfolio analysis rule: Allocation Cluster Risk (Emerging Markets)
|
||||
|
||||
## 2.118.0 - 2024-10-23
|
||||
|
||||
|
@ -88,7 +88,7 @@ export class AccountBalanceService {
|
||||
this.eventEmitter.emit(
|
||||
PortfolioChangedEvent.getName(),
|
||||
new PortfolioChangedEvent({
|
||||
userId: <string>where.userId
|
||||
userId: where.userId as string
|
||||
})
|
||||
);
|
||||
|
||||
|
@ -209,8 +209,8 @@ export class AccountService {
|
||||
const { data, where } = params;
|
||||
|
||||
await this.accountBalanceService.createOrUpdateAccountBalance({
|
||||
accountId: <string>data.id,
|
||||
balance: <number>data.balance,
|
||||
accountId: data.id as string,
|
||||
balance: data.balance as number,
|
||||
date: format(new Date(), DATE_FORMAT),
|
||||
userId: aUserId
|
||||
});
|
||||
|
@ -26,7 +26,7 @@ export class QueueController {
|
||||
public async deleteJobs(
|
||||
@Query('status') filterByStatus?: string
|
||||
): Promise<void> {
|
||||
const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
|
||||
const status = (filterByStatus?.split(',') as JobStatus[]) ?? undefined;
|
||||
return this.queueService.deleteJobs({ status });
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ export class QueueController {
|
||||
public async getJobs(
|
||||
@Query('status') filterByStatus?: string
|
||||
): Promise<AdminJobs> {
|
||||
const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
|
||||
const status = (filterByStatus?.split(',') as JobStatus[]) ?? undefined;
|
||||
return this.queueService.getJobs({ status });
|
||||
}
|
||||
|
||||
|
@ -85,7 +85,7 @@ export class AuthController {
|
||||
@Res() response: Response
|
||||
) {
|
||||
// Handles the Google OAuth2 callback
|
||||
const jwt: string = (<any>request.user).jwt;
|
||||
const jwt: string = (request.user as any).jwt;
|
||||
|
||||
if (jwt) {
|
||||
response.redirect(
|
||||
|
@ -198,12 +198,12 @@ export interface AuthenticatorAssertionResponseJSON
|
||||
/**
|
||||
* A WebAuthn-compatible device and the information needed to verify assertions by it
|
||||
*/
|
||||
export declare type AuthenticatorDevice = {
|
||||
export declare interface AuthenticatorDevice {
|
||||
credentialPublicKey: Buffer;
|
||||
credentialID: Buffer;
|
||||
counter: number;
|
||||
transports?: AuthenticatorTransport[];
|
||||
};
|
||||
}
|
||||
/**
|
||||
* An attempt to communicate that this isn't just any string, but a Base64URL-encoded string
|
||||
*/
|
||||
|
@ -442,10 +442,10 @@ export class BenchmarkService {
|
||||
|
||||
await this.redisCacheService.set(
|
||||
this.CACHE_KEY_BENCHMARKS,
|
||||
JSON.stringify(<BenchmarkValue>{
|
||||
JSON.stringify({
|
||||
benchmarks,
|
||||
expiration: expiration.getTime()
|
||||
}),
|
||||
} as BenchmarkValue),
|
||||
CACHE_TTL_INFINITE
|
||||
);
|
||||
}
|
||||
|
@ -410,7 +410,7 @@ export class OrderService {
|
||||
where.SymbolProfile,
|
||||
{
|
||||
AND: [
|
||||
{ dataSource: <DataSource>filterByDataSource },
|
||||
{ dataSource: filterByDataSource as DataSource },
|
||||
{ symbol: filterBySymbol }
|
||||
]
|
||||
}
|
||||
@ -419,7 +419,7 @@ export class OrderService {
|
||||
} else {
|
||||
where.SymbolProfile = {
|
||||
AND: [
|
||||
{ dataSource: <DataSource>filterByDataSource },
|
||||
{ dataSource: filterByDataSource as DataSource },
|
||||
{ symbol: filterBySymbol }
|
||||
]
|
||||
};
|
||||
@ -638,7 +638,7 @@ export class OrderService {
|
||||
{
|
||||
dataSource:
|
||||
data.SymbolProfile.connect.dataSource_symbol.dataSource,
|
||||
date: <Date>data.date,
|
||||
date: data.date as Date,
|
||||
symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
|
||||
}
|
||||
],
|
||||
|
@ -796,7 +796,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
|
||||
[key: DateRange]: Big;
|
||||
} = {};
|
||||
|
||||
for (const dateRange of <DateRange[]>[
|
||||
for (const dateRange of [
|
||||
'1d',
|
||||
'1y',
|
||||
'5y',
|
||||
@ -812,7 +812,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
|
||||
// .map((date) => {
|
||||
// return format(date, 'yyyy');
|
||||
// })
|
||||
]) {
|
||||
] as DateRange[]) {
|
||||
const dateInterval = getIntervalFromDateRange(dateRange);
|
||||
const endDate = dateInterval.endDate;
|
||||
let startDate = dateInterval.startDate;
|
||||
|
@ -138,7 +138,7 @@ export class PortfolioService {
|
||||
some: {
|
||||
SymbolProfile: {
|
||||
AND: [
|
||||
{ dataSource: <DataSource>filterByDataSource },
|
||||
{ dataSource: filterByDataSource as DataSource },
|
||||
{ symbol: filterBySymbol }
|
||||
]
|
||||
}
|
||||
@ -1160,7 +1160,7 @@ export class PortfolioService {
|
||||
|
||||
public async getReport(impersonationId: string): Promise<PortfolioReport> {
|
||||
const userId = await this.getUserId(impersonationId, this.request.user.id);
|
||||
const userSettings = <UserSettings>this.request.user.Settings.settings;
|
||||
const userSettings = this.request.user.Settings.settings as UserSettings;
|
||||
|
||||
const { accounts, holdings, markets, summary } = await this.getDetails({
|
||||
impersonationId,
|
||||
@ -1169,6 +1169,12 @@ export class PortfolioService {
|
||||
withSummary: true
|
||||
});
|
||||
|
||||
const marketsTotalInBaseCurrency = getSum(
|
||||
Object.values(markets).map(({ valueInBaseCurrency }) => {
|
||||
return new Big(valueInBaseCurrency);
|
||||
})
|
||||
).toNumber();
|
||||
|
||||
return {
|
||||
rules: {
|
||||
accountClusterRisk:
|
||||
@ -1193,12 +1199,12 @@ export class PortfolioService {
|
||||
[
|
||||
new AllocationClusterRiskDevelopedMarkets(
|
||||
this.exchangeRateDataService,
|
||||
summary.currentValueInBaseCurrency,
|
||||
marketsTotalInBaseCurrency,
|
||||
markets.developedMarkets.valueInBaseCurrency
|
||||
),
|
||||
new AllocationClusterRiskEmergingMarkets(
|
||||
this.exchangeRateDataService,
|
||||
summary.currentValueInBaseCurrency,
|
||||
marketsTotalInBaseCurrency,
|
||||
markets.emergingMarkets.valueInBaseCurrency
|
||||
)
|
||||
],
|
||||
@ -1358,20 +1364,20 @@ export class PortfolioService {
|
||||
}
|
||||
}
|
||||
|
||||
const marketsTotal =
|
||||
markets.developedMarkets.valueInBaseCurrency +
|
||||
markets.emergingMarkets.valueInBaseCurrency +
|
||||
markets.otherMarkets.valueInBaseCurrency +
|
||||
markets[UNKNOWN_KEY].valueInBaseCurrency;
|
||||
const marketsTotalInBaseCurrency = getSum(
|
||||
Object.values(markets).map(({ valueInBaseCurrency }) => {
|
||||
return new Big(valueInBaseCurrency);
|
||||
})
|
||||
).toNumber();
|
||||
|
||||
markets.developedMarkets.valueInPercentage =
|
||||
markets.developedMarkets.valueInBaseCurrency / marketsTotal;
|
||||
markets.developedMarkets.valueInBaseCurrency / marketsTotalInBaseCurrency;
|
||||
markets.emergingMarkets.valueInPercentage =
|
||||
markets.emergingMarkets.valueInBaseCurrency / marketsTotal;
|
||||
markets.emergingMarkets.valueInBaseCurrency / marketsTotalInBaseCurrency;
|
||||
markets.otherMarkets.valueInPercentage =
|
||||
markets.otherMarkets.valueInBaseCurrency / marketsTotal;
|
||||
markets.otherMarkets.valueInBaseCurrency / marketsTotalInBaseCurrency;
|
||||
markets[UNKNOWN_KEY].valueInPercentage =
|
||||
markets[UNKNOWN_KEY].valueInBaseCurrency / marketsTotal;
|
||||
markets[UNKNOWN_KEY].valueInBaseCurrency / marketsTotalInBaseCurrency;
|
||||
|
||||
const marketsAdvancedTotal =
|
||||
marketsAdvanced.asiaPacific.valueInBaseCurrency +
|
||||
|
@ -19,11 +19,11 @@ import { RedisCacheService } from './redis-cache.service';
|
||||
configurationService.get('REDIS_PASSWORD')
|
||||
);
|
||||
|
||||
return <RedisClientOptions>{
|
||||
return {
|
||||
store: redisStore,
|
||||
ttl: configurationService.get('CACHE_TTL'),
|
||||
url: `redis://${redisPassword ? `:${redisPassword}` : ''}@${configurationService.get('REDIS_HOST')}:${configurationService.get('REDIS_PORT')}/${configurationService.get('REDIS_DB')}`
|
||||
};
|
||||
} as RedisClientOptions;
|
||||
}
|
||||
}),
|
||||
ConfigurationModule
|
||||
|
@ -95,7 +95,7 @@ export class SubscriptionController {
|
||||
@Res() response: Response
|
||||
) {
|
||||
const userId = await this.subscriptionService.createSubscriptionViaStripe(
|
||||
<string>request.query.checkoutSessionId
|
||||
request.query.checkoutSessionId as string
|
||||
);
|
||||
|
||||
Logger.log(
|
||||
@ -113,7 +113,7 @@ export class SubscriptionController {
|
||||
@Post('stripe/checkout-session')
|
||||
@UseGuards(AuthGuard('jwt'), HasPermissionGuard)
|
||||
public async createCheckoutSession(
|
||||
@Body() { couponId, priceId }: { couponId: string; priceId: string }
|
||||
@Body() { couponId, priceId }: { couponId?: string; priceId: string }
|
||||
) {
|
||||
try {
|
||||
return this.subscriptionService.createCheckoutSession({
|
||||
|
@ -124,7 +124,9 @@ export class SubscriptionService {
|
||||
let offer: SubscriptionOffer = price ? 'renewal' : 'default';
|
||||
|
||||
if (isBefore(createdAt, parseDate('2023-01-01'))) {
|
||||
offer = 'renewal-early-bird';
|
||||
offer = 'renewal-early-bird-2023';
|
||||
} else if (isBefore(createdAt, parseDate('2024-01-01'))) {
|
||||
offer = 'renewal-early-bird-2024';
|
||||
}
|
||||
|
||||
return {
|
||||
|
@ -1,10 +1,10 @@
|
||||
import { IsCurrencyCode } from '@ghostfolio/api/validators/is-currency-code';
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/interfaces';
|
||||
import type {
|
||||
ColorScheme,
|
||||
DateRange,
|
||||
HoldingsViewMode,
|
||||
ViewMode,
|
||||
XRayRulesSettings
|
||||
ViewMode
|
||||
} from '@ghostfolio/common/types';
|
||||
|
||||
import {
|
||||
@ -31,11 +31,11 @@ export class UpdateUserSettingDto {
|
||||
@IsOptional()
|
||||
benchmark?: string;
|
||||
|
||||
@IsIn(<ColorScheme[]>['DARK', 'LIGHT'])
|
||||
@IsIn(['DARK', 'LIGHT'] as ColorScheme[])
|
||||
@IsOptional()
|
||||
colorScheme?: ColorScheme;
|
||||
|
||||
@IsIn(<DateRange[]>[
|
||||
@IsIn([
|
||||
'1d',
|
||||
'1y',
|
||||
'5y',
|
||||
@ -48,7 +48,7 @@ export class UpdateUserSettingDto {
|
||||
return format(date, 'yyyy');
|
||||
}
|
||||
)
|
||||
])
|
||||
] as DateRange[])
|
||||
@IsOptional()
|
||||
dateRange?: DateRange;
|
||||
|
||||
@ -68,7 +68,7 @@ export class UpdateUserSettingDto {
|
||||
@IsOptional()
|
||||
'filters.tags'?: string[];
|
||||
|
||||
@IsIn(<HoldingsViewMode[]>['CHART', 'TABLE'])
|
||||
@IsIn(['CHART', 'TABLE'] as HoldingsViewMode[])
|
||||
@IsOptional()
|
||||
holdingsViewMode?: HoldingsViewMode;
|
||||
|
||||
@ -100,7 +100,7 @@ export class UpdateUserSettingDto {
|
||||
@IsOptional()
|
||||
savingsRate?: number;
|
||||
|
||||
@IsIn(<ViewMode[]>['DEFAULT', 'ZEN'])
|
||||
@IsIn(['DEFAULT', 'ZEN'] as ViewMode[])
|
||||
@IsOptional()
|
||||
viewMode?: ViewMode;
|
||||
|
||||
|
@ -148,7 +148,7 @@ export class UserController {
|
||||
|
||||
const userSettings: UserSettings = merge(
|
||||
{},
|
||||
<UserSettings>this.request.user.Settings.settings,
|
||||
this.request.user.Settings.settings as UserSettings,
|
||||
data
|
||||
);
|
||||
|
||||
|
@ -116,8 +116,8 @@ export class UserService {
|
||||
accounts: Account,
|
||||
dateOfFirstActivity: firstActivity?.date ?? new Date(),
|
||||
settings: {
|
||||
...(<UserSettings>Settings.settings),
|
||||
locale: (<UserSettings>Settings.settings)?.locale ?? aLocale
|
||||
...(Settings.settings as UserSettings),
|
||||
locale: (Settings.settings as UserSettings)?.locale ?? aLocale
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ export function redactAttributes({
|
||||
object: any;
|
||||
options: { attribute: string; valueMap: { [key: string]: any } }[];
|
||||
}): any {
|
||||
if (!object || !options || !options.length) {
|
||||
if (!object || !options?.length) {
|
||||
return object;
|
||||
}
|
||||
|
||||
|
@ -34,28 +34,28 @@ export class ApiService {
|
||||
|
||||
const filters = [
|
||||
...accountIds.map((accountId) => {
|
||||
return <Filter>{
|
||||
return {
|
||||
id: accountId,
|
||||
type: 'ACCOUNT'
|
||||
};
|
||||
} as Filter;
|
||||
}),
|
||||
...assetClasses.map((assetClass) => {
|
||||
return <Filter>{
|
||||
return {
|
||||
id: assetClass,
|
||||
type: 'ASSET_CLASS'
|
||||
};
|
||||
} as Filter;
|
||||
}),
|
||||
...assetSubClasses.map((assetClass) => {
|
||||
return <Filter>{
|
||||
return {
|
||||
id: assetClass,
|
||||
type: 'ASSET_SUB_CLASS'
|
||||
};
|
||||
} as Filter;
|
||||
}),
|
||||
...tagIds.map((tagId) => {
|
||||
return <Filter>{
|
||||
return {
|
||||
id: tagId,
|
||||
type: 'TAG'
|
||||
};
|
||||
} as Filter;
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -144,21 +144,21 @@ export class MarketDataService {
|
||||
({ dataSource, date, marketPrice, symbol, state }) => {
|
||||
return this.prismaService.marketData.upsert({
|
||||
create: {
|
||||
dataSource: <DataSource>dataSource,
|
||||
date: <Date>date,
|
||||
marketPrice: <number>marketPrice,
|
||||
state: <MarketDataState>state,
|
||||
symbol: <string>symbol
|
||||
dataSource: dataSource as DataSource,
|
||||
date: date as Date,
|
||||
marketPrice: marketPrice as number,
|
||||
state: state as MarketDataState,
|
||||
symbol: symbol as string
|
||||
},
|
||||
update: {
|
||||
marketPrice: <number>marketPrice,
|
||||
state: <MarketDataState>state
|
||||
marketPrice: marketPrice as number,
|
||||
state: state as MarketDataState
|
||||
},
|
||||
where: {
|
||||
dataSource_date_symbol: {
|
||||
dataSource: <DataSource>dataSource,
|
||||
date: <Date>date,
|
||||
symbol: <string>symbol
|
||||
dataSource: dataSource as DataSource,
|
||||
date: date as Date,
|
||||
symbol: symbol as string
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -78,7 +78,7 @@ export class DataGatheringProcessor {
|
||||
public async gatherHistoricalMarketData(job: Job<IDataGatheringItem>) {
|
||||
try {
|
||||
const { dataSource, date, symbol } = job.data;
|
||||
let currentDate = parseISO(<string>(<unknown>date));
|
||||
let currentDate = parseISO(date as unknown as string);
|
||||
|
||||
Logger.log(
|
||||
`Historical market data gathering has been started for ${symbol} (${dataSource}) at ${format(
|
||||
|
@ -94,10 +94,10 @@ export class PortfolioSnapshotProcessor {
|
||||
filters: job.data.filters,
|
||||
userId: job.data.userId
|
||||
}),
|
||||
JSON.stringify(<PortfolioSnapshotValue>(<unknown>{
|
||||
JSON.stringify({
|
||||
expiration: expiration.getTime(),
|
||||
portfolioSnapshot: snapshot
|
||||
})),
|
||||
} as unknown as PortfolioSnapshotValue),
|
||||
CACHE_TTL_INFINITE
|
||||
);
|
||||
|
||||
|
@ -176,7 +176,7 @@ export class SymbolProfileService {
|
||||
countries: this.getCountries(
|
||||
symbolProfile?.countries as unknown as Prisma.JsonArray
|
||||
),
|
||||
dateOfFirstActivity: <Date>undefined,
|
||||
dateOfFirstActivity: undefined as Date,
|
||||
holdings: this.getHoldings(symbolProfile),
|
||||
scraperConfiguration: this.getScraperConfiguration(symbolProfile),
|
||||
sectors: this.getSectors(symbolProfile),
|
||||
|
@ -292,7 +292,7 @@ export class AppComponent implements OnDestroy, OnInit {
|
||||
|
||||
const dialogRef = this.dialog.open(GfHoldingDetailDialogComponent, {
|
||||
autoFocus: false,
|
||||
data: <HoldingDetailDialogParams>{
|
||||
data: {
|
||||
dataSource,
|
||||
symbol,
|
||||
baseCurrency: this.user?.settings?.baseCurrency,
|
||||
@ -312,7 +312,7 @@ export class AppComponent implements OnDestroy, OnInit {
|
||||
hasPermission(this.user?.permissions, permissions.updateOrder) &&
|
||||
!this.user?.settings?.isRestrictedView,
|
||||
locale: this.user?.settings?.locale
|
||||
},
|
||||
} as HoldingDetailDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
@ -47,8 +47,7 @@ export class AccountsTableComponent implements OnChanges, OnDestroy {
|
||||
|
||||
@ViewChild(MatSort) sort: MatSort;
|
||||
|
||||
public dataSource: MatTableDataSource<AccountModel> =
|
||||
new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<AccountModel>();
|
||||
public displayedColumns = [];
|
||||
public isLoading = true;
|
||||
public routeQueryParams: Subscription;
|
||||
|
@ -35,10 +35,10 @@ export class AdminJobsComponent implements OnDestroy, OnInit {
|
||||
DATA_GATHERING_QUEUE_PRIORITY_HIGH;
|
||||
public DATA_GATHERING_QUEUE_PRIORITY_MEDIUM =
|
||||
DATA_GATHERING_QUEUE_PRIORITY_MEDIUM;
|
||||
|
||||
public dataSource = new MatTableDataSource<AdminJobs['jobs'][0]>();
|
||||
public defaultDateTimeFormat: string;
|
||||
public filterForm: FormGroup;
|
||||
public dataSource: MatTableDataSource<AdminJobs['jobs'][0]> =
|
||||
new MatTableDataSource();
|
||||
public displayedColumns = [
|
||||
'index',
|
||||
'type',
|
||||
|
@ -178,14 +178,14 @@ export class AdminMarketDataDetailComponent implements OnChanges {
|
||||
const marketPrice = this.marketDataByMonth[yearMonth]?.[day]?.marketPrice;
|
||||
|
||||
const dialogRef = this.dialog.open(MarketDataDetailDialog, {
|
||||
data: <MarketDataDetailDialogParams>{
|
||||
data: {
|
||||
marketPrice,
|
||||
currency: this.currency,
|
||||
dataSource: this.dataSource,
|
||||
dateString: `${yearMonth}-${day}`,
|
||||
symbol: this.symbol,
|
||||
user: this.user
|
||||
},
|
||||
} as MarketDataDetailDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
@ -71,36 +71,35 @@ export class AdminMarketDataComponent
|
||||
return {
|
||||
id: assetSubClass.toString(),
|
||||
label: translate(assetSubClass),
|
||||
type: <Filter['type']>'ASSET_SUB_CLASS'
|
||||
type: 'ASSET_SUB_CLASS' as Filter['type']
|
||||
};
|
||||
})
|
||||
.concat([
|
||||
{
|
||||
id: 'BENCHMARKS',
|
||||
label: $localize`Benchmarks`,
|
||||
type: <Filter['type']>'PRESET_ID'
|
||||
type: 'PRESET_ID' as Filter['type']
|
||||
},
|
||||
{
|
||||
id: 'CURRENCIES',
|
||||
label: $localize`Currencies`,
|
||||
type: <Filter['type']>'PRESET_ID'
|
||||
type: 'PRESET_ID' as Filter['type']
|
||||
},
|
||||
{
|
||||
id: 'ETF_WITHOUT_COUNTRIES',
|
||||
label: $localize`ETFs without Countries`,
|
||||
type: <Filter['type']>'PRESET_ID'
|
||||
type: 'PRESET_ID' as Filter['type']
|
||||
},
|
||||
{
|
||||
id: 'ETF_WITHOUT_SECTORS',
|
||||
label: $localize`ETFs without Sectors`,
|
||||
type: <Filter['type']>'PRESET_ID'
|
||||
type: 'PRESET_ID' as Filter['type']
|
||||
}
|
||||
]);
|
||||
public benchmarks: Partial<SymbolProfile>[];
|
||||
public currentDataSource: DataSource;
|
||||
public currentSymbol: string;
|
||||
public dataSource: MatTableDataSource<AdminMarketDataItem> =
|
||||
new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<AdminMarketDataItem>();
|
||||
public defaultDateFormat: string;
|
||||
public deviceType: string;
|
||||
public displayedColumns: string[] = [];
|
||||
@ -375,13 +374,13 @@ export class AdminMarketDataComponent
|
||||
|
||||
const dialogRef = this.dialog.open(AssetProfileDialog, {
|
||||
autoFocus: false,
|
||||
data: <AssetProfileDialogParams>{
|
||||
data: {
|
||||
dataSource,
|
||||
symbol,
|
||||
colorScheme: this.user?.settings.colorScheme,
|
||||
deviceType: this.deviceType,
|
||||
locale: this.user?.settings?.locale
|
||||
},
|
||||
} as AssetProfileDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
@ -404,10 +403,10 @@ export class AdminMarketDataComponent
|
||||
|
||||
const dialogRef = this.dialog.open(CreateAssetProfileDialog, {
|
||||
autoFocus: false,
|
||||
data: <CreateAssetProfileDialogParams>{
|
||||
data: {
|
||||
deviceType: this.deviceType,
|
||||
locale: this.user?.settings?.locale
|
||||
},
|
||||
} as CreateAssetProfileDialogParams,
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
||||
|
@ -225,10 +225,10 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
|
||||
$localize`Please set your system message:`,
|
||||
JSON.stringify(
|
||||
this.systemMessage ??
|
||||
<SystemMessage>{
|
||||
({
|
||||
message: '⚒️ Scheduled maintenance in progress...',
|
||||
targetGroups: ['Basic', 'Premium']
|
||||
}
|
||||
} as SystemMessage)
|
||||
)
|
||||
);
|
||||
|
||||
|
@ -34,7 +34,7 @@ import { CreateOrUpdatePlatformDialog } from './create-or-update-platform-dialog
|
||||
export class AdminPlatformComponent implements OnInit, OnDestroy {
|
||||
@ViewChild(MatSort) sort: MatSort;
|
||||
|
||||
public dataSource: MatTableDataSource<Platform> = new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<Platform>();
|
||||
public deviceType: string;
|
||||
public displayedColumns = ['name', 'url', 'accounts', 'actions'];
|
||||
public platforms: Platform[];
|
||||
|
@ -34,7 +34,7 @@ import { CreateOrUpdateTagDialog } from './create-or-update-tag-dialog/create-or
|
||||
export class AdminTagComponent implements OnInit, OnDestroy {
|
||||
@ViewChild(MatSort) sort: MatSort;
|
||||
|
||||
public dataSource: MatTableDataSource<Tag> = new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<Tag>();
|
||||
public deviceType: string;
|
||||
public displayedColumns = ['name', 'userId', 'activities', 'actions'];
|
||||
public tags: Tag[];
|
||||
|
@ -24,8 +24,7 @@ import { takeUntil } from 'rxjs/operators';
|
||||
templateUrl: './admin-users.html'
|
||||
})
|
||||
export class AdminUsersComponent implements OnDestroy, OnInit {
|
||||
public dataSource: MatTableDataSource<AdminUsers['users'][0]> =
|
||||
new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<AdminUsers['users'][0]>();
|
||||
public defaultDateFormat: string;
|
||||
public displayedColumns: string[] = [];
|
||||
public getEmojiFlag = getEmojiFlag;
|
||||
|
@ -98,7 +98,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
|
||||
}
|
||||
|
||||
private initialize() {
|
||||
const benchmarkDataValues: { [date: string]: number } = {};
|
||||
const benchmarkDataValues: Record<string, number> = {};
|
||||
|
||||
for (const { date, value } of this.benchmarkDataItems) {
|
||||
benchmarkDataValues[date] = value;
|
||||
@ -133,9 +133,8 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
|
||||
if (this.chartCanvas) {
|
||||
if (this.chart) {
|
||||
this.chart.data = data;
|
||||
this.chart.options.plugins.tooltip = <unknown>(
|
||||
this.getTooltipPluginConfiguration()
|
||||
);
|
||||
this.chart.options.plugins.tooltip =
|
||||
this.getTooltipPluginConfiguration() as unknown;
|
||||
this.chart.update();
|
||||
} else {
|
||||
this.chart = new Chart(this.chartCanvas.nativeElement, {
|
||||
@ -154,7 +153,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
|
||||
},
|
||||
interaction: { intersect: false, mode: 'index' },
|
||||
maintainAspectRatio: true,
|
||||
plugins: <unknown>{
|
||||
plugins: {
|
||||
annotation: {
|
||||
annotations: {
|
||||
yAxis: {
|
||||
@ -173,7 +172,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
|
||||
verticalHoverLine: {
|
||||
color: `rgba(${getTextColor(this.colorScheme)}, 0.1)`
|
||||
}
|
||||
},
|
||||
} as unknown,
|
||||
responsive: true,
|
||||
scales: {
|
||||
x: {
|
||||
@ -238,7 +237,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
|
||||
unit: '%'
|
||||
}),
|
||||
mode: 'index',
|
||||
position: <unknown>'top',
|
||||
position: 'top' as unknown,
|
||||
xAlign: 'center',
|
||||
yAlign: 'bottom'
|
||||
};
|
||||
|
@ -180,7 +180,8 @@
|
||||
<ng-container i18n>Upgrade Plan</ng-container>
|
||||
} @else if (
|
||||
user.subscription.offer === 'renewal' ||
|
||||
user.subscription.offer === 'renewal-early-bird'
|
||||
user.subscription.offer === 'renewal-early-bird-2023' ||
|
||||
user.subscription.offer === 'renewal-early-bird-2024'
|
||||
) {
|
||||
<ng-container i18n>Renew Plan</ng-container>
|
||||
}
|
||||
|
@ -148,7 +148,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
|
||||
|
||||
public ngOnInit() {
|
||||
this.activityForm = this.formBuilder.group({
|
||||
tags: <string[]>[]
|
||||
tags: [] as string[]
|
||||
});
|
||||
|
||||
const filters: Filter[] = [
|
||||
|
@ -4,14 +4,11 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
|
||||
import {
|
||||
AssetProfileIdentifier,
|
||||
PortfolioPosition,
|
||||
ToggleOption,
|
||||
User
|
||||
} from '@ghostfolio/common/interfaces';
|
||||
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
|
||||
import {
|
||||
HoldingType,
|
||||
HoldingsViewMode,
|
||||
ToggleOption
|
||||
} from '@ghostfolio/common/types';
|
||||
import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types';
|
||||
|
||||
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
|
||||
import { FormControl } from '@angular/forms';
|
||||
|
@ -154,9 +154,8 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
|
||||
if (this.chartCanvas) {
|
||||
if (this.chart) {
|
||||
this.chart.data = chartData;
|
||||
this.chart.options.plugins.tooltip = <unknown>(
|
||||
this.getTooltipPluginConfiguration()
|
||||
);
|
||||
this.chart.options.plugins.tooltip =
|
||||
this.getTooltipPluginConfiguration() as unknown;
|
||||
|
||||
if (
|
||||
this.savingsRate &&
|
||||
@ -186,7 +185,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
|
||||
},
|
||||
interaction: { intersect: false, mode: 'index' },
|
||||
maintainAspectRatio: true,
|
||||
plugins: <unknown>{
|
||||
plugins: {
|
||||
annotation: {
|
||||
annotations: {
|
||||
savingsRate: this.savingsRate
|
||||
@ -227,7 +226,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
|
||||
verticalHoverLine: {
|
||||
color: `rgba(${getTextColor(this.colorScheme)}, 0.1)`
|
||||
}
|
||||
},
|
||||
} as unknown,
|
||||
responsive: true,
|
||||
scales: {
|
||||
x: {
|
||||
@ -294,7 +293,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
|
||||
unit: this.isInPercent ? '%' : undefined
|
||||
}),
|
||||
mode: 'index',
|
||||
position: <unknown>'top',
|
||||
position: 'top' as unknown,
|
||||
xAlign: 'center',
|
||||
yAlign: 'bottom'
|
||||
};
|
||||
|
@ -1,5 +1,7 @@
|
||||
import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/types';
|
||||
import {
|
||||
PortfolioReportRule,
|
||||
XRayRulesSettings
|
||||
} from '@ghostfolio/common/interfaces';
|
||||
|
||||
export interface IRuleSettingsDialogParams {
|
||||
rule: PortfolioReportRule;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/types';
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/interfaces';
|
||||
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { Component, Inject } from '@angular/core';
|
||||
|
@ -1,7 +1,9 @@
|
||||
import { UpdateUserSettingDto } from '@ghostfolio/api/app/user/update-user-setting.dto';
|
||||
import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
|
||||
import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/types';
|
||||
import {
|
||||
PortfolioReportRule,
|
||||
XRayRulesSettings
|
||||
} from '@ghostfolio/common/interfaces';
|
||||
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
|
@ -1,6 +1,8 @@
|
||||
import { UpdateUserSettingDto } from '@ghostfolio/api/app/user/update-user-setting.dto';
|
||||
import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/types';
|
||||
import {
|
||||
PortfolioReportRule,
|
||||
XRayRulesSettings
|
||||
} from '@ghostfolio/common/interfaces';
|
||||
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { ToggleOption } from '@ghostfolio/common/types';
|
||||
import { ToggleOption } from '@ghostfolio/common/interfaces';
|
||||
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
|
@ -16,7 +16,8 @@
|
||||
<ng-container i18n>Upgrade Plan</ng-container>
|
||||
} @else if (
|
||||
user.subscription.offer === 'renewal' ||
|
||||
user.subscription.offer === 'renewal-early-bird'
|
||||
user.subscription.offer === 'renewal-early-bird-2023' ||
|
||||
user.subscription.offer === 'renewal-early-bird-2024'
|
||||
) {
|
||||
<ng-container i18n>Renew Plan</ng-container>
|
||||
}
|
||||
|
@ -222,7 +222,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
|
||||
private openAccountDetailDialog(aAccountId: string) {
|
||||
const dialogRef = this.dialog.open(AccountDetailDialog, {
|
||||
autoFocus: false,
|
||||
data: <AccountDetailDialogParams>{
|
||||
data: {
|
||||
accountId: aAccountId,
|
||||
deviceType: this.deviceType,
|
||||
hasImpersonationId: this.hasImpersonationId,
|
||||
@ -230,7 +230,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
|
||||
!this.hasImpersonationId &&
|
||||
hasPermission(this.user?.permissions, permissions.createOrder) &&
|
||||
!this.user?.settings?.isRestrictedView
|
||||
},
|
||||
} as AccountDetailDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
@ -218,10 +218,10 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
|
||||
|
||||
public onImport() {
|
||||
const dialogRef = this.dialog.open(ImportActivitiesDialog, {
|
||||
data: <ImportActivitiesDialogParams>{
|
||||
data: {
|
||||
deviceType: this.deviceType,
|
||||
user: this.user
|
||||
},
|
||||
} as ImportActivitiesDialogParams,
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
||||
@ -235,11 +235,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
|
||||
|
||||
public onImportDividends() {
|
||||
const dialogRef = this.dialog.open(ImportActivitiesDialog, {
|
||||
data: <ImportActivitiesDialogParams>{
|
||||
data: {
|
||||
activityTypes: ['DIVIDEND'],
|
||||
deviceType: this.deviceType,
|
||||
user: this.user
|
||||
},
|
||||
} as ImportActivitiesDialogParams,
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
||||
|
@ -505,7 +505,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
|
||||
private openAccountDetailDialog(aAccountId: string) {
|
||||
const dialogRef = this.dialog.open(AccountDetailDialog, {
|
||||
autoFocus: false,
|
||||
data: <AccountDetailDialogParams>{
|
||||
data: {
|
||||
accountId: aAccountId,
|
||||
deviceType: this.deviceType,
|
||||
hasImpersonationId: this.hasImpersonationId,
|
||||
@ -513,7 +513,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
|
||||
!this.hasImpersonationId &&
|
||||
hasPermission(this.user?.permissions, permissions.createOrder) &&
|
||||
!this.user?.settings?.isRestrictedView
|
||||
},
|
||||
} as AccountDetailDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
@ -5,13 +5,14 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
|
||||
import { MatPaginator, PageEvent } from '@angular/material/paginator';
|
||||
import {
|
||||
HistoricalDataItem,
|
||||
InvestmentItem,
|
||||
PortfolioInvestments,
|
||||
PortfolioPerformance,
|
||||
PortfolioPosition,
|
||||
ToggleOption,
|
||||
User
|
||||
} from '@ghostfolio/common/interfaces';
|
||||
import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
|
||||
import { GroupBy, ToggleOption } from '@ghostfolio/common/types';
|
||||
import { GroupBy } from '@ghostfolio/common/types';
|
||||
import { translate } from '@ghostfolio/ui/i18n';
|
||||
|
||||
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
|
||||
|
@ -278,7 +278,8 @@
|
||||
<ng-container i18n>Upgrade Plan</ng-container>
|
||||
} @else if (
|
||||
user.subscription.offer === 'renewal' ||
|
||||
user.subscription.offer === 'renewal-early-bird'
|
||||
user.subscription.offer === 'renewal-early-bird-2023' ||
|
||||
user.subscription.offer === 'renewal-early-bird-2024'
|
||||
) {
|
||||
<ng-container i18n>Renew Plan</ng-container>
|
||||
}
|
||||
|
@ -230,8 +230,8 @@ export class DataService {
|
||||
public fetchActivity(aActivityId: string) {
|
||||
return this.http.get<Activity>(`/api/v1/order/${aActivityId}`).pipe(
|
||||
map((activity) => {
|
||||
activity.createdAt = parseISO(<string>(<unknown>activity.createdAt));
|
||||
activity.date = parseISO(<string>(<unknown>activity.date));
|
||||
activity.createdAt = parseISO(activity.createdAt as unknown as string);
|
||||
activity.date = parseISO(activity.date as unknown as string);
|
||||
|
||||
return activity;
|
||||
})
|
||||
@ -387,8 +387,8 @@ export class DataService {
|
||||
map((data) => {
|
||||
if (data.orders) {
|
||||
for (const order of data.orders) {
|
||||
order.createdAt = parseISO(<string>(<unknown>order.createdAt));
|
||||
order.date = parseISO(<string>(<unknown>order.date));
|
||||
order.createdAt = parseISO(order.createdAt as unknown as string);
|
||||
order.date = parseISO(order.date as unknown as string);
|
||||
}
|
||||
}
|
||||
|
||||
@ -399,9 +399,9 @@ export class DataService {
|
||||
|
||||
public fetchInfo(): InfoItem {
|
||||
const info = cloneDeep((window as any).info);
|
||||
const utmSource = <'ios' | 'trusted-web-activity'>(
|
||||
window.localStorage.getItem('utm_source')
|
||||
);
|
||||
const utmSource = window.localStorage.getItem('utm_source') as
|
||||
| 'ios'
|
||||
| 'trusted-web-activity';
|
||||
|
||||
info.globalPermissions = filterGlobalPermissions(
|
||||
info.globalPermissions,
|
||||
@ -715,9 +715,9 @@ export class DataService {
|
||||
|
||||
public updateInfo() {
|
||||
this.http.get<InfoItem>('/api/v1/info').subscribe((info) => {
|
||||
const utmSource = <'ios' | 'trusted-web-activity'>(
|
||||
window.localStorage.getItem('utm_source')
|
||||
);
|
||||
const utmSource = window.localStorage.getItem('utm_source') as
|
||||
| 'ios'
|
||||
| 'trusted-web-activity';
|
||||
|
||||
info.globalPermissions = filterGlobalPermissions(
|
||||
info.globalPermissions,
|
||||
|
@ -104,9 +104,9 @@ export class UserService extends ObservableStore<UserStoreState> {
|
||||
) {
|
||||
const dialogRef = this.dialog.open(SubscriptionInterstitialDialog, {
|
||||
autoFocus: false,
|
||||
data: <SubscriptionInterstitialDialogParams>{
|
||||
data: {
|
||||
user
|
||||
},
|
||||
} as SubscriptionInterstitialDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : '80vh',
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
@ -8,7 +8,7 @@ export async function validateObjectForForm<T>({
|
||||
ignoreFields = [],
|
||||
object
|
||||
}: {
|
||||
classDto: { new (): T };
|
||||
classDto: new () => T;
|
||||
form: FormGroup;
|
||||
ignoreFields?: string[];
|
||||
object: T;
|
||||
|
@ -12,9 +12,9 @@ import { environment } from './environments/environment';
|
||||
(async () => {
|
||||
const response = await fetch('/api/v1/info');
|
||||
const info: InfoItem = await response.json();
|
||||
const utmSource = <'ios' | 'trusted-web-activity'>(
|
||||
window.localStorage.getItem('utm_source')
|
||||
);
|
||||
const utmSource = window.localStorage.getItem('utm_source') as
|
||||
| 'ios'
|
||||
| 'trusted-web-activity';
|
||||
|
||||
info.globalPermissions = filterGlobalPermissions(
|
||||
info.globalPermissions,
|
||||
|
@ -125,14 +125,14 @@ export const PROPERTY_SLACK_COMMUNITY_USERS = 'SLACK_COMMUNITY_USERS';
|
||||
export const PROPERTY_STRIPE_CONFIG = 'STRIPE_CONFIG';
|
||||
export const PROPERTY_SYSTEM_MESSAGE = 'SYSTEM_MESSAGE';
|
||||
|
||||
export const QUEUE_JOB_STATUS_LIST = <JobStatus[]>[
|
||||
export const QUEUE_JOB_STATUS_LIST = [
|
||||
'active',
|
||||
'completed',
|
||||
'delayed',
|
||||
'failed',
|
||||
'paused',
|
||||
'waiting'
|
||||
];
|
||||
] as JobStatus[];
|
||||
|
||||
export const REPLACE_NAME_PARTS = [
|
||||
'Amundi Index Solutions -',
|
||||
|
@ -108,7 +108,7 @@ export function downloadAsFile({
|
||||
content = JSON.stringify(content, undefined, ' ');
|
||||
}
|
||||
|
||||
const file = new Blob([<string>content], {
|
||||
const file = new Blob([content as string], {
|
||||
type: contentType
|
||||
});
|
||||
a.href = URL.createObjectURL(file);
|
||||
|
@ -50,8 +50,10 @@ import type { Subscription } from './subscription.interface';
|
||||
import type { SymbolMetrics } from './symbol-metrics.interface';
|
||||
import type { SystemMessage } from './system-message.interface';
|
||||
import type { TabConfiguration } from './tab-configuration.interface';
|
||||
import type { ToggleOption } from './toggle-option.interface';
|
||||
import type { UserSettings } from './user-settings.interface';
|
||||
import type { User } from './user.interface';
|
||||
import type { XRayRulesSettings } from './x-ray-rules-settings.interface';
|
||||
|
||||
export {
|
||||
Access,
|
||||
@ -104,6 +106,8 @@ export {
|
||||
Subscription,
|
||||
SymbolMetrics,
|
||||
TabConfiguration,
|
||||
ToggleOption,
|
||||
User,
|
||||
UserSettings
|
||||
UserSettings,
|
||||
XRayRulesSettings
|
||||
};
|
||||
|
@ -1,4 +1,4 @@
|
||||
export type ToggleOption = {
|
||||
export interface ToggleOption {
|
||||
label: string;
|
||||
value: string;
|
||||
};
|
||||
}
|
@ -1,9 +1,9 @@
|
||||
import { XRayRulesSettings } from '@ghostfolio/common/interfaces/x-ray-rules-settings.interface';
|
||||
import {
|
||||
ColorScheme,
|
||||
DateRange,
|
||||
HoldingsViewMode,
|
||||
ViewMode,
|
||||
XRayRulesSettings
|
||||
ViewMode
|
||||
} from '@ghostfolio/common/types';
|
||||
|
||||
export interface UserSettings {
|
||||
|
@ -1,4 +1,4 @@
|
||||
export type XRayRulesSettings = {
|
||||
export interface XRayRulesSettings {
|
||||
AccountClusterRiskCurrentInvestment?: RuleSettings;
|
||||
AccountClusterRiskSingleAccount?: RuleSettings;
|
||||
AllocationClusterRiskDevelopedMarkets?: RuleSettings;
|
||||
@ -7,7 +7,7 @@ export type XRayRulesSettings = {
|
||||
CurrencyClusterRiskCurrentInvestment?: RuleSettings;
|
||||
EmergencyFundSetup?: RuleSettings;
|
||||
FeeRatioInitialInvestment?: RuleSettings;
|
||||
};
|
||||
}
|
||||
|
||||
interface RuleSettings {
|
||||
isActive: boolean;
|
@ -16,10 +16,8 @@ import type { Market } from './market.type';
|
||||
import type { OrderWithAccount } from './order-with-account.type';
|
||||
import type { RequestWithUser } from './request-with-user.type';
|
||||
import type { SubscriptionOffer } from './subscription-offer.type';
|
||||
import type { ToggleOption } from './toggle-option.type';
|
||||
import type { UserWithSettings } from './user-with-settings.type';
|
||||
import type { ViewMode } from './view-mode.type';
|
||||
import type { XRayRulesSettings } from './x-ray-rules-settings.type';
|
||||
|
||||
export type {
|
||||
AccessType,
|
||||
@ -40,8 +38,6 @@ export type {
|
||||
OrderWithAccount,
|
||||
RequestWithUser,
|
||||
SubscriptionOffer,
|
||||
ToggleOption,
|
||||
UserWithSettings,
|
||||
ViewMode,
|
||||
XRayRulesSettings
|
||||
ViewMode
|
||||
};
|
||||
|
@ -1 +1,5 @@
|
||||
export type SubscriptionOffer = 'default' | 'renewal' | 'renewal-early-bird';
|
||||
export type SubscriptionOffer =
|
||||
| 'default'
|
||||
| 'renewal'
|
||||
| 'renewal-early-bird-2023'
|
||||
| 'renewal-early-bird-2024';
|
||||
|
@ -74,9 +74,9 @@ export class GfAccountBalancesComponent
|
||||
date: new FormControl(new Date(), Validators.required)
|
||||
});
|
||||
|
||||
public dataSource: MatTableDataSource<
|
||||
public dataSource = new MatTableDataSource<
|
||||
AccountBalancesResponse['balances'][0]
|
||||
> = new MatTableDataSource();
|
||||
>();
|
||||
|
||||
public displayedColumns: string[] = ['date', 'value', 'actions'];
|
||||
public Validators = Validators;
|
||||
|
@ -157,7 +157,7 @@ export class GfActivitiesFilterComponent implements OnChanges, OnDestroy {
|
||||
|
||||
for (const type of Object.keys(filterGroupsMap)) {
|
||||
filterGroups.push({
|
||||
name: <Filter['type']>translate(type),
|
||||
name: translate(type) as Filter['type'],
|
||||
filters: filterGroupsMap[type]
|
||||
});
|
||||
}
|
||||
|
@ -180,10 +180,10 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
|
||||
debounceTime(300),
|
||||
distinctUntilChanged(),
|
||||
mergeMap(async (searchTerm) => {
|
||||
const result = <ISearchResults>{
|
||||
const result = {
|
||||
assetProfiles: [],
|
||||
holdings: []
|
||||
};
|
||||
} as ISearchResults;
|
||||
|
||||
try {
|
||||
if (searchTerm) {
|
||||
|
@ -109,13 +109,13 @@ export class GfBenchmarkComponent implements OnChanges, OnDestroy {
|
||||
symbol
|
||||
}: AssetProfileIdentifier) {
|
||||
const dialogRef = this.dialog.open(GfBenchmarkDetailDialogComponent, {
|
||||
data: <BenchmarkDetailDialogParams>{
|
||||
data: {
|
||||
dataSource,
|
||||
symbol,
|
||||
colorScheme: this.user?.settings?.colorScheme,
|
||||
deviceType: this.deviceType,
|
||||
locale: this.locale
|
||||
},
|
||||
} as BenchmarkDetailDialogParams,
|
||||
height: this.deviceType === 'mobile' ? '98vh' : undefined,
|
||||
width: this.deviceType === 'mobile' ? '100vw' : '50rem'
|
||||
});
|
||||
|
@ -67,8 +67,7 @@ export class GfHoldingsTableComponent implements OnChanges, OnDestroy {
|
||||
@ViewChild(MatPaginator) paginator: MatPaginator;
|
||||
@ViewChild(MatSort) sort: MatSort;
|
||||
|
||||
public dataSource: MatTableDataSource<PortfolioPosition> =
|
||||
new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<PortfolioPosition>();
|
||||
public displayedColumns = [];
|
||||
public ignoreAssetSubClasses = [AssetSubClass.CASH];
|
||||
public isLoading = true;
|
||||
|
@ -172,15 +172,14 @@ export class GfLineChartComponent
|
||||
if (this.chartCanvas) {
|
||||
if (this.chart) {
|
||||
this.chart.data = data;
|
||||
this.chart.options.plugins.tooltip = <unknown>(
|
||||
this.getTooltipPluginConfiguration()
|
||||
);
|
||||
this.chart.options.plugins.tooltip =
|
||||
this.getTooltipPluginConfiguration() as unknown;
|
||||
this.chart.options.animation =
|
||||
this.isAnimated &&
|
||||
<unknown>{
|
||||
({
|
||||
x: this.getAnimationConfigurationForAxis({ labels, axis: 'x' }),
|
||||
y: this.getAnimationConfigurationForAxis({ labels, axis: 'y' })
|
||||
};
|
||||
} as unknown);
|
||||
this.chart.update();
|
||||
} else {
|
||||
this.chart = new Chart(this.chartCanvas.nativeElement, {
|
||||
@ -188,10 +187,10 @@ export class GfLineChartComponent
|
||||
options: {
|
||||
animation:
|
||||
this.isAnimated &&
|
||||
<unknown>{
|
||||
({
|
||||
x: this.getAnimationConfigurationForAxis({ labels, axis: 'x' }),
|
||||
y: this.getAnimationConfigurationForAxis({ labels, axis: 'y' })
|
||||
},
|
||||
} as unknown),
|
||||
aspectRatio: 16 / 9,
|
||||
elements: {
|
||||
point: {
|
||||
@ -200,7 +199,7 @@ export class GfLineChartComponent
|
||||
}
|
||||
},
|
||||
interaction: { intersect: false, mode: 'index' },
|
||||
plugins: <unknown>{
|
||||
plugins: {
|
||||
legend: {
|
||||
align: 'start',
|
||||
display: this.showLegend,
|
||||
@ -210,7 +209,7 @@ export class GfLineChartComponent
|
||||
verticalHoverLine: {
|
||||
color: `rgba(${getTextColor(this.colorScheme)}, 0.1)`
|
||||
}
|
||||
},
|
||||
} as unknown,
|
||||
scales: {
|
||||
x: {
|
||||
border: {
|
||||
@ -325,7 +324,7 @@ export class GfLineChartComponent
|
||||
unit: this.unit
|
||||
}),
|
||||
mode: 'index',
|
||||
position: <unknown>'top',
|
||||
position: 'top' as unknown,
|
||||
xAlign: 'center',
|
||||
yAlign: 'bottom'
|
||||
};
|
||||
|
@ -304,14 +304,14 @@ export class GfPortfolioProportionChartComponent
|
||||
if (this.chartCanvas) {
|
||||
if (this.chart) {
|
||||
this.chart.data = data;
|
||||
this.chart.options.plugins.tooltip = <unknown>(
|
||||
this.getTooltipPluginConfiguration(data)
|
||||
);
|
||||
this.chart.options.plugins.tooltip = this.getTooltipPluginConfiguration(
|
||||
data
|
||||
) as unknown;
|
||||
this.chart.update();
|
||||
} else {
|
||||
this.chart = new Chart(this.chartCanvas.nativeElement, {
|
||||
data,
|
||||
options: <unknown>{
|
||||
options: {
|
||||
animation: false,
|
||||
cutout: '70%',
|
||||
layout: {
|
||||
@ -358,7 +358,7 @@ export class GfPortfolioProportionChartComponent
|
||||
legend: { display: false },
|
||||
tooltip: this.getTooltipPluginConfiguration(data)
|
||||
}
|
||||
},
|
||||
} as unknown,
|
||||
plugins: [ChartDataLabels],
|
||||
type: 'doughnut'
|
||||
});
|
||||
@ -405,7 +405,7 @@ export class GfPortfolioProportionChartComponent
|
||||
symbol = $localize`No data available`;
|
||||
}
|
||||
|
||||
const name = translate(this.positions[<string>symbol]?.name);
|
||||
const name = translate(this.positions[symbol as string]?.name);
|
||||
|
||||
let sum = 0;
|
||||
for (const item of context.dataset.data) {
|
||||
@ -414,12 +414,12 @@ export class GfPortfolioProportionChartComponent
|
||||
|
||||
const percentage = (context.parsed * 100) / sum;
|
||||
|
||||
if (<number>context.raw === Number.MAX_SAFE_INTEGER) {
|
||||
if ((context.raw as number) === Number.MAX_SAFE_INTEGER) {
|
||||
return $localize`No data available`;
|
||||
} else if (this.isInPercent) {
|
||||
return [`${name ?? symbol}`, `${percentage.toFixed(2)}%`];
|
||||
} else {
|
||||
const value = <number>context.raw;
|
||||
const value = context.raw as number;
|
||||
return [
|
||||
`${name ?? symbol}`,
|
||||
`${value.toLocaleString(this.locale, {
|
||||
|
@ -112,7 +112,7 @@ export abstract class AbstractMatFormField<T>
|
||||
public _disabled: boolean = false;
|
||||
|
||||
public get disabled() {
|
||||
if (this.ngControl && this.ngControl.disabled !== null) {
|
||||
if (this.ngControl?.disabled !== null) {
|
||||
return this.ngControl.disabled;
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ export class GfTopHoldingsComponent implements OnChanges, OnDestroy {
|
||||
@ViewChild(MatPaginator) paginator: MatPaginator;
|
||||
@ViewChild(MatSort) sort: MatSort;
|
||||
|
||||
public dataSource: MatTableDataSource<Holding> = new MatTableDataSource();
|
||||
public dataSource = new MatTableDataSource<Holding>();
|
||||
public displayedColumns: string[] = [
|
||||
'name',
|
||||
'valueInBaseCurrency',
|
||||
|
@ -48,7 +48,7 @@ export class GfValueComponent implements OnChanges {
|
||||
if (isNumber(this.value)) {
|
||||
this.isNumber = true;
|
||||
this.isString = false;
|
||||
this.absoluteValue = Math.abs(<number>this.value);
|
||||
this.absoluteValue = Math.abs(this.value as number);
|
||||
|
||||
if (this.colorizeSign) {
|
||||
if (this.isCurrency) {
|
||||
@ -113,7 +113,7 @@ export class GfValueComponent implements OnChanges {
|
||||
this.isString = true;
|
||||
|
||||
if (this.isDate) {
|
||||
this.formattedValue = new Date(<string>this.value).toLocaleDateString(
|
||||
this.formattedValue = new Date(this.value).toLocaleDateString(
|
||||
this.locale,
|
||||
{
|
||||
day: '2-digit',
|
||||
|
68
package-lock.json
generated
68
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "ghostfolio",
|
||||
"version": "2.117.0",
|
||||
"version": "2.118.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ghostfolio",
|
||||
"version": "2.117.0",
|
||||
"version": "2.118.0",
|
||||
"hasInstallScript": true,
|
||||
"license": "AGPL-3.0",
|
||||
"dependencies": {
|
||||
@ -40,7 +40,7 @@
|
||||
"@nestjs/platform-express": "10.1.3",
|
||||
"@nestjs/schedule": "3.0.2",
|
||||
"@nestjs/serve-static": "4.0.0",
|
||||
"@prisma/client": "5.20.0",
|
||||
"@prisma/client": "5.21.1",
|
||||
"@simplewebauthn/browser": "9.0.1",
|
||||
"@simplewebauthn/server": "9.0.3",
|
||||
"@stripe/stripe-js": "3.5.0",
|
||||
@ -150,7 +150,7 @@
|
||||
"nx": "20.0.3",
|
||||
"prettier": "3.3.3",
|
||||
"prettier-plugin-organize-attributes": "1.0.0",
|
||||
"prisma": "5.20.0",
|
||||
"prisma": "5.21.1",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"replace-in-file": "7.0.1",
|
||||
@ -8753,9 +8753,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@prisma/client": {
|
||||
"version": "5.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.20.0.tgz",
|
||||
"integrity": "sha512-CLv55ZuMuUawMsxoqxGtLT3bEZoa2W8L3Qnp6rDIFWy+ZBrUcOFKdoeGPSnbBqxc3SkdxJrF+D1veN/WNynZYA==",
|
||||
"version": "5.21.1",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.21.1.tgz",
|
||||
"integrity": "sha512-3n+GgbAZYjaS/k0M03yQsQfR1APbr411r74foknnsGpmhNKBG49VuUkxIU6jORgvJPChoD4WC4PqoHImN1FP0w==",
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"engines": {
|
||||
@ -8771,53 +8771,53 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@prisma/debug": {
|
||||
"version": "5.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.20.0.tgz",
|
||||
"integrity": "sha512-oCx79MJ4HSujokA8S1g0xgZUGybD4SyIOydoHMngFYiwEwYDQ5tBQkK5XoEHuwOYDKUOKRn/J0MEymckc4IgsQ==",
|
||||
"version": "5.21.1",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.21.1.tgz",
|
||||
"integrity": "sha512-uY8SAhcnORhvgtOrNdvWS98Aq/nkQ9QDUxrWAgW8XrCZaI3j2X7zb7Xe6GQSh6xSesKffFbFlkw0c2luHQviZA==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@prisma/engines": {
|
||||
"version": "5.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.20.0.tgz",
|
||||
"integrity": "sha512-DtqkP+hcZvPEbj8t8dK5df2b7d3B8GNauKqaddRRqQBBlgkbdhJkxhoJTrOowlS3vaRt2iMCkU0+CSNn0KhqAQ==",
|
||||
"version": "5.21.1",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.21.1.tgz",
|
||||
"integrity": "sha512-hGVTldUkIkTwoV8//hmnAAiAchi4oMEKD3aW5H2RrnI50tTdwza7VQbTTAyN3OIHWlK5DVg6xV7X8N/9dtOydA==",
|
||||
"devOptional": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/debug": "5.20.0",
|
||||
"@prisma/engines-version": "5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284",
|
||||
"@prisma/fetch-engine": "5.20.0",
|
||||
"@prisma/get-platform": "5.20.0"
|
||||
"@prisma/debug": "5.21.1",
|
||||
"@prisma/engines-version": "5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36",
|
||||
"@prisma/fetch-engine": "5.21.1",
|
||||
"@prisma/get-platform": "5.21.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@prisma/engines-version": {
|
||||
"version": "5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284.tgz",
|
||||
"integrity": "sha512-Lg8AS5lpi0auZe2Mn4gjuCg081UZf88k3cn0RCwHgR+6cyHHpttPZBElJTHf83ZGsRNAmVCZCfUGA57WB4u4JA==",
|
||||
"version": "5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36.tgz",
|
||||
"integrity": "sha512-qvnEflL0//lh44S/T9NcvTMxfyowNeUxTunPcDfKPjyJNrCNf2F1zQLcUv5UHAruECpX+zz21CzsC7V2xAeM7Q==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@prisma/fetch-engine": {
|
||||
"version": "5.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.20.0.tgz",
|
||||
"integrity": "sha512-JVcaPXC940wOGpCOwuqQRTz6I9SaBK0c1BAyC1pcz9xBi+dzFgUu3G/p9GV1FhFs9OKpfSpIhQfUJE9y00zhqw==",
|
||||
"version": "5.21.1",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.21.1.tgz",
|
||||
"integrity": "sha512-70S31vgpCGcp9J+mh/wHtLCkVezLUqe/fGWk3J3JWZIN7prdYSlr1C0niaWUyNK2VflLXYi8kMjAmSxUVq6WGQ==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/debug": "5.20.0",
|
||||
"@prisma/engines-version": "5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284",
|
||||
"@prisma/get-platform": "5.20.0"
|
||||
"@prisma/debug": "5.21.1",
|
||||
"@prisma/engines-version": "5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36",
|
||||
"@prisma/get-platform": "5.21.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@prisma/get-platform": {
|
||||
"version": "5.20.0",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.20.0.tgz",
|
||||
"integrity": "sha512-8/+CehTZZNzJlvuryRgc77hZCWrUDYd/PmlZ7p2yNXtmf2Una4BWnTbak3us6WVdqoz5wmptk6IhsXdG2v5fmA==",
|
||||
"version": "5.21.1",
|
||||
"resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.21.1.tgz",
|
||||
"integrity": "sha512-sRxjL3Igst3ct+e8ya/x//cDXmpLbZQ5vfps2N4tWl4VGKQAmym77C/IG/psSMsQKszc8uFC/q1dgmKFLUgXZQ==",
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/debug": "5.20.0"
|
||||
"@prisma/debug": "5.21.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@redis/bloom": {
|
||||
@ -29794,14 +29794,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/prisma": {
|
||||
"version": "5.20.0",
|
||||
"resolved": "https://registry.npmjs.org/prisma/-/prisma-5.20.0.tgz",
|
||||
"integrity": "sha512-6obb3ucKgAnsGS9x9gLOe8qa51XxvJ3vLQtmyf52CTey1Qcez3A6W6ROH5HIz5Q5bW+0VpmZb8WBohieMFGpig==",
|
||||
"version": "5.21.1",
|
||||
"resolved": "https://registry.npmjs.org/prisma/-/prisma-5.21.1.tgz",
|
||||
"integrity": "sha512-PB+Iqzld/uQBPaaw2UVIk84kb0ITsLajzsxzsadxxl54eaU5Gyl2/L02ysivHxK89t7YrfQJm+Ggk37uvM70oQ==",
|
||||
"devOptional": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@prisma/engines": "5.20.0"
|
||||
"@prisma/engines": "5.21.1"
|
||||
},
|
||||
"bin": {
|
||||
"prisma": "build/index.js"
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ghostfolio",
|
||||
"version": "2.118.0",
|
||||
"version": "2.119.0",
|
||||
"homepage": "https://ghostfol.io",
|
||||
"license": "AGPL-3.0",
|
||||
"repository": "https://github.com/ghostfolio/ghostfolio",
|
||||
@ -86,7 +86,7 @@
|
||||
"@nestjs/platform-express": "10.1.3",
|
||||
"@nestjs/schedule": "3.0.2",
|
||||
"@nestjs/serve-static": "4.0.0",
|
||||
"@prisma/client": "5.20.0",
|
||||
"@prisma/client": "5.21.1",
|
||||
"@simplewebauthn/browser": "9.0.1",
|
||||
"@simplewebauthn/server": "9.0.3",
|
||||
"@stripe/stripe-js": "3.5.0",
|
||||
@ -196,7 +196,7 @@
|
||||
"nx": "20.0.3",
|
||||
"prettier": "3.3.3",
|
||||
"prettier-plugin-organize-attributes": "1.0.0",
|
||||
"prisma": "5.20.0",
|
||||
"prisma": "5.21.1",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"replace-in-file": "7.0.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user