diff --git a/pkg/apiserver/model/workflow.go b/pkg/apiserver/model/workflow.go index e4340c5ee..da06009b6 100644 --- a/pkg/apiserver/model/workflow.go +++ b/pkg/apiserver/model/workflow.go @@ -89,6 +89,7 @@ func (w *Workflow) Index() map[string]string { type WorkflowRecord struct { Model WorkflowName string `json:"workflowName"` + WorkflowAlias string `json:"workflowAlias"` AppPrimaryKey string `json:"appPrimaryKey"` RevisionPrimaryKey string `json:"revisionPrimaryKey"` Name string `json:"name"` diff --git a/pkg/apiserver/rest/apis/v1/types.go b/pkg/apiserver/rest/apis/v1/types.go index 1be163260..c821b0de9 100644 --- a/pkg/apiserver/rest/apis/v1/types.go +++ b/pkg/apiserver/rest/apis/v1/types.go @@ -622,6 +622,7 @@ type WorkflowRecord struct { Name string `json:"name"` Namespace string `json:"namespace"` WorkflowName string `json:"workflowName"` + WorkflowAlias string `json:"workflowAlias"` ApplicationRevision string `json:"applicationRevision"` StartTime time.Time `json:"startTime,omitempty"` Status string `json:"status"` diff --git a/pkg/apiserver/rest/usecase/workflow.go b/pkg/apiserver/rest/usecase/workflow.go index c4b3213ff..67d8c2fcc 100644 --- a/pkg/apiserver/rest/usecase/workflow.go +++ b/pkg/apiserver/rest/usecase/workflow.go @@ -512,6 +512,7 @@ func (w *workflowUsecaseImpl) CreateWorkflowRecord(ctx context.Context, appModel return w.ds.Add(ctx, &model.WorkflowRecord{ WorkflowName: workflow.Name, + WorkflowAlias: workflow.Alias, AppPrimaryKey: appModel.PrimaryKey(), RevisionPrimaryKey: app.Annotations[oam.AnnotationDeployVersion], Name: app.Annotations[oam.AnnotationPublishVersion], @@ -519,7 +520,7 @@ func (w *workflowUsecaseImpl) CreateWorkflowRecord(ctx context.Context, appModel Finished: "false", StartTime: time.Now().Time, Steps: steps, - Status: model.RevisionStatusInit, + Status: model.RevisionStatusRunning, }) } func (w *workflowUsecaseImpl) CountWorkflow(ctx context.Context, app *model.Application) int64 { @@ -654,6 +655,7 @@ func convertFromRecordModel(record *model.WorkflowRecord) *apisv1.WorkflowRecord Name: record.Name, Namespace: record.Namespace, WorkflowName: record.WorkflowName, + WorkflowAlias: record.WorkflowAlias, ApplicationRevision: record.RevisionPrimaryKey, StartTime: record.StartTime, Status: record.Status,