@lightdash/common 0.1342.0 → 0.1343.0

package/dist/authorization/organizationMemberAbility.js

@@ -205,6 +205,10 @@ exports.organizationMemberAbilities = {
             organizationUuid: member.organizationUuid,
             type: projects_1.ProjectType.PREVIEW,
         });
+        can('delete', 'Project', {
+            organizationUuid: member.organizationUuid,
+            type: projects_1.ProjectType.PREVIEW,
+        });
     },
     admin(member, { can }) {
         exports.organizationMemberAbilities.developer(member, { can });
@@ -221,6 +225,9 @@ exports.organizationMemberAbilities = {
             organizationUuid: member.organizationUuid,
             type: { $in: [projects_1.ProjectType.DEFAULT, projects_1.ProjectType.PREVIEW] },
         });
+        can('delete', 'Project', {
+            organizationUuid: member.organizationUuid,
+        });
         can('manage', 'Project', {
             organizationUuid: member.organizationUuid,
         });

package/dist/authorization/organizationMemberAbility.test.js

@@ -911,33 +911,45 @@ describe('Organization member permissions', () => {
                 membership: organizationMemberAbility_mock_1.ORGANIZATION_ADMIN,
                 canCreateProject: true,
                 canCreatePreview: true,
+                canDeleteProject: true,
+                canDeletePreview: true,
             },
             {
                 membership: organizationMemberAbility_mock_1.ORGANIZATION_DEVELOPER,
                 canCreateProject: false,
                 canCreatePreview: true,
+                canDeleteProject: false,
+                canDeletePreview: true,
             },
             {
                 membership: organizationMemberAbility_mock_1.ORGANIZATION_MEMBER,
                 canCreateProject: false,
                 canCreatePreview: false,
+                canDeleteProject: false,
+                canDeletePreview: false,
             },
             {
                 membership: organizationMemberAbility_mock_1.ORGANIZATION_VIEWER,
                 canCreateProject: false,
                 canCreatePreview: false,
+                canDeleteProject: false,
+                canDeletePreview: false,
             },
             {
                 membership: organizationMemberAbility_mock_1.ORGANIZATION_INTERACTIVE_VIEWER,
                 canCreateProject: false,
                 canCreatePreview: false,
+                canDeleteProject: false,
+                canDeletePreview: false,
             },
             {
                 membership: organizationMemberAbility_mock_1.ORGANIZATION_EDITOR,
                 canCreateProject: false,
                 canCreatePreview: false,
+                canDeleteProject: false,
+                canDeletePreview: false,
             },
-        ].forEach(({ membership, canCreateProject, canCreatePreview }) => {
+        ].forEach(({ membership, canCreateProject, canCreatePreview, canDeleteProject, canDeletePreview, }) => {
             const ability = defineAbilityForOrganizationMember(membership);
             describe(`user is '${membership.role}' role`, () => {
                 it('checks if users can create project in organization they belong to', () => {
@@ -964,6 +976,28 @@ describe('Organization member permissions', () => {
                         type: projects_1.ProjectType.PREVIEW,
                     }))).toEqual(false);
                 });
+                it('checks if users can delete a project in organization they belong to', () => {
+                    expect(ability.can('delete', (0, ability_1.subject)('Project', {
+                        organizationUuid: membership.organizationUuid,
+                    }))).toEqual(canDeleteProject);
+                });
+                it('checks that users cannot delete a project in another organization', () => {
+                    expect(ability.can('delete', (0, ability_1.subject)('Project', {
+                        organizationUuid: '789',
+                    }))).toEqual(false);
+                });
+                it('checks if users can delete a PREVIEW project in organization they belong to', () => {
+                    expect(ability.can('delete', (0, ability_1.subject)('Project', {
+                        organizationUuid: membership.organizationUuid,
+                        type: projects_1.ProjectType.PREVIEW,
+                    }))).toEqual(canDeletePreview);
+                });
+                it('checks that users cannot delete a PREVIEW project in another organization', () => {
+                    expect(ability.can('delete', (0, ability_1.subject)('Project', {
+                        organizationUuid: '789',
+                        type: projects_1.ProjectType.PREVIEW,
+                    }))).toEqual(false);
+                });
             });
         });
     });

package/dist/authorization/projectMemberAbility.js

@@ -187,6 +187,10 @@ exports.projectMemberAbilities = {
         can('manage', 'CompileProject', {
             projectUuid: member.projectUuid,
         });
+        can('delete', 'Project', {
+            type: projects_1.ProjectType.PREVIEW,
+            createdByUserUuid: member.userUuid,
+        });
         can('create', 'Project', {
             upstreamProjectUuid: member.projectUuid,
             type: projects_1.ProjectType.PREVIEW,
@@ -194,6 +198,9 @@ exports.projectMemberAbilities = {
     },
     admin(member, { can }) {
         exports.projectMemberAbilities.developer(member, { can });
+        can('delete', 'Project', {
+            projectUuid: member.projectUuid,
+        });
         can('manage', 'Project', {
             projectUuid: member.projectUuid,
         });

package/dist/authorization/projectMemberAbility.test.js

@@ -737,24 +737,29 @@ describe('Project member permissions', () => {
         {
             membership: projectMemberAbility_mock_1.PROJECT_ADMIN,
             canCreatePreview: true,
+            canDeleteTheirOwnPreview: true,
         },
         {
             membership: projectMemberAbility_mock_1.PROJECT_DEVELOPER,
             canCreatePreview: true,
+            canDeleteTheirOwnPreview: true,
         },
         {
             membership: projectMemberAbility_mock_1.PROJECT_EDITOR,
             canCreatePreview: false,
+            canDeleteTheirOwnPreview: false,
         },
         {
             membership: projectMemberAbility_mock_1.PROJECT_INTERACTIVE_VIEWER,
             canCreatePreview: false,
+            canDeleteTheirOwnPreview: false,
         },
         {
             membership: projectMemberAbility_mock_1.PROJECT_VIEWER,
             canCreatePreview: false,
+            canDeleteTheirOwnPreview: false,
         },
-    ].forEach(({ membership, canCreatePreview }) => {
+    ].forEach(({ membership, canCreatePreview, canDeleteTheirOwnPreview }) => {
         describe('test project preview permissions', () => {
             const ability = defineAbilityForProjectMember(membership);
             it('checks if user can create PREVIEW projects', () => {
@@ -769,6 +774,18 @@ describe('Project member permissions', () => {
                     type: projects_1.ProjectType.DEFAULT,
                 }))).toEqual(false);
             });
+            it('checks if user can delete their own PREVIEW projects', () => {
+                expect(ability.can('delete', (0, ability_1.subject)('Project', {
+                    createdByUserUuid: membership.userUuid,
+                    type: projects_1.ProjectType.PREVIEW,
+                }))).toEqual(canDeleteTheirOwnPreview);
+            });
+            it('checks that users cannot delete other users PREVIEW projects', () => {
+                expect(ability.can('delete', (0, ability_1.subject)('Project', {
+                    createdByUserUuid: '1234',
+                    type: projects_1.ProjectType.PREVIEW,
+                }))).toEqual(false);
+            });
         });
     });
 });

package/dist/index.d.ts

@@ -502,10 +502,10 @@ export declare enum DBFieldTypes {
 }
 export declare const sensitiveDbtCredentialsFieldNames: readonly ["personal_access_token", "api_key"];
 export declare const DbtProjectTypeLabels: Record<DbtProjectType, string>;
-export type CreateProject = Omit<Project, 'projectUuid' | 'organizationUuid' | 'schedulerTimezone'> & {
+export type CreateProject = Omit<Project, 'projectUuid' | 'organizationUuid' | 'schedulerTimezone' | 'createdByUserUuid'> & {
     warehouseConnection: CreateWarehouseCredentials;
 };
-export type UpdateProject = Omit<Project, 'projectUuid' | 'organizationUuid' | 'type' | 'schedulerTimezone'> & {
+export type UpdateProject = Omit<Project, 'projectUuid' | 'organizationUuid' | 'type' | 'schedulerTimezone' | 'createdByUserUuid'> & {
     warehouseConnection: CreateWarehouseCredentials;
 };
 export declare const getResultValueArray: (rows: ResultRow[], preferRaw?: boolean, calculateMinAndMax?: boolean) => {

package/dist/types/organization.d.ts

@@ -44,6 +44,7 @@ export type OrganizationProject = {
     projectUuid: string;
     name: string;
     type: ProjectType;
+    createdByUserUuid: string | null;
     warehouseType: WarehouseTypes;
     requireUserCredentials: boolean;
 };

package/dist/types/projects.d.ts

@@ -231,6 +231,7 @@ export type Project = {
     dbtVersion: SupportedDbtVersions;
     semanticLayerConnection?: SemanticLayerConnection;
     schedulerTimezone: string;
+    createdByUserUuid: string | null;
 };
 export type ProjectSummary = Pick<Project, 'name' | 'projectUuid' | 'organizationUuid' | 'type' | 'upstreamProjectUuid'>;
 export type ApiProjectResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lightdash/common",
-    "version": "0.1342.0",
+    "version": "0.1343.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "files": [