Add restricted view and manage permission to access

apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html

@@ -83,6 +83,19 @@
             <gf-access-level-icon accessLevel="READ_RESTRICTED" />
           </mat-option>
           @if (accessForm.get('type')?.value === 'PRIVATE') {
+            <!--
+              The permission to change the data without the monetary values is
+              not available yet, because it is intended for the model context
+              protocol, which exposes read tools only
+              <mat-option
+                value="CREATE_READ_RESTRICTED_UPDATE_DELETE"
+                [disabled]="!canGrantWriteAccess"
+              >
+                <gf-access-level-icon
+                  accessLevel="CREATE_READ_RESTRICTED_UPDATE_DELETE"
+                />
+              </mat-option>
+            -->
             <mat-option value="READ">
               <gf-access-level-icon accessLevel="READ" />
             </mat-option>

libs/common/src/lib/scopes.spec.ts

@@ -3,13 +3,16 @@ import {
   SCOPES_OF_READ_ACCESS,
   SCOPES_OF_READ_RESTRICTED_ACCESS,
   SCOPES_OF_WRITE_ACCESS,
+  getAccessLevel,
   getScopesOfAccess,
+  getScopesOfAccessLevel,
   getScopesOfOwnAccess,
   getScopesOfUnrestrictedImpersonation,
   hasAnyScopeOfWriteAccess,
   hasScope,
   scopes
 } from '@ghostfolio/common/scopes';
+import { AccessLevel } from '@ghostfolio/common/types';
 
 describe('Scopes', () => {
   describe('Scopes of read access', () => {
@@ -57,6 +60,70 @@ describe('Scopes', () => {
     });
   });
 
+  describe('Get access level', () => {
+    it('Write scopes with the monetary values', () => {
+      expect(
+        getAccessLevel([...SCOPES_OF_READ_ACCESS, ...SCOPES_OF_WRITE_ACCESS])
+      ).toEqual('CREATE_READ_UPDATE_DELETE');
+    });
+
+    it('Write scopes without the monetary values', () => {
+      expect(
+        getAccessLevel([
+          ...SCOPES_OF_READ_RESTRICTED_ACCESS,
+          ...SCOPES_OF_WRITE_ACCESS
+        ])
+      ).toEqual('CREATE_READ_RESTRICTED_UPDATE_DELETE');
+    });
+
+    it('Read scopes with the monetary values', () => {
+      expect(getAccessLevel([...SCOPES_OF_READ_ACCESS])).toEqual('READ');
+    });
+
+    it('Read scopes without the monetary values', () => {
+      expect(getAccessLevel([...SCOPES_OF_READ_RESTRICTED_ACCESS])).toEqual(
+        'READ_RESTRICTED'
+      );
+    });
+
+    it('Without scopes', () => {
+      expect(getAccessLevel(undefined)).toEqual('READ_RESTRICTED');
+    });
+  });
+
+  describe('Get scopes of access level', () => {
+    // A new access level has to be added here deliberately, because the type
+    // of the record is exhaustive
+    const accessLevels: Record<AccessLevel, true> = {
+      CREATE_READ_RESTRICTED_UPDATE_DELETE: true,
+      CREATE_READ_UPDATE_DELETE: true,
+      READ: true,
+      READ_RESTRICTED: true
+    };
+
+    it('Grants the write scopes without the monetary values', () => {
+      const scopesOfAccessLevel = getScopesOfAccessLevel(
+        'CREATE_READ_RESTRICTED_UPDATE_DELETE'
+      );
+
+      expect(scopesOfAccessLevel).toEqual([
+        ...SCOPES_OF_READ_RESTRICTED_ACCESS,
+        ...SCOPES_OF_WRITE_ACCESS
+      ]);
+      expect(scopesOfAccessLevel).not.toContain(scopes.portfolioReadValues);
+    });
+
+    // The dialog compares the access level of the stored scopes with the
+    // selected access level, hence both functions have to be inverse
+    for (const accessLevel of Object.keys(accessLevels) as AccessLevel[]) {
+      it(`Is inverse to the access level of ${accessLevel}`, () => {
+        expect(getAccessLevel(getScopesOfAccessLevel(accessLevel))).toEqual(
+          accessLevel
+        );
+      });
+    }
+  });
+
   describe('Get scopes of access', () => {
     it('Gives the scopes of the access', () => {
       expect(

libs/common/src/lib/scopes.ts

@@ -62,12 +62,17 @@ export const SCOPES_OF_READ_RESTRICTED_ACCESS: readonly Scope[] =
   });
 
 /**
- * Ceiling of scopes per access type. The scopes stored on an access are
+ * Maximum scopes per access type. The scopes stored on an access are
  * intersected with it, hence a scope which the type does not permit stays
  * ineffective even if it is stored.
  */
 const SCOPES_OF_TYPE: Record<AccessType, readonly Scope[]> = {
-  MCP: SCOPES_OF_READ_RESTRICTED_ACCESS,
+  MCP: [
+    ...SCOPES_OF_READ_RESTRICTED_ACCESS
+    // Write scope is not permitted yet, because the controller exposes read
+    // tools only
+    // ...SCOPES_OF_WRITE_ACCESS
+  ],
   PRIVATE: Object.values(scopes),
   PUBLIC: SCOPES_OF_PUBLIC_ACCESS
 };
@@ -76,13 +81,15 @@ const SCOPES_OF_TYPE: Record<AccessType, readonly Scope[]> = {
  * Access level which the scopes of an access grant
  */
 export function getAccessLevel(aScopes: string[] = []): AccessLevel {
+  const hasScopeToReadValues = hasScope(aScopes, scopes.portfolioReadValues);
+
   if (hasAnyScopeOfWriteAccess(aScopes)) {
-    return 'CREATE_READ_UPDATE_DELETE';
+    return hasScopeToReadValues
+      ? 'CREATE_READ_UPDATE_DELETE'
+      : 'CREATE_READ_RESTRICTED_UPDATE_DELETE';
   }
 
-  return hasScope(aScopes, scopes.portfolioReadValues)
-    ? 'READ'
-    : 'READ_RESTRICTED';
+  return hasScopeToReadValues ? 'READ' : 'READ_RESTRICTED';
 }
 
 export function getScopesOfAccess({
@@ -105,6 +112,8 @@ export function getScopesOfAccess({
  */
 export function getScopesOfAccessLevel(aAccessLevel: AccessLevel): Scope[] {
   switch (aAccessLevel) {
+    case 'CREATE_READ_RESTRICTED_UPDATE_DELETE':
+      return [...SCOPES_OF_READ_RESTRICTED_ACCESS, ...SCOPES_OF_WRITE_ACCESS];
     case 'CREATE_READ_UPDATE_DELETE':
       return [...SCOPES_OF_READ_ACCESS, ...SCOPES_OF_WRITE_ACCESS];
     case 'READ':

libs/common/src/lib/types/access-level.type.ts

@@ -1,2 +1,5 @@
 export type AccessLevel =
-  'CREATE_READ_UPDATE_DELETE' | 'READ' | 'READ_RESTRICTED';
+  | 'CREATE_READ_RESTRICTED_UPDATE_DELETE'
+  | 'CREATE_READ_UPDATE_DELETE'
+  | 'READ'
+  | 'READ_RESTRICTED';

libs/ui/src/lib/access-level-icon/access-level-icon.component.html

@@ -1,5 +1,9 @@
 <span class="align-items-center d-flex">
   @switch (accessLevel()) {
+    @case ('CREATE_READ_RESTRICTED_UPDATE_DELETE') {
+      <ion-icon class="mr-1" name="lock-closed-outline" />
+      <ng-container i18n>Restricted view and manage</ng-container>
+    }
     @case ('CREATE_READ_UPDATE_DELETE') {
       <ion-icon class="mr-1" name="create-outline" />
       <ng-container i18n>View and manage</ng-container>

libs/ui/src/lib/access-level-icon/access-level-icon.component.stories.ts

@@ -16,7 +16,12 @@ export default {
   argTypes: {
     accessLevel: {
       control: 'select',
-      options: ['CREATE_READ_UPDATE_DELETE', 'READ', 'READ_RESTRICTED']
+      options: [
+        'CREATE_READ_RESTRICTED_UPDATE_DELETE',
+        'CREATE_READ_UPDATE_DELETE',
+        'READ',
+        'READ_RESTRICTED'
+      ]
     }
   }
 } as Meta<GfAccessLevelIconComponent>;
@@ -29,6 +34,12 @@ export const RestrictedView: Story = {
   }
 };
 
+export const RestrictedViewAndManage: Story = {
+  args: {
+    accessLevel: 'CREATE_READ_RESTRICTED_UPDATE_DELETE'
+  }
+};
+
 export const View: Story = {
   args: {
     accessLevel: 'READ'