Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/remove alias from user interface (#1083)

Thomas Kaul95bcc3f32d65
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b147fac8ae..5e613f3b66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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
+
+### Changed
+
+- Removed the alias from the user interface as a preparation to remove it from the `User` database schema
+
## 1.169.0 - 14.07.2022
### Added
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index 5e240a4737..2d4edc9938 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 32716b4542..213351ede9 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<IUser> {
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 39f778b2bf..8eef628321 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 @@
<td class="mat-cell px-1 py-2">
<div class="d-flex align-items-center">
<span class="d-none d-sm-inline-block"
- >{{ userItem.alias || userItem.id }}</span
+ >{{ userItem.id }}</span
>
<span class="d-inline-block d-sm-none"
- >{{ userItem.alias || (userItem.id | slice:0:5) +
- '...' }}</span
+ >{{ (userItem.id | slice:0:5) + '...' }}</span
>
<gf-premium-indicator
*ngIf="userItem?.subscription?.type === 'Premium'"
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index 23967fd80e..9846cd76b7 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -124,13 +124,11 @@
: 'radio-button-on-outline'
"
></ion-icon>
- <span *ngIf="user?.alias">{{ user.alias }}</span>
- <span *ngIf="!user?.alias" i18n><span></span>Me</span>
+ <span i18n>Me</span>
</button>
<button
*ngFor="let accessItem of user?.access"
class="align-items-center d-flex"
- disabled="false"
mat-menu-item
(click)="impersonateAccount(accessItem.id)"
>
diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/account/account-page.html
index 1fc13f105f..88a1ee6209 100644
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@@ -8,10 +8,6 @@
<div class="col">
<mat-card class="mb-3">
<mat-card-content>
- <div *ngIf="user.alias" class="d-flex py-1">
- <div class="pr-1 w-50" i18n>Alias</div>
- <div class="pl-1 w-50">{{ user.alias }}</div>
- </div>
<div
*ngIf="hasPermissionToUpdateUserSettings && user?.subscription"
class="d-flex py-1"
diff --git a/libs/common/src/lib/interfaces/admin-data.interface.ts b/libs/common/src/lib/interfaces/admin-data.interface.ts
index 1e0c6e5320..c51b2c8d78 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 b40259544d..6effa3cf6c 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;