Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Fix enum issue.

Brian Caoce02958bc22a
diff --git a/interface/enum.d.ts b/lib/enum.ts
similarity index 79%
rename from interface/enum.d.ts
rename to lib/enum.ts
index 8b09039ca..d82703338 100644
--- a/interface/enum.d.ts
+++ b/lib/enum.ts
@@ -1,6 +1,6 @@
/* eslint-disable no-unused-vars */
export namespace UmamiApi {
- enum EventType {
+ export enum EventType {
Pageview = 1,
Event = 2,
}
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index 98eadc1bd..e03974f2f 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -1,5 +1,5 @@
import { Prisma } from '@prisma/client';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
import cache from 'lib/cache';
import prisma from 'lib/prisma';
@@ -82,22 +82,16 @@ export async function updateUser(
data: Prisma.UserUpdateInput,
where: Prisma.UserWhereUniqueInput,
): Promise<User> {
- return prisma.client.user
- .update({
- where,
- data,
- select: {
- id: true,
- username: true,
- createdAt: true,
- userRole: true,
- },
- })
- .then(user => {
- const { userRole, ...rest } = user;
-
- return { ...rest, isAdmin: userRole.some(a => a.roleId === UmamiApi.SystemRole.Admin) };
- });
+ return prisma.client.user.update({
+ where,
+ data,
+ select: {
+ id: true,
+ username: true,
+ createdAt: true,
+ userRole: true,
+ },
+ });
}
export async function deleteUser(
diff --git a/queries/analytics/event/getEventData.ts b/queries/analytics/event/getEventData.ts
index 2e776f52d..3c6bd4603 100644
--- a/queries/analytics/event/getEventData.ts
+++ b/queries/analytics/event/getEventData.ts
@@ -3,7 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import cache from 'lib/cache';
import { WebsiteMetric } from 'interface/api/models';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
export async function getEventData(
...args: [
diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.ts
index c2e819c49..96843dcec 100644
--- a/queries/analytics/event/getEventMetrics.ts
+++ b/queries/analytics/event/getEventMetrics.ts
@@ -3,7 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache';
import { WebsiteEventMetric } from 'interface/api/models';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
export async function getEventMetrics(
...args: [
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 6bb44ef57..02a349e36 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -4,7 +4,7 @@ import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import { uuid } from 'lib/crypto';
import cache from 'lib/cache';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
export async function saveEvent(args: {
id: string;
diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.ts
index 106d14a95..de8fe4482 100644
--- a/queries/analytics/pageview/getPageviewMetrics.ts
+++ b/queries/analytics/pageview/getPageviewMetrics.ts
@@ -3,7 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache';
import { Prisma } from '@prisma/client';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
export async function getPageviewMetrics(
...args: [
diff --git a/queries/analytics/pageview/getPageviewStats.ts b/queries/analytics/pageview/getPageviewStats.ts
index 4a7a7782c..f9cda5fe8 100644
--- a/queries/analytics/pageview/getPageviewStats.ts
+++ b/queries/analytics/pageview/getPageviewStats.ts
@@ -2,7 +2,7 @@ import cache from 'lib/cache';
import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
export async function getPageviewStats(
...args: [
diff --git a/queries/analytics/pageview/savePageView.ts b/queries/analytics/pageview/savePageView.ts
index 134dfd098..793a8cd44 100644
--- a/queries/analytics/pageview/savePageView.ts
+++ b/queries/analytics/pageview/savePageView.ts
@@ -4,7 +4,7 @@ import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import cache from 'lib/cache';
import { uuid } from 'lib/crypto';
-import { UmamiApi } from 'interface/enum';
+import { UmamiApi } from 'lib/enum';
export async function savePageView(args: {
id: string;