diff --git a/app/common/src/services/Backend.ts b/app/common/src/services/Backend.ts index 4be911ecac7d..8a39b8d054f8 100644 --- a/app/common/src/services/Backend.ts +++ b/app/common/src/services/Backend.ts @@ -504,7 +504,7 @@ export interface UserPermission { /** User permission for a specific user group. */ export interface UserGroupPermission { - readonly userGroup: UserGroupInfo + readonly userGroup: UserGroup readonly permission: permissions.PermissionAction } @@ -560,7 +560,7 @@ export function isUserGroupPermissionAnd(predicate: (permission: UserGroupPermis /** Get the property representing the name on an arbitrary variant of {@link UserPermission}. */ export function getAssetPermissionName(permission: AssetPermission) { - return isUserPermission(permission) ? permission.user.name : permission.userGroup.groupName + return isUserPermission(permission) ? permission.user.name : permission.userGroup.name } /** Get the property representing the id on an arbitrary variant of {@link UserPermission}. */ @@ -1174,8 +1174,8 @@ export function compareAssetPermissions(a: AssetPermission, b: AssetPermission) } else { // NOTE [NP]: Although `userId` is unique, and therefore sufficient to sort permissions, sort // name first, so that it's easier to find a permission in a long list (i.e., for readability). - const aName = 'user' in a ? a.user.name : a.userGroup.groupName - const bName = 'user' in b ? b.user.name : b.userGroup.groupName + const aName = 'user' in a ? a.user.name : a.userGroup.name + const bName = 'user' in b ? b.user.name : b.userGroup.name const aUserId = 'user' in a ? a.user.userId : a.userGroup.id const bUserId = 'user' in b ? b.user.userId : b.userGroup.id return ( diff --git a/app/gui/src/dashboard/utilities/permissions.ts b/app/gui/src/dashboard/utilities/permissions.ts index 5346d4f76f42..b0ffa80ffd32 100644 --- a/app/gui/src/dashboard/utilities/permissions.ts +++ b/app/gui/src/dashboard/utilities/permissions.ts @@ -38,7 +38,7 @@ export function tryCreateOwnerPermission( category: Category, user: backend.User, users: readonly backend.User[], - userGroups: readonly backend.UserGroupInfo[], + userGroups: readonly backend.UserGroup[], ): readonly backend.AssetPermission[] { switch (category.type) { case 'team': {