Add HelmRelease section to Add Application

cmd/clusters-service/api/cluster_services.proto

@@ -527,6 +527,7 @@ message Chart {
 message ChartSpec {
   string chart = 1;
   SourceRef source_ref = 2;
+  string version = 3; 
 }
 
 message Metadata {

cmd/clusters-service/api/cluster_services.swagger.json

@@ -819,6 +819,9 @@
         },
         "sourceRef": {
           "$ref": "#/definitions/v1SourceRef"
+        },
+        "version": {
+          "type": "string"
         }
       }
     },

cmd/clusters-service/pkg/server/automations.go

@@ -174,6 +174,7 @@ func createHelmReleaseObject(hr *capiv1_proto.HelmRelease) *helmv2.HelmRelease {
 						Name:       hr.Spec.Chart.Spec.SourceRef.Name,
 						Namespace:  hr.Spec.Chart.Spec.SourceRef.Namespace,
 					},
+					Version: hr.Spec.Chart.Spec.Version,
 				},
 			},
 			Interval: metav1.Duration{Duration: time.Minute * 10},

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.5.0
 	github.com/stretchr/testify v1.8.0
-	github.com/weaveworks/weave-gitops v0.9.4-0.20220817125053-721c4723c935
+	github.com/weaveworks/weave-gitops v0.9.4-0.20220825144206-f72caa29d3c7
 	github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2
 	github.com/weaveworks/weave-gitops-enterprise/common v0.0.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -1333,8 +1333,8 @@ github.com/weaveworks/policy-agent/api v1.0.4 h1:dznn4I3+tfSniNbERFaAXOMpLsvwW+6
 github.com/weaveworks/policy-agent/api v1.0.4/go.mod h1:GbePwORMtByaPqKoD7xuY/oqdq8iagfh5R6NZS14+AA=
 github.com/weaveworks/progressive-delivery v0.0.0-20220808183836-c7c637e887d0 h1:49pW4S2L2fqQYGqqr/5Grps55RopEbQcepTnQeNZ+sE=
 github.com/weaveworks/progressive-delivery v0.0.0-20220808183836-c7c637e887d0/go.mod h1:XRrKv9SdRa6r/CGlT78c50dyxz+r9DWOiy09npLS3L8=
-github.com/weaveworks/weave-gitops v0.9.4-0.20220817125053-721c4723c935 h1:c2zd3+DMocgrszlsQmX2DOxehuR9Qw2IzJ5leFF0pPg=
-github.com/weaveworks/weave-gitops v0.9.4-0.20220817125053-721c4723c935/go.mod h1:VQvGWjVAXzEeMkafSyP9nP25TapGyj7GYd6pouJ5uR4=
+github.com/weaveworks/weave-gitops v0.9.4-0.20220825144206-f72caa29d3c7 h1:/ah8HBfAMUH2JoBRoorQCAsr6Ool8JgoCGbgCiS4DE0=
+github.com/weaveworks/weave-gitops v0.9.4-0.20220825144206-f72caa29d3c7/go.mod h1:sMWzafQ2wnXhNoL+aEbFPOrRPIz8DcqAzOAEn7kM0Zc=
 github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2 h1:7jeiQehqmI4ds6YIq8TW1Vqhlb6V7G2BVRJ8VM3r99I=
 github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2/go.mod h1:6PMYg+VtSNePnP7EXyNG+/hNRNZ3r0mQtolIZU4s/J0=
 github.com/xanzy/go-gitlab v0.69.0 h1:sPci9xHzlX+lcJvPqNu3y3BQpePuR2R694Bal4AeyB8=

ui-cra/src/cluster-services/cluster_services.pb.ts

@@ -360,6 +360,7 @@ export type Chart = {
 export type ChartSpec = {
   chart?: string
   sourceRef?: SourceRef
+  version?: string
 }
 
 export type Metadata = {

ui-cra/src/components/Applications/Add/form/Partials/AppFields.tsx

@@ -1,11 +1,11 @@
 import React, { FC, Dispatch } from 'react';
 import styled from 'styled-components';
+import useProfiles from '../../../../../contexts/Profiles';
 import { Input, Select } from '../../../../../utils/form';
-import _ from 'lodash';
 import { MenuItem } from '@material-ui/core';
-import { GitRepository } from '@weaveworks/weave-gitops/ui/lib/api/core/types.pb';
 import { GitopsClusterEnriched } from '../../../../../types/custom';
-import { ListGitRepositoriesResponse } from '@weaveworks/weave-gitops/ui/lib/api/core/core.pb';
+import { useListSources } from '@weaveworks/weave-gitops';
+import { Source } from '@weaveworks/weave-gitops/ui/lib/types';
 import { DEFAULT_FLUX_KUSTOMIZATION_NAMESPACE } from '../../../../../utils/config';
 
 const FormWrapper = styled.form`
@@ -22,16 +22,10 @@ const AppFields: FC<{
   setFormData: Dispatch<React.SetStateAction<any>> | any;
   index?: number;
   clusters?: GitopsClusterEnriched[];
-  GitRepoResponse?: ListGitRepositoriesResponse;
-}> = ({
-  formData,
-  setFormData,
-  index = 0,
-  clusters = undefined,
-  GitRepoResponse = undefined,
-}) => {
+}> = ({ formData, setFormData, index = 0, clusters = undefined }) => {
+  const { setHelmRepo } = useProfiles();
+  const { data } = useListSources();
   const automation = formData.clusterAutomations[index];
-  let gitResposFilterdList: GitRepository[] = [];
 
   const handleSelectCluster = (event: React.ChangeEvent<any>) => {
     const value = event.target.value;
@@ -48,29 +42,48 @@ const AppFields: FC<{
       clusterAutomations: currentAutomation,
     });
   };
+
+  let repos: Source[] | undefined = [];
+
   if (clusters) {
     const clusterName = automation.cluster_namespace
       ? `${automation.cluster_namespace}/${automation.cluster_name}`
       : `${automation.cluster_name}`;
-    gitResposFilterdList = _.filter(GitRepoResponse?.gitRepositories, [
-      'clusterName',
-      clusterName,
-    ]);
+
+    repos = data?.result.filter(
+      object =>
+        object.clusterName === clusterName &&
+        (object.kind === 'KindGitRepository' ||
+          object.kind === 'KindHelmRepository'),
+    );
   }
 
   const handleSelectSource = (event: React.ChangeEvent<any>) => {
-    const value = event.target.value;
+    const { value } = event.target;
     let currentAutomation = [...formData.clusterAutomations];
+
     currentAutomation[index] = {
       ...automation,
       source_name: JSON.parse(value).name,
       source_namespace: JSON.parse(value).namespace,
       source: value,
     };
+
     setFormData({
       ...formData,
+      source_name: JSON.parse(value).name,
+      source_namespace: JSON.parse(value).namespace,
+      source_type: JSON.parse(value).kind,
+      source: value,
       clusterAutomations: currentAutomation,
     });
+
+    if (JSON.parse(value).kind === 'KindHelmRepository') {
+      setHelmRepo({
+        name: JSON.parse(value).name,
+        namespace: JSON.parse(value).namespace,
+      });
+    }
   };
 
   const handleFormData = (
@@ -86,6 +99,7 @@ const AppFields: FC<{
       ...automation,
       [fieldName as string]: value,
     };
+
     setFormData({
       ...formData,
       clusterAutomations: currentAutomation,
@@ -140,33 +154,33 @@ const AppFields: FC<{
             defaultValue={''}
             description="The name and type of source"
           >
-            {gitResposFilterdList.length > 0 ? (
-              gitResposFilterdList?.map(
-                (option: GitRepository, index: number) => {
-                  return (
-                    <MenuItem key={index} value={JSON.stringify(option)}>
-                      {option.name}
-                    </MenuItem>
-                  );
-                },
-              )
+            {repos ? (
+              repos.map((option: Source, index: number) => {
+                return (
+                  <MenuItem key={index} value={JSON.stringify(option)}>
+                    {option?.kind?.slice(4)} : {option.name}
+                  </MenuItem>
+                );
+              })
             ) : (
               <MenuItem disabled={true}>
-                No GitRepository available please select another cluster
+                No repository available, please select another cluster.
               </MenuItem>
             )}
           </Select>
         </>
       )}
-      <Input
-        className="form-section"
-        required={true}
-        name="path"
-        label="SELECT PATH/CHART"
-        value={formData.clusterAutomations[index].path}
-        onChange={event => handleFormData(event, 'path')}
-        description="Path within the git repository to read yaml files"
-      />
+      {formData.source_type === 'KindGitRepository' ? (
+        <Input
+          className="form-section"
+          required={true}
+          name="path"
+          label="SELECT PATH/CHART"
+          value={formData.clusterAutomations[index].path}
+          onChange={event => handleFormData(event, 'path')}
+          description="Path within the git repository to read yaml files"
+        />
+      ) : null}
     </FormWrapper>
   );
 };