diff --git a/CHANGELOG.md b/CHANGELOG.md index 62f45fdf6..68dab494c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Removed the alias from the user interface as a preparation to remove it from the `User` database schema - Removed the activities import limit for users with a subscription ### Todo diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts index 5e240a473..2d4edc993 100644 --- a/apps/api/src/app/admin/admin.service.ts +++ b/apps/api/src/app/admin/admin.service.ts @@ -1,6 +1,5 @@ import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; -import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service'; import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { MarketDataService } from '@ghostfolio/api/services/market-data.service'; import { PrismaService } from '@ghostfolio/api/services/prisma.service'; @@ -24,7 +23,6 @@ export class AdminService { public constructor( private readonly configurationService: ConfigurationService, - private readonly dataGatheringService: DataGatheringService, private readonly exchangeRateDataService: ExchangeRateDataService, private readonly marketDataService: MarketDataService, private readonly prismaService: PrismaService, @@ -174,7 +172,6 @@ export class AdminService { _count: { select: { Account: true, Order: true } }, - alias: true, Analytics: { select: { activityCount: true, @@ -194,7 +191,7 @@ export class AdminService { }); return usersWithAnalytics.map( - ({ _count, alias, Analytics, createdAt, id, Subscription }) => { + ({ _count, Analytics, createdAt, id, Subscription }) => { const daysSinceRegistration = differenceInDays(new Date(), createdAt) + 1; const engagement = Analytics.activityCount / daysSinceRegistration; @@ -206,7 +203,6 @@ export class AdminService { : undefined; return { - alias, createdAt, engagement, id, diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 32716b454..213351ede 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -36,14 +36,7 @@ export class UserService { } public async getUser( - { - Account, - alias, - id, - permissions, - Settings, - subscription - }: UserWithSettings, + { Account, id, permissions, Settings, subscription }: UserWithSettings, aLocale = locale ): Promise { const access = await this.prismaService.access.findMany({ @@ -63,7 +56,6 @@ export class UserService { } return { - alias, id, permissions, subscription, diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html index 39f778b2b..8eef62832 100644 --- a/apps/client/src/app/components/admin-users/admin-users.html +++ b/apps/client/src/app/components/admin-users/admin-users.html @@ -29,11 +29,10 @@
{{ userItem.alias || userItem.id }}{{ userItem.id }} {{ userItem.alias || (userItem.id | slice:0:5) + - '...' }}{{ (userItem.id | slice:0:5) + '...' }} - {{ user.alias }} - Me + Me
+
+
+

How do I get my finances in order?

+
+ Before you can think of long-term investing, you have to get your + finances in order. Learn how you can reach your financial goals + easier and faster in this guide. +
+
+ How do I get my finances in order? → +
+
+

Market

diff --git a/libs/common/src/lib/interfaces/admin-data.interface.ts b/libs/common/src/lib/interfaces/admin-data.interface.ts index 1e0c6e532..c51b2c8d7 100644 --- a/libs/common/src/lib/interfaces/admin-data.interface.ts +++ b/libs/common/src/lib/interfaces/admin-data.interface.ts @@ -5,7 +5,6 @@ export interface AdminData { userCount: number; users: { accountCount: number; - alias: string; createdAt: Date; engagement: number; id: string; diff --git a/libs/common/src/lib/interfaces/user.interface.ts b/libs/common/src/lib/interfaces/user.interface.ts index b40259544..6effa3cf6 100644 --- a/libs/common/src/lib/interfaces/user.interface.ts +++ b/libs/common/src/lib/interfaces/user.interface.ts @@ -8,7 +8,6 @@ export interface User { id: string; }[]; accounts: Account[]; - alias?: string; id: string; permissions: string[]; settings: UserSettings;