From 2db36f4acc3e957c96c2c1eec4ca9c7c0dbf960e Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Fri, 21 Aug 2026 09:46:22 +0200 Subject: [PATCH] Add write access --- .../access-table/access-table.component.ts | 10 +++- ...reate-or-update-access-dialog.component.ts | 59 ++++++++++--------- .../create-or-update-access-dialog.html | 24 ++------ .../interfaces/interfaces.ts | 2 + 4 files changed, 44 insertions(+), 51 deletions(-) diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts index 3affcef7a..21dcc1a12 100644 --- a/apps/client/src/app/components/access-table/access-table.component.ts +++ b/apps/client/src/app/components/access-table/access-table.component.ts @@ -1,7 +1,11 @@ import { ConfirmationDialogType } from '@ghostfolio/common/enums'; import { Access, User } from '@ghostfolio/common/interfaces'; import { publicRoutes } from '@ghostfolio/common/routes/routes'; -import { hasScope, scopes } from '@ghostfolio/common/scopes'; +import { + SCOPES_OF_WRITE_ACCESS, + hasScope, + scopes +} from '@ghostfolio/common/scopes'; import { NotificationService } from '@ghostfolio/ui/notifications'; import { Clipboard, ClipboardModule } from '@angular/cdk/clipboard'; @@ -106,7 +110,9 @@ export class GfAccessTableComponent { } protected hasScopesToWrite({ scopes: scopesOfAccess }: Access) { - return hasScope(scopesOfAccess, scopes.activityCreate); + return SCOPES_OF_WRITE_ACCESS.some((scope) => { + return hasScope(scopesOfAccess, scope); + }); } protected onCopyUrlToClipboard(aId: string) { diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts index 34d8d569c..d0656b258 100644 --- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts +++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts @@ -5,6 +5,7 @@ import { SCOPES_OF_READ_ACCESS, SCOPES_OF_READ_RESTRICTED_ACCESS, SCOPES_OF_WRITE_ACCESS, + Scope, hasScope, scopes } from '@ghostfolio/common/scopes'; @@ -47,11 +48,13 @@ import { import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { StatusCodes } from 'http-status-codes'; import { EMPTY, catchError } from 'rxjs'; -import { CreateOrUpdateAccessDialogParams } from './interfaces/interfaces'; +import { + AccessLevel, + CreateOrUpdateAccessDialogParams +} from './interfaces/interfaces'; @Component({ changeDetection: ChangeDetectionStrategy.OnPush, @@ -64,7 +67,6 @@ import { CreateOrUpdateAccessDialogParams } from './interfaces/interfaces'; MatFormFieldModule, MatInputModule, MatSelectModule, - MatSlideToggleModule, ReactiveFormsModule ], selector: 'gf-create-or-update-access-dialog', @@ -113,17 +115,13 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit { const isPublic = access?.type === 'PUBLIC'; this.accessForm = this.formBuilder.group({ + accessLevel: this.getAccessLevel(access?.scopes), alias: [access?.alias ?? ''], filters: [null], granteeUserId: [ access?.grantee ?? null, isPublic ? null : Validators.required ], - hasScopeToReadValues: hasScope( - access?.scopes, - scopes.portfolioReadValues - ), - hasScopesToWrite: hasScope(access?.scopes, scopes.activityCreate), type: [ { disabled: this.mode === 'update', value: access?.type ?? 'PRIVATE' }, Validators.required @@ -149,12 +147,6 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit { .subscribe((accessType) => { const granteeUserIdControl = this.accessForm.get('granteeUserId'); - const hasScopeToReadValuesControl = this.accessForm.get( - 'hasScopeToReadValues' - ); - - const hasScopesToWriteControl = this.accessForm.get('hasScopesToWrite'); - if (accessType === 'PRIVATE') { granteeUserIdControl?.setValidators(Validators.required); this.accessForm.get('filters')?.setValue(null); @@ -164,8 +156,7 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit { // A public access never exposes the monetary values and never // changes data - hasScopeToReadValuesControl?.setValue(false); - hasScopesToWriteControl?.setValue(false); + this.accessForm.get('accessLevel')?.setValue('RESTRICTED_VIEW'); } granteeUserIdControl?.updateValueAndValidity(); @@ -194,19 +185,15 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit { ); } - /** - * The write access is granted as one unit, hence the dialog offers a single - * control for all write scopes - */ - private buildScopes() { - return [ - ...(this.accessForm.get('hasScopeToReadValues')?.value - ? SCOPES_OF_READ_ACCESS - : SCOPES_OF_READ_RESTRICTED_ACCESS), - ...(this.accessForm.get('hasScopesToWrite')?.value - ? SCOPES_OF_WRITE_ACCESS - : []) - ]; + private buildScopes(): Scope[] { + switch (this.accessForm.get('accessLevel')?.value as AccessLevel) { + case 'CHANGE': + return [...SCOPES_OF_READ_ACCESS, ...SCOPES_OF_WRITE_ACCESS]; + case 'VIEW': + return [...SCOPES_OF_READ_ACCESS]; + default: + return [...SCOPES_OF_READ_RESTRICTED_ACCESS]; + } } private async createAccess() { @@ -248,6 +235,20 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit { } } + private getAccessLevel(scopesOfAccess: string[] | undefined): AccessLevel { + if ( + SCOPES_OF_WRITE_ACCESS.some((scope) => { + return hasScope(scopesOfAccess, scope); + }) + ) { + return 'CHANGE'; + } + + return hasScope(scopesOfAccess, scopes.portfolioReadValues) + ? 'VIEW' + : 'RESTRICTED_VIEW'; + } + private loadHoldings() { this.dataService .fetchPortfolioHoldings() diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html index dd3168f33..fa2e221ee 100644 --- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html +++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -36,31 +36,15 @@
Permission - - Restricted view + + Restricted view @if (accessForm.get('type')?.value === 'PRIVATE') { - View + View + View and change }
- @if (accessForm.get('type')?.value === 'PRIVATE') { -
-
-
Changes
-
- Allow to add, to update and to delete data of your portfolio -
-
-
- -
-
- } @if (accessForm.get('type')?.value === 'PRIVATE') {
diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/interfaces/interfaces.ts index 8d1ac0ba9..d93aaf293 100644 --- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/interfaces/interfaces.ts +++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/interfaces/interfaces.ts @@ -3,3 +3,5 @@ import { Access } from '@ghostfolio/common/interfaces'; export interface CreateOrUpdateAccessDialogParams { access?: Access; } + +export type AccessLevel = 'CHANGE' | 'RESTRICTED_VIEW' | 'VIEW';