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!

fix: installed extensions

Blue Mousede099ffce9f2
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index 46914a413..0225aca71 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -80,14 +80,21 @@ export class ExtensionsController {
throw new ForbiddenException('You must be logged in to access this route.')
}
- const [extensions, count] = await this.extensionsService.findAndCount({
+ const [extensionsToUser, count] = await this.extensionsService.findAndCountExtensionToUser({
where: {
- owner: userId,
+ userId,
},
skip: queries.offset || 0,
take: queries.limit > 100 ? 25 : queries.limit || 25,
+ }, ['extension'])
+
+ const extensions = _map(extensionsToUser, (extensionToUser) => {
+ return extensionToUser.extension
})
+ // todo: also return projectExtensions - via findAndCountExtensionToProject
+
+ // @ts-ignore
return { extensions, count }
}
diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.ts
index 53e9579d0..c9c0bb210 100644
--- a/src/marketplace/extensions/extensions.service.ts
+++ b/src/marketplace/extensions/extensions.service.ts
@@ -48,6 +48,26 @@ export class ExtensionsService {
await this.extensionToProjectRepository.delete({ extensionId, projectId })
}
+ async findAndCountExtensionToProject(
+ options: FindManyOptions<ExtensionToProject>,
+ relations: string[] = [],
+ ): Promise<[ExtensionToProject[], number]> {
+ return await this.extensionToProjectRepository.findAndCount({
+ ...options,
+ relations,
+ })
+ }
+
+ async findAndCountExtensionToUser(
+ options: FindManyOptions<ExtensionToUser>,
+ relations: string[] = [],
+ ): Promise<[ExtensionToUser[], number]> {
+ return await this.extensionToUserRepository.findAndCount({
+ ...options,
+ relations,
+ })
+ }
+
async findOneExtensionToUser(
options: FindOneOptions<ExtensionToUser>,
): Promise<ExtensionToUser> {
@@ -123,7 +143,7 @@ export class ExtensionsService {
): Promise<[Extension[], number]> {
return await this.extensionRepository.findAndCount({
...options,
- relations: relations,
+ relations,
})
}
}