📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
fixed project related lint issues
Blue Mousee2732be67f5f
diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex 7170b7ba9..4ef41933e 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -548,19 +548,19 @@ export class ProjectController {let projectif (isSelfhosted) {- const project = await getProjectsClickhouse(id)+ const chProject = await getProjectsClickhouse(id)- if (_isEmpty(project)) {+ if (_isEmpty(chProject)) {throw new NotFoundException()}- project.active = projectDTO.active- project.origins = _map(projectDTO.origins, _trim)- project.ipBlacklist = _map(projectDTO.ipBlacklist, _trim)- project.name = projectDTO.name- project.public = projectDTO.public+ chProject.active = projectDTO.active+ chProject.origins = _map(projectDTO.origins, _trim)+ chProject.ipBlacklist = _map(projectDTO.ipBlacklist, _trim)+ chProject.name = projectDTO.name+ chProject.public = projectDTO.publicawait updateProjectClickhouse(- this.projectService.formatToClickhouse(project),+ this.projectService.formatToClickhouse(chProject),)} else {project = await this.projectService.findOne(id, {@@ -583,11 +583,10 @@ export class ProjectController {if (project.isAnalyticsProject && projectDTO.isCaptcha) {const captchaProjects = _filter(user.projects,- (project: Project) => project.isCaptchaProject,+ (fProject: Project) => fProject.isCaptchaProject,)const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects- console.log('asd')if (_size(captchaProjects >= (maxProjects || PROJECTS_MAXIMUM))) {throw new ForbiddenException(`You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,@@ -749,6 +748,7 @@ export class ProjectController {@CurrentUserId() uid: string,): Promise<any> {this.logger.log({ uid, id }, 'DELETE /project/captcha/:id')+if (!isValidPID(id)) {throw new BadRequestException('The provided Project ID (pid) is incorrect',@@ -790,6 +790,8 @@ export class ProjectController {return 'Error while deleting your CAPTCHA project'}}++ return null}// The routes related to sharing projects feature@@ -1018,7 +1020,7 @@ export class ProjectController {}if (actionToken.action === ActionTokenType.PROJECT_SHARE) {- const { newValue: shareId, id } = actionToken+ const { newValue: shareId, id: tokenID } = actionTokenconst share = await this.projectService.findOneShare(shareId)share.confirmed = true@@ -1032,7 +1034,7 @@ export class ProjectController {// }await this.projectService.updateShare(shareId, share)- await this.actionTokensService.delete(id)+ await this.actionTokensService.delete(tokenID)}}diff --git a/src/project/project.service.ts b/src/project/project.service.tsindex 3d1e2908e..3f9d059c2 100644--- a/src/project/project.service.ts+++ b/src/project/project.service.ts@@ -260,7 +260,7 @@ export class ProjectService {return this.projectShareRepository.delete(id)}- async updateShare(id: string, share: ProjectShare | Object): Promise<any> {+ async updateShare(id: string, share: ProjectShare | object): Promise<any> {return this.projectShareRepository.update(id, share)}@@ -270,7 +270,7 @@ export class ProjectService {async findOneShare(id: string,- params: Object = {},+ params: object = {},): Promise<ProjectShare | null> {return this.projectShareRepository.findOne(id, params)}@@ -279,7 +279,7 @@ export class ProjectService {return this.projectsRepository.findOne(id, { relations: ['admin'] })}- findOne(id: string, params: Object = {}): Promise<Project | null> {+ findOne(id: string, params: object = {}): Promise<Project | null> {return this.projectsRepository.findOne(id, params)}@@ -307,9 +307,10 @@ export class ProjectService {uid === project.admin?.id ||_findIndex(project.share, ({ user }) => user?.id === uid) !== -1) {- } else {- throw new ForbiddenException('You are not allowed to view this project')+ return null}++ throw new ForbiddenException('You are not allowed to view this project')}allowedToManage(@@ -326,9 +327,10 @@ export class ProjectService {share => share.user?.id === uid && share.role === Role.admin,) !== -1) {- } else {- throw new ForbiddenException(message)+ return null}++ throw new ForbiddenException(message)}async checkIfIDUnique(projectID: string): Promise<void> {@@ -410,13 +412,11 @@ export class ProjectService {.format('YYYY-MM-DD HH:mm:ss')const monthEnd = dayjs.utc().endOf('month').format('YYYY-MM-DD HH:mm:ss')- let pids-if (isSelfhosted) {// selfhosted has no limitsreturn 0}- pids = await this.find({+ const pids = await this.find({where: {admin: uid,},@@ -427,20 +427,20 @@ export class ProjectService {return 0}- const count_ev_query = `SELECT COUNT() FROM analytics WHERE pid IN (${_join(+ const countEVQuery = `SELECT COUNT() FROM analytics WHERE pid IN (${_join(_map(pids, el => `'${el.id}'`),',',)}) AND created BETWEEN '${monthStart}' AND '${monthEnd}'`- const count_custom_ev_query = `SELECT COUNT() FROM customEV WHERE pid IN (${_join(+ const countCustomEVQuery = `SELECT COUNT() FROM customEV WHERE pid IN (${_join(_map(pids, el => `'${el.id}'`),',',)}) AND created BETWEEN '${monthStart}' AND '${monthEnd}'`- const pageviews = (await clickhouse.query(count_ev_query).toPromise())[0][+ const pageviews = (await clickhouse.query(countEVQuery).toPromise())[0]['count()']const customEvents = (- await clickhouse.query(count_custom_ev_query).toPromise()+ await clickhouse.query(countCustomEVQuery).toPromise())[0]['count()']count = pageviews + customEvents