From 8d092fd10249895aaef8a3785bf44ca1b7531cb1 Mon Sep 17 00:00:00 2001 From: gearnode Date: Thu, 20 Feb 2025 08:33:58 +0100 Subject: [PATCH] Fix typecheck Signed-off-by: gearnode --- ...tBreadcrumbControlOverviewQuery.graphql.ts | 140 ++++++++++++------ ...readcrumbFrameworkOverviewQuery.graphql.ts | 26 ++-- .../console/src/pages/ControlOverviewPage.tsx | 16 +- .../ControlOverviewPageQuery.graphql.ts | 14 +- 4 files changed, 122 insertions(+), 74 deletions(-) diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts b/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts index 86af99e49..9a6cfaeae 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts +++ b/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<<2369d48ac2f92f14d77f24d397fe7c18>> + * @generated SignedSource<<97872b5e7ae5639cfd1270f64bba56ff>> * @lightSyntaxTransform * @nogrep */ @@ -11,9 +11,14 @@ import { ConcreteRequest } from 'relay-runtime'; export type ConsoleLayoutBreadcrumbControlOverviewQuery$variables = { controlId: string; + frameworkId: string; }; export type ConsoleLayoutBreadcrumbControlOverviewQuery$data = { - readonly vendor: { + readonly control: { + readonly id: string; + readonly name?: string; + }; + readonly framework: { readonly id: string; readonly name?: string; }; @@ -24,58 +29,98 @@ export type ConsoleLayoutBreadcrumbControlOverviewQuery = { }; const node: ConcreteRequest = (function(){ -var v0 = [ - { - "defaultValue": null, - "kind": "LocalArgument", - "name": "controlId" - } -], -v1 = [ +var v0 = { + "defaultValue": null, + "kind": "LocalArgument", + "name": "controlId" +}, +v1 = { + "defaultValue": null, + "kind": "LocalArgument", + "name": "frameworkId" +}, +v2 = [ { "kind": "Variable", "name": "id", - "variableName": "controlId" + "variableName": "frameworkId" } ], -v2 = { +v3 = { "alias": null, "args": null, "kind": "ScalarField", "name": "id", "storageKey": null }, -v3 = { +v4 = [ + { + "alias": null, + "args": null, + "kind": "ScalarField", + "name": "name", + "storageKey": null + } +], +v5 = { "kind": "InlineFragment", - "selections": [ - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "name", - "storageKey": null - } - ], + "selections": (v4/*: any*/), + "type": "Framework", + "abstractKey": null +}, +v6 = [ + { + "kind": "Variable", + "name": "id", + "variableName": "controlId" + } +], +v7 = { + "kind": "InlineFragment", + "selections": (v4/*: any*/), "type": "Control", "abstractKey": null +}, +v8 = { + "alias": null, + "args": null, + "kind": "ScalarField", + "name": "__typename", + "storageKey": null }; return { "fragment": { - "argumentDefinitions": (v0/*: any*/), + "argumentDefinitions": [ + (v0/*: any*/), + (v1/*: any*/) + ], "kind": "Fragment", "metadata": null, "name": "ConsoleLayoutBreadcrumbControlOverviewQuery", "selections": [ { - "alias": "vendor", - "args": (v1/*: any*/), + "alias": "framework", + "args": (v2/*: any*/), "concreteType": null, "kind": "LinkedField", "name": "node", "plural": false, "selections": [ - (v2/*: any*/), - (v3/*: any*/) + (v3/*: any*/), + (v5/*: any*/) + ], + "storageKey": null + }, + { + "alias": "control", + "args": (v6/*: any*/), + "concreteType": null, + "kind": "LinkedField", + "name": "node", + "plural": false, + "selections": [ + (v3/*: any*/), + (v7/*: any*/) ], "storageKey": null } @@ -85,43 +130,54 @@ return { }, "kind": "Request", "operation": { - "argumentDefinitions": (v0/*: any*/), + "argumentDefinitions": [ + (v1/*: any*/), + (v0/*: any*/) + ], "kind": "Operation", "name": "ConsoleLayoutBreadcrumbControlOverviewQuery", "selections": [ { - "alias": "vendor", - "args": (v1/*: any*/), + "alias": "framework", + "args": (v2/*: any*/), "concreteType": null, "kind": "LinkedField", "name": "node", "plural": false, "selections": [ - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "__typename", - "storageKey": null - }, - (v2/*: any*/), - (v3/*: any*/) + (v8/*: any*/), + (v3/*: any*/), + (v5/*: any*/) + ], + "storageKey": null + }, + { + "alias": "control", + "args": (v6/*: any*/), + "concreteType": null, + "kind": "LinkedField", + "name": "node", + "plural": false, + "selections": [ + (v8/*: any*/), + (v3/*: any*/), + (v7/*: any*/) ], "storageKey": null } ] }, "params": { - "cacheID": "00384256b541f268704b25cbb9c2cb0a", + "cacheID": "11b09324c7d417f8a7a655024c8f74a0", "id": null, "metadata": {}, "name": "ConsoleLayoutBreadcrumbControlOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbControlOverviewQuery(\n $controlId: ID!\n) {\n vendor: node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n }\n }\n}\n" + "text": "query ConsoleLayoutBreadcrumbControlOverviewQuery(\n $frameworkId: ID!\n $controlId: ID!\n) {\n framework: node(id: $frameworkId) {\n __typename\n id\n ... on Framework {\n name\n }\n }\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n }\n }\n}\n" } }; })(); -(node as any).hash = "cfa3ce6c9e7a6c25f7b147ba61a00b55"; +(node as any).hash = "0f7464f6a2432b3820b89e40b55c8545"; export default node; diff --git a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts b/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts index b892bcd00..d6dd941f0 100644 --- a/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts +++ b/apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbFrameworkOverviewQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<> + * @generated SignedSource<<1706f11580339ff248a8fa9b53862829>> * @lightSyntaxTransform * @nogrep */ @@ -10,12 +10,12 @@ import { ConcreteRequest } from 'relay-runtime'; export type ConsoleLayoutBreadcrumbFrameworkOverviewQuery$variables = { - peopleId: string; + frameworkId: string; }; export type ConsoleLayoutBreadcrumbFrameworkOverviewQuery$data = { - readonly people: { - readonly fullName?: string; + readonly framework: { readonly id: string; + readonly name?: string; }; }; export type ConsoleLayoutBreadcrumbFrameworkOverviewQuery = { @@ -28,14 +28,14 @@ var v0 = [ { "defaultValue": null, "kind": "LocalArgument", - "name": "peopleId" + "name": "frameworkId" } ], v1 = [ { "kind": "Variable", "name": "id", - "variableName": "peopleId" + "variableName": "frameworkId" } ], v2 = { @@ -52,11 +52,11 @@ v3 = { "alias": null, "args": null, "kind": "ScalarField", - "name": "fullName", + "name": "name", "storageKey": null } ], - "type": "People", + "type": "Framework", "abstractKey": null }; return { @@ -67,7 +67,7 @@ return { "name": "ConsoleLayoutBreadcrumbFrameworkOverviewQuery", "selections": [ { - "alias": "people", + "alias": "framework", "args": (v1/*: any*/), "concreteType": null, "kind": "LinkedField", @@ -90,7 +90,7 @@ return { "name": "ConsoleLayoutBreadcrumbFrameworkOverviewQuery", "selections": [ { - "alias": "people", + "alias": "framework", "args": (v1/*: any*/), "concreteType": null, "kind": "LinkedField", @@ -112,16 +112,16 @@ return { ] }, "params": { - "cacheID": "38bda48229b0d45b23dff36b33fa3adb", + "cacheID": "287decd67859fe4c2248b6d6b0a3d56d", "id": null, "metadata": {}, "name": "ConsoleLayoutBreadcrumbFrameworkOverviewQuery", "operationKind": "query", - "text": "query ConsoleLayoutBreadcrumbFrameworkOverviewQuery(\n $peopleId: ID!\n) {\n people: node(id: $peopleId) {\n __typename\n id\n ... on People {\n fullName\n }\n }\n}\n" + "text": "query ConsoleLayoutBreadcrumbFrameworkOverviewQuery(\n $frameworkId: ID!\n) {\n framework: node(id: $frameworkId) {\n __typename\n id\n ... on Framework {\n name\n }\n }\n}\n" } }; })(); -(node as any).hash = "1f4b25d943e1d8a79c3e77936833e998"; +(node as any).hash = "a4c4f857eb13cf154a01f70874f0fd58"; export default node; diff --git a/apps/console/src/pages/ControlOverviewPage.tsx b/apps/console/src/pages/ControlOverviewPage.tsx index d02dca162..fac94e2fd 100644 --- a/apps/console/src/pages/ControlOverviewPage.tsx +++ b/apps/console/src/pages/ControlOverviewPage.tsx @@ -13,14 +13,7 @@ import { Helmet } from "react-helmet-async"; import type { ControlOverviewPageQuery as ControlOverviewPageQueryType } from "./__generated__/ControlOverviewPageQuery.graphql"; const controlOverviewPageQuery = graphql` - query ControlOverviewPageQuery($frameworkId: ID!, $controlId: ID!) { - framework: node(id: $frameworkId) { - id - ... on Framework { - name - } - } - + query ControlOverviewPageQuery($controlId: ID!) { control: node(id: $controlId) { id ... on Control { @@ -53,7 +46,6 @@ function ControlOverviewPageContent({ queryRef, ); const control = data.control; - const framework = data.framework; const tasks = control?.tasks?.edges.map((edge) => edge?.node) ?? []; return ( @@ -171,14 +163,14 @@ function ControlOverviewPageFallback() { } export default function ControlOverviewPage() { - const { frameworkId, controlId } = useParams(); + const { controlId } = useParams(); const [queryRef, loadQuery] = useQueryLoader( controlOverviewPageQuery, ); useEffect(() => { - loadQuery({ frameworkId: frameworkId!, controlId: controlId! }); - }, [loadQuery, frameworkId, controlId]); + loadQuery({ controlId: controlId! }); + }, [loadQuery, controlId]); return ( <> diff --git a/apps/console/src/pages/__generated__/ControlOverviewPageQuery.graphql.ts b/apps/console/src/pages/__generated__/ControlOverviewPageQuery.graphql.ts index 5ad303dc7..1c5f463b8 100644 --- a/apps/console/src/pages/__generated__/ControlOverviewPageQuery.graphql.ts +++ b/apps/console/src/pages/__generated__/ControlOverviewPageQuery.graphql.ts @@ -1,5 +1,5 @@ /** - * @generated SignedSource<> + * @generated SignedSource<<3e556c8d6b7896963c5433de8acca792>> * @lightSyntaxTransform * @nogrep */ @@ -15,7 +15,7 @@ export type ControlOverviewPageQuery$variables = { controlId: string; }; export type ControlOverviewPageQuery$data = { - readonly node: { + readonly control: { readonly category?: string; readonly description?: string; readonly id: string; @@ -143,7 +143,7 @@ return { "name": "ControlOverviewPageQuery", "selections": [ { - "alias": null, + "alias": "control", "args": (v1/*: any*/), "concreteType": null, "kind": "LinkedField", @@ -166,7 +166,7 @@ return { "name": "ControlOverviewPageQuery", "selections": [ { - "alias": null, + "alias": "control", "args": (v1/*: any*/), "concreteType": null, "kind": "LinkedField", @@ -188,16 +188,16 @@ return { ] }, "params": { - "cacheID": "adb3dd88c138a9168b25c35df888af86", + "cacheID": "130c195db0e9055a63b88ea5eee8b3aa", "id": null, "metadata": {}, "name": "ControlOverviewPageQuery", "operationKind": "query", - "text": "query ControlOverviewPageQuery(\n $controlId: ID!\n) {\n node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n description\n state\n category\n tasks {\n edges {\n node {\n id\n name\n description\n state\n }\n }\n }\n }\n }\n}\n" + "text": "query ControlOverviewPageQuery(\n $controlId: ID!\n) {\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n description\n state\n category\n tasks {\n edges {\n node {\n id\n name\n description\n state\n }\n }\n }\n }\n }\n}\n" } }; })(); -(node as any).hash = "3db82e512ed61585e9825785e1685240"; +(node as any).hash = "1feb1b6d25907ac45205183c39092d35"; export default node;