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

Fix control overview breadcrumb show framework name twice

Browse Source 
Signed-off-by: gearnode <bryan@frimin.fr>
This commit is contained in:
gearnode
2025-02-28 20:11:41 +01:00
parent 8d8149e692
commit f2e3a2fba6
2 changed files with 42 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/console/src/layouts/ConsoleLayout.tsx
View File

@@ -293,16 +293,7 @@ function BreadcrumbControlOverview() {
const { organizationId, frameworkId, controlId } = useParams(); const { organizationId, frameworkId, controlId } = useParams();
const data = useLazyLoadQuery<ConsoleLayoutBreadcrumbControlOverviewQuery>( const data = useLazyLoadQuery<ConsoleLayoutBreadcrumbControlOverviewQuery>(
graphql` graphql`
query ConsoleLayoutBreadcrumbControlOverviewQuery( query ConsoleLayoutBreadcrumbControlOverviewQuery($controlId: ID!) {
$frameworkId: ID!
$controlId: ID!
) {
framework: node(id: $frameworkId) {
id
... on Framework {
name
}
}
control: node(id: $controlId) { control: node(id: $controlId) {
id id
... on Control { ... on Control {
@@ -311,21 +302,11 @@ function BreadcrumbControlOverview() {
} }
} }
`, `,
{ frameworkId: frameworkId!, controlId: controlId! } { controlId: controlId! }
); );
return ( return (
<> <>
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbLink asChild>
<Link
to={`/organizations/${organizationId}/frameworks/${frameworkId}`}
>
{data.framework?.name}
</Link>
</BreadcrumbLink>
</BreadcrumbItem>
<BreadcrumbSeparator /> <BreadcrumbSeparator />
<BreadcrumbItem> <BreadcrumbItem>
<BreadcrumbLink asChild> <BreadcrumbLink asChild>

114
apps/console/src/layouts/__generated__/ConsoleLayoutBreadcrumbControlOverviewQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<97872b5e7ae5639cfd1270f64bba56ff>> * @generated SignedSource<<00ec8864c54512b021bdfa0f7b53cd43>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -11,17 +11,12 @@
import { ConcreteRequest } from 'relay-runtime'; import { ConcreteRequest } from 'relay-runtime';
export type ConsoleLayoutBreadcrumbControlOverviewQuery$variables = { export type ConsoleLayoutBreadcrumbControlOverviewQuery$variables = {
controlId: string; controlId: string;
frameworkId: string;
}; };
export type ConsoleLayoutBreadcrumbControlOverviewQuery$data = { export type ConsoleLayoutBreadcrumbControlOverviewQuery$data = {
readonly control: { readonly control: {
readonly id: string; readonly id: string;
readonly name?: string; readonly name?: string;
}; };
readonly framework: {
readonly id: string;
readonly name?: string;
};
}; };
export type ConsoleLayoutBreadcrumbControlOverviewQuery = { export type ConsoleLayoutBreadcrumbControlOverviewQuery = {
response: ConsoleLayoutBreadcrumbControlOverviewQuery$data; response: ConsoleLayoutBreadcrumbControlOverviewQuery$data;
@@ -29,31 +24,30 @@ export type ConsoleLayoutBreadcrumbControlOverviewQuery = {
}; };
const node: ConcreteRequest = (function(){ const node: ConcreteRequest = (function(){
var v0 = { var v0 = [
{
"defaultValue": null, "defaultValue": null,
"kind": "LocalArgument", "kind": "LocalArgument",
"name": "controlId" "name": "controlId"
}, }
v1 = { ],
"defaultValue": null, v1 = [
"kind": "LocalArgument",
"name": "frameworkId"
},
v2 = [
{ {
"kind": "Variable", "kind": "Variable",
"name": "id", "name": "id",
"variableName": "frameworkId" "variableName": "controlId"
} }
], ],
v3 = { v2 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "id", "name": "id",
"storageKey": null "storageKey": null
}, },
v4 = [ v3 = {
"kind": "InlineFragment",
"selections": [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -61,66 +55,27 @@ v4 = [
"name": "name", "name": "name",
"storageKey": null "storageKey": null
} }
], ],
v5 = {
"kind": "InlineFragment",
"selections": (v4/*: any*/),
"type": "Framework",
"abstractKey": null
},
v6 = [
{
"kind": "Variable",
"name": "id",
"variableName": "controlId"
}
],
v7 = {
"kind": "InlineFragment",
"selections": (v4/*: any*/),
"type": "Control", "type": "Control",
"abstractKey": null "abstractKey": null
},
v8 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__typename",
"storageKey": null
}; };
return { return {
"fragment": { "fragment": {
"argumentDefinitions": [ "argumentDefinitions": (v0/*: any*/),
(v0/*: any*/),
(v1/*: any*/)
],
"kind": "Fragment", "kind": "Fragment",
"metadata": null, "metadata": null,
"name": "ConsoleLayoutBreadcrumbControlOverviewQuery", "name": "ConsoleLayoutBreadcrumbControlOverviewQuery",
"selections": [ "selections": [
{
"alias": "framework",
"args": (v2/*: any*/),
"concreteType": null,
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v3/*: any*/),
(v5/*: any*/)
],
"storageKey": null
},
{ {
"alias": "control", "alias": "control",
"args": (v6/*: any*/), "args": (v1/*: any*/),
"concreteType": null, "concreteType": null,
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
"selections": [ "selections": [
(v3/*: any*/), (v2/*: any*/),
(v7/*: any*/) (v3/*: any*/)
], ],
"storageKey": null "storageKey": null
} }
@@ -130,54 +85,43 @@ return {
}, },
"kind": "Request", "kind": "Request",
"operation": { "operation": {
"argumentDefinitions": [ "argumentDefinitions": (v0/*: any*/),
(v1/*: any*/),
(v0/*: any*/)
],
"kind": "Operation", "kind": "Operation",
"name": "ConsoleLayoutBreadcrumbControlOverviewQuery", "name": "ConsoleLayoutBreadcrumbControlOverviewQuery",
"selections": [ "selections": [
{ {
"alias": "framework", "alias": "control",
"args": (v2/*: any*/), "args": (v1/*: any*/),
"concreteType": null, "concreteType": null,
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
"selections": [ "selections": [
(v8/*: any*/), {
(v3/*: any*/), "alias": null,
(v5/*: any*/) "args": null,
], "kind": "ScalarField",
"name": "__typename",
"storageKey": null "storageKey": null
}, },
{ (v2/*: any*/),
"alias": "control", (v3/*: any*/)
"args": (v6/*: any*/),
"concreteType": null,
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v8/*: any*/),
(v3/*: any*/),
(v7/*: any*/)
], ],
"storageKey": null "storageKey": null
} }
] ]
}, },
"params": { "params": {
"cacheID": "11b09324c7d417f8a7a655024c8f74a0", "cacheID": "7ff42b211b319b1a413258ef2242b6e3",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "ConsoleLayoutBreadcrumbControlOverviewQuery", "name": "ConsoleLayoutBreadcrumbControlOverviewQuery",
"operationKind": "query", "operationKind": "query",
"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" "text": "query ConsoleLayoutBreadcrumbControlOverviewQuery(\n $controlId: ID!\n) {\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n name\n }\n }\n}\n"
} }
}; };
})(); })();
(node as any).hash = "0f7464f6a2432b3820b89e40b55c8545"; (node as any).hash = "089c9c977bce592f440e3503f62aee3a";
export default node; export default node;