Merge branch 'dev' into analytics

umami-software · Dec 18, 2024 · 562ec43 · 562ec43
2 parents 717ff8f + 2d27333
commit 562ec43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
@@ -1,5 +1,4 @@
 import debug from 'debug';
-import { Prisma } from '@prisma/client';
 import prisma from '@umami/prisma-client';
 import { formatInTimeZone } from 'date-fns-tz';
 import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
@@ -286,7 +285,7 @@ async function pagedRawQuery(
   return { data, count, page: +page, pageSize: size, orderBy };
 }
 
-function getQueryMode(): { mode?: Prisma.QueryMode } {
+function getQueryMode(): { mode?: 'default' | 'insensitive' } {
   const db = getDatabaseType();
 
   if (db === POSTGRESQL) {

diff --git a/src/pages/api/reports/funnel.ts b/src/pages/api/reports/funnel.ts
@@ -31,10 +31,7 @@ const schema = {
       .of(
         yup.object().shape({
           type: yup.string().required(),
-          value: yup
-            .string()
-            .matches(/^[a-zA-Z0-9/*-_]+$/, 'Invalid URL pattern')
-            .required(),
+          value: yup.string().required(),
         }),
       )
       .min(2)