Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/improve usability of no activities info (#4382)
Thomas Kaulf63d171678be
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 878ba40e86..ac3c459150 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Optimized the asynchronous operations using `Promise.all()` in the portfolio service (`getPerformance`)- Improved the symbol lookup in the _Trackinsight_ data enhancer for asset profile data+- Removed the no transactions info component from the holdings table on the home page+- Refactored the show condition of the step by step introduction for new users using the activities count- Upgraded `color` from version `4.2.3` to `5.0.0`- Upgraded `prisma` from version `6.3.0` to `6.4.1`diff --git a/apps/client/src/app/components/home-holdings/home-holdings.html b/apps/client/src/app/components/home-holdings/home-holdings.htmlindex abbc93b3d2..f981e50a17 100644--- a/apps/client/src/app/components/home-holdings/home-holdings.html+++ b/apps/client/src/app/components/home-holdings/home-holdings.html@@ -48,7 +48,6 @@<gf-holdings-table[baseCurrency]="user?.settings?.baseCurrency"[deviceType]="deviceType"- [hasPermissionToCreateActivity]="hasPermissionToCreateOrder"[holdings]="holdings"[locale]="user?.settings?.locale"(holdingClicked)="onHoldingClicked($event)"diff --git a/apps/client/src/app/components/home-overview/home-overview.html b/apps/client/src/app/components/home-overview/home-overview.htmlindex 8cd317428b..c13c8f0434 100644--- a/apps/client/src/app/components/home-overview/home-overview.html+++ b/apps/client/src/app/components/home-overview/home-overview.html@@ -1,7 +1,7 @@<divclass="align-items-center container d-flex flex-column h-100 justify-content-center overview p-0 position-relative">- @if (hasPermissionToCreateOrder && historicalDataItems?.length === 0) {+ @if (hasPermissionToCreateOrder && user?.activitiesCount === 0) {<div class="justify-content-center row w-100"><div class="col introduction"><h4 i18n>Welcome to Ghostfolio</h4>diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.tsindex 91254e002c..5f5f7cea99 100644--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts@@ -125,7 +125,10 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {this.dataSource = new MatTableDataSource(activities);this.totalItems = count;- if (this.hasPermissionToCreateActivity && this.totalItems <= 0) {+ if (+ this.hasPermissionToCreateActivity &&+ this.user?.activitiesCount === 0+ ) {this.router.navigate([], { queryParams: { createDialog: true } });}@@ -160,6 +163,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {}).pipe(takeUntil(this.unsubscribeSubject)).subscribe(() => {+ this.userService+ .get(true)+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe();+this.fetchActivities();});}@@ -169,6 +177,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {.deleteActivity(aId).pipe(takeUntil(this.unsubscribeSubject)).subscribe(() => {+ this.userService+ .get(true)+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe();+this.fetchActivities();});}@@ -230,6 +243,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {.afterClosed().pipe(takeUntil(this.unsubscribeSubject)).subscribe(() => {+ this.userService+ .get(true)+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe();+this.fetchActivities();});}@@ -248,6 +266,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {.afterClosed().pipe(takeUntil(this.unsubscribeSubject)).subscribe(() => {+ this.userService+ .get(true)+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe();+this.fetchActivities();});}@@ -333,6 +356,11 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {if (transaction) {this.dataService.postOrder(transaction).subscribe({next: () => {+ this.userService+ .get(true)+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe();+this.fetchActivities();}});diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.htmlindex c06f7dd750..99eb16386d 100644--- a/apps/client/src/app/pages/portfolio/activities/activities-page.html+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html@@ -6,7 +6,9 @@[baseCurrency]="user?.settings?.baseCurrency"[dataSource]="dataSource"[deviceType]="deviceType"- [hasPermissionToCreateActivity]="hasPermissionToCreateActivity"+ [hasPermissionToCreateActivity]="+ hasPermissionToCreateActivity && user?.activitiesCount === 0+ "[hasPermissionToDeleteActivity]="hasPermissionToDeleteActivity"[hasPermissionToExportActivities]="!hasImpersonationId"[locale]="user?.settings?.locale"diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.htmlindex 5e4526fdce..dde1030775 100644--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html@@ -198,11 +198,3 @@</button></div>}--@if (- dataSource.data.length === 0 && hasPermissionToCreateActivity && !isLoading-) {- <div class="p-3 text-center">- <gf-no-transactions-info-indicator [hasBorder]="false" />- </div>-}diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.tsindex 14382f4203..802cdc69a7 100644--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts@@ -5,7 +5,6 @@ import {AssetProfileIdentifier,PortfolioPosition} from '@ghostfolio/common/interfaces';-import { GfNoTransactionsInfoComponent } from '@ghostfolio/ui/no-transactions-info';import { GfValueComponent } from '@ghostfolio/ui/value';import { CommonModule } from '@angular/common';@@ -34,7 +33,6 @@ import { Subject, Subscription } from 'rxjs';imports: [CommonModule,GfAssetProfileIconComponent,- GfNoTransactionsInfoComponent,GfSymbolModule,GfValueComponent,MatButtonModule,@@ -52,7 +50,6 @@ import { Subject, Subscription } from 'rxjs';export class GfHoldingsTableComponent implements OnChanges, OnDestroy {@Input() baseCurrency: string;@Input() deviceType: string;- @Input() hasPermissionToCreateActivity: boolean;@Input() hasPermissionToOpenDetails = true;@Input() hasPermissionToShowValues = true;@Input() holdings: PortfolioPosition[];