watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	src/app/(main)/teams/TeamsDataTable.tsx
#	src/app/(main)/teams/TeamsJoinButton.tsx
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
This commit is contained in:
Mike Cao 2025-09-23 23:10:05 -07:00
commit 8115709a8b
10 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/constants.ts
View file

@ -127,12 +127,12 @@ export const DATA_TYPES = {
export const ROLES = {
admin: 'admin',
teamManager: 'team-manager',
teamMember: 'team-member',
teamOwner: 'team-owner',
teamViewOnly: 'team-view-only',
user: 'user',
viewOnly: 'view-only',
teamOwner: 'team-owner',
teamManager: 'team-manager',
teamMember: 'team-member',
teamViewOnly: 'team-view-only',
} as const;
export const PERMISSIONS = {

2
src/lib/request.ts
View file

@ -119,7 +119,7 @@ export async function getQueryFilters(
}));
cohortFilters.push({
name: cohortParams.action.type,
name: `cohort_${cohortParams.action.type}`,
operator: 'eq',
value: cohortParams.action.value,
});