diff --git a/flux-plugin/src/flux-applications/application.tsx b/flux-plugin/src/flux-applications/application.tsx index fee825d..8338dd4 100644 --- a/flux-plugin/src/flux-applications/application.tsx +++ b/flux-plugin/src/flux-applications/application.tsx @@ -188,7 +188,7 @@ export default function FluxApplicationDetailView(props) { // }); return ( <> - {resource && } + {resource && } { @@ -284,45 +284,6 @@ function CustomResourceDetails(props) { return extraInfo; } - const inventories = cr?.jsonData?.status?.inventory?.entries; - - function findDeployment() { - const deployment = inventories?.find(inventory => - inventory.id.toLowerCase().includes('deployment') - ); - const parsedDeployment = deployment?.id.split('_'); - const namespace = parsedDeployment?.[0]; - const name = parsedDeployment?.[1]; - return name; - } - findDeployment(); - const mapsource = React.useMemo(() => { - const temp: GraphSource = { - id: 'applications', - label: 'Applications', - nodes: () => - cr - ? [ - { - id: cr?.jsonData.metadata.uid, - type: 'kubeObject', - data: { - resource: cr, - }, - }, - ] - : [], - edges: ({ resources }) => { - const deployment = resources.deployments.find(it => it.metadata.name === findDeployment()); - - return deployment - ? [{ id: 'myid', source: cr.metadata.uid, target: deployment.metadata.uid }] - : []; - }, - }; - return temp; - }, [cr]); - function prepareActions() { const actions = []; actions.push(); @@ -331,6 +292,7 @@ function CustomResourceDetails(props) { actions.push(); return actions; } + console.log("namespace is ",namespace); return ( <> { cr && } @@ -363,16 +325,24 @@ function CustomResourceDetails(props) { columns={[ { header: 'Name', - accessorFn: item => item.name, - }, - { - header: 'Kind', - accessorFn: item => item.kind, - }, + accessorFn: item => { + console.log("name is ", item.name, item.namespace, type) + return { item.name } + }}, { + header: 'Namespace', + accessorFn: item => { item.namespace || namespace } + } + ]} /> - + {/* - + */}