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

Fix signature count mismatch with signatures tab on documents

Browse Source 
The badge on a document version showed signatures filtered by
activeContract: true, while the signatures tab fetched signatures with
no filter and listed people filtered by contractEnded: false and
state: ACTIVE. The two views disagreed both when a signer's contract had
ended and when a signer was deactivated while still under contract.

Add a state: ProfileState field to DocumentVersionSignatureFilter
alongside the existing activeContract filter, so the signature query
can mirror the same predicates as the people query. Pass
{ activeContract: true, state: ACTIVE } from the badge, the document
list item, and the signatures tab fragment. The same filter is now
evaluated on both the count and the list.

Threaded through the console and MCP resolvers, the MCP spec, and the
n8n getAllSignatures operation.

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
2026-05-22 10:55:31 +02:00
parent 63e8c85f66
commit 83445c6e34
9 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/console/src/pages/organizations/documents/DocumentLayout.tsx
View File

@@ -40,10 +40,10 @@ export const documentLayoutQuery = graphql`
...DocumentTitleFormFragment
...DocumentActionsDropdown_versionFragment
...DocumentDetailsCard_versionFragment
signatures(first: 0 filter: { activeContract: true }) {
signatures(first: 0 filter: { activeContract: true, state: ACTIVE }) {
totalCount
}
signedSignatures: signatures(first: 0 filter: { states: [SIGNED], activeContract: true }) {
signedSignatures: signatures(first: 0 filter: { states: [SIGNED], activeContract: true, state: ACTIVE }) {
totalCount
}
approvalQuorums(first: 1, orderBy: { field: CREATED_AT, direction: DESC }) {
@@ -85,10 +85,10 @@ export const documentLayoutQuery = graphql`
...DocumentTitleFormFragment
...DocumentActionsDropdown_versionFragment
...DocumentDetailsCard_versionFragment
signatures(first: 0 filter: { activeContract: true }) {
signatures(first: 0 filter: { activeContract: true, state: ACTIVE }) {
totalCount
}
signedSignatures: signatures(first: 0 filter: { states: [SIGNED], activeContract: true }) {
signedSignatures: signatures(first: 0 filter: { states: [SIGNED], activeContract: true, state: ACTIVE }) {
totalCount
}
approvalQuorums(first: 1, orderBy: { field: CREATED_AT, direction: DESC }) {

4
apps/console/src/pages/organizations/documents/_components/DocumentListItem.tsx
View File

@@ -54,10 +54,10 @@ const fragment = graphql`
}
}
}
signatures(first: 0 filter: { activeContract: true }) {
signatures(first: 0 filter: { activeContract: true, state: ACTIVE }) {
totalCount
}
signedSignatures: signatures(first: 0 filter: { states: [SIGNED], activeContract: true }) {
signedSignatures: signatures(first: 0 filter: { states: [SIGNED], activeContract: true, state: ACTIVE }) {
totalCount
}
}

9
apps/console/src/pages/organizations/documents/signatures/_components/DocumentSignatureList.tsx
View File

@@ -29,7 +29,7 @@ const versionFragment = graphql`
@argumentDefinitions(
count: { type: "Int", defaultValue: 1000 }
cursor: { type: "CursorKey" }
signatureFilter: { type: "DocumentVersionSignatureFilter" }
signatureFilter: { type: "DocumentVersionSignatureFilter", defaultValue: { activeContract: true, state: ACTIVE } }
) {
...DocumentSignaturePlaceholder_versionFragment
signatures(first: $count, after: $cursor, filter: $signatureFilter)
@@ -102,8 +102,11 @@ export function DocumentSignatureList(props: {
return;
}
const filter
= selectedStates.length > 0 ? { states: selectedStates } : null;
const filter = {
activeContract: true,
state: "ACTIVE" as const,
...(selectedStates.length > 0 ? { states: selectedStates } : {}),
};
refetch({ signatureFilter: filter });
}, [selectedStates, refetch]);

13
packages/n8n-node/nodes/Probo/actions/document/getAllSignatures.operation.ts
View File

@@ -91,6 +91,18 @@ export const description: INodeProperties[] = [
default: false,
description: 'Whether to filter by active contract status',
},
{
displayName: 'Profile State',
name: 'state',
type: 'options',
default: '',
description: 'Filter by signatory profile state',
options: [
{ name: 'Any', value: '' },
{ name: 'Active', value: 'ACTIVE' },
{ name: 'Inactive', value: 'INACTIVE' },
],
},
],
},
];
@@ -107,6 +119,7 @@ export async function execute(
const filter: IDataObject = {};
if ((filters.states as string[])?.length) filter.states = filters.states;
if (filters.activeContract !== undefined) filter.activeContract = filters.activeContract;
if (filters.state) filter.state = filters.state;
const hasFilter = Object.keys(filter).length > 0;

16
pkg/coredata/document_version_signature_filter.go
View File

@@ -22,13 +22,15 @@ type (
DocumentVersionSignatureFilter struct {
states DocumentVersionSignatureStates
activeContract *bool
state *ProfileState
}
)
func NewDocumentVersionSignatureFilter(states []DocumentVersionSignatureState, activeContract *bool) *DocumentVersionSignatureFilter {
func NewDocumentVersionSignatureFilter(states []DocumentVersionSignatureState, activeContract *bool, state *ProfileState) *DocumentVersionSignatureFilter {
return &DocumentVersionSignatureFilter{
states: DocumentVersionSignatureStates(states),
activeContract: activeContract,
state: state,
}
}
@@ -36,6 +38,7 @@ func (f *DocumentVersionSignatureFilter) SQLArguments() pgx.StrictNamedArgs {
return pgx.StrictNamedArgs{
"states": f.states,
"active_contract": f.activeContract,
"profile_state": f.state,
}
}
@@ -70,5 +73,16 @@ func (f *DocumentVersionSignatureFilter) SQLFragment() string {
)
)
END
AND
CASE
WHEN @profile_state::text IS NULL
THEN TRUE
ELSE EXISTS (
SELECT 1
FROM iam_membership_profiles p
WHERE p.id = signed_by_profile_id
AND p.state = @profile_state::membership_state
)
END
)`
}

7
pkg/server/api/console/v1/document_resolvers.go
View File

@@ -279,6 +279,7 @@ func (r *documentVersionResolver) Signatures(ctx context.Context, obj *types.Doc
var (
signatureStates []coredata.DocumentVersionSignatureState
activeContract *bool
profileState *coredata.ProfileState
)
if filter != nil {
@@ -289,9 +290,13 @@ func (r *documentVersionResolver) Signatures(ctx context.Context, obj *types.Doc
if filter.ActiveContract != nil {
activeContract = filter.ActiveContract
}
if filter.State != nil {
profileState = filter.State
}
}
signatureFilter := coredata.NewDocumentVersionSignatureFilter(signatureStates, activeContract)
signatureFilter := coredata.NewDocumentVersionSignatureFilter(signatureStates, activeContract, profileState)
cursor := types.NewCursor(first, after, last, before, pageOrderBy)

1
pkg/server/api/console/v1/graphql/document.graphql
View File

@@ -247,6 +247,7 @@ input DocumentVersionSignatureOrder {
input DocumentVersionSignatureFilter {
states: [DocumentVersionSignatureState!]
activeContract: Boolean
state: ProfileState
}
input DocumentVersionApprovalQuorumOrder {

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

@@ -2188,6 +2188,7 @@ func (r *Resolver) ListDocumentVersionSignaturesTool(ctx context.Context, req *m
var (
signatureStates []coredata.DocumentVersionSignatureState
activeContract *bool
profileState *coredata.ProfileState
)
if input.Filter != nil {
@@ -2198,9 +2199,13 @@ func (r *Resolver) ListDocumentVersionSignaturesTool(ctx context.Context, req *m
if input.Filter.ActiveContract != nil {
activeContract = input.Filter.ActiveContract
}
if input.Filter.State != nil {
profileState = input.Filter.State
}
}
signatureFilter := coredata.NewDocumentVersionSignatureFilter(signatureStates, activeContract)
signatureFilter := coredata.NewDocumentVersionSignatureFilter(signatureStates, activeContract, profileState)
page, err := prb.Documents.ListSignatures(ctx, scope, input.DocumentVersionID, cursor, signatureFilter)
if err != nil {

3
pkg/server/api/mcp/v1/specification.yaml
View File

@@ -6322,6 +6322,9 @@ components:
active_contract:
type: boolean
description: Signatory contract status
state:
$ref: "#/components/schemas/ProfileState"
description: Signatory profile state
ListDocumentVersionSignaturesOutput:
type: object