Merge branch 'dev' of https://github.com/umami-software/umami into dev

lib/enum.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-vars */
 export namespace UmamiApi {
-  enum EventType {
+  export enum EventType {
     Pageview = 1,
     Event = 2,
   }

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(

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: [

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: [

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;

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: [

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: [

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;