Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00
Code Issues Projects Releases Wiki Activity

fix: user projects should exclude archived ones (#8118)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2024-09-06 12:29:05 +02:00 committed by GitHub
parent 028cf06f6c
commit 47753b90b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/features/project/project-service.e2e.test.ts
View File

@ -321,6 +321,27 @@ test('should archive project', async () => {
expect(archivedProject).toMatchObject({ archivedAt: expect.any(Date) }); expect(archivedProject).toMatchObject({ archivedAt: expect.any(Date) });
}); });
test('archive project removes it from user projects', async () => {
const project = {
id: 'test-user-archive',
name: 'New project',
description: 'Blah',
mode: 'open' as const,
defaultStickiness: 'default',
};
await projectService.createProject(project, user, TEST_AUDIT_USER);
const userProjectsBeforeArchive = await projectService.getProjectsByUser(
user.id,
);
expect(userProjectsBeforeArchive).toEqual(['test-user-archive']);
await projectService.archiveProject(project.id, TEST_AUDIT_USER);
const userProjects = await projectService.getProjectsByUser(user.id);
expect(userProjects).toEqual([]);
});
test('should revive project', async () => { test('should revive project', async () => {
const project = { const project = {
id: 'test-revive', id: 'test-revive',

14
src/lib/features/project/project-store.ts
View File

@ -539,20 +539,28 @@ class ProjectStore implements IProjectStore {
async getProjectsByUser(userId: number): Promise<string[]> { async getProjectsByUser(userId: number): Promise<string[]> {
const projects = await this.db const projects = await this.db
.from((db) => { .from((db) => {
db.select('project') db.select('role_user.project')
.from('role_user') .from('role_user')
.leftJoin('roles', 'role_user.role_id', 'roles.id') .leftJoin('roles', 'role_user.role_id', 'roles.id')
.leftJoin('projects', 'role_user.project', 'projects.id')
.where('user_id', userId) .where('user_id', userId)
.andWhere('projects.archived_at', null)
.union((queryBuilder) => { .union((queryBuilder) => {
queryBuilder queryBuilder
.select('project') .select('group_role.project')
.from('group_role') .from('group_role')
.leftJoin( .leftJoin(
'group_user', 'group_user',
'group_user.group_id', 'group_user.group_id',
'group_role.group_id', 'group_role.group_id',
) )
.where('user_id', userId); .leftJoin(
'projects',
'group_role.project',
'projects.id',
)
.where('group_user.user_id', userId)
.andWhere('projects.archived_at', null);
}) })
.as('query'); .as('query');
}) })