From a81085358749ce09c68bc8dff2075e06ce72a9a5 Mon Sep 17 00:00:00 2001 From: Sacha Al Himdani Date: Fri, 29 Aug 2025 19:27:45 +0200 Subject: [PATCH] Add default snapshot null filter Signed-off-by: Sacha Al Himdani --- ...NonconformityRegistryGraphListQuery.graphql.ts | 13 ++++++++++--- .../NonconformityRegistriesPage.tsx | 1 + ...NonconformityRegistriesPageFragment.graphql.ts | 12 ++++++++++-- .../NonconformityRegistriesPageQuery.graphql.ts | 13 ++++++++++--- ...onformityRegistriesPageRefetchQuery.graphql.ts | 15 +++++++++++---- pkg/coredata/nonconformity_registry_filter.go | 2 +- pkg/server/api/console/v1/schema.graphql | 12 ++++++------ pkg/server/api/console/v1/schema/schema.go | 12 ++++++------ 8 files changed, 55 insertions(+), 25 deletions(-) diff --git a/apps/console/src/hooks/graph/__generated__/NonconformityRegistryGraphListQuery.graphql.ts b/apps/console/src/hooks/graph/__generated__/NonconformityRegistryGraphListQuery.graphql.ts index 79d6c5f76..f02527cba 100644 --- a/apps/console/src/hooks/graph/__generated__/NonconformityRegistryGraphListQuery.graphql.ts +++ b/apps/console/src/hooks/graph/__generated__/NonconformityRegistryGraphListQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<> + * @generated SignedSource<<725635dc6b9b06340cfc49b9b75d509c>> * @lightSyntaxTransform * @nogrep */ @@ -176,6 +176,13 @@ return { "name": "referenceId", "storageKey": null }, + { + "alias": null, + "args": null, + "kind": "ScalarField", + "name": "snapshotId", + "storageKey": null + }, { "alias": null, "args": null, @@ -359,12 +366,12 @@ return { ] }, "params": { - "cacheID": "727537500ac037fec1a9ffd04a5c651f", + "cacheID": "f788ee5c51814a5f68795aaca97cb971", "id": null, "metadata": {}, "name": "NonconformityRegistryGraphListQuery", "operationKind": "query", - "text": "query NonconformityRegistryGraphListQuery(\n $organizationId: ID!\n $snapshotId: ID\n) {\n node(id: $organizationId) {\n __typename\n ... on Organization {\n ...NonconformityRegistriesPageFragment_3iomuz\n }\n id\n }\n}\n\nfragment NonconformityRegistriesPageFragment_3iomuz on Organization {\n id\n nonconformityRegistries(first: 10, filter: {snapshotId: $snapshotId}) {\n totalCount\n edges {\n node {\n id\n referenceId\n description\n status\n dateIdentified\n dueDate\n rootCause\n correctiveAction\n effectivenessCheck\n audit {\n id\n name\n framework {\n id\n name\n }\n }\n owner {\n id\n fullName\n }\n createdAt\n updatedAt\n __typename\n }\n cursor\n }\n pageInfo {\n hasNextPage\n endCursor\n }\n }\n}\n" + "text": "query NonconformityRegistryGraphListQuery(\n $organizationId: ID!\n $snapshotId: ID\n) {\n node(id: $organizationId) {\n __typename\n ... on Organization {\n ...NonconformityRegistriesPageFragment_3iomuz\n }\n id\n }\n}\n\nfragment NonconformityRegistriesPageFragment_3iomuz on Organization {\n id\n nonconformityRegistries(first: 10, filter: {snapshotId: $snapshotId}) {\n totalCount\n edges {\n node {\n id\n referenceId\n snapshotId\n description\n status\n dateIdentified\n dueDate\n rootCause\n correctiveAction\n effectivenessCheck\n audit {\n id\n name\n framework {\n id\n name\n }\n }\n owner {\n id\n fullName\n }\n createdAt\n updatedAt\n __typename\n }\n cursor\n }\n pageInfo {\n hasNextPage\n endCursor\n }\n }\n}\n" } }; })(); diff --git a/apps/console/src/pages/organizations/nonconformityRegistries/NonconformityRegistriesPage.tsx b/apps/console/src/pages/organizations/nonconformityRegistries/NonconformityRegistriesPage.tsx index 14cd8f9b9..a3ccadbe0 100644 --- a/apps/console/src/pages/organizations/nonconformityRegistries/NonconformityRegistriesPage.tsx +++ b/apps/console/src/pages/organizations/nonconformityRegistries/NonconformityRegistriesPage.tsx @@ -64,6 +64,7 @@ const nonconformityRegistriesPageFragment = graphql` node { id referenceId + snapshotId description status dateIdentified diff --git a/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageFragment.graphql.ts b/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageFragment.graphql.ts index 2c20345da..8532906bf 100644 --- a/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageFragment.graphql.ts +++ b/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageFragment.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<> + * @generated SignedSource<<7ec3fc6b9ecb6302152fe0031e791682>> * @lightSyntaxTransform * @nogrep */ @@ -38,6 +38,7 @@ export type NonconformityRegistriesPageFragment$data = { }; readonly referenceId: string; readonly rootCause: string; + readonly snapshotId: string | null | undefined; readonly status: NonconformityRegistryStatus; readonly updatedAt: any; }; @@ -176,6 +177,13 @@ return { "name": "referenceId", "storageKey": null }, + { + "alias": null, + "args": null, + "kind": "ScalarField", + "name": "snapshotId", + "storageKey": null + }, { "alias": null, "args": null, @@ -350,6 +358,6 @@ return { }; })(); -(node as any).hash = "ebde2010138ec4b17adb214f7bd24ac6"; +(node as any).hash = "36f3622d63ddf02a2703a2c8428f4268"; export default node; diff --git a/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageQuery.graphql.ts b/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageQuery.graphql.ts index 492ece656..104c2f71d 100644 --- a/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageQuery.graphql.ts +++ b/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<1ea20f794eca2a8b357e64ccf3ac6deb>> + * @generated SignedSource<<5e78749bb635e7aa478ad7efb8f5e01b>> * @lightSyntaxTransform * @nogrep */ @@ -176,6 +176,13 @@ return { "name": "referenceId", "storageKey": null }, + { + "alias": null, + "args": null, + "kind": "ScalarField", + "name": "snapshotId", + "storageKey": null + }, { "alias": null, "args": null, @@ -359,12 +366,12 @@ return { ] }, "params": { - "cacheID": "f2ec31e8e8ec0d13aeac353f53044f97", + "cacheID": "fc70ce5fd4a22cc2bc0d9a63d476008f", "id": null, "metadata": {}, "name": "NonconformityRegistriesPageQuery", "operationKind": "query", - "text": "query NonconformityRegistriesPageQuery(\n $organizationId: ID!\n $snapshotId: ID\n) {\n node(id: $organizationId) {\n __typename\n ... on Organization {\n ...NonconformityRegistriesPageFragment_3iomuz\n }\n id\n }\n}\n\nfragment NonconformityRegistriesPageFragment_3iomuz on Organization {\n id\n nonconformityRegistries(first: 10, filter: {snapshotId: $snapshotId}) {\n totalCount\n edges {\n node {\n id\n referenceId\n description\n status\n dateIdentified\n dueDate\n rootCause\n correctiveAction\n effectivenessCheck\n audit {\n id\n name\n framework {\n id\n name\n }\n }\n owner {\n id\n fullName\n }\n createdAt\n updatedAt\n __typename\n }\n cursor\n }\n pageInfo {\n hasNextPage\n endCursor\n }\n }\n}\n" + "text": "query NonconformityRegistriesPageQuery(\n $organizationId: ID!\n $snapshotId: ID\n) {\n node(id: $organizationId) {\n __typename\n ... on Organization {\n ...NonconformityRegistriesPageFragment_3iomuz\n }\n id\n }\n}\n\nfragment NonconformityRegistriesPageFragment_3iomuz on Organization {\n id\n nonconformityRegistries(first: 10, filter: {snapshotId: $snapshotId}) {\n totalCount\n edges {\n node {\n id\n referenceId\n snapshotId\n description\n status\n dateIdentified\n dueDate\n rootCause\n correctiveAction\n effectivenessCheck\n audit {\n id\n name\n framework {\n id\n name\n }\n }\n owner {\n id\n fullName\n }\n createdAt\n updatedAt\n __typename\n }\n cursor\n }\n pageInfo {\n hasNextPage\n endCursor\n }\n }\n}\n" } }; })(); diff --git a/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageRefetchQuery.graphql.ts b/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageRefetchQuery.graphql.ts index 6a4da041e..68a3dee56 100644 --- a/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageRefetchQuery.graphql.ts +++ b/apps/console/src/pages/organizations/nonconformityRegistries/__generated__/NonconformityRegistriesPageRefetchQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<> + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -200,6 +200,13 @@ return { "name": "referenceId", "storageKey": null }, + { + "alias": null, + "args": null, + "kind": "ScalarField", + "name": "snapshotId", + "storageKey": null + }, { "alias": null, "args": null, @@ -383,16 +390,16 @@ return { ] }, "params": { - "cacheID": "50e5771b4ff22e23d81c31bf7c92e619", + "cacheID": "c8a936f15b58d1f1d51984f692b0bba5", "id": null, "metadata": {}, "name": "NonconformityRegistriesPageRefetchQuery", "operationKind": "query", - "text": "query NonconformityRegistriesPageRefetchQuery(\n $after: CursorKey\n $first: Int = 10\n $snapshotId: ID = null\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...NonconformityRegistriesPageFragment_35e0S5\n id\n }\n}\n\nfragment NonconformityRegistriesPageFragment_35e0S5 on Organization {\n id\n nonconformityRegistries(first: $first, after: $after, filter: {snapshotId: $snapshotId}) {\n totalCount\n edges {\n node {\n id\n referenceId\n description\n status\n dateIdentified\n dueDate\n rootCause\n correctiveAction\n effectivenessCheck\n audit {\n id\n name\n framework {\n id\n name\n }\n }\n owner {\n id\n fullName\n }\n createdAt\n updatedAt\n __typename\n }\n cursor\n }\n pageInfo {\n hasNextPage\n endCursor\n }\n }\n}\n" + "text": "query NonconformityRegistriesPageRefetchQuery(\n $after: CursorKey\n $first: Int = 10\n $snapshotId: ID = null\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...NonconformityRegistriesPageFragment_35e0S5\n id\n }\n}\n\nfragment NonconformityRegistriesPageFragment_35e0S5 on Organization {\n id\n nonconformityRegistries(first: $first, after: $after, filter: {snapshotId: $snapshotId}) {\n totalCount\n edges {\n node {\n id\n referenceId\n snapshotId\n description\n status\n dateIdentified\n dueDate\n rootCause\n correctiveAction\n effectivenessCheck\n audit {\n id\n name\n framework {\n id\n name\n }\n }\n owner {\n id\n fullName\n }\n createdAt\n updatedAt\n __typename\n }\n cursor\n }\n pageInfo {\n hasNextPage\n endCursor\n }\n }\n}\n" } }; })(); -(node as any).hash = "ebde2010138ec4b17adb214f7bd24ac6"; +(node as any).hash = "36f3622d63ddf02a2703a2c8428f4268"; export default node; diff --git a/pkg/coredata/nonconformity_registry_filter.go b/pkg/coredata/nonconformity_registry_filter.go index 45775ca71..01c69bdee 100644 --- a/pkg/coredata/nonconformity_registry_filter.go +++ b/pkg/coredata/nonconformity_registry_filter.go @@ -27,7 +27,7 @@ type ( func NewNonconformityRegistryFilter(snapshotID **gid.GID) *NonconformityRegistryFilter { return &NonconformityRegistryFilter{ - snapshotID: nil, + snapshotID: snapshotID, } } diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql index 98a756a2e..f826bd8d4 100644 --- a/pkg/server/api/console/v1/schema.graphql +++ b/pkg/server/api/console/v1/schema.graphql @@ -1248,7 +1248,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: AssetOrder - filter: AssetFilter + filter: AssetFilter = { snapshotId: null } ): AssetConnection! @goField(forceResolver: true) data( @@ -1257,7 +1257,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: DatumOrder - filter: DatumFilter + filter: DatumFilter = { snapshotId: null } ): DatumConnection! @goField(forceResolver: true) audits( @@ -1274,7 +1274,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: NonconformityRegistryOrder - filter: NonconformityRegistryFilter + filter: NonconformityRegistryFilter = { snapshotId: null } ): NonconformityRegistryConnection! @goField(forceResolver: true) complianceRegistries( @@ -1283,7 +1283,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: ComplianceRegistryOrder - filter: ComplianceRegistryFilter + filter: ComplianceRegistryFilter = { snapshotId: null } ): ComplianceRegistryConnection! @goField(forceResolver: true) continualImprovementRegistries( @@ -1292,7 +1292,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: ContinualImprovementRegistriesOrder - filter: ContinualImprovementRegistryFilter + filter: ContinualImprovementRegistryFilter = { snapshotId: null } ): ContinualImprovementRegistryConnection! @goField(forceResolver: true) processingActivityRegistries( @@ -1301,7 +1301,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: ProcessingActivityRegistryOrder - filter: ProcessingActivityRegistryFilter + filter: ProcessingActivityRegistryFilter = { snapshotId: null } ): ProcessingActivityRegistryConnection! @goField(forceResolver: true) snapshots( diff --git a/pkg/server/api/console/v1/schema/schema.go b/pkg/server/api/console/v1/schema/schema.go index f1c46cce2..d21096190 100644 --- a/pkg/server/api/console/v1/schema/schema.go +++ b/pkg/server/api/console/v1/schema/schema.go @@ -9200,7 +9200,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: AssetOrder - filter: AssetFilter + filter: AssetFilter = { snapshotId: null } ): AssetConnection! @goField(forceResolver: true) data( @@ -9209,7 +9209,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: DatumOrder - filter: DatumFilter + filter: DatumFilter = { snapshotId: null } ): DatumConnection! @goField(forceResolver: true) audits( @@ -9226,7 +9226,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: NonconformityRegistryOrder - filter: NonconformityRegistryFilter + filter: NonconformityRegistryFilter = { snapshotId: null } ): NonconformityRegistryConnection! @goField(forceResolver: true) complianceRegistries( @@ -9235,7 +9235,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: ComplianceRegistryOrder - filter: ComplianceRegistryFilter + filter: ComplianceRegistryFilter = { snapshotId: null } ): ComplianceRegistryConnection! @goField(forceResolver: true) continualImprovementRegistries( @@ -9244,7 +9244,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: ContinualImprovementRegistriesOrder - filter: ContinualImprovementRegistryFilter + filter: ContinualImprovementRegistryFilter = { snapshotId: null } ): ContinualImprovementRegistryConnection! @goField(forceResolver: true) processingActivityRegistries( @@ -9253,7 +9253,7 @@ type Organization implements Node { last: Int before: CursorKey orderBy: ProcessingActivityRegistryOrder - filter: ProcessingActivityRegistryFilter + filter: ProcessingActivityRegistryFilter = { snapshotId: null } ): ProcessingActivityRegistryConnection! @goField(forceResolver: true) snapshots(