Browse Source

Merge branch 'main' into UI_tweaks

pull/5530/head
Thomas Kaul 3 months ago
committed by GitHub
parent
commit
d9f8fd1b3c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 9
      CHANGELOG.md
  2. 1
      apps/api/src/interceptors/redact-values-in-response/redact-values-in-response.interceptor.ts
  3. 13
      apps/client/src/app/pages/register/register-page.component.ts
  4. 2
      apps/client/src/app/pages/register/user-account-registration-dialog/interfaces/interfaces.ts
  5. 12
      apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.component.ts
  6. 0
      apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.html
  7. 0
      apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.scss
  8. 7
      libs/ui/src/lib/activities-table/activities-table.component.ts

9
CHANGELOG.md

@ -7,11 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased ## Unreleased
### Added
- Added an option to configure the account column of the activities table component
### Changed ### Changed
- Added the symbol to the benchmark component - Added the symbol to the benchmark component
- Renamed the show access token dialog component to user account registration dialog component
- Refreshed the cryptocurrencies list - Refreshed the cryptocurrencies list
### Fixed
- Fixed an issue with `unitPriceInAssetProfileCurrency` in the value redaction interceptor for the impersonation mode
## 2.200.0 - 2025-09-17 ## 2.200.0 - 2025-09-17
### Changed ### Changed

1
apps/api/src/interceptors/redact-values-in-response/redact-values-in-response.interceptor.ts

@ -61,6 +61,7 @@ export class RedactValuesInResponseInterceptor<T>
'totalInterestInBaseCurrency', 'totalInterestInBaseCurrency',
'totalValueInBaseCurrency', 'totalValueInBaseCurrency',
'unitPrice', 'unitPrice',
'unitPriceInAssetProfileCurrency',
'value', 'value',
'valueInBaseCurrency' 'valueInBaseCurrency'
].map((attribute) => { ].map((attribute) => {

13
apps/client/src/app/pages/register/register-page.component.ts

@ -18,8 +18,8 @@ import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { ShowAccessTokenDialogParams } from './show-access-token-dialog/interfaces/interfaces'; import { UserAccountRegistrationDialogParams } from './user-account-registration-dialog/interfaces/interfaces';
import { GfShowAccessTokenDialogComponent } from './show-access-token-dialog/show-access-token-dialog.component'; import { GfUserAccountRegistrationDialogComponent } from './user-account-registration-dialog/user-account-registration-dialog.component';
@Component({ @Component({
host: { class: 'page' }, host: { class: 'page' },
@ -84,15 +84,18 @@ export class GfRegisterPageComponent implements OnDestroy, OnInit {
} }
public openShowAccessTokenDialog() { public openShowAccessTokenDialog() {
const dialogRef = this.dialog.open(GfShowAccessTokenDialogComponent, { const dialogRef = this.dialog.open(
GfUserAccountRegistrationDialogComponent,
{
data: { data: {
deviceType: this.deviceType, deviceType: this.deviceType,
needsToAcceptTermsOfService: this.hasPermissionForSubscription needsToAcceptTermsOfService: this.hasPermissionForSubscription
} as ShowAccessTokenDialogParams, } as UserAccountRegistrationDialogParams,
disableClose: true, disableClose: true,
height: this.deviceType === 'mobile' ? '98vh' : undefined, height: this.deviceType === 'mobile' ? '98vh' : undefined,
width: this.deviceType === 'mobile' ? '100vw' : '30rem' width: this.deviceType === 'mobile' ? '100vw' : '30rem'
}); }
);
dialogRef dialogRef
.afterClosed() .afterClosed()

2
apps/client/src/app/pages/register/show-access-token-dialog/interfaces/interfaces.ts → apps/client/src/app/pages/register/user-account-registration-dialog/interfaces/interfaces.ts

@ -1,4 +1,4 @@
export interface ShowAccessTokenDialogParams { export interface UserAccountRegistrationDialogParams {
deviceType: string; deviceType: string;
needsToAcceptTermsOfService: boolean; needsToAcceptTermsOfService: boolean;
} }

12
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.component.ts → apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.component.ts

@ -30,7 +30,7 @@ import {
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { ShowAccessTokenDialogParams } from './interfaces/interfaces'; import { UserAccountRegistrationDialogParams } from './interfaces/interfaces';
@Component({ @Component({
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
@ -50,11 +50,11 @@ import { ShowAccessTokenDialogParams } from './interfaces/interfaces';
TextFieldModule TextFieldModule
], ],
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
selector: 'gf-show-access-token-dialog', selector: 'gf-user-account-registration-dialog',
styleUrls: ['./show-access-token-dialog.scss'], styleUrls: ['./user-account-registration-dialog.scss'],
templateUrl: 'show-access-token-dialog.html' templateUrl: 'user-account-registration-dialog.html'
}) })
export class GfShowAccessTokenDialogComponent { export class GfUserAccountRegistrationDialogComponent {
@ViewChild(MatStepper) stepper!: MatStepper; @ViewChild(MatStepper) stepper!: MatStepper;
public accessToken: string; public accessToken: string;
@ -69,7 +69,7 @@ export class GfShowAccessTokenDialogComponent {
public constructor( public constructor(
private changeDetectorRef: ChangeDetectorRef, private changeDetectorRef: ChangeDetectorRef,
@Inject(MAT_DIALOG_DATA) public data: ShowAccessTokenDialogParams, @Inject(MAT_DIALOG_DATA) public data: UserAccountRegistrationDialogParams,
private dataService: DataService private dataService: DataService
) { ) {
addIcons({ arrowForwardOutline, checkmarkOutline, copyOutline }); addIcons({ arrowForwardOutline, checkmarkOutline, copyOutline });

0
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html → apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.html

0
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.scss → apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.scss

7
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -104,6 +104,7 @@ export class GfActivitiesTableComponent
@Input() locale = getLocale(); @Input() locale = getLocale();
@Input() pageIndex: number; @Input() pageIndex: number;
@Input() pageSize = DEFAULT_PAGE_SIZE; @Input() pageSize = DEFAULT_PAGE_SIZE;
@Input() showAccountColumn = true;
@Input() showActions = true; @Input() showActions = true;
@Input() showCheckbox = false; @Input() showCheckbox = false;
@Input() showNameColumn = true; @Input() showNameColumn = true;
@ -192,6 +193,12 @@ export class GfActivitiesTableComponent
'actions' 'actions'
]; ];
if (!this.showAccountColumn) {
this.displayedColumns = this.displayedColumns.filter((column) => {
return column !== 'account';
});
}
if (!this.showCheckbox) { if (!this.showCheckbox) {
this.displayedColumns = this.displayedColumns.filter((column) => { this.displayedColumns = this.displayedColumns.filter((column) => {
return column !== 'importStatus' && column !== 'select'; return column !== 'importStatus' && column !== 'select';

Loading…
Cancel
Save