diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue index 470c281e73..fcc4a781fc 100644 --- a/packages/nc-gui/components/workspace/CollaboratorsList.vue +++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue @@ -1,6 +1,6 @@ @@ -59,15 +72,25 @@ onMounted(async () => {
-
{{ $t('objects.users') }}
-
{{ $t('general.access') }}
+
+ + {{ $t('objects.users') }} + + +
+
+ + {{ $t('general.access') }} + + +
{{ $t('title.dateJoined') }}
Actions
diff --git a/packages/nc-gui/composables/useUserSorts.ts b/packages/nc-gui/composables/useUserSorts.ts index 4644bd86ac..9182a701e5 100644 --- a/packages/nc-gui/composables/useUserSorts.ts +++ b/packages/nc-gui/composables/useUserSorts.ts @@ -1,5 +1,5 @@ import rfdc from 'rfdc' -import { OrgUserRoles, ProjectRoles, WorkspaceUserRoles } from 'nocodb-sdk' +import { OrderedOrgRoles, OrderedProjectRoles, OrderedWorkspaceRoles } from 'nocodb-sdk' import type { UsersSortType } from '~/lib' import { useGlobal } from '#imports' @@ -105,11 +105,11 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') { function handleGetSortedData>(data: T[], sortsConfig: UsersSortType = sorts.value): T[] { let userRoleOrder: string[] = [] if (roleType === 'Workspace') { - userRoleOrder = Object.values(WorkspaceUserRoles) + userRoleOrder = Object.values(OrderedWorkspaceRoles) } else if (roleType === 'Org') { - userRoleOrder = Object.values(OrgUserRoles) + userRoleOrder = Object.values(OrderedOrgRoles) } else if (roleType === 'Project') { - userRoleOrder = Object.values(ProjectRoles) + userRoleOrder = Object.values(OrderedProjectRoles) } data = clone(data) diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts index 6cde2bbcb7..ae8a607fa2 100644 --- a/packages/nocodb-sdk/src/lib/enums.ts +++ b/packages/nocodb-sdk/src/lib/enums.ts @@ -247,6 +247,14 @@ export const OrderedWorkspaceRoles = [ null, ]; +export const OrderedOrgRoles = [ + OrgUserRoles.SUPER_ADMIN, + OrgUserRoles.CREATOR, + OrgUserRoles.VIEWER, + // placeholder for no access + null, +]; + export const OrderedProjectRoles = [ ProjectRoles.OWNER, ProjectRoles.CREATOR,