Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fixed isDataExists & isLocked for shared projects (#219)

Andrii Romasiun28cc834c5639
diff --git a/apps/production/src/project/entity/project-share.entity.ts b/apps/production/src/project/entity/project-share.entity.ts
index bbab7dd7a..2ae498969 100644
--- a/apps/production/src/project/entity/project-share.entity.ts
+++ b/apps/production/src/project/entity/project-share.entity.ts
@@ -22,19 +22,31 @@ export class ProjectShare {
@PrimaryGeneratedColumn('uuid')
id: string
+ /**
+ * User whom with the project was shared
+ */
@ApiProperty({ type: () => User })
@ManyToOne(() => User, user => user.sharedProjects)
user: User
+ /**
+ * Project in question
+ */
@ManyToOne(() => Project, project => project.share)
project: Project
+ /**
+ * Boolean indicating whether the user accepted project invitation
+ */
@ApiProperty()
@Column({
default: false,
})
confirmed: boolean
+ /**
+ * User's role in the project
+ */
@Column({
type: 'enum',
enum: Role,
diff --git a/apps/production/src/project/project.controller.ts b/apps/production/src/project/project.controller.ts
index 99d3c2897..e2892aec0 100644
--- a/apps/production/src/project/project.controller.ts
+++ b/apps/production/src/project/project.controller.ts
@@ -244,6 +244,22 @@ export class ProjectController {
where,
)
+ const pidsWithData =
+ await this.projectService.getPIDsWhereAnalyticsDataExists(
+ _map(paginated.results, ({ project }) => project.id),
+ )
+
+ paginated.results = _map(paginated.results, share => ({
+ ...share,
+ project: {
+ ...share.project,
+ admin: undefined,
+ passwordHash: undefined,
+ isLocked: !!share?.project?.admin?.dashboardBlockReason,
+ isDataExists: _includes(pidsWithData, share?.project?.id),
+ },
+ }))
+
return paginated
}
diff --git a/apps/production/src/project/project.service.ts b/apps/production/src/project/project.service.ts
index ba4bbed81..8cd570e78 100644
--- a/apps/production/src/project/project.service.ts
+++ b/apps/production/src/project/project.service.ts
@@ -368,11 +368,10 @@ export class ProjectService {
order: {
project: 'ASC',
},
- relations: ['project'],
+ relations: ['project', 'project.admin'],
})
return new Pagination<ProjectShare>({
- // results: processProjectsUser(results),
results,
total,
})