From 090b9d11a8c69f917ca7deba38859957a121f12e Mon Sep 17 00:00:00 2001 From: Csaba Tuncsik Date: Tue, 2 Jul 2024 14:17:09 +0200 Subject: [PATCH] fix(editor): Fix frontend project roles (#9901) --- .../editor-ui/src/stores/roles.store.test.ts | 108 ++++++++++++++++++ packages/editor-ui/src/stores/roles.store.ts | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 packages/editor-ui/src/stores/roles.store.test.ts diff --git a/packages/editor-ui/src/stores/roles.store.test.ts b/packages/editor-ui/src/stores/roles.store.test.ts new file mode 100644 index 0000000000000..6914a1e43665b --- /dev/null +++ b/packages/editor-ui/src/stores/roles.store.test.ts @@ -0,0 +1,108 @@ +import { useRolesStore } from '@/stores/roles.store'; +import * as rolesApi from '@/api/roles.api'; +import { createPinia, setActivePinia } from 'pinia'; + +let rolesStore: ReturnType; + +describe('roles store', () => { + beforeEach(() => { + setActivePinia(createPinia()); + rolesStore = useRolesStore(); + }); + + it('should use project roles defined in the frontend in correct order', async () => { + vi.spyOn(rolesApi, 'getRoles').mockResolvedValue({ + global: [], + credential: [], + workflow: [], + project: [ + { + name: 'Project Admin', + role: 'project:admin', + scopes: [ + 'workflow:create', + 'workflow:read', + 'workflow:update', + 'workflow:delete', + 'workflow:list', + 'workflow:execute', + 'workflow:move', + 'credential:create', + 'credential:read', + 'credential:update', + 'credential:delete', + 'credential:list', + 'credential:move', + 'project:list', + 'project:read', + 'project:update', + 'project:delete', + ], + licensed: true, + }, + { + name: 'Project Owner', + role: 'project:personalOwner', + scopes: [ + 'workflow:create', + 'workflow:read', + 'workflow:update', + 'workflow:delete', + 'workflow:list', + 'workflow:execute', + 'workflow:share', + 'workflow:move', + 'credential:create', + 'credential:read', + 'credential:update', + 'credential:delete', + 'credential:list', + 'credential:share', + 'credential:move', + 'project:list', + 'project:read', + ], + licensed: true, + }, + { + name: 'Project Editor', + role: 'project:editor', + scopes: [ + 'workflow:create', + 'workflow:read', + 'workflow:update', + 'workflow:delete', + 'workflow:list', + 'workflow:execute', + 'credential:create', + 'credential:read', + 'credential:update', + 'credential:delete', + 'credential:list', + 'project:list', + 'project:read', + ], + licensed: true, + }, + { + name: 'Project Viewer', + role: 'project:viewer', + scopes: [ + 'credential:list', + 'credential:read', + 'project:list', + 'project:read', + 'workflow:list', + 'workflow:read', + ], + licensed: true, + }, + ], + }); + await rolesStore.fetchRoles(); + expect(rolesStore.processedProjectRoles.map(({ role }) => role)).toEqual([ + 'project:editor', + 'project:admin', + ]); + }); +}); diff --git a/packages/editor-ui/src/stores/roles.store.ts b/packages/editor-ui/src/stores/roles.store.ts index 226d2f32988bc..b927a0d8d3966 100644 --- a/packages/editor-ui/src/stores/roles.store.ts +++ b/packages/editor-ui/src/stores/roles.store.ts @@ -20,12 +20,12 @@ export const useRolesStore = defineStore('roles', () => { const processedProjectRoles = computed(() => roles.value.project + .filter((role) => projectRoleOrderMap.value.has(role.role)) .sort( (a, b) => (projectRoleOrderMap.value.get(a.role) ?? 0) - (projectRoleOrderMap.value.get(b.role) ?? 0), - ) - .filter((role) => role.role !== 'project:personalOwner'), + ), ); const processedCredentialRoles = computed(() =>