Update API response to include status.lastAppliedRevision fields (#1643)

* Update API response to include status.lastAppliedRevision fields

* add test cover

* revert application snap

Author: TheGostKasper

api/pipelines/pipelines.swagger.json

@@ -263,6 +263,9 @@
         },
         "version": {
           "type": "string"
+        },
+        "lastAppliedRevision": {
+          "type": "string"
         }
       }
     }

api/pipelines/types.proto

@@ -37,6 +37,7 @@ message WorkloadStatus {
     string kind    = 1;
     string name    = 2;
     string version = 3;
+    string lastAppliedRevision = 4;
 }
 
 message PipelineTargetStatus {

pkg/api/pipelines/types.pb.go

@@ -108,6 +108,7 @@ func getWorkloadStatus(obj *unstructured.Unstructured) (*pb.WorkloadStatus, erro
 		ws.Kind = hr.Kind
 		ws.Name = hr.Name
 		ws.Version = hr.Spec.Chart.Spec.Version
+		ws.LastAppliedRevision = hr.Status.LastAppliedRevision
 	}
 
 	return ws, nil

pkg/pipelines/server/get.go

@@ -40,6 +40,7 @@ func TestGetPipeline(t *testing.T) {
 
 		assert.Equal(t, p.Name, res.Pipeline.Name)
 		assert.Equal(t, res.Pipeline.Status.Environments[envName].TargetsStatuses[0].Workloads[0].Version, hr.Spec.Chart.Spec.Version)
+		assert.Equal(t, res.Pipeline.Status.Environments[envName].TargetsStatuses[0].Workloads[0].LastAppliedRevision, hr.Status.LastAppliedRevision)
 		assert.Equal(t, res.Pipeline.Status.Environments[envName].TargetsStatuses[0].Namespace, targetNamespace.Name)
 	})
 
@@ -109,6 +110,9 @@ func createHelmRelease(ctx context.Context, t *testing.T, k client.Client, name
 				},
 			},
 		},
+		Status: helm.HelmReleaseStatus{
+			LastAppliedRevision: "0.1.2",
+		},
 	}
 
 	require.NoError(t, k.Create(ctx, hr))

pkg/pipelines/server/get_test.go

@@ -35,6 +35,7 @@ export type WorkloadStatus = {
   kind?: string
   name?: string
   version?: string
+  lastAppliedRevision?: string
 }
 
 export type PipelineTargetStatus = {

ui-cra/src/api/pipelines/types.pb.ts

@@ -1,3 +1,4 @@
+/* eslint-disable testing-library/no-node-access */
 import { act, render, RenderResult, screen } from '@testing-library/react';
 import { formatURL } from '@weaveworks/weave-gitops';
 import PipelineDetails from '..';
@@ -81,6 +82,7 @@ const res: GetPipelineResponse = {
                   kind: 'HelmRelease',
                   name: 'podinfo',
                   version: '6.2.0',
+                  lastAppliedRevision: '6.2.0',
                 },
               ],
             },
@@ -141,6 +143,16 @@ const res: GetPipelineResponse = {
   },
 };
 
+interface MappedWorkload {
+  kind?: string | undefined;
+  name?: string | undefined;
+  namespace?: string | undefined;
+  version?: string | undefined;
+  lastAppliedVersion?: string | undefined;
+  mappedClusterName?: string | undefined;
+  clusterName?: string | undefined;
+}
+
 describe('PipelineDetails', () => {
   let wrap: (el: JSX.Element) => JSX.Element;
   let api: PipelinesClientMock;
@@ -178,23 +190,14 @@ describe('PipelineDetails', () => {
       );
       expect(targets.length).toEqual(env.targets?.length);
 
-      let workloads: {
-        target: string | undefined;
-        kind?: string | undefined;
-        name?: string | undefined;
-        namespace?: string | undefined;
-        version?: string | undefined;
-        clusterName?: string | undefined;
-      }[] = [];
+      let workloads: MappedWorkload[] = [];
 
       targetsStatuses[env.name!].targetsStatuses?.forEach(ts => {
         if (ts.workloads) {
           const wrks = ts.workloads.map(wrk => ({
             ...wrk,
-            target: ts.clusterRef?.name
-              ? `${ts.clusterRef?.name}/${ts.namespace}`
-              : ts.namespace,
-            clusterName: ts.clusterRef?.namespace
+            clusterName: ts.clusterRef?.name,
+            mappedClusterName: ts.clusterRef?.namespace
               ? `${ts.clusterRef?.namespace}/${ts.clusterRef.name}`
               : '',
             namespace: ts.namespace,
@@ -205,28 +208,55 @@ describe('PipelineDetails', () => {
 
       // Targets
       targets.forEach((target, index) => {
-        // Target
-        const workloadTarget =
-          target.querySelector('.workloadTarget')?.textContent;
-        expect(workloadTarget).toEqual(workloads![index].target);
+        const workloadTarget = target.querySelector('.workloadTarget');
+
+        // Cluster Name
+        const clusterNameEle = workloadTarget?.querySelector('.cluster-name');
+        if (workloads![index].clusterName) {
+          checkTextContentToEqual(
+            clusterNameEle,
+            workloads![index].clusterName || '',
+          );
+        } else {
+          elementToBeNull(clusterNameEle);
+        }
+
+        // Workload Namespace
+        const workloadNamespace = workloadTarget?.querySelector(
+          '.workload-namespace',
+        );
+        expect(workloadNamespace?.textContent).toEqual(
+          workloads![index].namespace,
+        );
 
         //Target as a link
         const linkToAutomation = target.querySelector('.workloadName > a');
-
-        if (workloads![index].clusterName) {
+        if (workloads![index].mappedClusterName) {
           const href = formatURL('/helm_release/details', {
             name: workloads![index].name,
             namespace: workloads![index].namespace,
-            clusterName: workloads![index].clusterName,
+            clusterName: workloads![index].mappedClusterName,
           });
           linkToExists(linkToAutomation, href);
         } else {
-          linkToBeNull(linkToAutomation);
+          elementToBeNull(linkToAutomation);
+          checkTextContentToEqual(
+            target.querySelector('.workload-name'),
+            workloads![index].name || '',
+          );
+        }
+        // Workload Last Applied Version
+        const lastAppliedRevision = target.querySelector(
+          'workloadName > .last-applied-version',
+        );
+        if (workloads![index].lastAppliedVersion) {
+          checkTextContentToEqual(
+            lastAppliedRevision,
+            workloads![index].lastAppliedVersion || '',
+          );
+        } else {
+          elementToBeNull(lastAppliedRevision);
         }
-
-        // Workload Name
-        const workloadName = target.querySelector('.workloadName')?.textContent;
-        expect(workloadName).toEqual(workloads![index].name);
 
         // Workload Version
         const workloadVersion = target.querySelector('.version')?.textContent;
@@ -254,9 +284,16 @@ describe('PipelineDetails', () => {
   });
 });
 
-const linkToExists = (element: Element | null, href: String) => {
-  return expect(element).toHaveAttribute('href', href);
+const linkToExists = (element: Element | null, href: string) => {
+  expect(element).toHaveAttribute('href', href);
 };
-const linkToBeNull = (element: Element | null) => {
-  return expect(element).toBeNull();
+const elementToBeNull = (element: Element | null | undefined) => {
+  expect(element).toBeNull();
+};
+
+const checkTextContentToEqual = (
+  element: Element | null | undefined,
+  clusterName: string,
+) => {
+  expect(element?.textContent).toEqual(clusterName);
 };