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

# Conflicts:
#	src/app/(main)/teams/TeamsDataTable.tsx
#	src/app/(main)/teams/TeamsJoinButton.tsx
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx

src/lib/constants.ts

@@ -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 = {

src/lib/request.ts

@@ -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,
       });