Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
implement cloud mode logic
Francis Cao9f8ea060b653
diff --git a/pages/api/config.ts b/pages/api/config.tsindex e5ae318ac..65c8aa97f 100644--- a/pages/api/config.ts+++ b/pages/api/config.ts@@ -16,7 +16,7 @@ export default async (req: NextApiRequest, res: NextApiResponse<ConfigResponse>)trackerScriptName: process.env.TRACKER_SCRIPT_NAME,updatesDisabled: !!process.env.DISABLE_UPDATES,telemetryDisabled: !!process.env.DISABLE_TELEMETRY,- adminDisabled: !!process.env.DISABLE_ADMIN,+ adminDisabled: !!process.env.CLOUD_MODE,});}diff --git a/pages/login.js b/pages/login.jsindex eb837e217..a4cc43611 100644--- a/pages/login.js+++ b/pages/login.js@@ -16,7 +16,7 @@ export default function LoginPage({ pageDisabled }) {export async function getServerSideProps() {return {props: {- pageDisabled: !!process.env.DISABLE_LOGIN,+ pageDisabled: !!process.env.CLOUD_MODE,},};}diff --git a/queries/admin/website.ts b/queries/admin/website.tsindex cf2425a35..c54d2b482 100644--- a/queries/admin/website.ts+++ b/queries/admin/website.ts@@ -69,42 +69,35 @@ export async function resetWebsite(});}-export async function deleteWebsite(websiteId: string) {- return runQuery({- [PRISMA]: () => deleteWebsiteRelationalQuery(websiteId),- [CLICKHOUSE]: () => deleteWebsiteClickhouseQuery(websiteId),- });-}--async function deleteWebsiteRelationalQuery(- websiteId,+export async function deleteWebsite(+ websiteId: string,): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {const { client, transaction } = prisma;- return transaction([- client.websiteEvent.deleteMany({- where: { websiteId },- }),- client.session.deleteMany({- where: { websiteId },- }),- client.website.delete({+ if (process.env.CLOUD_MODE) {+ return prisma.client.website.update({+ data: {+ deletedAt: new Date(),+ },where: { id: websiteId },- }),- ]).then(async data => {- if (cache.enabled) {- await cache.deleteWebsite(websiteId);- }-- return data;- });-}+ });+ } else {+ return transaction([+ client.websiteEvent.deleteMany({+ where: { websiteId },+ }),+ client.session.deleteMany({+ where: { websiteId },+ }),+ client.website.delete({+ where: { id: websiteId },+ }),+ ]).then(async data => {+ if (cache.enabled) {+ await cache.deleteWebsite(websiteId);+ }-async function deleteWebsiteClickhouseQuery(websiteId): Promise<Website> {- return prisma.client.website.update({- data: {- deletedAt: new Date(),- },- where: { id: websiteId },- });+ return data;+ });+ }}