Skip to content

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

Feature/improve platform managment in admin control (#1939)

Thomas Kaul5249257dd8dd
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bc12a7fb3..51413fc2b0 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
+- Improved the management of platforms in the admin control panel
- Improved the language localization for German (`de`)
## 1.266.0 - 2023-05-06
diff --git a/apps/api/src/app/info/info.module.ts b/apps/api/src/app/info/info.module.ts
index aa26373933..75d681b564 100644
--- a/apps/api/src/app/info/info.module.ts
+++ b/apps/api/src/app/info/info.module.ts
@@ -1,4 +1,5 @@
import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';
+import { PlatformModule } from '@ghostfolio/api/app/platform/platform.module';
import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@@ -26,6 +27,7 @@ import { InfoService } from './info.service';
secret: process.env.JWT_SECRET_KEY,
signOptions: { expiresIn: '30 days' }
}),
+ PlatformModule,
PrismaModule,
PropertyModule,
RedisCacheModule,
diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.ts
index f2cf36ae09..f825418ebd 100644
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@@ -1,4 +1,5 @@
import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
+import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
@@ -38,6 +39,7 @@ export class InfoService {
private readonly configurationService: ConfigurationService,
private readonly exchangeRateDataService: ExchangeRateDataService,
private readonly jwtService: JwtService,
+ private readonly platformService: PlatformService,
private readonly prismaService: PrismaService,
private readonly propertyService: PropertyService,
private readonly redisCacheService: RedisCacheService,
@@ -47,9 +49,12 @@ export class InfoService {
public async get(): Promise<InfoItem> {
const info: Partial<InfoItem> = {};
let isReadOnlyMode: boolean;
- const platforms = await this.prismaService.platform.findMany({
- orderBy: { name: 'asc' },
- select: { id: true, name: true }
+ const platforms = (
+ await this.platformService.getPlatforms({
+ orderBy: { name: 'asc' }
+ })
+ ).map(({ id, name }) => {
+ return { id, name };
});
let systemMessage: string;
diff --git a/apps/api/src/app/platform/platform.controller.ts b/apps/api/src/app/platform/platform.controller.ts
index 85d92da689..8c4d62bd6c 100644
--- a/apps/api/src/app/platform/platform.controller.ts
+++ b/apps/api/src/app/platform/platform.controller.ts
@@ -30,8 +30,8 @@ export class PlatformController {
@Get()
@UseGuards(AuthGuard('jwt'))
- public async getPlatforms(): Promise<Platform[]> {
- return this.platformService.getPlatforms();
+ public async getPlatforms() {
+ return this.platformService.getPlatformsWithAccountCount();
}
@Post()
diff --git a/apps/api/src/app/platform/platform.service.ts b/apps/api/src/app/platform/platform.service.ts
index 9832252a49..12d1076040 100644
--- a/apps/api/src/app/platform/platform.service.ts
+++ b/apps/api/src/app/platform/platform.service.ts
@@ -6,10 +6,6 @@ import { Platform, Prisma } from '@prisma/client';
export class PlatformService {
public constructor(private readonly prismaService: PrismaService) {}
- public async getPlatforms(): Promise<Platform[]> {
- return this.prismaService.platform.findMany();
- }
-
public async getPlatform(
platformWhereUniqueInput: Prisma.PlatformWhereUniqueInput
): Promise<Platform> {
@@ -18,6 +14,48 @@ export class PlatformService {
});
}
+ public async getPlatforms({
+ cursor,
+ orderBy,
+ skip,
+ take,
+ where
+ }: {
+ cursor?: Prisma.PlatformWhereUniqueInput;
+ orderBy?: Prisma.PlatformOrderByWithRelationInput;
+ skip?: number;
+ take?: number;
+ where?: Prisma.PlatformWhereInput;
+ } = {}) {
+ return this.prismaService.platform.findMany({
+ cursor,
+ orderBy,
+ skip,
+ take,
+ where
+ });
+ }
+
+ public async getPlatformsWithAccountCount() {
+ const platformsWithAccountCount =
+ await this.prismaService.platform.findMany({
+ include: {
+ _count: {
+ select: { Account: true }
+ }
+ }
+ });
+
+ return platformsWithAccountCount.map(({ _count, id, name, url }) => {
+ return {
+ id,
+ name,
+ url,
+ accountCount: _count.Account
+ };
+ });
+ }
+
public async createPlatform(data: Prisma.PlatformCreateInput) {
return this.prismaService.platform.create({
data
diff --git a/apps/client/src/app/components/platform/platform.component.html b/apps/client/src/app/components/admin-platform/admin-platform.component.html
similarity index 87%
rename from apps/client/src/app/components/platform/platform.component.html
rename to apps/client/src/app/components/admin-platform/admin-platform.component.html
index b4560e0c4d..ce83ddfdcd 100644
--- a/apps/client/src/app/components/platform/platform.component.html
+++ b/apps/client/src/app/components/admin-platform/admin-platform.component.html
@@ -43,6 +43,20 @@
</td>
</ng-container>
+ <ng-container matColumnDef="accounts">
+ <th
+ *matHeaderCellDef
+ class="px-1"
+ mat-header-cell
+ mat-sort-header="accountCount"
+ >
+ <ng-container i18n>Accounts</ng-container>
+ </th>
+ <td *matCellDef="let element" class="px-1" mat-cell>
+ {{ element.accountCount }}
+ </td>
+ </ng-container>
+
<ng-container matColumnDef="actions">
<th
*matHeaderCellDef
diff --git a/apps/client/src/app/components/platform/platform.component.scss b/apps/client/src/app/components/admin-platform/admin-platform.component.scss
similarity index 100%
rename from apps/client/src/app/components/platform/platform.component.scss
rename to apps/client/src/app/components/admin-platform/admin-platform.component.scss
diff --git a/apps/client/src/app/components/platform/platform.module.ts b/apps/client/src/app/components/admin-platform/admin-platform.module.ts
similarity index 100%
rename from apps/client/src/app/components/platform/platform.module.ts
rename to apps/client/src/app/components/admin-platform/admin-platform.module.ts
diff --git a/apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts
similarity index 100%
rename from apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts
rename to apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts
diff --git a/apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-platform-dialog.html b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.html
similarity index 100%
rename from apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-platform-dialog.html
rename to apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.html
diff --git a/apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts
similarity index 100%
rename from apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts
rename to apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts
diff --git a/apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-platform-dialog.scss b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.scss
similarity index 100%
rename from apps/client/src/app/components/platform/create-or-update-platform-dialog/create-or-update-platform-dialog.scss
rename to apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.scss
diff --git a/apps/client/src/app/components/platform/create-or-update-platform-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/interfaces/interfaces.ts
similarity index 100%
rename from apps/client/src/app/components/platform/create-or-update-platform-dialog/interfaces/interfaces.ts
rename to apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/interfaces/interfaces.ts
diff --git a/apps/client/src/app/components/platform/platform.component.ts b/apps/client/src/app/components/admin-platform/platform.component.ts
similarity index 96%
rename from apps/client/src/app/components/platform/platform.component.ts
rename to apps/client/src/app/components/admin-platform/platform.component.ts
index 066f6f4645..66b85d1c26 100644
--- a/apps/client/src/app/components/platform/platform.component.ts
+++ b/apps/client/src/app/components/admin-platform/platform.component.ts
@@ -22,16 +22,17 @@ import { Subject, takeUntil } from 'rxjs';
import { CreateOrUpdatePlatformDialog } from './create-or-update-platform-dialog/create-or-update-account-platform.component';
@Component({
- selector: 'gf-platform-overview',
- styleUrls: ['./platform.component.scss'],
- templateUrl: './platform.component.html'
+ host: { class: 'page' },
+ selector: 'gf-admin-platform',
+ styleUrls: ['./admin-platform.component.scss'],
+ templateUrl: './admin-platform.component.html'
})
export class AdminPlatformComponent implements OnInit, OnDestroy {
@ViewChild(MatSort) sort: MatSort;
public dataSource: MatTableDataSource<Platform> = new MatTableDataSource();
public deviceType: string;
- public displayedColumns = ['name', 'url', 'actions'];
+ public displayedColumns = ['name', 'url', 'accounts', 'actions'];
public hasPermissionToCreatePlatform: boolean;
public hasPermissionToDeletePlatform: boolean;
public platforms: PlatformModel[];
diff --git a/apps/client/src/app/pages/admin/admin-page-routing.module.ts b/apps/client/src/app/pages/admin/admin-page-routing.module.ts
index 28cd846178..6cdc448562 100644
--- a/apps/client/src/app/pages/admin/admin-page-routing.module.ts
+++ b/apps/client/src/app/pages/admin/admin-page-routing.module.ts
@@ -3,8 +3,8 @@ import { RouterModule, Routes } from '@angular/router';
import { AdminJobsComponent } from '@ghostfolio/client/components/admin-jobs/admin-jobs.component';
import { AdminMarketDataComponent } from '@ghostfolio/client/components/admin-market-data/admin-market-data.component';
import { AdminOverviewComponent } from '@ghostfolio/client/components/admin-overview/admin-overview.component';
+import { AdminPlatformComponent } from '@ghostfolio/client/components/admin-platform/platform.component';
import { AdminUsersComponent } from '@ghostfolio/client/components/admin-users/admin-users.component';
-import { AdminPlatformComponent } from '@ghostfolio/client/components/platform/platform.component';
import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
import { AdminPageComponent } from './admin-page.component';
diff --git a/apps/client/src/app/pages/admin/admin-page.html b/apps/client/src/app/pages/admin/admin-page.html
index ed3c46bd52..8de6164989 100644
--- a/apps/client/src/app/pages/admin/admin-page.html
+++ b/apps/client/src/app/pages/admin/admin-page.html
@@ -6,6 +6,7 @@
<a
#rla="routerLinkActive"
*ngFor="let tab of tabs"
+ class="px-3"
mat-tab-link
routerLinkActive
[active]="rla.isActive"
diff --git a/apps/client/src/app/pages/admin/admin-page.module.ts b/apps/client/src/app/pages/admin/admin-page.module.ts
index ba37d81a53..204a856dfb 100644
--- a/apps/client/src/app/pages/admin/admin-page.module.ts
+++ b/apps/client/src/app/pages/admin/admin-page.module.ts
@@ -4,8 +4,8 @@ import { MatTabsModule } from '@angular/material/tabs';
import { GfAdminJobsModule } from '@ghostfolio/client/components/admin-jobs/admin-jobs.module';
import { GfAdminMarketDataModule } from '@ghostfolio/client/components/admin-market-data/admin-market-data.module';
import { GfAdminOverviewModule } from '@ghostfolio/client/components/admin-overview/admin-overview.module';
+import { GfAdminPlatformModule } from '@ghostfolio/client/components/admin-platform/admin-platform.module';
import { GfAdminUsersModule } from '@ghostfolio/client/components/admin-users/admin-users.module';
-import { GfAdminPlatformModule } from '@ghostfolio/client/components/platform/platform.module';
import { CacheService } from '@ghostfolio/client/services/cache.service';
import { AdminPageRoutingModule } from './admin-page-routing.module';