Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 47 additions & 8 deletions data/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -6543,7 +6543,7 @@ type EntityConnection
input EntityFilter
@join__type(graph: STRAWBERRY)
{
entityType: RBACElementType = null
entityType: RBACElementTypeFilter = null
entityId: StringFilter = null
AND: [EntityFilter!] = null
OR: [EntityFilter!] = null
Expand Down Expand Up @@ -11808,6 +11808,25 @@ enum OperationType
GRANT_HARD_DELETE @join__enumValue(graph: STRAWBERRY)
}

"""
Added in UNRELEASED. Filter for permission operation columns. Supports equals / in / not_equals / not_in.
Comment thread
ironAiken2 marked this conversation as resolved.
"""
input OperationTypeFilter
@join__type(graph: STRAWBERRY)
{
"""Matches rows with this exact operation."""
equals: OperationType = null

"""Matches rows whose operation is in this list."""
in: [OperationType!] = null

"""Excludes rows with this exact operation."""
notEquals: OperationType = null

"""Excludes rows whose operation is in this list."""
notIn: [OperationType!] = null
}

"""Added in 24.09.0. Sort direction for ordering"""
enum OrderDirection
@join__type(graph: STRAWBERRY)
Expand Down Expand Up @@ -11891,9 +11910,10 @@ type PermissionEdge
input PermissionFilter
@join__type(graph: STRAWBERRY)
{
roleId: UUID = null
scopeType: RBACElementType = null
entityType: RBACElementType = null
roleId: UUIDFilter = null
scopeType: RBACElementTypeFilter = null
scopeId: StringFilter = null
entityType: RBACElementTypeFilter = null
createdAt: DateTimeFilter = null
AND: [PermissionFilter!] = null
OR: [PermissionFilter!] = null
Expand All @@ -11906,10 +11926,10 @@ Added in 26.4.0. Nested filter for permissions within a role assignment. Filters
input PermissionNestedFilter
@join__type(graph: STRAWBERRY)
{
scopeId: String = null
scopeType: RBACElementType = null
entityType: RBACElementType = null
operation: OperationType = null
scopeId: StringFilter = null
scopeType: RBACElementTypeFilter = null
entityType: RBACElementTypeFilter = null
operation: OperationTypeFilter = null
AND: [PermissionNestedFilter!] = null
OR: [PermissionNestedFilter!] = null
NOT: [PermissionNestedFilter!] = null
Expand Down Expand Up @@ -14453,6 +14473,25 @@ enum RBACElementType
ARTIFACT_REVISION @join__enumValue(graph: STRAWBERRY)
}

"""
Added in UNRELEASED. Filter for RBAC element type fields (scope_type / entity_type). Supports equals / in / not_equals / not_in.
Comment thread
ironAiken2 marked this conversation as resolved.
"""
input RBACElementTypeFilter
@join__type(graph: STRAWBERRY)
{
"""Matches rows with this exact element type."""
equals: RBACElementType = null

"""Matches rows whose element type is in this list."""
in: [RBACElementType!] = null

"""Excludes rows with this exact element type."""
notEquals: RBACElementType = null

"""Excludes rows whose element type is in this list."""
notIn: [RBACElementType!] = null
}

"""
Added in 25.19.0. This enum represents the readiness status of a replica, indicating whether the deployment has been checked and its health state.
"""
Expand Down
2 changes: 1 addition & 1 deletion react/src/components/RoleDetailDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const RoleDetailDrawerInner: React.FC<RoleDetailDrawerInnerProps> = ({
{
id: localRoleId,
assignmentFilter: { roleId: { equals: localRoleId } },
permissionFilter: { roleId: localRoleId },
permissionFilter: { roleId: { equals: localRoleId } },
scopeFilter: null,
scopeOrderBy: null,
assignmentLimit: 10,
Expand Down
4 changes: 1 addition & 3 deletions react/src/components/RolePermissionTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ const RolePermissionTab: React.FC<RolePermissionTabProps> = ({
refetch(
{
filter: {
roleId,
roleId: { equals: roleId },
...(overrides?.filter !== undefined
? overrides.filter
: queryParams.filter),
Expand Down Expand Up @@ -272,7 +272,6 @@ const RolePermissionTab: React.FC<RolePermissionTabProps> = ({
key: 'scopeType',
propertyLabel: t('rbac.ScopeType'),
type: 'enum',
valueMode: 'scalar',
options: [
'DOMAIN',
'PROJECT',
Expand All @@ -292,7 +291,6 @@ const RolePermissionTab: React.FC<RolePermissionTabProps> = ({
key: 'entityType',
propertyLabel: t('rbac.EntityType'),
type: 'enum',
valueMode: 'scalar',
options: [
'DOMAIN',
'PROJECT',
Expand Down
1 change: 0 additions & 1 deletion react/src/components/RoleScopeTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ const RoleScopeTab: React.FC<RoleScopeTabProps> = ({ queryRef }) => {
key: 'entityType',
propertyLabel: t('rbac.ScopeType'),
type: 'enum',
valueMode: 'scalar',
options: [
'DOMAIN',
'PROJECT',
Expand Down
2 changes: 1 addition & 1 deletion react/src/hooks/useCurrentUserProjectRoles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const useCurrentUserProjectRoles = (): CurrentUserProjectRolesResult => {
query useCurrentUserProjectRolesQuery {
myRolesResult: myRoles(
first: 100
filter: { permission: { entityType: PROJECT_ADMIN_PAGE } }
filter: { permission: { entityType: { equals: PROJECT_ADMIN_PAGE } } }
) @catch(to: RESULT) {
edges {
node {
Expand Down
Loading