🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
deleteSiteImport
Edward Cui44cba8392f61
diff --git a/client/src/api/admin/import.ts b/client/src/api/admin/import.tsindex 670538135..32c28aeb9 100644--- a/client/src/api/admin/import.ts+++ b/client/src/api/admin/import.ts@@ -20,10 +20,6 @@ interface CreateSiteImportResponse {};}-interface DeleteImportResponse {- message: string;-}-export function useGetSiteImports(site: number) {return useQuery({queryKey: ["get-site-imports", site],@@ -62,13 +58,9 @@ export function useDeleteSiteImport(site: number) {return useMutation({mutationFn: async (importId: string) => {- return await authedFetch<APIResponse<DeleteImportResponse>>(- `/delete-site-import/${site}/${importId}`,- undefined,- {- method: "DELETE",- }- );+ return await authedFetch(`/delete-site-import/${site}/${importId}`, undefined, {+ method: "DELETE",+ });},onSuccess: async () => {await queryClient.invalidateQueries({diff --git a/server/src/api/sites/deleteSiteImport.ts b/server/src/api/sites/deleteSiteImport.tsindex 5f4d78139..f18cfb691 100644--- a/server/src/api/sites/deleteSiteImport.ts+++ b/server/src/api/sites/deleteSiteImport.ts@@ -4,9 +4,6 @@ import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";import { getImportById, deleteImport } from "../../services/import/importStatusManager.js";import { clickhouse } from "../../db/clickhouse/clickhouse.js";import { importQuotaManager } from "../../services/import/importQuotaManager.js";-import { db } from "../../db/postgres/postgres.js";-import { sites } from "../../db/postgres/schema.js";-import { eq } from "drizzle-orm";const deleteImportRequestSchema = z.object({@@ -47,55 +44,33 @@ export async function deleteSiteImport(request: FastifyRequest<DeleteImportRequereturn reply.status(403).send({ error: "Import does not belong to this site" });}- // Cannot delete imports that are still in progressif (importRecord.completedAt === null) {return reply.status(400).send({ error: "Cannot delete active import" });}const siteId = Number(site);- // Get organization ID for quota manager notification- const [siteRecord] = await db- .select({ organizationId: sites.organizationId })- .from(sites)- .where(eq(sites.siteId, siteId))- .limit(1);-try {await clickhouse.command({- query: `DELETE FROM events WHERE import_id = {importId:String} AND site_id = {siteId:UInt16}`,+ query: "DELETE FROM events WHERE import_id = {importId:UUID} AND site_id = {siteId:UInt16}",query_params: {importId: importId,siteId: siteId,},});- console.log(`Deleted events for import ${importId} from ClickHouse`);} catch (chError) {- console.error(`Failed to delete ClickHouse events for ${importId}:`, chError);- return reply.status(500).send({- error: "Failed to delete imported events",- });+ return reply.status(500).send({ error: "Failed to delete imported events" });}try {await deleteImport(importId);} catch (dbError) {- console.error(`Failed to delete import record ${importId}:`, dbError);- return reply.status(500).send({- error: "Failed to delete import record",- });+ return reply.status(500).send({ error: "Failed to delete import record" });}- // Notify quota manager that import is no longer active- if (siteRecord) {- importQuotaManager.completeImport(siteRecord.organizationId);- }+ importQuotaManager.completeImport(importRecord.organizationId);- return reply.send({- data: {- message: "Import deleted successfully",- },- });+ return reply.send();} catch (error) {console.error("Error deleting import:", error);return reply.status(500).send({ error: "Internal server error" });