wip

Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>
argoproj · Jun 20, 2023 · b2d284b · b2d284b
1 parent 64daf34
commit b2d284b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go
@@ -244,6 +244,11 @@ func (a *ApplicationSource) AllowsConcurrentProcessing() bool {
 	return true
 }
 
+// IsRef returns true when the application source is of type Ref
+func (a *ApplicationSource) IsRef() bool {
+	return a.Ref != ""
+}
+
 // IsHelm returns true when the application source is of type Helm
 func (a *ApplicationSource) IsHelm() bool {
 	return a.Chart != ""

diff --git a/server/application/application.go b/server/application/application.go
@@ -1359,12 +1359,15 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe
 	if err != nil {
 		return nil, err
 	}
-
+	revision := q.GetRevision()
 	var source *v1alpha1.ApplicationSource
 	if a.Spec.HasMultipleSources() {
 		for _, h := range a.Status.History {
 			if h.ID == int64(*q.VersionId) {
 				source = &h.Sources[*q.SourceIndex]
+				// if source.IsRef() {
+				// 	revision = source.TargetRevision
+				// }
 			}
 		}
 		if source == nil {
@@ -1392,7 +1395,7 @@ func (s *Server) RevisionMetadata(ctx context.Context, q *application.RevisionMe
 	defer ioutil.Close(conn)
 	return repoClient.GetRevisionMetadata(ctx, &apiclient.RepoServerRevisionMetadataRequest{
 		Repo:           repo,
-		Revision:       q.GetRevision(),
+		Revision:       revision,
 		CheckSignature: len(proj.Spec.SignatureKeys) > 0,
 	})
 }

diff --git a/...applications/components/application-deployment-history/application-deployment-history.tsx b/...applications/components/application-deployment-history/application-deployment-history.tsx
@@ -25,7 +25,6 @@ export const ApplicationDeploymentHistory = ({
         const runEnd = nextDeployedAt ? moment(nextDeployedAt) : moment();
         return {...info, nextDeployedAt, durationMs: runEnd.diff(moment(info.deployedAt)) / 1000};
     });
-
     return (
         <div className='application-deployment-history'>
             {recentDeployments.map((info, index) => (
@@ -70,7 +69,33 @@ export const ApplicationDeploymentHistory = ({
                             </div>
                         </div>
                         {selectedRollbackDeploymentIndex === index ? 
-                            info.sources.map((source, i) => (
+                            info.sources === undefined ?
+                            (
+                                <React.Fragment>
+                                    <RevisionMetadataRows
+                                        applicationName={app.metadata.name}
+                                        applicationNamespace={app.metadata.namespace}
+                                        source={{...recentDeployments[index].source, targetRevision: recentDeployments[index].revision}}
+                                        index={0}
+                                        versionId={recentDeployments[index].id}
+                                    />
+                                    <DataLoader
+                                        input={{...recentDeployments[index].source, targetRevision: recentDeployments[index].revision, appName: app.metadata.name}}
+                                        load={src => services.repos.appDetails(src, src.appName, app.spec.project, 0, recentDeployments[index].id)}>
+                                        {(details: models.RepoAppDetails) => (
+                                            <div>
+                                                <ApplicationParameters
+                                                    application={{
+                                                        ...app,
+                                                        spec: {...app.spec, source: recentDeployments[index].source}
+                                                    }}
+                                                    details={details}
+                                                />
+                                            </div>
+                                        )}
+                                    </DataLoader>
+                                </React.Fragment>
+                            ): info.sources.map((source, i) => (
                                 <React.Fragment>
                                     <div>
                                         <div className='row'>