📈 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
Easier project deletion logic
Blue Mousedb73e27bf4a6
diff --git a/backend/apps/cloud/src/project/project.controller.ts b/backend/apps/cloud/src/project/project.controller.tsindex 25b1f1934..57b88c6a0 100644--- a/backend/apps/cloud/src/project/project.controller.ts+++ b/backend/apps/cloud/src/project/project.controller.ts@@ -764,54 +764,6 @@ export class ProjectController {return secret}- @ApiBearerAuth()- @Delete('/captcha/:id')- @HttpCode(204)- @UseGuards(JwtAccessTokenGuard, RolesGuard)- @Roles(UserType.CUSTOMER, UserType.ADMIN)- @ApiResponse({ status: 204, description: 'Empty body' })- async deleteCAPTCHA(- @Param('id') id: string,- @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',- )- }-- const user = await this.userService.findOne({ where: { id: uid } })- const project = await this.projectService.getFullProject(id)-- if (_isEmpty(project)) {- throw new NotFoundException(`Project with ID ${id} does not exist`)- }-- this.projectService.allowedToManage(project, uid, user.roles)-- try {- await clickhouse.command({- query: 'DELETE FROM captcha WHERE pid={pid:FixedString(12)}',- query_params: {- pid: id,- },- })-- project.captchaSecretKey = null- project.isCaptchaEnabled = false- project.isCaptchaProject = false-- await this.projectService.update({ id }, project)-- return 'CAPTCHA project deleted successfully'- } catch (e) {- this.logger.error(e)- return 'Error while deleting your CAPTCHA project'- }- }-@Delete('/partially/:pid')@ApiQuery({name: 'from',@@ -1693,22 +1645,16 @@ export class ProjectController {await Promise.all(promises)await deleteProjectRedis(id)- } catch (e) {- this.logger.error(e)+ } catch (reason) {+ this.logger.error(reason)return 'Error while deleting your project'}try {- if (project.isCaptchaProject) {- project.isAnalyticsProject = false- await this.projectService.update({ id }, project)- } else {- await this.projectService.deleteMultipleShare(`project = "${id}"`)- await this.projectService.delete(id)- await this.deleteCAPTCHA(id, uid)- }- } catch (e) {- this.logger.error(e)+ await this.projectService.deleteMultipleShare(`project = "${id}"`)+ await this.projectService.delete(id)+ } catch (reason) {+ this.logger.error(reason)return 'Error while deleting your project'}diff --git a/web/app/api/index.ts b/web/app/api/index.tsindex f9b0e331b..0b317b279 100644--- a/web/app/api/index.ts+++ b/web/app/api/index.ts@@ -437,14 +437,6 @@ export const deleteProject = (id: string) =>throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message})-export const deleteCaptchaProject = (id: string) =>- api- .delete(`project/captcha/${id}`)- .then((response) => response.data)- .catch((error) => {- throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message- })-export const resetProject = (id: string) =>api.delete(`/project/reset/${id}`)diff --git a/web/app/pages/Captcha/Settings/CaptchaSettings.tsx b/web/app/pages/Captcha/Settings/CaptchaSettings.tsxindex b85d18852..ca89c5adb 100644--- a/web/app/pages/Captcha/Settings/CaptchaSettings.tsx+++ b/web/app/pages/Captcha/Settings/CaptchaSettings.tsx@@ -18,7 +18,7 @@ import { toast } from 'sonner'import {createProject,updateProject,- deleteCaptchaProject,+ deleteProject,resetCaptchaProject,reGenerateCaptchaSecretKey,getProject,@@ -164,7 +164,7 @@ const CaptchaSettings = ({ isSettings }: CaptchaSettingsProps) => {if (!projectDeleting) {setProjectDeleting(true)try {- await deleteCaptchaProject(id)+ await deleteProject(id)toast.success(t('project.settings.deleted'))navigate(routes.dashboard)} catch (reason: any) {