rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix profiles default filter

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-03-10 18:19:16 +04:00
parent 21a5201759
commit 17c9f2eded
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/iam/scim/filter.go
View File

@@ -25,7 +25,7 @@ import (
) )
func ParseUserFilter(expr scimfilter.Expression) (*coredata.MembershipProfileFilter, error) { func ParseUserFilter(expr scimfilter.Expression) (*coredata.MembershipProfileFilter, error) {
filter := coredata.NewMembershipProfileFilter(nil) filter := coredata.NewMembershipProfileFilter(nil).WithMembership()
if expr == nil { if expr == nil {
return filter, nil return filter, nil

7
pkg/server/api/connect/v1/v1_resolver.go
View File

@@ -38,9 +38,9 @@ func (r *identityResolver) Profiles(ctx context.Context, obj *types.Identity, fi
return nil, err return nil, err
} }
filters := coredata.NewMembershipProfileFilter(nil) filters := coredata.NewMembershipProfileFilter(nil).WithMembership()
if filter != nil { if filter != nil {
filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded) filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded).WithMembership()
if filter.State != nil { if filter.State != nil {
filters.WithState(*filter.State) filters.WithState(*filter.State)
} }
@@ -1184,8 +1184,7 @@ func (r *organizationResolver) Profiles(ctx context.Context, obj *types.Organiza
return nil, err return nil, err
} }
filter := coredata.NewMembershipProfileFilter(nil) filter := coredata.NewMembershipProfileFilter(nil).WithMembership()
filter = filter.WithMembership()
if gqlutils.OnlyTotalCountSelected(ctx) { if gqlutils.OnlyTotalCountSelected(ctx) {
return &types.ProfileConnection{ return &types.ProfileConnection{

4
pkg/server/api/console/v1/v1_resolver.go
View File

@@ -5674,9 +5674,9 @@ func (r *organizationResolver) Profiles(ctx context.Context, obj *types.Organiza
}, nil }, nil
} }
filters := coredata.NewMembershipProfileFilter(nil) filters := coredata.NewMembershipProfileFilter(nil).WithMembership()
if filter != nil { if filter != nil {
filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded) filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded).WithMembership()
} }
pageOrderBy := page.OrderBy[coredata.MembershipProfileOrderField]{ pageOrderBy := page.OrderBy[coredata.MembershipProfileOrderField]{

4
pkg/server/api/mcp/v1/schema.resolvers.go
View File

@@ -2754,9 +2754,9 @@ func (r *Resolver) ListUsersTool(ctx context.Context, req *mcp.CallToolRequest,
} }
cursor := types.NewCursor(input.Size, input.Cursor, pageOrderBy) cursor := types.NewCursor(input.Size, input.Cursor, pageOrderBy)
filter := coredata.NewMembershipProfileFilter(nil) filter := coredata.NewMembershipProfileFilter(nil).WithMembership()
if input.Filter != nil { if input.Filter != nil {
filter = coredata.NewMembershipProfileFilter(input.Filter.ExcludeContractEnded) filter = coredata.NewMembershipProfileFilter(input.Filter.ExcludeContractEnded).WithMembership()
} }
pageResult, err := r.iamSvc.OrganizationService.ListProfiles(ctx, input.OrganizationID, cursor, filter) pageResult, err := r.iamSvc.OrganizationService.ListProfiles(ctx, input.OrganizationID, cursor, filter)