From aed4ea056a049edfe42cbe9428364a51306a96c7 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Wed, 5 Jul 2023 17:06:50 +0200
Subject: [PATCH 01/14] Implement a deployments card - WIP

---
 plugins/backstage-plugin-flux/dev/index.tsx   |  40 ++
 .../FluxDeploymentsTable.tsx                  |  71 ++++
 .../FluxEntityDeploymentsCard.test.tsx        | 344 ++++++++++++++++++
 .../FluxEntityDeploymentsCard.tsx             |  42 +++
 .../FluxEntityDeploymentsCard/index.ts        |   1 +
 .../backstage-plugin-flux/src/hooks/query.ts  |  27 ++
 plugins/backstage-plugin-flux/src/index.ts    |   1 +
 plugins/backstage-plugin-flux/src/plugin.ts   |  16 +
 8 files changed, 542 insertions(+)
 create mode 100644 plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
 create mode 100644 plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
 create mode 100644 plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx
 create mode 100644 plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/index.ts

diff --git a/plugins/backstage-plugin-flux/dev/index.tsx b/plugins/backstage-plugin-flux/dev/index.tsx
index bbff895..24fc508 100644
--- a/plugins/backstage-plugin-flux/dev/index.tsx
+++ b/plugins/backstage-plugin-flux/dev/index.tsx
@@ -25,6 +25,7 @@ import {
   FluxEntityOCIRepositoriesCard,
   FluxEntityHelmRepositoriesCard,
   FluxEntityKustomizationsCard,
+  FluxEntityDeploymentsCard,
 } from '../src/plugin';
 import {
   newTestHelmRelease,
@@ -397,5 +398,44 @@ createDevApp()
       </TestApiProvider>
     ),
   })
+  .addPage({
+    title: 'Deployments',
+    path: '/deployments',
+    element: (
+      <TestApiProvider
+        apis={[
+          [
+            configApiRef,
+            new ConfigReader({
+              gitops: { baseUrl: 'https://example.com/wego' },
+            }),
+          ],
+          [
+            kubernetesApiRef,
+            new StubKubernetesClient([
+              newTestKustomization(
+                'flux-system',
+                './clusters/my-cluster',
+                true,
+              ),
+              newTestHelmRelease(
+                'prometheus1',
+                'kube-prometheus-stack',
+                '6.3.5',
+              ),
+            ]),
+          ],
+
+          [kubernetesAuthProvidersApiRef, new StubKubernetesAuthProvidersApi()],
+        ]}
+      >
+        <EntityProvider entity={fakeEntity}>
+          <Content>
+            <FluxEntityDeploymentsCard />
+          </Content>
+        </EntityProvider>
+      </TestApiProvider>
+    ),
+  })
   .registerPlugin(weaveworksFluxPlugin)
   .render();
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
new file mode 100644
index 0000000..8ccd719
--- /dev/null
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import { TableColumn } from '@backstage/core-components';
+import {
+  idColumn,
+  nameAndClusterNameColumn,
+  pathColumn,
+  repoColumn,
+  statusColumn,
+  updatedColumn,
+  syncColumn,
+} from '../helpers';
+import { HelmRelease, Kustomization } from '../../objects';
+import { FluxEntityTable } from '../FluxEntityTable';
+import { T } from '../../hooks/query';
+
+export const defaultColumns: TableColumn<Kustomization>[] = [
+  idColumn(),
+  nameAndClusterNameColumn(),
+  pathColumn(),
+  repoColumn(),
+  statusColumn(),
+  updatedColumn(),
+  syncColumn(),
+];
+
+type Props = {
+  deployments: T[];
+  isLoading: boolean;
+  columns: TableColumn<Kustomization>[];
+};
+
+export const FluxDeploymentsTable = ({
+  deployments,
+  isLoading,
+  columns,
+}: Props) => {
+  console.log(deployments);
+  // const data = kustomizations.map(k => {
+  //   const {
+  //     clusterName,
+  //     namespace,
+  //     name,
+  //     sourceRef,
+  //     path,
+  //     conditions,
+  //     suspended,
+  //     type,
+  //   } = k;
+  //   return {
+  //     id: `${clusterName}/${namespace}/${name}`,
+  //     conditions,
+  //     suspended,
+  //     name,
+  //     namespace,
+  //     clusterName,
+  //     sourceRef,
+  //     path,
+  //     type,
+  //   } as Kustomization & { id: string };
+  // });
+
+  return (
+    <FluxEntityTable
+      columns={columns}
+      title="Deployments"
+      // data={data}
+      data={[]}
+      isLoading={isLoading}
+    />
+  );
+};
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
new file mode 100644
index 0000000..1c04700
--- /dev/null
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -0,0 +1,344 @@
+import React from 'react';
+import { Entity } from '@backstage/catalog-model';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { configApiRef } from '@backstage/core-plugin-api';
+import { ConfigReader } from '@backstage/core-app-api';
+import {
+  KubernetesApi,
+  kubernetesApiRef,
+  KubernetesAuthProvidersApi,
+  kubernetesAuthProvidersApiRef,
+} from '@backstage/plugin-kubernetes';
+import {
+  CustomObjectsByEntityRequest,
+  KubernetesRequestBody,
+  ObjectsByEntityResponse,
+} from '@backstage/plugin-kubernetes-common';
+import { FluxEntityDeploymentsCard } from './FluxEntityDeploymentsCard';
+
+const makeTestKustomization = (name: string, path: string) => {
+  return {
+    apiVersion: 'kustomize.toolkit.fluxcd.io/v1',
+    kind: 'Kustomization',
+    metadata: {
+      annotations: {
+        'reconcile.fluxcd.io/requestedAt': '2023-07-03T17:18:03.990333+01:00',
+      },
+      creationTimestamp: '2023-06-29T08:06:59Z',
+      finalizers: ['finalizers.fluxcd.io'],
+      generation: 1,
+      labels: {
+        'kustomize.toolkit.fluxcd.io/name': 'flux-system',
+        'kustomize.toolkit.fluxcd.io/namespace': 'flux-system',
+      },
+      name,
+      namespace: 'flux-system',
+      resourceVersion: '1181625',
+      uid: 'ab33ae5b-a282-40b1-9fdc-d87f05401628',
+    },
+    spec: {
+      force: false,
+      interval: '10m0s',
+      path,
+      prune: true,
+      sourceRef: {
+        kind: 'GitRepository',
+        name: 'flux-system',
+      },
+    },
+    status: {
+      conditions: [
+        {
+          lastTransitionTime: '2023-07-03T16:18:04Z',
+          message:
+            'Applied revision: main@sha1:c933408394a3af8fa7208af8c9abf7fe430f99d4',
+          observedGeneration: 1,
+          reason: 'ReconciliationSucceeded',
+          status: 'True',
+          type: 'Ready',
+        },
+      ],
+      inventory: {
+        entries: [
+          {
+            id: '_alerts.notification.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_buckets.source.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_gitrepositories.source.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_helmcharts.source.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_helmreleases.helm.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_helmrepositories.source.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_kustomizations.kustomize.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_ocirepositories.source.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_providers.notification.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_receivers.notification.toolkit.fluxcd.io_apiextensions.k8s.io_CustomResourceDefinition',
+            v: 'v1',
+          },
+          {
+            id: '_flux-system__Namespace',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_critical-pods-flux-system__ResourceQuota',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_helm-controller__ServiceAccount',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_kustomize-controller__ServiceAccount',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_notification-controller__ServiceAccount',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_source-controller__ServiceAccount',
+            v: 'v1',
+          },
+          {
+            id: '_crd-controller-flux-system_rbac.authorization.k8s.io_ClusterRole',
+            v: 'v1',
+          },
+          {
+            id: '_flux-edit-flux-system_rbac.authorization.k8s.io_ClusterRole',
+            v: 'v1',
+          },
+          {
+            id: '_flux-view-flux-system_rbac.authorization.k8s.io_ClusterRole',
+            v: 'v1',
+          },
+          {
+            id: '_cluster-reconciler-flux-system_rbac.authorization.k8s.io_ClusterRoleBinding',
+            v: 'v1',
+          },
+          {
+            id: '_crd-controller-flux-system_rbac.authorization.k8s.io_ClusterRoleBinding',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_notification-controller__Service',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_source-controller__Service',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_webhook-receiver__Service',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_helm-controller_apps_Deployment',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_kustomize-controller_apps_Deployment',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_notification-controller_apps_Deployment',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_source-controller_apps_Deployment',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_flux-system_kustomize.toolkit.fluxcd.io_Kustomization',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_allow-egress_networking.k8s.io_NetworkPolicy',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_allow-scraping_networking.k8s.io_NetworkPolicy',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_allow-webhooks_networking.k8s.io_NetworkPolicy',
+            v: 'v1',
+          },
+          {
+            id: 'default_podinfo_source.toolkit.fluxcd.io_GitRepository',
+            v: 'v1',
+          },
+          {
+            id: 'default_podinfo-shard1_source.toolkit.fluxcd.io_GitRepository',
+            v: 'v1',
+          },
+          {
+            id: 'default_podinfo-shard2_source.toolkit.fluxcd.io_GitRepository',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_flux-system_source.toolkit.fluxcd.io_GitRepository',
+            v: 'v1',
+          },
+          {
+            id: 'flux-system_source-controller-shardset_templates.weave.works_FluxShardSet',
+            v: 'v1alpha1',
+          },
+        ],
+      },
+      lastAppliedRevision: 'main@sha1:c933408394a3af8fa7208af8c9abf7fe430f99d4',
+      lastAttemptedRevision:
+        'main@sha1:c933408394a3af8fa7208af8c9abf7fe430f99d4',
+      lastHandledReconcileAt: '2023-07-03T17:18:03.990333+01:00',
+      observedGeneration: 1,
+    },
+  };
+};
+
+class StubKubernetesClient implements KubernetesApi {
+  getObjectsByEntity = jest.fn();
+
+  async getClusters(): Promise<{ name: string; authProvider: string }[]> {
+    return [{ name: 'mock-cluster', authProvider: 'serviceAccount' }];
+  }
+
+  getWorkloadsByEntity = jest.fn();
+
+  getCustomObjectsByEntity(
+    _: CustomObjectsByEntityRequest,
+  ): Promise<ObjectsByEntityResponse> {
+    return Promise.resolve({
+      items: [
+        {
+          cluster: {
+            name: 'demo-cluster',
+          },
+          podMetrics: [],
+          errors: [],
+          resources: [
+            {
+              type: 'customresources',
+              resources: [
+                makeTestKustomization('flux-system', './clusters/my-cluster'),
+              ],
+            },
+          ],
+        },
+      ],
+    });
+  }
+
+  proxy = jest.fn();
+}
+
+class StubKubernetesAuthProvidersApi implements KubernetesAuthProvidersApi {
+  decorateRequestBodyForAuth(
+    _: string,
+    requestBody: KubernetesRequestBody,
+  ): Promise<KubernetesRequestBody> {
+    return Promise.resolve(requestBody);
+  }
+  getCredentials(_: string): Promise<{
+    token?: string;
+  }> {
+    return Promise.resolve({ token: 'mock-token' });
+  }
+}
+
+const entity: Entity = {
+  apiVersion: 'v1',
+  kind: 'Component',
+  metadata: {
+    name: 'my-name',
+    annotations: {
+      'backstage.io/kubernetes-id': 'testing-service',
+    },
+  },
+};
+
+describe('<FluxEntityDeploymentsCard />', () => {
+  let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
+
+  beforeEach(() => {
+    Wrapper = ({ children }: { children?: React.ReactNode }) => (
+      <div>{children}</div>
+    );
+  });
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('listing Kustomizations', () => {
+    it('shows the details of an Kustomization', async () => {
+      const result = await renderInTestApp(
+        <Wrapper>
+          <TestApiProvider
+            apis={[
+              [
+                configApiRef,
+                new ConfigReader({
+                  gitops: { baseUrl: 'https://example.com/wego' },
+                }),
+              ],
+              [kubernetesApiRef, new StubKubernetesClient()],
+              [
+                kubernetesAuthProvidersApiRef,
+                new StubKubernetesAuthProvidersApi(),
+              ],
+            ]}
+          >
+            <EntityProvider entity={entity}>
+              <FluxEntityDeploymentsCard />
+            </EntityProvider>
+          </TestApiProvider>
+        </Wrapper>,
+      );
+
+      const { getByText } = result;
+
+      const testCases = [
+        {
+          name: 'flux-system',
+          path: './clusters/my-cluster',
+          repo: 'flux-system',
+        },
+      ];
+
+      for (const testCase of testCases) {
+        const cell = getByText(testCase.name);
+        expect(cell).toBeInTheDocument();
+
+        const tr = cell.closest('tr');
+        expect(tr).toBeInTheDocument();
+        expect(tr).toHaveTextContent(testCase.path);
+        expect(tr).toHaveTextContent(testCase.repo);
+      }
+    });
+  });
+});
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx
new file mode 100644
index 0000000..0dbab39
--- /dev/null
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { WeaveGitOpsContext } from '../WeaveGitOpsContext';
+import { useFluxDeployments } from '../../hooks';
+import { FluxDeploymentsTable, defaultColumns } from './FluxDeploymentsTable';
+
+const DeploymentsPanel = () => {
+  const { entity } = useEntity();
+  const { data, loading, errors } = useFluxDeployments(entity);
+
+  if (errors) {
+    return (
+      <div>
+        Errors:
+        <ul>
+          {errors.map(err => (
+            <li>{err.message}</li>
+          ))}
+        </ul>
+      </div>
+    );
+  }
+
+  return (
+    <FluxDeploymentsTable
+      deployments={data || []}
+      isLoading={loading && !data}
+      columns={defaultColumns}
+    />
+  );
+};
+
+/**
+ * Render the Kustomizations associated with the current Entity.
+ *
+ * @public
+ */
+export const FluxEntityDeploymentsCard = () => (
+  <WeaveGitOpsContext>
+    <DeploymentsPanel />
+  </WeaveGitOpsContext>
+);
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/index.ts b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/index.ts
new file mode 100644
index 0000000..4b9b497
--- /dev/null
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/index.ts
@@ -0,0 +1 @@
+export { FluxEntityDeploymentsCard } from './FluxEntityDeploymentsCard';
diff --git a/plugins/backstage-plugin-flux/src/hooks/query.ts b/plugins/backstage-plugin-flux/src/hooks/query.ts
index 209129d..1757cb3 100644
--- a/plugins/backstage-plugin-flux/src/hooks/query.ts
+++ b/plugins/backstage-plugin-flux/src/hooks/query.ts
@@ -205,3 +205,30 @@ export function useHelmRepositories(entity: Entity): Response<HelmRepository> {
       : kubernetesErrors,
   };
 }
+
+/**
+ * Query for the Flux Deployments - Kustomizations and Helm Releases - associated with this Entity.
+ * @public
+ */
+
+export interface T extends FluxObject {}
+
+export function useFluxDeployments(entity: Entity): Response<T> {
+  const { kubernetesObjects, loading, error } = useCustomResources(entity, [
+    helmReleaseGVK,
+    kustomizationsGVK,
+  ]);
+
+  const { data, kubernetesErrors } = toResponse<T>(
+    item => new FluxObject(item),
+    kubernetesObjects,
+  );
+
+  return {
+    data,
+    loading,
+    errors: error
+      ? [new Error(error), ...(kubernetesErrors || [])]
+      : kubernetesErrors,
+  };
+}
diff --git a/plugins/backstage-plugin-flux/src/index.ts b/plugins/backstage-plugin-flux/src/index.ts
index 417a4a0..61fe493 100644
--- a/plugins/backstage-plugin-flux/src/index.ts
+++ b/plugins/backstage-plugin-flux/src/index.ts
@@ -5,4 +5,5 @@ export {
   FluxEntityOCIRepositoriesCard,
   FluxEntityKustomizationsCard,
   FluxEntityHelmRepositoriesCard,
+  FluxEntityDeploymentsCard,
 } from './plugin';
diff --git a/plugins/backstage-plugin-flux/src/plugin.ts b/plugins/backstage-plugin-flux/src/plugin.ts
index 083f87a..1136bd6 100644
--- a/plugins/backstage-plugin-flux/src/plugin.ts
+++ b/plugins/backstage-plugin-flux/src/plugin.ts
@@ -95,3 +95,19 @@ export const FluxEntityKustomizationsCard = weaveworksFluxPlugin.provide(
     },
   }),
 );
+
+/**
+ * Card used to show the state of Flux Kustomizations for an Entity.
+ * @public
+ */
+export const FluxEntityDeploymentsCard = weaveworksFluxPlugin.provide(
+  createComponentExtension({
+    name: 'FluxEntityDeploymentsCard',
+    component: {
+      lazy: () =>
+        import('./components/FluxEntityDeploymentsCard').then(
+          m => m.FluxEntityDeploymentsCard,
+        ),
+    },
+  }),
+);

From 0ce0f2c9abf9877401d4ff9d4f5abe6978f3cb47 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Wed, 5 Jul 2023 17:54:28 +0200
Subject: [PATCH 02/14] Implement a deployments card - WIP2

---
 .../FluxDeploymentsTable.tsx                  | 89 ++++++++++++-------
 .../backstage-plugin-flux/src/hooks/query.ts  | 12 +--
 2 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index 8ccd719..a611244 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -3,30 +3,26 @@ import { TableColumn } from '@backstage/core-components';
 import {
   idColumn,
   nameAndClusterNameColumn,
-  pathColumn,
-  repoColumn,
   statusColumn,
   updatedColumn,
   syncColumn,
+  Deployment,
 } from '../helpers';
 import { HelmRelease, Kustomization } from '../../objects';
 import { FluxEntityTable } from '../FluxEntityTable';
-import { T } from '../../hooks/query';
 
-export const defaultColumns: TableColumn<Kustomization>[] = [
+export const defaultColumns: TableColumn<Deployment>[] = [
   idColumn(),
   nameAndClusterNameColumn(),
-  pathColumn(),
-  repoColumn(),
   statusColumn(),
   updatedColumn(),
   syncColumn(),
 ];
 
 type Props = {
-  deployments: T[];
+  deployments: Deployment[];
   isLoading: boolean;
-  columns: TableColumn<Kustomization>[];
+  columns: TableColumn<Deployment>[];
 };
 
 export const FluxDeploymentsTable = ({
@@ -35,36 +31,63 @@ export const FluxDeploymentsTable = ({
   columns,
 }: Props) => {
   console.log(deployments);
-  // const data = kustomizations.map(k => {
-  //   const {
-  //     clusterName,
-  //     namespace,
-  //     name,
-  //     sourceRef,
-  //     path,
-  //     conditions,
-  //     suspended,
-  //     type,
-  //   } = k;
-  //   return {
-  //     id: `${clusterName}/${namespace}/${name}`,
-  //     conditions,
-  //     suspended,
-  //     name,
-  //     namespace,
-  //     clusterName,
-  //     sourceRef,
-  //     path,
-  //     type,
-  //   } as Kustomization & { id: string };
-  // });
+
+  const data = deployments.map(d => {
+    // TODO: Simplify the the below, extract common fields and add custom
+    if (d instanceof Kustomization) {
+      const {
+        clusterName,
+        namespace,
+        name,
+        sourceRef,
+        path,
+        conditions,
+        suspended,
+        type,
+      } = d;
+      return {
+        id: `${clusterName}/${namespace}/${name}`,
+        conditions,
+        suspended,
+        name,
+        namespace,
+        clusterName,
+        sourceRef,
+        path,
+        type,
+      } as Kustomization & { id: string };
+    } else if (d instanceof HelmRelease) {
+      const {
+        clusterName,
+        namespace,
+        name,
+        helmChart,
+        conditions,
+        suspended,
+        sourceRef,
+        type,
+        lastAppliedRevision,
+      } = d;
+      return {
+        id: `${clusterName}/${namespace}/${name}`,
+        conditions,
+        suspended,
+        name,
+        namespace,
+        helmChart,
+        lastAppliedRevision,
+        clusterName,
+        sourceRef,
+        type,
+      } as HelmRelease & { id: string };
+    }
+  });
 
   return (
     <FluxEntityTable
       columns={columns}
       title="Deployments"
-      // data={data}
-      data={[]}
+      data={data}
       isLoading={isLoading}
     />
   );
diff --git a/plugins/backstage-plugin-flux/src/hooks/query.ts b/plugins/backstage-plugin-flux/src/hooks/query.ts
index 1757cb3..d3e70e2 100644
--- a/plugins/backstage-plugin-flux/src/hooks/query.ts
+++ b/plugins/backstage-plugin-flux/src/hooks/query.ts
@@ -18,6 +18,7 @@ import {
   helmRepositoryGVK,
   HelmRepository,
 } from '../objects';
+import { Deployment } from '../components/helpers';
 
 function toErrors(
   cluster: ClusterAttributes,
@@ -211,16 +212,17 @@ export function useHelmRepositories(entity: Entity): Response<HelmRepository> {
  * @public
  */
 
-export interface T extends FluxObject {}
-
-export function useFluxDeployments(entity: Entity): Response<T> {
+export function useFluxDeployments(entity: Entity): Response<Deployment> {
   const { kubernetesObjects, loading, error } = useCustomResources(entity, [
     helmReleaseGVK,
     kustomizationsGVK,
   ]);
 
-  const { data, kubernetesErrors } = toResponse<T>(
-    item => new FluxObject(item),
+  const { data, kubernetesErrors } = toResponse<Deployment>(
+    item =>
+      item instanceof Kustomization
+        ? new Kustomization(item)
+        : new HelmRelease(item),
     kubernetesObjects,
   );
 

From 47da1e4eb336a4efde9992bcb8b16083c3ecd40c Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Thu, 6 Jul 2023 17:25:27 +0200
Subject: [PATCH 03/14] Adjust hooks, helpers and table to work wiht both
 Deployments types

---
 plugins/backstage-plugin-flux/package.json    |  3 +-
 .../FluxDeploymentsTable.tsx                  | 59 ++++++++++---------
 .../FluxEntityDeploymentsCard.test.tsx        |  1 +
 .../FluxHelmReleasesTable.tsx                 | 12 +---
 .../src/components/helpers.tsx                | 36 ++++++++++-
 .../backstage-plugin-flux/src/hooks/query.ts  | 19 +++---
 plugins/backstage-plugin-flux/src/objects.ts  |  4 +-
 7 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/plugins/backstage-plugin-flux/package.json b/plugins/backstage-plugin-flux/package.json
index 222d0b1..64400a0 100644
--- a/plugins/backstage-plugin-flux/package.json
+++ b/plugins/backstage-plugin-flux/package.json
@@ -38,8 +38,7 @@
     "react-query": "^3.39.3",
     "react-use": "^17.2.4",
     "styled-components": "^5.3.0",
-    "use-deep-compare": "^1.1.0",
-    "yaml": "^2.3.1"
+    "use-deep-compare": "^1.1.0"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0"
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index a611244..b5f9ac0 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -7,13 +7,21 @@ import {
   updatedColumn,
   syncColumn,
   Deployment,
+  typeColumn,
+  pathColumn,
+  chartColumn,
+  repoColumn,
 } from '../helpers';
-import { HelmRelease, Kustomization } from '../../objects';
+import { HelmChart, HelmRelease, Kustomization } from '../../objects';
 import { FluxEntityTable } from '../FluxEntityTable';
 
 export const defaultColumns: TableColumn<Deployment>[] = [
   idColumn(),
   nameAndClusterNameColumn(),
+  typeColumn(),
+  pathColumn(),
+  repoColumn(),
+  chartColumn(),
   statusColumn(),
   updatedColumn(),
   syncColumn(),
@@ -30,55 +38,48 @@ export const FluxDeploymentsTable = ({
   isLoading,
   columns,
 }: Props) => {
-  console.log(deployments);
+  let helmChart = {} as HelmChart;
+  let path = '';
+  let repo = '';
 
   const data = deployments.map(d => {
-    // TODO: Simplify the the below, extract common fields and add custom
+    const {
+      clusterName,
+      namespace,
+      name,
+      conditions,
+      suspended,
+      sourceRef,
+      type,
+      lastAppliedRevision,
+    } = d;
     if (d instanceof Kustomization) {
-      const {
-        clusterName,
-        namespace,
-        name,
-        sourceRef,
-        path,
-        conditions,
-        suspended,
-        type,
-      } = d;
+      path = d.path;
       return {
         id: `${clusterName}/${namespace}/${name}`,
         conditions,
         suspended,
         name,
         namespace,
+        lastAppliedRevision,
         clusterName,
         sourceRef,
-        path,
         type,
+        path,
       } as Kustomization & { id: string };
     } else if (d instanceof HelmRelease) {
-      const {
-        clusterName,
-        namespace,
-        name,
-        helmChart,
-        conditions,
-        suspended,
-        sourceRef,
-        type,
-        lastAppliedRevision,
-      } = d;
+      helmChart = d.helmChart;
       return {
         id: `${clusterName}/${namespace}/${name}`,
         conditions,
         suspended,
         name,
         namespace,
-        helmChart,
         lastAppliedRevision,
         clusterName,
         sourceRef,
         type,
+        helmChart,
       } as HelmRelease & { id: string };
     }
   });
@@ -87,7 +88,11 @@ export const FluxDeploymentsTable = ({
     <FluxEntityTable
       columns={columns}
       title="Deployments"
-      data={data}
+      data={
+        data as
+          | (HelmRelease & { id: string })[]
+          | (Kustomization & { id: string })[]
+      }
       isLoading={isLoading}
     />
   );
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index 1c04700..e8380ca 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -17,6 +17,7 @@ import {
 } from '@backstage/plugin-kubernetes-common';
 import { FluxEntityDeploymentsCard } from './FluxEntityDeploymentsCard';
 
+// add a helm release also
 const makeTestKustomization = (name: string, path: string) => {
   return {
     apiVersion: 'kustomize.toolkit.fluxcd.io/v1',
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx
index 4e7c9e9..ca69a95 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { TableColumn } from '@backstage/core-components';
 import {
+  chartColumn,
   idColumn,
   nameAndClusterNameColumn,
-  sortAndFilterOptions,
   statusColumn,
   syncColumn,
   updatedColumn,
@@ -11,16 +11,6 @@ import {
 import { HelmRelease } from '../../objects';
 import { FluxEntityTable } from '../FluxEntityTable';
 
-function chartColumn() {
-  const formatContent = (hr: HelmRelease) =>
-    `${hr.helmChart.chart}/${hr.lastAppliedRevision}`;
-  return {
-    title: 'Chart',
-    render: (hr: HelmRelease) => formatContent(hr),
-    ...sortAndFilterOptions(hr => formatContent(hr)),
-  } as TableColumn<HelmRelease>;
-}
-
 export const defaultColumns: TableColumn<HelmRelease>[] = [
   idColumn(),
   nameAndClusterNameColumn(),
diff --git a/plugins/backstage-plugin-flux/src/components/helpers.tsx b/plugins/backstage-plugin-flux/src/components/helpers.tsx
index c45e711..2a61bc9 100644
--- a/plugins/backstage-plugin-flux/src/components/helpers.tsx
+++ b/plugins/backstage-plugin-flux/src/components/helpers.tsx
@@ -157,6 +157,14 @@ export const nameAndClusterNameColumn = <T extends FluxObject>() => {
   } as TableColumn<T>;
 };
 
+export const typeColumn = <T extends Deployment>() => {
+  return {
+    title: 'Type',
+    field: 'type',
+    render: resource => <span>{resource?.type}</span>,
+  } as TableColumn<T>;
+};
+
 export const verifiedColumn = <T extends GitRepository | OCIRepository>() => {
   return {
     title: (
@@ -196,7 +204,23 @@ export const artifactColumn = <T extends Source>() => {
   } as TableColumn<T>;
 };
 
-export const repoColumn = <T extends Kustomization>() => {
+export const chartColumn = <T extends Deployment>() => {
+  const formatContent = (resource: Deployment) => {
+    if (resource.type === 'HelmRelease') {
+      return `${(resource as HelmRelease)?.helmChart?.chart}/${
+        resource?.lastAppliedRevision
+      }`;
+    } else return '';
+  };
+
+  return {
+    title: 'Chart',
+    render: (resource: Deployment) => formatContent(resource),
+    ...sortAndFilterOptions(resource => formatContent(resource)),
+  } as TableColumn<T>;
+};
+
+export const repoColumn = <T extends Deployment>() => {
   return {
     title: 'Repo',
     field: 'repo',
@@ -204,11 +228,17 @@ export const repoColumn = <T extends Kustomization>() => {
   } as TableColumn<T>;
 };
 
-export const pathColumn = <T extends Kustomization>() => {
+export const pathColumn = <T extends Deployment>() => {
   return {
     title: 'Path',
     field: 'path',
-    render: resource => <span>{resource?.path}</span>,
+    render: resource => (
+      <span>
+        {resource.type === 'Kustomization'
+          ? (resource as Kustomization)?.path
+          : ''}
+      </span>
+    ),
   } as TableColumn<T>;
 };
 
diff --git a/plugins/backstage-plugin-flux/src/hooks/query.ts b/plugins/backstage-plugin-flux/src/hooks/query.ts
index d3e70e2..6650081 100644
--- a/plugins/backstage-plugin-flux/src/hooks/query.ts
+++ b/plugins/backstage-plugin-flux/src/hooks/query.ts
@@ -14,7 +14,7 @@ import {
   gitRepositoriesGVK,
   helmReleaseGVK,
   ociRepositoriesGVK,
-  kustomizationsGVK,
+  kustomizationGVK,
   helmRepositoryGVK,
   HelmRepository,
 } from '../objects';
@@ -167,7 +167,7 @@ export function useOCIRepositories(entity: Entity): Response<OCIRepository> {
  */
 export function useKustomizations(entity: Entity): Response<Kustomization> {
   const { kubernetesObjects, loading, error } = useCustomResources(entity, [
-    kustomizationsGVK,
+    kustomizationGVK,
   ]);
 
   const { data, kubernetesErrors } = toResponse<Kustomization>(
@@ -215,16 +215,15 @@ export function useHelmRepositories(entity: Entity): Response<HelmRepository> {
 export function useFluxDeployments(entity: Entity): Response<Deployment> {
   const { kubernetesObjects, loading, error } = useCustomResources(entity, [
     helmReleaseGVK,
-    kustomizationsGVK,
+    kustomizationGVK,
   ]);
 
-  const { data, kubernetesErrors } = toResponse<Deployment>(
-    item =>
-      item instanceof Kustomization
-        ? new Kustomization(item)
-        : new HelmRelease(item),
-    kubernetesObjects,
-  );
+  const { data, kubernetesErrors } = toResponse<Deployment>(item => {
+    const { kind } = JSON.parse(item.payload as string);
+    return kind === 'Kustomization'
+      ? new Kustomization(item)
+      : new HelmRelease(item);
+  }, kubernetesObjects);
 
   return {
     data,
diff --git a/plugins/backstage-plugin-flux/src/objects.ts b/plugins/backstage-plugin-flux/src/objects.ts
index 2aacbfa..78a61a0 100644
--- a/plugins/backstage-plugin-flux/src/objects.ts
+++ b/plugins/backstage-plugin-flux/src/objects.ts
@@ -413,7 +413,7 @@ export const helmRepositoryGVK: CustomResourceMatcher = {
   plural: 'helmrepositories',
 };
 
-export const kustomizationsGVK: CustomResourceMatcher = {
+export const kustomizationGVK: CustomResourceMatcher = {
   apiVersion: 'v1beta2',
   group: 'kustomize.toolkit.fluxcd.io',
   plural: 'kustomizations',
@@ -432,7 +432,7 @@ export function gvkFromKind(
     case 'OCIRepository':
       return ociRepositoriesGVK;
     case 'Kustomization':
-      return kustomizationsGVK;
+      return kustomizationGVK;
     default:
       break;
   }

From 3dfaaa22a485bea84594b4bbf93a424bfab440fe Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Thu, 6 Jul 2023 18:15:25 +0200
Subject: [PATCH 04/14] Tests

---
 .../FluxEntityDeploymentsCard.test.tsx        | 67 +++++++++++++++++--
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index e8380ca..4eac1eb 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -17,7 +17,6 @@ import {
 } from '@backstage/plugin-kubernetes-common';
 import { FluxEntityDeploymentsCard } from './FluxEntityDeploymentsCard';
 
-// add a helm release also
 const makeTestKustomization = (name: string, path: string) => {
   return {
     apiVersion: 'kustomize.toolkit.fluxcd.io/v1',
@@ -220,6 +219,48 @@ const makeTestKustomization = (name: string, path: string) => {
     },
   };
 };
+const makeTestHelmRelease = (name: string, chart: string, version: string) => {
+  return {
+    apiVersion: 'helm.toolkit.fluxcd.io/v2beta1',
+    kind: 'HelmRelease',
+    metadata: {
+      annotations: {
+        'metadata.weave.works/test': 'value',
+      },
+      creationTimestamp: '2023-05-25T14:14:46Z',
+      finalizers: ['finalizers.fluxcd.io'],
+      name: name,
+      namespace: 'default',
+    },
+    spec: {
+      interval: '5m',
+      chart: {
+        spec: {
+          chart,
+          version: '45.x',
+          sourceRef: {
+            kind: 'HelmRepository',
+            name: 'prometheus-community',
+            namespace: 'default',
+          },
+          interval: '60m',
+        },
+      },
+    },
+    status: {
+      lastAppliedRevision: version,
+      conditions: [
+        {
+          lastTransitionTime: '2023-05-25T15:03:33Z',
+          message: 'pulled "test" chart with version "1.0.0"',
+          reason: 'ChartPullSucceeded',
+          status: 'True',
+          type: 'Ready',
+        },
+      ],
+    },
+  };
+};
 
 class StubKubernetesClient implements KubernetesApi {
   getObjectsByEntity = jest.fn();
@@ -246,6 +287,7 @@ class StubKubernetesClient implements KubernetesApi {
               type: 'customresources',
               resources: [
                 makeTestKustomization('flux-system', './clusters/my-cluster'),
+                makeTestHelmRelease('redis', 'redis', '1.2.3'),
               ],
             },
           ],
@@ -295,7 +337,7 @@ describe('<FluxEntityDeploymentsCard />', () => {
     jest.resetAllMocks();
   });
 
-  describe('listing Kustomizations', () => {
+  describe('listing Deployments', () => {
     it('shows the details of an Kustomization', async () => {
       const result = await renderInTestApp(
         <Wrapper>
@@ -328,17 +370,30 @@ describe('<FluxEntityDeploymentsCard />', () => {
           name: 'flux-system',
           path: './clusters/my-cluster',
           repo: 'flux-system',
+          type: 'Kustomization',
+        },
+        {
+          name: 'default/normal',
+          version: 'kube-prometheus-stack/6.3.5',
+          type: 'HelmRelease',
         },
       ];
 
-      for (const testCase of testCases) {
-        const cell = getByText(testCase.name);
+      for (let i = 0; i < testCases.length; i++) {
+        const cell = getByText(testCases[i].name);
         expect(cell).toBeInTheDocument();
 
         const tr = cell.closest('tr');
         expect(tr).toBeInTheDocument();
-        expect(tr).toHaveTextContent(testCase.path);
-        expect(tr).toHaveTextContent(testCase.repo);
+
+        if (i === 0) {
+          expect(tr).toHaveTextContent(testCases?.[i].path as string);
+        }
+        if (i === 1) {
+          expect(tr).toHaveTextContent(testCases?.[i].version as string);
+        }
+        expect(tr).toHaveTextContent(testCases?.[i].type as string);
+        expect(tr).toHaveTextContent(testCases[i].repo as string);
       }
     });
   });

From 46f447484d87a53a1768380a092d16545536443a Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Thu, 6 Jul 2023 18:19:03 +0200
Subject: [PATCH 05/14] Cleanup

---
 plugins/backstage-plugin-flux/package.json                | 3 ++-
 .../FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/backstage-plugin-flux/package.json b/plugins/backstage-plugin-flux/package.json
index 64400a0..222d0b1 100644
--- a/plugins/backstage-plugin-flux/package.json
+++ b/plugins/backstage-plugin-flux/package.json
@@ -38,7 +38,8 @@
     "react-query": "^3.39.3",
     "react-use": "^17.2.4",
     "styled-components": "^5.3.0",
-    "use-deep-compare": "^1.1.0"
+    "use-deep-compare": "^1.1.0",
+    "yaml": "^2.3.1"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0"
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index b5f9ac0..66e7d32 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -40,7 +40,6 @@ export const FluxDeploymentsTable = ({
 }: Props) => {
   let helmChart = {} as HelmChart;
   let path = '';
-  let repo = '';
 
   const data = deployments.map(d => {
     const {
@@ -89,9 +88,10 @@ export const FluxDeploymentsTable = ({
       columns={columns}
       title="Deployments"
       data={
-        data as
-          | (HelmRelease & { id: string })[]
-          | (Kustomization & { id: string })[]
+        data as (
+          | (HelmRelease & { id: string })
+          | (Kustomization & { id: string })
+        )[]
       }
       isLoading={isLoading}
     />

From 5794842a7ed6cae72afcd903db9d989bdd40857b Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Thu, 6 Jul 2023 18:40:32 +0200
Subject: [PATCH 06/14] Split test assertions to avoid calling expect
 conditionally

---
 .../FluxDeploymentsTable.tsx                  |  1 +
 .../FluxEntityDeploymentsCard.test.tsx        | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index 66e7d32..3ca47ad 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -81,6 +81,7 @@ export const FluxDeploymentsTable = ({
         helmChart,
       } as HelmRelease & { id: string };
     }
+    return null;
   });
 
   return (
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index 4eac1eb..a0ecff0 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -379,22 +379,23 @@ describe('<FluxEntityDeploymentsCard />', () => {
         },
       ];
 
-      for (let i = 0; i < testCases.length; i++) {
-        const cell = getByText(testCases[i].name);
-        expect(cell).toBeInTheDocument();
+      // kustomization
+      const kcell = getByText(testCases[0].name);
+      expect(kcell).toBeInTheDocument();
+      const ktr = kcell.closest('tr');
+      expect(ktr).toBeInTheDocument();
+      expect(ktr).toHaveTextContent(testCases[0].path as string);
+      expect(ktr).toHaveTextContent(testCases[0].type as string);
+      expect(ktr).toHaveTextContent(testCases[0].repo as string);
 
-        const tr = cell.closest('tr');
-        expect(tr).toBeInTheDocument();
-
-        if (i === 0) {
-          expect(tr).toHaveTextContent(testCases?.[i].path as string);
-        }
-        if (i === 1) {
-          expect(tr).toHaveTextContent(testCases?.[i].version as string);
-        }
-        expect(tr).toHaveTextContent(testCases?.[i].type as string);
-        expect(tr).toHaveTextContent(testCases[i].repo as string);
-      }
+      //helmrelease
+      const hrcell = getByText(testCases[1].name);
+      expect(hrcell).toBeInTheDocument();
+      const hrtr = hrcell.closest('tr');
+      expect(hrtr).toBeInTheDocument();
+      expect(hrtr).toHaveTextContent(testCases[1].version as string);
+      expect(hrtr).toHaveTextContent(testCases[1].type as string);
+      expect(hrtr).toHaveTextContent(testCases[1].repo as string);
     });
   });
 });

From bf65c46b3400bf3000e8909d00c2cf8f5fea9cc2 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Thu, 6 Jul 2023 18:49:20 +0200
Subject: [PATCH 07/14] Fix warnings

---
 .../FluxEntityDeploymentsCard.test.tsx                         | 2 +-
 plugins/backstage-plugin-flux/src/components/helpers.tsx       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index a0ecff0..f4f6f26 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -388,7 +388,7 @@ describe('<FluxEntityDeploymentsCard />', () => {
       expect(ktr).toHaveTextContent(testCases[0].type as string);
       expect(ktr).toHaveTextContent(testCases[0].repo as string);
 
-      //helmrelease
+      // helmrelease
       const hrcell = getByText(testCases[1].name);
       expect(hrcell).toBeInTheDocument();
       const hrtr = hrcell.closest('tr');
diff --git a/plugins/backstage-plugin-flux/src/components/helpers.tsx b/plugins/backstage-plugin-flux/src/components/helpers.tsx
index 2a61bc9..e86fa65 100644
--- a/plugins/backstage-plugin-flux/src/components/helpers.tsx
+++ b/plugins/backstage-plugin-flux/src/components/helpers.tsx
@@ -210,7 +210,8 @@ export const chartColumn = <T extends Deployment>() => {
       return `${(resource as HelmRelease)?.helmChart?.chart}/${
         resource?.lastAppliedRevision
       }`;
-    } else return '';
+    }
+    return '';
   };
 
   return {

From 9317c17bdec3326a92f4cc2ee71e87f892ce1266 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Fri, 7 Jul 2023 15:29:43 +0200
Subject: [PATCH 08/14] Implement PR feedback

---
 .../FluxDeploymentsTable.tsx                  |   8 +--
 .../src/components/helpers.tsx                |  67 ++++++++++++------
 .../backstage-plugin-flux/src/hooks/query.ts  |   9 +--
 .../backstage-plugin-flux/src/images/helm.png | Bin 0 -> 14439 bytes
 .../src/images/kustomize.png                  | Bin 0 -> 5414 bytes
 .../src/images/pending-action.svg             |   1 -
 6 files changed, 53 insertions(+), 32 deletions(-)
 create mode 100644 plugins/backstage-plugin-flux/src/images/helm.png
 create mode 100644 plugins/backstage-plugin-flux/src/images/kustomize.png
 delete mode 100644 plugins/backstage-plugin-flux/src/images/pending-action.svg

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index 3ca47ad..2fd1443 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -7,10 +7,8 @@ import {
   updatedColumn,
   syncColumn,
   Deployment,
-  typeColumn,
-  pathColumn,
-  chartColumn,
   repoColumn,
+  referenceColumn,
 } from '../helpers';
 import { HelmChart, HelmRelease, Kustomization } from '../../objects';
 import { FluxEntityTable } from '../FluxEntityTable';
@@ -18,10 +16,8 @@ import { FluxEntityTable } from '../FluxEntityTable';
 export const defaultColumns: TableColumn<Deployment>[] = [
   idColumn(),
   nameAndClusterNameColumn(),
-  typeColumn(),
-  pathColumn(),
   repoColumn(),
-  chartColumn(),
+  referenceColumn(),
   statusColumn(),
   updatedColumn(),
   syncColumn(),
diff --git a/plugins/backstage-plugin-flux/src/components/helpers.tsx b/plugins/backstage-plugin-flux/src/components/helpers.tsx
index e86fa65..1fd95ef 100644
--- a/plugins/backstage-plugin-flux/src/components/helpers.tsx
+++ b/plugins/backstage-plugin-flux/src/components/helpers.tsx
@@ -22,6 +22,8 @@ import {
 } from '../objects';
 import Flex from './Flex';
 import KubeStatusIndicator, { getIndicatorInfo } from './KubeStatusIndicator';
+import kustomize from '../images/kustomize.png';
+import helm from '../images/helm.png';
 
 export type Source = GitRepository | OCIRepository | HelmRepository;
 export type Deployment = HelmRelease | Kustomization;
@@ -157,14 +159,6 @@ export const nameAndClusterNameColumn = <T extends FluxObject>() => {
   } as TableColumn<T>;
 };
 
-export const typeColumn = <T extends Deployment>() => {
-  return {
-    title: 'Type',
-    field: 'type',
-    render: resource => <span>{resource?.type}</span>,
-  } as TableColumn<T>;
-};
-
 export const verifiedColumn = <T extends GitRepository | OCIRepository>() => {
   return {
     title: (
@@ -204,7 +198,7 @@ export const artifactColumn = <T extends Source>() => {
   } as TableColumn<T>;
 };
 
-export const chartColumn = <T extends Deployment>() => {
+export const referenceColumn = <T extends Deployment>() => {
   const formatContent = (resource: Deployment) => {
     if (resource.type === 'HelmRelease') {
       return `${(resource as HelmRelease)?.helmChart?.chart}/${
@@ -215,9 +209,22 @@ export const chartColumn = <T extends Deployment>() => {
   };
 
   return {
-    title: 'Chart',
-    render: (resource: Deployment) => formatContent(resource),
-    ...sortAndFilterOptions(resource => formatContent(resource)),
+    title: 'Reference',
+    render: (resource: Deployment) =>
+      resource.type === 'HelmRelease' ? (
+        formatContent(resource)
+      ) : (
+        <span>
+          {resource.type === 'Kustomization'
+            ? (resource as Kustomization)?.path
+            : ''}
+        </span>
+      ),
+    ...sortAndFilterOptions(resource =>
+      resource.type === 'HelmRelease'
+        ? formatContent(resource)
+        : (resource as Kustomization)?.path,
+    ),
   } as TableColumn<T>;
 };
 
@@ -225,21 +232,39 @@ export const repoColumn = <T extends Deployment>() => {
   return {
     title: 'Repo',
     field: 'repo',
-    render: resource => <span>{resource?.sourceRef?.name}</span>,
+    render: resource => (
+      <Tooltip title={resource.type || 'Unknown'}>
+        <div>
+          <Flex align>
+            <img
+              alt="repo"
+              width="25px"
+              style={{ marginRight: '6px' }}
+              src={resource?.type === 'HelmRelease' ? helm : kustomize}
+            />
+            <span>{resource?.sourceRef?.name}</span>
+          </Flex>
+        </div>
+      </Tooltip>
+    ),
   } as TableColumn<T>;
 };
 
-export const pathColumn = <T extends Deployment>() => {
+export const pathColumn = <T extends Kustomization>() => {
   return {
     title: 'Path',
     field: 'path',
-    render: resource => (
-      <span>
-        {resource.type === 'Kustomization'
-          ? (resource as Kustomization)?.path
-          : ''}
-      </span>
-    ),
+    render: resource => <span>{resource?.path}</span>,
+  } as TableColumn<T>;
+};
+
+export const chartColumn = <T extends HelmRelease>() => {
+  const formatContent = (resource: HelmRelease) =>
+    `${resource.helmChart.chart}/${resource.lastAppliedRevision}`;
+  return {
+    title: 'Chart',
+    render: (resource: HelmRelease) => formatContent(resource),
+    ...sortAndFilterOptions(resource => formatContent(resource)),
   } as TableColumn<T>;
 };
 
diff --git a/plugins/backstage-plugin-flux/src/hooks/query.ts b/plugins/backstage-plugin-flux/src/hooks/query.ts
index 6650081..bd21e92 100644
--- a/plugins/backstage-plugin-flux/src/hooks/query.ts
+++ b/plugins/backstage-plugin-flux/src/hooks/query.ts
@@ -213,10 +213,11 @@ export function useHelmRepositories(entity: Entity): Response<HelmRepository> {
  */
 
 export function useFluxDeployments(entity: Entity): Response<Deployment> {
-  const { kubernetesObjects, loading, error } = useCustomResources(entity, [
-    helmReleaseGVK,
-    kustomizationGVK,
-  ]);
+  const { kubernetesObjects, loading, error } = useCustomResources(
+    entity,
+    [helmReleaseGVK, kustomizationGVK],
+    60000000,
+  );
 
   const { data, kubernetesErrors } = toResponse<Deployment>(item => {
     const { kind } = JSON.parse(item.payload as string);
diff --git a/plugins/backstage-plugin-flux/src/images/helm.png b/plugins/backstage-plugin-flux/src/images/helm.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9d4be0be6bfd934e3875c00385847eedd35115c
GIT binary patch
literal 14439
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

literal 0
HcmV?d00001

diff --git a/plugins/backstage-plugin-flux/src/images/kustomize.png b/plugins/backstage-plugin-flux/src/images/kustomize.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a45bfe99861ac632c6b8228e5d75988094350b6
GIT binary patch
literal 5414
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
Q2LJ#707*qoM6N<$f*xwLod5s;

literal 0
HcmV?d00001

diff --git a/plugins/backstage-plugin-flux/src/images/pending-action.svg b/plugins/backstage-plugin-flux/src/images/pending-action.svg
deleted file mode 100644
index e095e29..0000000
--- a/plugins/backstage-plugin-flux/src/images/pending-action.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="Capa_1_copia" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#f2994a;}.cls-2{fill:#fff;}</style></defs><circle class="cls-1" cx="12" cy="12" r="10"/><g id="Capa_2_copia"><path class="cls-2" d="m11.59,15.35h-1.59c-1.49,0-2.52-.1-3.06-.19v-1.03c.3-.21.96-.59,1.91-.96.55-.22,1.33-.35,2.15-.35.02,0,.03,0,.05,0,.04-.32.11-.64.22-.93-.09,0-.18-.01-.27-.01-.91,0-1.81.14-2.5.41-1.38.55-2.5,1.22-2.5,1.5v2c0,.27,1.8.5,4,.5h2c.13,0,.25,0,.37,0-.31-.27-.57-.58-.79-.94Z"/><path class="cls-2" d="m11,7.29c.83,0,1.5.67,1.5,1.5s-.67,1.5-1.5,1.5-1.5-.67-1.5-1.5.67-1.5,1.5-1.5m0-1c-1.38,0-2.5,1.12-2.5,2.5s1.12,2.5,2.5,2.5,2.5-1.12,2.5-2.5-1.12-2.5-2.5-2.5h0Z"/><path class="cls-2" d="m15,16.5c-.83,0-1.54-.29-2.12-.88-.58-.59-.88-1.29-.88-2.12s.29-1.54.88-2.12c.59-.58,1.29-.88,2.12-.88s1.54.29,2.12.88c.58.59.88,1.29.88,2.12s-.29,1.54-.88,2.12c-.59.58-1.29.88-2.12.88Zm.92-1.4l.44-.44-1.19-1.19v-1.78h-.62v2l1.37,1.41Z"/></g></svg>

From 9c74f77c89cd93004c4f400c25434acc65867796 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Fri, 7 Jul 2023 15:33:33 +0200
Subject: [PATCH 09/14] Update tests

---
 .../FluxEntityDeploymentsCard.test.tsx        | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index f4f6f26..2c875b5 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -368,34 +368,25 @@ describe('<FluxEntityDeploymentsCard />', () => {
       const testCases = [
         {
           name: 'flux-system',
-          path: './clusters/my-cluster',
           repo: 'flux-system',
-          type: 'Kustomization',
+          reference: './clusters/my-cluster',
         },
         {
           name: 'default/normal',
-          version: 'kube-prometheus-stack/6.3.5',
-          type: 'HelmRelease',
+          repo: 'prometheus-community',
+          reference: 'kube-prometheus-stack/6.3.5',
         },
       ];
 
-      // kustomization
-      const kcell = getByText(testCases[0].name);
-      expect(kcell).toBeInTheDocument();
-      const ktr = kcell.closest('tr');
-      expect(ktr).toBeInTheDocument();
-      expect(ktr).toHaveTextContent(testCases[0].path as string);
-      expect(ktr).toHaveTextContent(testCases[0].type as string);
-      expect(ktr).toHaveTextContent(testCases[0].repo as string);
+      for (const testCase of testCases) {
+        const cell = getByText(testCase.name);
+        expect(cell).toBeInTheDocument();
 
-      // helmrelease
-      const hrcell = getByText(testCases[1].name);
-      expect(hrcell).toBeInTheDocument();
-      const hrtr = hrcell.closest('tr');
-      expect(hrtr).toBeInTheDocument();
-      expect(hrtr).toHaveTextContent(testCases[1].version as string);
-      expect(hrtr).toHaveTextContent(testCases[1].type as string);
-      expect(hrtr).toHaveTextContent(testCases[1].repo as string);
+        const tr = cell.closest('tr');
+        expect(tr).toBeInTheDocument();
+        expect(tr).toHaveTextContent(testCase.repo);
+        expect(tr).toHaveTextContent(testCase.reference);
+      }
     });
   });
 });

From a8a413f288f212a608b86372559b518cedd3aca3 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Fri, 7 Jul 2023 19:26:26 +0200
Subject: [PATCH 10/14] Update test and add new icons for k8s and helm

---
 .../FluxEntityDeploymentsCard.test.tsx        |   4 +-
 .../src/components/helpers.tsx                |  65 +++++++++++++++---
 .../backstage-plugin-flux/src/images/helm.png | Bin 14439 -> 0 bytes
 .../src/images/kustomize.png                  | Bin 5414 -> 0 bytes
 4 files changed, 59 insertions(+), 10 deletions(-)
 delete mode 100644 plugins/backstage-plugin-flux/src/images/helm.png
 delete mode 100644 plugins/backstage-plugin-flux/src/images/kustomize.png

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index 2c875b5..c4949a6 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -338,7 +338,7 @@ describe('<FluxEntityDeploymentsCard />', () => {
   });
 
   describe('listing Deployments', () => {
-    it('shows the details of an Kustomization', async () => {
+    it('shows the details of a Deployment', async () => {
       const result = await renderInTestApp(
         <Wrapper>
           <TestApiProvider
@@ -372,7 +372,7 @@ describe('<FluxEntityDeploymentsCard />', () => {
           reference: './clusters/my-cluster',
         },
         {
-          name: 'default/normal',
+          name: 'normal',
           repo: 'prometheus-community',
           reference: 'kube-prometheus-stack/6.3.5',
         },
diff --git a/plugins/backstage-plugin-flux/src/components/helpers.tsx b/plugins/backstage-plugin-flux/src/components/helpers.tsx
index 1fd95ef..e88ae3a 100644
--- a/plugins/backstage-plugin-flux/src/components/helpers.tsx
+++ b/plugins/backstage-plugin-flux/src/components/helpers.tsx
@@ -22,8 +22,60 @@ import {
 } from '../objects';
 import Flex from './Flex';
 import KubeStatusIndicator, { getIndicatorInfo } from './KubeStatusIndicator';
-import kustomize from '../images/kustomize.png';
-import helm from '../images/helm.png';
+
+const helm = (
+  <svg
+    width="25px"
+    id="Layer_1"
+    data-name="Layer 1"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 500 500"
+  >
+    <path
+      fill="currentColor"
+      d="M136.52938,121.13478c-.572-.54252-1.19462-1.12636-1.81-1.71761-12.61677-12.12115-22.38092-26.13637-28.279-42.702-1.65073-4.63637-2.89692-9.36515-2.67587-14.35871.021-.4739.01959-.94915.05226-1.42214.445-6.44594,4.75912-9.70322,11.05839-8.17669a27.325,27.325,0,0,1,5.73149,2.19653c6.89022,3.45538,12.5062,8.56359,17.67051,14.16571a112.52651,112.52651,0,0,1,21.722,33.42965,8.29635,8.29635,0,0,0,.38946.861c.07116.12855.22232.21282.55927.51883A176.357,176.357,0,0,1,241.968,79.06864c-.17651-.8761-.28195-1.54571-.44772-2.2a112.49436,112.49436,0,0,1-2.65292-36.95637,84.07478,84.07478,0,0,1,4.44444-21.76378,31.32555,31.32555,0,0,1,5.47651-10.17139,15.687,15.687,0,0,1,3.16336-2.82149,7.026,7.026,0,0,1,8.03255-.056,17.27854,17.27854,0,0,1,5.8402,6.73185A53.05435,53.05435,0,0,1,271.08657,26.508a112.50469,112.50469,0,0,1,2.12263,33.00356,95.59806,95.59806,0,0,1-3.49052,19.91081c7.12171,1.31193,14.20955,2.32869,21.1473,3.97713a186.37909,186.37909,0,0,1,20.44069,6.0033A188.31671,188.31671,0,0,1,331.0769,97.9721c6.34538,3.16433,12.38553,6.94066,18.71757,10.53829.20571-.433.50439-.94982.706-1.50212A108.65959,108.65959,0,0,1,383.40128,60.246a37.75787,37.75787,0,0,1,11.822-6.883,17.24558,17.24558,0,0,1,3.67827-.84512c6.264-.71729,8.89351,3.2244,9.35653,7.93183a29.94372,29.94372,0,0,1-.77381,10.35466A87.90551,87.90551,0,0,1,396.75426,95.492c-6.79016,10.97178-14.85015,20.85494-25.09307,28.83042-.30234.2354-.56784.51814-1.07988.99029a177.77993,177.77993,0,0,1,26.59293,30.88244,10.96227,10.96227,0,0,1-1.689.29762c-10.59546.015-21.1911-.01829-31.78622.04607a4.004,4.004,0,0,1-3.17246-1.69,147.87522,147.87522,0,0,0-88.17776-46.54846,143.35862,143.35862,0,0,0-30.27955-1.16923,146.40735,146.40735,0,0,0-82.53728,31.81054,140.06663,140.06663,0,0,0-16.97616,15.84186,4.72839,4.72839,0,0,1-3.86326,1.75742c-10.12056-.07028-20.24188-.035-30.36293-.03495h-2.15212c.618-2.408,6.84026-10.93786,13.88352-18.55281C125.31349,132.2744,130.87768,126.8839,136.52938,121.13478Z"
+    />
+    <path
+      fill="currentColor"
+      d="M394.52934,347.9123a176.63854,176.63854,0,0,1-23.97343,27.16338c.70941.59068,1.28594,1.07041,1.86212,1.55057A108.31456,108.31456,0,0,1,406.10131,424.772a34.61831,34.61831,0,0,1,2.202,14.42026,14.88544,14.88544,0,0,1-.74786,3.69206,7.20762,7.20762,0,0,1-8.15793,5.02308,22.23329,22.23329,0,0,1-6.76276-2.00629,51.23237,51.23237,0,0,1-9.18151-5.8151,107.59183,107.59183,0,0,1-32.936-46.7072c-.18746-.51334-.39218-1.0204-.72243-1.87691a194.65008,194.65008,0,0,1-25.01223,14.00774,181.66925,181.66925,0,0,1-26.6869,9.72442,187.55649,187.55649,0,0,1-28.3045,5.38805c.16807.84015.26446,1.5098.43745,2.15907a109.172,109.172,0,0,1,2.9708,36.44311,80.804,80.804,0,0,1-4.42286,22.4773,78.24971,78.24971,0,0,1-4.16475,8.74473,13.39,13.39,0,0,1-2.33865,2.97083c-3.98009,4.109-8.73225,4.144-12.61157-.07366a27.28012,27.28012,0,0,1-3.907-5.61776c-3.07685-5.77569-4.6604-12.056-5.791-18.46021a116.86329,116.86329,0,0,1-1.35893-26.465,94.4795,94.4795,0,0,1,2.88466-19.18513c.14009-.53269.268-1.0696.37134-1.61034.02629-.13754-.06342-.2973-.17067-.73825a176.12108,176.12108,0,0,1-80.96855-24.99386c-.40992.90921-.76206,1.67473-1.10168,2.44579a110.47729,110.47729,0,0,1-30.90112,41.42041,38.16071,38.16071,0,0,1-12.04706,6.95909,12.08987,12.08987,0,0,1-6.51516.70023,7.11858,7.11858,0,0,1-5.40329-4.4892c-1.41614-3.424-1.16526-6.985-.68438-10.51691a55.45267,55.45267,0,0,1,4.30768-14.25037A112.49985,112.49985,0,0,1,134.88761,380.779c.459-.43461.92981-.857,1.38087-1.29954a3.76029,3.76029,0,0,0,.36534-.65529,178.90466,178.90466,0,0,1-28.469-31.31672c.98458-.08018,1.64327-.18,2.30205-.1806,10.51436-.00976,21.029.02736,31.54284-.04358a4.70554,4.70554,0,0,1,3.70344,1.62615,146.94611,146.94611,0,0,0,39.40276,28.88494,139.94667,139.94667,0,0,0,49.70395,14.77367q70.68048,6.87067,121.59971-42.85452a7.64571,7.64571,0,0,1,5.99261-2.44347c9.80139.12121,19.60512.04986,29.408.04986h2.53353Z"
+    />
+    <path
+      fill="currentColor"
+      d="M350.73576,197.76167c2.78711,0,5.47037.18919,8.11487-.0501,2.9951-.271,5.139.8001,7.32354,2.81308,12.61275,11.62214,25.35732,23.10129,38.05863,34.62729.63855.57948,1.29039,1.14432,2.1101,1.8701.76445-.65718,1.48119-1.24318,2.16483-1.8655Q428.14636,217.27914,447.756,199.37a5.44772,5.44772,0,0,1,4.20358-1.64576c3.21888.13038,6.44673.03746,9.8412.03746V303.13036c-1.72309.50368-24.8756.60366-27.63911.0611v-53.362l-.53656-.25427c-9.01079,8.21784-18.0216,16.43564-27.23786,24.8408-9.22584-8.31119-18.34194-16.52347-27.458-24.73577l-.52449.19192c-.023,4.45359-.00774,8.90828-.01046,13.36233q-.00408,6.63942-.00058,13.27882v26.87211h-27.428C350.45161,301.61243,350.21289,203.72342,350.73576,197.76167Z"
+    />
+    <path
+      fill="currentColor"
+      d="M97.63436,197.88229h27.26325c.55054,1.75251.65821,102.97139.09469,105.525H97.70468c-.15021-6.70344-.04736-13.38394-.06622-20.06131-.01871-6.62261-.0041-13.24531-.0041-20.03958H63.84679V303.047c-2.05946.61518-25.33374.67417-27.64758.123V197.89436H63.73742v37.18876c1.96793.56844,30.92319.67339,33.872.12942.00818-2.97713.02-6.02646.024-9.0758q.0063-4.7433.00094-9.4866,0-4.625,0-9.25C97.63437,204.32179,97.63436,201.24346,97.63436,197.88229Z"
+    />
+    <path
+      fill="currentColor"
+      d="M157.5757,303.3683V198.1946c1.617-.52913,61.545-.73586,65.46219-.20457v22.41432c-.87869.063-1.7857.18341-2.69279.18454q-16.0086.01994-32.01725.00881l-2.96767,0v17.43353H218.7067V261.2229H185.65838c-.55339,1.98509-.70531,15.81681-.25622,19.64583.84488.05679,1.75.16952,2.6553.17059q16.00862.01863,32.01727.00822h2.96945V303.3683Z"
+    />
+    <path
+      fill="currentColor"
+      d="M254.28291,303.40855c-.50074-2.82232-.39948-103.60181.09747-105.51735h27.16208v77.76453c1.17173.06084,2.09122.14921,3.01077.15005q16.128.01468,32.2561.00658c.92562,0,1.85125,0,2.90733,0v27.59622Z"
+    />
+  </svg>
+);
+const kubernetes = (
+  <svg
+    width="25px"
+    id="Layer_1"
+    data-name="Layer 1"
+    xmlns="http://www.w3.org/2000/svg"
+    role="img"
+    viewBox="9.70 9.20 210.86 204.86"
+  >
+    <path
+      fill="currentColor"
+      d="M134.358 126.46551a3.59023 3.59023 0 0 0-.855-.065 3.68515 3.68515 0 0 0-1.425.37 3.725 3.725 0 0 0-1.803 4.825l-.026.037 8.528 20.603a43.53012 43.53012 0 0 0 17.595-22.102l-21.976-3.714zm-34.194 2.92a3.72 3.72 0 0 0-3.568-2.894 3.6556 3.6556 0 0 0-.733.065l-.037-.045-21.785 3.698a43.69506 43.69506 0 0 0 17.54 21.946l8.442-20.399-.066-.08a3.68318 3.68318 0 0 0 .207-2.291zm18.245 8a3.718 3.718 0 0 0-6.557.008h-.018l-10.713 19.372a43.637 43.637 0 0 0 23.815 1.225q2.197-.5 4.292-1.199l-10.738-19.407zm33.914-45l-16.483 14.753.009.047a3.725 3.725 0 0 0 1.46 6.395l.02.089 21.35 6.15a44.278 44.278 0 0 0-6.356-27.432zM121.7 94.0385a3.725 3.725 0 0 0 5.913 2.84l.065.028 18.036-12.789a43.85 43.85 0 0 0-25.287-12.19l1.253 22.105zm-19.1 2.922a3.72 3.72 0 0 0 5.904-2.85l.092-.044 1.253-22.139a44.68209 44.68209 0 0 0-4.501.775 43.4669 43.4669 0 0 0-20.937 11.409l18.154 12.869zm-9.678 16.728a3.72 3.72 0 0 0 1.462-6.396l.018-.087-16.574-14.825a43.454 43.454 0 0 0-6.168 27.511l21.245-6.13zm16.098 6.512l6.114 2.94 6.096-2.933 1.514-6.582-4.219-5.276h-6.79l-4.231 5.268z"
+    />
+    <path
+      fill="currentColor"
+      d="M216.208 133.16651l-17.422-75.675a13.60207 13.60207 0 0 0-7.293-9.073l-70.521-33.67a13.589 13.589 0 0 0-11.705 0l-70.507 33.688a13.598 13.598 0 0 0-7.295 9.072l-17.394 75.673a13.315 13.315 0 0 0-.004 5.81 13.50607 13.50607 0 0 0 .491 1.718 13.0998 13.0998 0 0 0 1.343 2.726c.239.365.491.72.765 1.064l48.804 60.678c.213.264.448.505.681.75a13.42334 13.42334 0 0 0 2.574 2.133 13.9237 13.9237 0 0 0 3.857 1.677 13.29785 13.29785 0 0 0 3.43.473h.759l77.504-.018a12.99345 12.99345 0 0 0 1.41-.083 13.46921 13.46921 0 0 0 1.989-.378 13.872 13.872 0 0 0 1.381-.442c.353-.135.705-.27 1.045-.433a13.94127 13.94127 0 0 0 1.479-.822 13.30347 13.30347 0 0 0 3.237-2.865l1.488-1.85 47.299-58.84a13.185 13.185 0 0 0 2.108-3.785 13.67036 13.67036 0 0 0 .5-1.724 13.28215 13.28215 0 0 0-.004-5.809zm-73.147 29.432a14.51575 14.51575 0 0 0 .703 1.703 3.314 3.314 0 0 0-.327 2.49 39.37244 39.37244 0 0 0 3.742 6.7 35.06044 35.06044 0 0 1 2.263 3.364c.17.315.392.803.553 1.136a4.24 4.24 0 1 1-7.63 3.607c-.161-.33-.385-.77-.522-1.082a35.27528 35.27528 0 0 1-1.225-3.868 39.3046 39.3046 0 0 0-2.896-7.097 3.335 3.335 0 0 0-2.154-1.307c-.135-.233-.635-1.149-.903-1.623a54.617 54.617 0 0 1-38.948-.1l-.955 1.731a3.429 3.429 0 0 0-1.819.886 29.51728 29.51728 0 0 0-3.268 7.582 34.89931 34.89931 0 0 1-1.218 3.868c-.135.31-.361.744-.522 1.073v.009l-.007.008a4.238 4.238 0 1 1-7.619-3.616c.159-.335.372-.82.54-1.135a35.17706 35.17706 0 0 1 2.262-3.373 41.22786 41.22786 0 0 0 3.82-6.866 4.18792 4.18792 0 0 0-.376-2.387l.768-1.84a54.922 54.922 0 0 1-24.338-30.387l-1.839.313a4.68007 4.68007 0 0 0-2.428-.855 39.52352 39.52352 0 0 0-7.356 2.165 35.58886 35.58886 0 0 1-3.787 1.45c-.305.084-.745.168-1.093.244-.028.01-.052.022-.08.029a.60518.60518 0 0 1-.065.006 4.236 4.236 0 1 1-1.874-8.224l.061-.015.037-.01c.353-.083.805-.2 1.127-.262a35.27 35.27 0 0 1 4.05-.326 39.38835 39.38835 0 0 0 7.564-1.242 5.83506 5.83506 0 0 0 1.814-1.83l1.767-.516a54.613 54.613 0 0 1 8.613-38.073l-1.353-1.206a4.688 4.688 0 0 0-.848-2.436 39.36558 39.36558 0 0 0-6.277-4.41 35.2503 35.2503 0 0 1-3.499-2.046c-.256-.191-.596-.478-.874-.704l-.063-.044a4.473 4.473 0 0 1-1.038-6.222 4.066 4.066 0 0 1 3.363-1.488 5.03 5.03 0 0 1 2.942 1.11c.287.225.68.526.935.745a35.25285 35.25285 0 0 1 2.78 2.95 39.38314 39.38314 0 0 0 5.69 5.142 3.333 3.333 0 0 0 2.507.243q.754.55 1.522 1.082a54.28892 54.28892 0 0 1 27.577-15.754 55.05181 55.05181 0 0 1 7.63-1.173l.1-1.784a4.6001 4.6001 0 0 0 1.37-2.184 39.47551 39.47551 0 0 0-.47-7.654 35.466 35.466 0 0 1-.576-4.014c-.011-.307.006-.731.01-1.081 0-.04-.01-.079-.01-.118a4.242 4.242 0 1 1 8.441-.004c0 .37.022.861.009 1.2a35.109 35.109 0 0 1-.579 4.013 39.53346 39.53346 0 0 0-.478 7.656 3.344 3.344 0 0 0 1.379 2.11c.015.305.065 1.323.102 1.884a55.309 55.309 0 0 1 35.032 16.927l1.606-1.147a4.6901 4.6901 0 0 0 2.56-.278 39.53152 39.53152 0 0 0 5.69-5.148 35.00382 35.00382 0 0 1 2.787-2.95c.259-.222.65-.52.936-.746a4.242 4.242 0 1 1 5.258 6.598c-.283.229-.657.548-.929.75a35.09523 35.09523 0 0 1-3.507 2.046 39.49476 39.49476 0 0 0-6.277 4.41 3.337 3.337 0 0 0-.792 2.39c-.235.216-1.06.947-1.497 1.343a54.837 54.837 0 0 1 8.792 37.983l1.704.496a4.7449 4.7449 0 0 0 1.82 1.831 39.46448 39.46448 0 0 0 7.568 1.245 35.64041 35.64041 0 0 1 4.046.324c.355.065.868.207 1.23.29a4.236 4.236 0 1 1-1.878 8.223l-.061-.008c-.028-.007-.054-.022-.083-.029-.348-.076-.785-.152-1.09-.232a35.1407 35.1407 0 0 1-3.785-1.462 39.47672 39.47672 0 0 0-7.363-2.165 3.337 3.337 0 0 0-2.362.877q-.9-.171-1.804-.316a54.91994 54.91994 0 0 1-24.328 30.605z"
+    />
+  </svg>
+);
 
 export type Source = GitRepository | OCIRepository | HelmRepository;
 export type Deployment = HelmRelease | Kustomization;
@@ -236,12 +288,9 @@ export const repoColumn = <T extends Deployment>() => {
       <Tooltip title={resource.type || 'Unknown'}>
         <div>
           <Flex align>
-            <img
-              alt="repo"
-              width="25px"
-              style={{ marginRight: '6px' }}
-              src={resource?.type === 'HelmRelease' ? helm : kustomize}
-            />
+            <div style={{ marginRight: '6px' }}>
+              {resource.type === 'HelmRelease' ? helm : kubernetes}
+            </div>
             <span>{resource?.sourceRef?.name}</span>
           </Flex>
         </div>
diff --git a/plugins/backstage-plugin-flux/src/images/helm.png b/plugins/backstage-plugin-flux/src/images/helm.png
deleted file mode 100644
index e9d4be0be6bfd934e3875c00385847eedd35115c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14439
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

diff --git a/plugins/backstage-plugin-flux/src/images/kustomize.png b/plugins/backstage-plugin-flux/src/images/kustomize.png
deleted file mode 100644
index 4a45bfe99861ac632c6b8228e5d75988094350b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5414
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
Q2LJ#707*qoM6N<$f*xwLod5s;


From 9ea9908ebd1c052c80175190c5e37d890a0e0127 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Mon, 10 Jul 2023 10:52:40 +0200
Subject: [PATCH 11/14] Update test

---
 .../FluxEntityDeploymentsCard.test.tsx                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
index c4949a6..1dbed3f 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.test.tsx
@@ -287,7 +287,7 @@ class StubKubernetesClient implements KubernetesApi {
               type: 'customresources',
               resources: [
                 makeTestKustomization('flux-system', './clusters/my-cluster'),
-                makeTestHelmRelease('redis', 'redis', '1.2.3'),
+                makeTestHelmRelease('normal', 'kube-prometheus-stack', '6.3.5'),
               ],
             },
           ],
@@ -372,7 +372,7 @@ describe('<FluxEntityDeploymentsCard />', () => {
           reference: './clusters/my-cluster',
         },
         {
-          name: 'normal',
+          name: 'default/normal',
           repo: 'prometheus-community',
           reference: 'kube-prometheus-stack/6.3.5',
         },

From 834efd9874d292592e85f816ed736c0e244faecb Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Mon, 10 Jul 2023 12:43:43 +0200
Subject: [PATCH 12/14] Remove interval from hook

---
 plugins/backstage-plugin-flux/src/hooks/query.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/hooks/query.ts b/plugins/backstage-plugin-flux/src/hooks/query.ts
index bd21e92..6650081 100644
--- a/plugins/backstage-plugin-flux/src/hooks/query.ts
+++ b/plugins/backstage-plugin-flux/src/hooks/query.ts
@@ -213,11 +213,10 @@ export function useHelmRepositories(entity: Entity): Response<HelmRepository> {
  */
 
 export function useFluxDeployments(entity: Entity): Response<Deployment> {
-  const { kubernetesObjects, loading, error } = useCustomResources(
-    entity,
-    [helmReleaseGVK, kustomizationGVK],
-    60000000,
-  );
+  const { kubernetesObjects, loading, error } = useCustomResources(entity, [
+    helmReleaseGVK,
+    kustomizationGVK,
+  ]);
 
   const { data, kubernetesErrors } = toResponse<Deployment>(item => {
     const { kind } = JSON.parse(item.payload as string);

From 0af1ef53bb0ed6b15d62468fee5200d3a5c64b05 Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Tue, 11 Jul 2023 14:17:33 +0200
Subject: [PATCH 13/14] Implement PR feedback

---
 .../FluxDeploymentsTable.tsx                  | 14 ++-
 .../FluxEntityDeploymentsCard.tsx             |  3 +-
 .../FluxEntityHelmReleasesCard.tsx            | 10 ++-
 .../FluxHelmReleasesTable.tsx                 | 72 ---------------
 .../FluxEntityKustomizationsCard.tsx          |  9 +-
 .../FluxKustomizationsTable.tsx               | 68 --------------
 .../src/components/helpers.tsx                | 89 +++----------------
 .../src/images/icons.tsx                      | 56 ++++++++++++
 8 files changed, 93 insertions(+), 228 deletions(-)
 delete mode 100644 plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx
 delete mode 100644 plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxKustomizationsTable.tsx
 create mode 100644 plugins/backstage-plugin-flux/src/images/icons.tsx

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index 2fd1443..a9c357e 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -9,12 +9,14 @@ import {
   Deployment,
   repoColumn,
   referenceColumn,
+  typeColumn,
 } from '../helpers';
 import { HelmChart, HelmRelease, Kustomization } from '../../objects';
 import { FluxEntityTable } from '../FluxEntityTable';
 
 export const defaultColumns: TableColumn<Deployment>[] = [
   idColumn(),
+  typeColumn(),
   nameAndClusterNameColumn(),
   repoColumn(),
   referenceColumn(),
@@ -27,13 +29,23 @@ type Props = {
   deployments: Deployment[];
   isLoading: boolean;
   columns: TableColumn<Deployment>[];
+  kinds: string[];
 };
 
 export const FluxDeploymentsTable = ({
+  kinds,
   deployments,
   isLoading,
   columns,
 }: Props) => {
+  const getTitle = () => {
+    if (kinds.length === 1) {
+      return `${kinds[0]}s`;
+    } else {
+      return 'Deployments';
+    }
+  };
+
   let helmChart = {} as HelmChart;
   let path = '';
 
@@ -83,7 +95,7 @@ export const FluxDeploymentsTable = ({
   return (
     <FluxEntityTable
       columns={columns}
-      title="Deployments"
+      title={getTitle()}
       data={
         data as (
           | (HelmRelease & { id: string })
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx
index 0dbab39..04aa0a0 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxEntityDeploymentsCard.tsx
@@ -23,6 +23,7 @@ const DeploymentsPanel = () => {
 
   return (
     <FluxDeploymentsTable
+      kinds={['Kustomization', 'HelmRelease']}
       deployments={data || []}
       isLoading={loading && !data}
       columns={defaultColumns}
@@ -31,7 +32,7 @@ const DeploymentsPanel = () => {
 };
 
 /**
- * Render the Kustomizations associated with the current Entity.
+ * Render the Deployments associated with the current Entity.
  *
  * @public
  */
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxEntityHelmReleasesCard.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxEntityHelmReleasesCard.tsx
index e0a3330..0e93337 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxEntityHelmReleasesCard.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxEntityHelmReleasesCard.tsx
@@ -1,8 +1,11 @@
 import React from 'react';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { useHelmReleases } from '../../hooks/query';
-import { FluxHelmReleasesTable, defaultColumns } from './FluxHelmReleasesTable';
 import { WeaveGitOpsContext } from '../WeaveGitOpsContext';
+import {
+  FluxDeploymentsTable,
+  defaultColumns,
+} from '../FluxEntityDeploymentsCard/FluxDeploymentsTable';
 
 const HelmReleasePanel = () => {
   const { entity } = useEntity();
@@ -23,8 +26,9 @@ const HelmReleasePanel = () => {
   }
 
   return (
-    <FluxHelmReleasesTable
-      helmReleases={data || []}
+    <FluxDeploymentsTable
+      kinds={['HelmRelease']}
+      deployments={data || []}
       isLoading={loading && !data}
       columns={defaultColumns}
     />
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx
deleted file mode 100644
index ca69a95..0000000
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityHelmReleasesCard/FluxHelmReleasesTable.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react';
-import { TableColumn } from '@backstage/core-components';
-import {
-  chartColumn,
-  idColumn,
-  nameAndClusterNameColumn,
-  statusColumn,
-  syncColumn,
-  updatedColumn,
-} from '../helpers';
-import { HelmRelease } from '../../objects';
-import { FluxEntityTable } from '../FluxEntityTable';
-
-export const defaultColumns: TableColumn<HelmRelease>[] = [
-  idColumn(),
-  nameAndClusterNameColumn(),
-  chartColumn(),
-  statusColumn(),
-  updatedColumn(),
-  syncColumn(),
-];
-
-type Props = {
-  helmReleases: HelmRelease[];
-  isLoading: boolean;
-  columns: TableColumn<HelmRelease>[];
-};
-
-/**
- * @public
- */
-export const FluxHelmReleasesTable = ({
-  helmReleases,
-  isLoading,
-  columns,
-}: Props) => {
-  // TODO: Simplify this to store the ID and HelmRelease
-  const data = helmReleases.map(hr => {
-    const {
-      clusterName,
-      namespace,
-      name,
-      helmChart,
-      conditions,
-      suspended,
-      sourceRef,
-      type,
-      lastAppliedRevision,
-    } = hr;
-    return {
-      id: `${clusterName}/${namespace}/${name}`,
-      conditions,
-      suspended,
-      name,
-      namespace,
-      helmChart,
-      lastAppliedRevision,
-      clusterName,
-      sourceRef,
-      type,
-    } as HelmRelease & { id: string };
-  });
-
-  return (
-    <FluxEntityTable
-      columns={columns}
-      title="Helm Releases"
-      data={data}
-      isLoading={isLoading}
-    />
-  );
-};
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxEntityKustomizationsCard.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxEntityKustomizationsCard.tsx
index 415cfb0..5d6e22a 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxEntityKustomizationsCard.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxEntityKustomizationsCard.tsx
@@ -3,9 +3,9 @@ import { useEntity } from '@backstage/plugin-catalog-react';
 import { WeaveGitOpsContext } from '../WeaveGitOpsContext';
 import { useKustomizations } from '../../hooks';
 import {
-  FluxKustomizationsTable,
+  FluxDeploymentsTable,
   defaultColumns,
-} from './FluxKustomizationsTable';
+} from '../FluxEntityDeploymentsCard/FluxDeploymentsTable';
 
 const KustomizationPanel = () => {
   const { entity } = useEntity();
@@ -25,8 +25,9 @@ const KustomizationPanel = () => {
   }
 
   return (
-    <FluxKustomizationsTable
-      kustomizations={data || []}
+    <FluxDeploymentsTable
+      kinds={['Kustomization']}
+      deployments={data || []}
       isLoading={loading && !data}
       columns={defaultColumns}
     />
diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxKustomizationsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxKustomizationsTable.tsx
deleted file mode 100644
index e3ca8ec..0000000
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityKustomizationsCard/FluxKustomizationsTable.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { TableColumn } from '@backstage/core-components';
-import {
-  idColumn,
-  nameAndClusterNameColumn,
-  pathColumn,
-  repoColumn,
-  statusColumn,
-  updatedColumn,
-  syncColumn,
-} from '../helpers';
-import { Kustomization } from '../../objects';
-import { FluxEntityTable } from '../FluxEntityTable';
-
-export const defaultColumns: TableColumn<Kustomization>[] = [
-  idColumn(),
-  nameAndClusterNameColumn(),
-  pathColumn(),
-  repoColumn(),
-  statusColumn(),
-  updatedColumn(),
-  syncColumn(),
-];
-
-type Props = {
-  kustomizations: Kustomization[];
-  isLoading: boolean;
-  columns: TableColumn<Kustomization>[];
-};
-
-export const FluxKustomizationsTable = ({
-  kustomizations,
-  isLoading,
-  columns,
-}: Props) => {
-  const data = kustomizations.map(k => {
-    const {
-      clusterName,
-      namespace,
-      name,
-      sourceRef,
-      path,
-      conditions,
-      suspended,
-      type,
-    } = k;
-    return {
-      id: `${clusterName}/${namespace}/${name}`,
-      conditions,
-      suspended,
-      name,
-      namespace,
-      clusterName,
-      sourceRef,
-      path,
-      type,
-    } as Kustomization & { id: string };
-  });
-
-  return (
-    <FluxEntityTable
-      columns={columns}
-      title="Kustomizations"
-      data={data}
-      isLoading={isLoading}
-    />
-  );
-};
diff --git a/plugins/backstage-plugin-flux/src/components/helpers.tsx b/plugins/backstage-plugin-flux/src/components/helpers.tsx
index e88ae3a..6c31ca5 100644
--- a/plugins/backstage-plugin-flux/src/components/helpers.tsx
+++ b/plugins/backstage-plugin-flux/src/components/helpers.tsx
@@ -22,60 +22,7 @@ import {
 } from '../objects';
 import Flex from './Flex';
 import KubeStatusIndicator, { getIndicatorInfo } from './KubeStatusIndicator';
-
-const helm = (
-  <svg
-    width="25px"
-    id="Layer_1"
-    data-name="Layer 1"
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 500 500"
-  >
-    <path
-      fill="currentColor"
-      d="M136.52938,121.13478c-.572-.54252-1.19462-1.12636-1.81-1.71761-12.61677-12.12115-22.38092-26.13637-28.279-42.702-1.65073-4.63637-2.89692-9.36515-2.67587-14.35871.021-.4739.01959-.94915.05226-1.42214.445-6.44594,4.75912-9.70322,11.05839-8.17669a27.325,27.325,0,0,1,5.73149,2.19653c6.89022,3.45538,12.5062,8.56359,17.67051,14.16571a112.52651,112.52651,0,0,1,21.722,33.42965,8.29635,8.29635,0,0,0,.38946.861c.07116.12855.22232.21282.55927.51883A176.357,176.357,0,0,1,241.968,79.06864c-.17651-.8761-.28195-1.54571-.44772-2.2a112.49436,112.49436,0,0,1-2.65292-36.95637,84.07478,84.07478,0,0,1,4.44444-21.76378,31.32555,31.32555,0,0,1,5.47651-10.17139,15.687,15.687,0,0,1,3.16336-2.82149,7.026,7.026,0,0,1,8.03255-.056,17.27854,17.27854,0,0,1,5.8402,6.73185A53.05435,53.05435,0,0,1,271.08657,26.508a112.50469,112.50469,0,0,1,2.12263,33.00356,95.59806,95.59806,0,0,1-3.49052,19.91081c7.12171,1.31193,14.20955,2.32869,21.1473,3.97713a186.37909,186.37909,0,0,1,20.44069,6.0033A188.31671,188.31671,0,0,1,331.0769,97.9721c6.34538,3.16433,12.38553,6.94066,18.71757,10.53829.20571-.433.50439-.94982.706-1.50212A108.65959,108.65959,0,0,1,383.40128,60.246a37.75787,37.75787,0,0,1,11.822-6.883,17.24558,17.24558,0,0,1,3.67827-.84512c6.264-.71729,8.89351,3.2244,9.35653,7.93183a29.94372,29.94372,0,0,1-.77381,10.35466A87.90551,87.90551,0,0,1,396.75426,95.492c-6.79016,10.97178-14.85015,20.85494-25.09307,28.83042-.30234.2354-.56784.51814-1.07988.99029a177.77993,177.77993,0,0,1,26.59293,30.88244,10.96227,10.96227,0,0,1-1.689.29762c-10.59546.015-21.1911-.01829-31.78622.04607a4.004,4.004,0,0,1-3.17246-1.69,147.87522,147.87522,0,0,0-88.17776-46.54846,143.35862,143.35862,0,0,0-30.27955-1.16923,146.40735,146.40735,0,0,0-82.53728,31.81054,140.06663,140.06663,0,0,0-16.97616,15.84186,4.72839,4.72839,0,0,1-3.86326,1.75742c-10.12056-.07028-20.24188-.035-30.36293-.03495h-2.15212c.618-2.408,6.84026-10.93786,13.88352-18.55281C125.31349,132.2744,130.87768,126.8839,136.52938,121.13478Z"
-    />
-    <path
-      fill="currentColor"
-      d="M394.52934,347.9123a176.63854,176.63854,0,0,1-23.97343,27.16338c.70941.59068,1.28594,1.07041,1.86212,1.55057A108.31456,108.31456,0,0,1,406.10131,424.772a34.61831,34.61831,0,0,1,2.202,14.42026,14.88544,14.88544,0,0,1-.74786,3.69206,7.20762,7.20762,0,0,1-8.15793,5.02308,22.23329,22.23329,0,0,1-6.76276-2.00629,51.23237,51.23237,0,0,1-9.18151-5.8151,107.59183,107.59183,0,0,1-32.936-46.7072c-.18746-.51334-.39218-1.0204-.72243-1.87691a194.65008,194.65008,0,0,1-25.01223,14.00774,181.66925,181.66925,0,0,1-26.6869,9.72442,187.55649,187.55649,0,0,1-28.3045,5.38805c.16807.84015.26446,1.5098.43745,2.15907a109.172,109.172,0,0,1,2.9708,36.44311,80.804,80.804,0,0,1-4.42286,22.4773,78.24971,78.24971,0,0,1-4.16475,8.74473,13.39,13.39,0,0,1-2.33865,2.97083c-3.98009,4.109-8.73225,4.144-12.61157-.07366a27.28012,27.28012,0,0,1-3.907-5.61776c-3.07685-5.77569-4.6604-12.056-5.791-18.46021a116.86329,116.86329,0,0,1-1.35893-26.465,94.4795,94.4795,0,0,1,2.88466-19.18513c.14009-.53269.268-1.0696.37134-1.61034.02629-.13754-.06342-.2973-.17067-.73825a176.12108,176.12108,0,0,1-80.96855-24.99386c-.40992.90921-.76206,1.67473-1.10168,2.44579a110.47729,110.47729,0,0,1-30.90112,41.42041,38.16071,38.16071,0,0,1-12.04706,6.95909,12.08987,12.08987,0,0,1-6.51516.70023,7.11858,7.11858,0,0,1-5.40329-4.4892c-1.41614-3.424-1.16526-6.985-.68438-10.51691a55.45267,55.45267,0,0,1,4.30768-14.25037A112.49985,112.49985,0,0,1,134.88761,380.779c.459-.43461.92981-.857,1.38087-1.29954a3.76029,3.76029,0,0,0,.36534-.65529,178.90466,178.90466,0,0,1-28.469-31.31672c.98458-.08018,1.64327-.18,2.30205-.1806,10.51436-.00976,21.029.02736,31.54284-.04358a4.70554,4.70554,0,0,1,3.70344,1.62615,146.94611,146.94611,0,0,0,39.40276,28.88494,139.94667,139.94667,0,0,0,49.70395,14.77367q70.68048,6.87067,121.59971-42.85452a7.64571,7.64571,0,0,1,5.99261-2.44347c9.80139.12121,19.60512.04986,29.408.04986h2.53353Z"
-    />
-    <path
-      fill="currentColor"
-      d="M350.73576,197.76167c2.78711,0,5.47037.18919,8.11487-.0501,2.9951-.271,5.139.8001,7.32354,2.81308,12.61275,11.62214,25.35732,23.10129,38.05863,34.62729.63855.57948,1.29039,1.14432,2.1101,1.8701.76445-.65718,1.48119-1.24318,2.16483-1.8655Q428.14636,217.27914,447.756,199.37a5.44772,5.44772,0,0,1,4.20358-1.64576c3.21888.13038,6.44673.03746,9.8412.03746V303.13036c-1.72309.50368-24.8756.60366-27.63911.0611v-53.362l-.53656-.25427c-9.01079,8.21784-18.0216,16.43564-27.23786,24.8408-9.22584-8.31119-18.34194-16.52347-27.458-24.73577l-.52449.19192c-.023,4.45359-.00774,8.90828-.01046,13.36233q-.00408,6.63942-.00058,13.27882v26.87211h-27.428C350.45161,301.61243,350.21289,203.72342,350.73576,197.76167Z"
-    />
-    <path
-      fill="currentColor"
-      d="M97.63436,197.88229h27.26325c.55054,1.75251.65821,102.97139.09469,105.525H97.70468c-.15021-6.70344-.04736-13.38394-.06622-20.06131-.01871-6.62261-.0041-13.24531-.0041-20.03958H63.84679V303.047c-2.05946.61518-25.33374.67417-27.64758.123V197.89436H63.73742v37.18876c1.96793.56844,30.92319.67339,33.872.12942.00818-2.97713.02-6.02646.024-9.0758q.0063-4.7433.00094-9.4866,0-4.625,0-9.25C97.63437,204.32179,97.63436,201.24346,97.63436,197.88229Z"
-    />
-    <path
-      fill="currentColor"
-      d="M157.5757,303.3683V198.1946c1.617-.52913,61.545-.73586,65.46219-.20457v22.41432c-.87869.063-1.7857.18341-2.69279.18454q-16.0086.01994-32.01725.00881l-2.96767,0v17.43353H218.7067V261.2229H185.65838c-.55339,1.98509-.70531,15.81681-.25622,19.64583.84488.05679,1.75.16952,2.6553.17059q16.00862.01863,32.01727.00822h2.96945V303.3683Z"
-    />
-    <path
-      fill="currentColor"
-      d="M254.28291,303.40855c-.50074-2.82232-.39948-103.60181.09747-105.51735h27.16208v77.76453c1.17173.06084,2.09122.14921,3.01077.15005q16.128.01468,32.2561.00658c.92562,0,1.85125,0,2.90733,0v27.59622Z"
-    />
-  </svg>
-);
-const kubernetes = (
-  <svg
-    width="25px"
-    id="Layer_1"
-    data-name="Layer 1"
-    xmlns="http://www.w3.org/2000/svg"
-    role="img"
-    viewBox="9.70 9.20 210.86 204.86"
-  >
-    <path
-      fill="currentColor"
-      d="M134.358 126.46551a3.59023 3.59023 0 0 0-.855-.065 3.68515 3.68515 0 0 0-1.425.37 3.725 3.725 0 0 0-1.803 4.825l-.026.037 8.528 20.603a43.53012 43.53012 0 0 0 17.595-22.102l-21.976-3.714zm-34.194 2.92a3.72 3.72 0 0 0-3.568-2.894 3.6556 3.6556 0 0 0-.733.065l-.037-.045-21.785 3.698a43.69506 43.69506 0 0 0 17.54 21.946l8.442-20.399-.066-.08a3.68318 3.68318 0 0 0 .207-2.291zm18.245 8a3.718 3.718 0 0 0-6.557.008h-.018l-10.713 19.372a43.637 43.637 0 0 0 23.815 1.225q2.197-.5 4.292-1.199l-10.738-19.407zm33.914-45l-16.483 14.753.009.047a3.725 3.725 0 0 0 1.46 6.395l.02.089 21.35 6.15a44.278 44.278 0 0 0-6.356-27.432zM121.7 94.0385a3.725 3.725 0 0 0 5.913 2.84l.065.028 18.036-12.789a43.85 43.85 0 0 0-25.287-12.19l1.253 22.105zm-19.1 2.922a3.72 3.72 0 0 0 5.904-2.85l.092-.044 1.253-22.139a44.68209 44.68209 0 0 0-4.501.775 43.4669 43.4669 0 0 0-20.937 11.409l18.154 12.869zm-9.678 16.728a3.72 3.72 0 0 0 1.462-6.396l.018-.087-16.574-14.825a43.454 43.454 0 0 0-6.168 27.511l21.245-6.13zm16.098 6.512l6.114 2.94 6.096-2.933 1.514-6.582-4.219-5.276h-6.79l-4.231 5.268z"
-    />
-    <path
-      fill="currentColor"
-      d="M216.208 133.16651l-17.422-75.675a13.60207 13.60207 0 0 0-7.293-9.073l-70.521-33.67a13.589 13.589 0 0 0-11.705 0l-70.507 33.688a13.598 13.598 0 0 0-7.295 9.072l-17.394 75.673a13.315 13.315 0 0 0-.004 5.81 13.50607 13.50607 0 0 0 .491 1.718 13.0998 13.0998 0 0 0 1.343 2.726c.239.365.491.72.765 1.064l48.804 60.678c.213.264.448.505.681.75a13.42334 13.42334 0 0 0 2.574 2.133 13.9237 13.9237 0 0 0 3.857 1.677 13.29785 13.29785 0 0 0 3.43.473h.759l77.504-.018a12.99345 12.99345 0 0 0 1.41-.083 13.46921 13.46921 0 0 0 1.989-.378 13.872 13.872 0 0 0 1.381-.442c.353-.135.705-.27 1.045-.433a13.94127 13.94127 0 0 0 1.479-.822 13.30347 13.30347 0 0 0 3.237-2.865l1.488-1.85 47.299-58.84a13.185 13.185 0 0 0 2.108-3.785 13.67036 13.67036 0 0 0 .5-1.724 13.28215 13.28215 0 0 0-.004-5.809zm-73.147 29.432a14.51575 14.51575 0 0 0 .703 1.703 3.314 3.314 0 0 0-.327 2.49 39.37244 39.37244 0 0 0 3.742 6.7 35.06044 35.06044 0 0 1 2.263 3.364c.17.315.392.803.553 1.136a4.24 4.24 0 1 1-7.63 3.607c-.161-.33-.385-.77-.522-1.082a35.27528 35.27528 0 0 1-1.225-3.868 39.3046 39.3046 0 0 0-2.896-7.097 3.335 3.335 0 0 0-2.154-1.307c-.135-.233-.635-1.149-.903-1.623a54.617 54.617 0 0 1-38.948-.1l-.955 1.731a3.429 3.429 0 0 0-1.819.886 29.51728 29.51728 0 0 0-3.268 7.582 34.89931 34.89931 0 0 1-1.218 3.868c-.135.31-.361.744-.522 1.073v.009l-.007.008a4.238 4.238 0 1 1-7.619-3.616c.159-.335.372-.82.54-1.135a35.17706 35.17706 0 0 1 2.262-3.373 41.22786 41.22786 0 0 0 3.82-6.866 4.18792 4.18792 0 0 0-.376-2.387l.768-1.84a54.922 54.922 0 0 1-24.338-30.387l-1.839.313a4.68007 4.68007 0 0 0-2.428-.855 39.52352 39.52352 0 0 0-7.356 2.165 35.58886 35.58886 0 0 1-3.787 1.45c-.305.084-.745.168-1.093.244-.028.01-.052.022-.08.029a.60518.60518 0 0 1-.065.006 4.236 4.236 0 1 1-1.874-8.224l.061-.015.037-.01c.353-.083.805-.2 1.127-.262a35.27 35.27 0 0 1 4.05-.326 39.38835 39.38835 0 0 0 7.564-1.242 5.83506 5.83506 0 0 0 1.814-1.83l1.767-.516a54.613 54.613 0 0 1 8.613-38.073l-1.353-1.206a4.688 4.688 0 0 0-.848-2.436 39.36558 39.36558 0 0 0-6.277-4.41 35.2503 35.2503 0 0 1-3.499-2.046c-.256-.191-.596-.478-.874-.704l-.063-.044a4.473 4.473 0 0 1-1.038-6.222 4.066 4.066 0 0 1 3.363-1.488 5.03 5.03 0 0 1 2.942 1.11c.287.225.68.526.935.745a35.25285 35.25285 0 0 1 2.78 2.95 39.38314 39.38314 0 0 0 5.69 5.142 3.333 3.333 0 0 0 2.507.243q.754.55 1.522 1.082a54.28892 54.28892 0 0 1 27.577-15.754 55.05181 55.05181 0 0 1 7.63-1.173l.1-1.784a4.6001 4.6001 0 0 0 1.37-2.184 39.47551 39.47551 0 0 0-.47-7.654 35.466 35.466 0 0 1-.576-4.014c-.011-.307.006-.731.01-1.081 0-.04-.01-.079-.01-.118a4.242 4.242 0 1 1 8.441-.004c0 .37.022.861.009 1.2a35.109 35.109 0 0 1-.579 4.013 39.53346 39.53346 0 0 0-.478 7.656 3.344 3.344 0 0 0 1.379 2.11c.015.305.065 1.323.102 1.884a55.309 55.309 0 0 1 35.032 16.927l1.606-1.147a4.6901 4.6901 0 0 0 2.56-.278 39.53152 39.53152 0 0 0 5.69-5.148 35.00382 35.00382 0 0 1 2.787-2.95c.259-.222.65-.52.936-.746a4.242 4.242 0 1 1 5.258 6.598c-.283.229-.657.548-.929.75a35.09523 35.09523 0 0 1-3.507 2.046 39.49476 39.49476 0 0 0-6.277 4.41 3.337 3.337 0 0 0-.792 2.39c-.235.216-1.06.947-1.497 1.343a54.837 54.837 0 0 1 8.792 37.983l1.704.496a4.7449 4.7449 0 0 0 1.82 1.831 39.46448 39.46448 0 0 0 7.568 1.245 35.64041 35.64041 0 0 1 4.046.324c.355.065.868.207 1.23.29a4.236 4.236 0 1 1-1.878 8.223l-.061-.008c-.028-.007-.054-.022-.083-.029-.348-.076-.785-.152-1.09-.232a35.1407 35.1407 0 0 1-3.785-1.462 39.47672 39.47672 0 0 0-7.363-2.165 3.337 3.337 0 0 0-2.362.877q-.9-.171-1.804-.316a54.91994 54.91994 0 0 1-24.328 30.605z"
-    />
-  </svg>
-);
+import { helm, kubernetes } from '../images/icons';
 
 export type Source = GitRepository | OCIRepository | HelmRepository;
 export type Deployment = HelmRelease | Kustomization;
@@ -280,40 +227,24 @@ export const referenceColumn = <T extends Deployment>() => {
   } as TableColumn<T>;
 };
 
-export const repoColumn = <T extends Deployment>() => {
+export const typeColumn = <T extends Deployment>() => {
   return {
-    title: 'Repo',
-    field: 'repo',
+    title: '',
+    field: 'type',
     render: resource => (
       <Tooltip title={resource.type || 'Unknown'}>
-        <div>
-          <Flex align>
-            <div style={{ marginRight: '6px' }}>
-              {resource.type === 'HelmRelease' ? helm : kubernetes}
-            </div>
-            <span>{resource?.sourceRef?.name}</span>
-          </Flex>
-        </div>
+        <div>{resource.type === 'HelmRelease' ? helm : kubernetes}</div>
       </Tooltip>
     ),
+    width: '20px',
   } as TableColumn<T>;
 };
 
-export const pathColumn = <T extends Kustomization>() => {
-  return {
-    title: 'Path',
-    field: 'path',
-    render: resource => <span>{resource?.path}</span>,
-  } as TableColumn<T>;
-};
-
-export const chartColumn = <T extends HelmRelease>() => {
-  const formatContent = (resource: HelmRelease) =>
-    `${resource.helmChart.chart}/${resource.lastAppliedRevision}`;
+export const repoColumn = <T extends Deployment>() => {
   return {
-    title: 'Chart',
-    render: (resource: HelmRelease) => formatContent(resource),
-    ...sortAndFilterOptions(resource => formatContent(resource)),
+    title: 'Repo',
+    field: 'repo',
+    render: resource => <span>{resource?.sourceRef?.name}</span>,
   } as TableColumn<T>;
 };
 
diff --git a/plugins/backstage-plugin-flux/src/images/icons.tsx b/plugins/backstage-plugin-flux/src/images/icons.tsx
new file mode 100644
index 0000000..0ac4b38
--- /dev/null
+++ b/plugins/backstage-plugin-flux/src/images/icons.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+
+export const helm = (
+  <svg
+    width="25px"
+    id="Layer_1"
+    data-name="Layer 1"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 500 500"
+  >
+    <path
+      fill="currentColor"
+      d="M136.52938,121.13478c-.572-.54252-1.19462-1.12636-1.81-1.71761-12.61677-12.12115-22.38092-26.13637-28.279-42.702-1.65073-4.63637-2.89692-9.36515-2.67587-14.35871.021-.4739.01959-.94915.05226-1.42214.445-6.44594,4.75912-9.70322,11.05839-8.17669a27.325,27.325,0,0,1,5.73149,2.19653c6.89022,3.45538,12.5062,8.56359,17.67051,14.16571a112.52651,112.52651,0,0,1,21.722,33.42965,8.29635,8.29635,0,0,0,.38946.861c.07116.12855.22232.21282.55927.51883A176.357,176.357,0,0,1,241.968,79.06864c-.17651-.8761-.28195-1.54571-.44772-2.2a112.49436,112.49436,0,0,1-2.65292-36.95637,84.07478,84.07478,0,0,1,4.44444-21.76378,31.32555,31.32555,0,0,1,5.47651-10.17139,15.687,15.687,0,0,1,3.16336-2.82149,7.026,7.026,0,0,1,8.03255-.056,17.27854,17.27854,0,0,1,5.8402,6.73185A53.05435,53.05435,0,0,1,271.08657,26.508a112.50469,112.50469,0,0,1,2.12263,33.00356,95.59806,95.59806,0,0,1-3.49052,19.91081c7.12171,1.31193,14.20955,2.32869,21.1473,3.97713a186.37909,186.37909,0,0,1,20.44069,6.0033A188.31671,188.31671,0,0,1,331.0769,97.9721c6.34538,3.16433,12.38553,6.94066,18.71757,10.53829.20571-.433.50439-.94982.706-1.50212A108.65959,108.65959,0,0,1,383.40128,60.246a37.75787,37.75787,0,0,1,11.822-6.883,17.24558,17.24558,0,0,1,3.67827-.84512c6.264-.71729,8.89351,3.2244,9.35653,7.93183a29.94372,29.94372,0,0,1-.77381,10.35466A87.90551,87.90551,0,0,1,396.75426,95.492c-6.79016,10.97178-14.85015,20.85494-25.09307,28.83042-.30234.2354-.56784.51814-1.07988.99029a177.77993,177.77993,0,0,1,26.59293,30.88244,10.96227,10.96227,0,0,1-1.689.29762c-10.59546.015-21.1911-.01829-31.78622.04607a4.004,4.004,0,0,1-3.17246-1.69,147.87522,147.87522,0,0,0-88.17776-46.54846,143.35862,143.35862,0,0,0-30.27955-1.16923,146.40735,146.40735,0,0,0-82.53728,31.81054,140.06663,140.06663,0,0,0-16.97616,15.84186,4.72839,4.72839,0,0,1-3.86326,1.75742c-10.12056-.07028-20.24188-.035-30.36293-.03495h-2.15212c.618-2.408,6.84026-10.93786,13.88352-18.55281C125.31349,132.2744,130.87768,126.8839,136.52938,121.13478Z"
+    />
+    <path
+      fill="currentColor"
+      d="M394.52934,347.9123a176.63854,176.63854,0,0,1-23.97343,27.16338c.70941.59068,1.28594,1.07041,1.86212,1.55057A108.31456,108.31456,0,0,1,406.10131,424.772a34.61831,34.61831,0,0,1,2.202,14.42026,14.88544,14.88544,0,0,1-.74786,3.69206,7.20762,7.20762,0,0,1-8.15793,5.02308,22.23329,22.23329,0,0,1-6.76276-2.00629,51.23237,51.23237,0,0,1-9.18151-5.8151,107.59183,107.59183,0,0,1-32.936-46.7072c-.18746-.51334-.39218-1.0204-.72243-1.87691a194.65008,194.65008,0,0,1-25.01223,14.00774,181.66925,181.66925,0,0,1-26.6869,9.72442,187.55649,187.55649,0,0,1-28.3045,5.38805c.16807.84015.26446,1.5098.43745,2.15907a109.172,109.172,0,0,1,2.9708,36.44311,80.804,80.804,0,0,1-4.42286,22.4773,78.24971,78.24971,0,0,1-4.16475,8.74473,13.39,13.39,0,0,1-2.33865,2.97083c-3.98009,4.109-8.73225,4.144-12.61157-.07366a27.28012,27.28012,0,0,1-3.907-5.61776c-3.07685-5.77569-4.6604-12.056-5.791-18.46021a116.86329,116.86329,0,0,1-1.35893-26.465,94.4795,94.4795,0,0,1,2.88466-19.18513c.14009-.53269.268-1.0696.37134-1.61034.02629-.13754-.06342-.2973-.17067-.73825a176.12108,176.12108,0,0,1-80.96855-24.99386c-.40992.90921-.76206,1.67473-1.10168,2.44579a110.47729,110.47729,0,0,1-30.90112,41.42041,38.16071,38.16071,0,0,1-12.04706,6.95909,12.08987,12.08987,0,0,1-6.51516.70023,7.11858,7.11858,0,0,1-5.40329-4.4892c-1.41614-3.424-1.16526-6.985-.68438-10.51691a55.45267,55.45267,0,0,1,4.30768-14.25037A112.49985,112.49985,0,0,1,134.88761,380.779c.459-.43461.92981-.857,1.38087-1.29954a3.76029,3.76029,0,0,0,.36534-.65529,178.90466,178.90466,0,0,1-28.469-31.31672c.98458-.08018,1.64327-.18,2.30205-.1806,10.51436-.00976,21.029.02736,31.54284-.04358a4.70554,4.70554,0,0,1,3.70344,1.62615,146.94611,146.94611,0,0,0,39.40276,28.88494,139.94667,139.94667,0,0,0,49.70395,14.77367q70.68048,6.87067,121.59971-42.85452a7.64571,7.64571,0,0,1,5.99261-2.44347c9.80139.12121,19.60512.04986,29.408.04986h2.53353Z"
+    />
+    <path
+      fill="currentColor"
+      d="M350.73576,197.76167c2.78711,0,5.47037.18919,8.11487-.0501,2.9951-.271,5.139.8001,7.32354,2.81308,12.61275,11.62214,25.35732,23.10129,38.05863,34.62729.63855.57948,1.29039,1.14432,2.1101,1.8701.76445-.65718,1.48119-1.24318,2.16483-1.8655Q428.14636,217.27914,447.756,199.37a5.44772,5.44772,0,0,1,4.20358-1.64576c3.21888.13038,6.44673.03746,9.8412.03746V303.13036c-1.72309.50368-24.8756.60366-27.63911.0611v-53.362l-.53656-.25427c-9.01079,8.21784-18.0216,16.43564-27.23786,24.8408-9.22584-8.31119-18.34194-16.52347-27.458-24.73577l-.52449.19192c-.023,4.45359-.00774,8.90828-.01046,13.36233q-.00408,6.63942-.00058,13.27882v26.87211h-27.428C350.45161,301.61243,350.21289,203.72342,350.73576,197.76167Z"
+    />
+    <path
+      fill="currentColor"
+      d="M97.63436,197.88229h27.26325c.55054,1.75251.65821,102.97139.09469,105.525H97.70468c-.15021-6.70344-.04736-13.38394-.06622-20.06131-.01871-6.62261-.0041-13.24531-.0041-20.03958H63.84679V303.047c-2.05946.61518-25.33374.67417-27.64758.123V197.89436H63.73742v37.18876c1.96793.56844,30.92319.67339,33.872.12942.00818-2.97713.02-6.02646.024-9.0758q.0063-4.7433.00094-9.4866,0-4.625,0-9.25C97.63437,204.32179,97.63436,201.24346,97.63436,197.88229Z"
+    />
+    <path
+      fill="currentColor"
+      d="M157.5757,303.3683V198.1946c1.617-.52913,61.545-.73586,65.46219-.20457v22.41432c-.87869.063-1.7857.18341-2.69279.18454q-16.0086.01994-32.01725.00881l-2.96767,0v17.43353H218.7067V261.2229H185.65838c-.55339,1.98509-.70531,15.81681-.25622,19.64583.84488.05679,1.75.16952,2.6553.17059q16.00862.01863,32.01727.00822h2.96945V303.3683Z"
+    />
+    <path
+      fill="currentColor"
+      d="M254.28291,303.40855c-.50074-2.82232-.39948-103.60181.09747-105.51735h27.16208v77.76453c1.17173.06084,2.09122.14921,3.01077.15005q16.128.01468,32.2561.00658c.92562,0,1.85125,0,2.90733,0v27.59622Z"
+    />
+  </svg>
+);
+
+export const kubernetes = (
+  <svg
+    width="25px"
+    id="Layer_1"
+    data-name="Layer 1"
+    xmlns="http://www.w3.org/2000/svg"
+    role="img"
+    viewBox="9.70 9.20 210.86 204.86"
+  >
+    <path
+      fill="currentColor"
+      d="M134.358 126.46551a3.59023 3.59023 0 0 0-.855-.065 3.68515 3.68515 0 0 0-1.425.37 3.725 3.725 0 0 0-1.803 4.825l-.026.037 8.528 20.603a43.53012 43.53012 0 0 0 17.595-22.102l-21.976-3.714zm-34.194 2.92a3.72 3.72 0 0 0-3.568-2.894 3.6556 3.6556 0 0 0-.733.065l-.037-.045-21.785 3.698a43.69506 43.69506 0 0 0 17.54 21.946l8.442-20.399-.066-.08a3.68318 3.68318 0 0 0 .207-2.291zm18.245 8a3.718 3.718 0 0 0-6.557.008h-.018l-10.713 19.372a43.637 43.637 0 0 0 23.815 1.225q2.197-.5 4.292-1.199l-10.738-19.407zm33.914-45l-16.483 14.753.009.047a3.725 3.725 0 0 0 1.46 6.395l.02.089 21.35 6.15a44.278 44.278 0 0 0-6.356-27.432zM121.7 94.0385a3.725 3.725 0 0 0 5.913 2.84l.065.028 18.036-12.789a43.85 43.85 0 0 0-25.287-12.19l1.253 22.105zm-19.1 2.922a3.72 3.72 0 0 0 5.904-2.85l.092-.044 1.253-22.139a44.68209 44.68209 0 0 0-4.501.775 43.4669 43.4669 0 0 0-20.937 11.409l18.154 12.869zm-9.678 16.728a3.72 3.72 0 0 0 1.462-6.396l.018-.087-16.574-14.825a43.454 43.454 0 0 0-6.168 27.511l21.245-6.13zm16.098 6.512l6.114 2.94 6.096-2.933 1.514-6.582-4.219-5.276h-6.79l-4.231 5.268z"
+    />
+    <path
+      fill="currentColor"
+      d="M216.208 133.16651l-17.422-75.675a13.60207 13.60207 0 0 0-7.293-9.073l-70.521-33.67a13.589 13.589 0 0 0-11.705 0l-70.507 33.688a13.598 13.598 0 0 0-7.295 9.072l-17.394 75.673a13.315 13.315 0 0 0-.004 5.81 13.50607 13.50607 0 0 0 .491 1.718 13.0998 13.0998 0 0 0 1.343 2.726c.239.365.491.72.765 1.064l48.804 60.678c.213.264.448.505.681.75a13.42334 13.42334 0 0 0 2.574 2.133 13.9237 13.9237 0 0 0 3.857 1.677 13.29785 13.29785 0 0 0 3.43.473h.759l77.504-.018a12.99345 12.99345 0 0 0 1.41-.083 13.46921 13.46921 0 0 0 1.989-.378 13.872 13.872 0 0 0 1.381-.442c.353-.135.705-.27 1.045-.433a13.94127 13.94127 0 0 0 1.479-.822 13.30347 13.30347 0 0 0 3.237-2.865l1.488-1.85 47.299-58.84a13.185 13.185 0 0 0 2.108-3.785 13.67036 13.67036 0 0 0 .5-1.724 13.28215 13.28215 0 0 0-.004-5.809zm-73.147 29.432a14.51575 14.51575 0 0 0 .703 1.703 3.314 3.314 0 0 0-.327 2.49 39.37244 39.37244 0 0 0 3.742 6.7 35.06044 35.06044 0 0 1 2.263 3.364c.17.315.392.803.553 1.136a4.24 4.24 0 1 1-7.63 3.607c-.161-.33-.385-.77-.522-1.082a35.27528 35.27528 0 0 1-1.225-3.868 39.3046 39.3046 0 0 0-2.896-7.097 3.335 3.335 0 0 0-2.154-1.307c-.135-.233-.635-1.149-.903-1.623a54.617 54.617 0 0 1-38.948-.1l-.955 1.731a3.429 3.429 0 0 0-1.819.886 29.51728 29.51728 0 0 0-3.268 7.582 34.89931 34.89931 0 0 1-1.218 3.868c-.135.31-.361.744-.522 1.073v.009l-.007.008a4.238 4.238 0 1 1-7.619-3.616c.159-.335.372-.82.54-1.135a35.17706 35.17706 0 0 1 2.262-3.373 41.22786 41.22786 0 0 0 3.82-6.866 4.18792 4.18792 0 0 0-.376-2.387l.768-1.84a54.922 54.922 0 0 1-24.338-30.387l-1.839.313a4.68007 4.68007 0 0 0-2.428-.855 39.52352 39.52352 0 0 0-7.356 2.165 35.58886 35.58886 0 0 1-3.787 1.45c-.305.084-.745.168-1.093.244-.028.01-.052.022-.08.029a.60518.60518 0 0 1-.065.006 4.236 4.236 0 1 1-1.874-8.224l.061-.015.037-.01c.353-.083.805-.2 1.127-.262a35.27 35.27 0 0 1 4.05-.326 39.38835 39.38835 0 0 0 7.564-1.242 5.83506 5.83506 0 0 0 1.814-1.83l1.767-.516a54.613 54.613 0 0 1 8.613-38.073l-1.353-1.206a4.688 4.688 0 0 0-.848-2.436 39.36558 39.36558 0 0 0-6.277-4.41 35.2503 35.2503 0 0 1-3.499-2.046c-.256-.191-.596-.478-.874-.704l-.063-.044a4.473 4.473 0 0 1-1.038-6.222 4.066 4.066 0 0 1 3.363-1.488 5.03 5.03 0 0 1 2.942 1.11c.287.225.68.526.935.745a35.25285 35.25285 0 0 1 2.78 2.95 39.38314 39.38314 0 0 0 5.69 5.142 3.333 3.333 0 0 0 2.507.243q.754.55 1.522 1.082a54.28892 54.28892 0 0 1 27.577-15.754 55.05181 55.05181 0 0 1 7.63-1.173l.1-1.784a4.6001 4.6001 0 0 0 1.37-2.184 39.47551 39.47551 0 0 0-.47-7.654 35.466 35.466 0 0 1-.576-4.014c-.011-.307.006-.731.01-1.081 0-.04-.01-.079-.01-.118a4.242 4.242 0 1 1 8.441-.004c0 .37.022.861.009 1.2a35.109 35.109 0 0 1-.579 4.013 39.53346 39.53346 0 0 0-.478 7.656 3.344 3.344 0 0 0 1.379 2.11c.015.305.065 1.323.102 1.884a55.309 55.309 0 0 1 35.032 16.927l1.606-1.147a4.6901 4.6901 0 0 0 2.56-.278 39.53152 39.53152 0 0 0 5.69-5.148 35.00382 35.00382 0 0 1 2.787-2.95c.259-.222.65-.52.936-.746a4.242 4.242 0 1 1 5.258 6.598c-.283.229-.657.548-.929.75a35.09523 35.09523 0 0 1-3.507 2.046 39.49476 39.49476 0 0 0-6.277 4.41 3.337 3.337 0 0 0-.792 2.39c-.235.216-1.06.947-1.497 1.343a54.837 54.837 0 0 1 8.792 37.983l1.704.496a4.7449 4.7449 0 0 0 1.82 1.831 39.46448 39.46448 0 0 0 7.568 1.245 35.64041 35.64041 0 0 1 4.046.324c.355.065.868.207 1.23.29a4.236 4.236 0 1 1-1.878 8.223l-.061-.008c-.028-.007-.054-.022-.083-.029-.348-.076-.785-.152-1.09-.232a35.1407 35.1407 0 0 1-3.785-1.462 39.47672 39.47672 0 0 0-7.363-2.165 3.337 3.337 0 0 0-2.362.877q-.9-.171-1.804-.316a54.91994 54.91994 0 0 1-24.328 30.605z"
+    />
+  </svg>
+);

From f66c9768ec5031c8ac48595fc7bc91db0b8f7c4d Mon Sep 17 00:00:00 2001
From: AlinaGoaga <goaga.alina@gmail.com>
Date: Tue, 11 Jul 2023 15:09:38 +0200
Subject: [PATCH 14/14] Solve test warning

---
 .../FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
index a9c357e..1d7316b 100644
--- a/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
+++ b/plugins/backstage-plugin-flux/src/components/FluxEntityDeploymentsCard/FluxDeploymentsTable.tsx
@@ -41,9 +41,8 @@ export const FluxDeploymentsTable = ({
   const getTitle = () => {
     if (kinds.length === 1) {
       return `${kinds[0]}s`;
-    } else {
-      return 'Deployments';
     }
+    return 'Deployments';
   };
 
   let helmChart = {} as HelmChart;