diff --git a/api-contracts/openapi/components/schemas/workflow.yaml b/api-contracts/openapi/components/schemas/workflow.yaml
index 1f6796111..e102915d7 100644
--- a/api-contracts/openapi/components/schemas/workflow.yaml
+++ b/api-contracts/openapi/components/schemas/workflow.yaml
@@ -17,8 +17,6 @@ Workflow:
items:
$ref: "#/WorkflowTag"
description: The tags of the workflow.
- lastRun:
- $ref: "./_index.yaml#/WorkflowRun"
jobs:
type: array
items:
diff --git a/api/v1/server/handlers/workflows/get.go b/api/v1/server/handlers/workflows/get.go
index 4e33bf70e..7df3fa836 100644
--- a/api/v1/server/handlers/workflows/get.go
+++ b/api/v1/server/handlers/workflows/get.go
@@ -11,7 +11,7 @@ import (
func (t *WorkflowService) WorkflowGet(ctx echo.Context, request gen.WorkflowGetRequestObject) (gen.WorkflowGetResponseObject, error) {
workflow := ctx.Get("workflow").(*db.WorkflowModel)
- resp, err := transformers.ToWorkflow(workflow, nil)
+ resp, err := transformers.ToWorkflow(workflow)
if err != nil {
return nil, err
diff --git a/api/v1/server/handlers/workflows/list.go b/api/v1/server/handlers/workflows/list.go
index e6a1995c0..de27b5983 100644
--- a/api/v1/server/handlers/workflows/list.go
+++ b/api/v1/server/handlers/workflows/list.go
@@ -31,11 +31,7 @@ func (t *WorkflowService) WorkflowList(ctx echo.Context, request gen.WorkflowLis
rows := make([]gen.Workflow, len(listResp.Rows))
for i := range listResp.Rows {
- workflow, err := transformers.ToWorkflow(listResp.Rows[i].WorkflowModel, listResp.Rows[i].LatestRun)
-
- if err != nil {
- return nil, err
- }
+ workflow := transformers.ToWorkflowFromSQLC(listResp.Rows[i])
rows[i] = *workflow
}
diff --git a/api/v1/server/oas/gen/openapi.gen.go b/api/v1/server/oas/gen/openapi.gen.go
index 5c1de077a..b9805257c 100644
--- a/api/v1/server/oas/gen/openapi.gen.go
+++ b/api/v1/server/oas/gen/openapi.gen.go
@@ -984,7 +984,6 @@ type Workflow struct {
// Jobs The jobs of the workflow.
Jobs *[]Job `json:"jobs,omitempty"`
- LastRun *WorkflowRun `json:"lastRun,omitempty"`
Metadata APIResourceMeta `json:"metadata"`
// Name The name of the workflow.
@@ -8400,93 +8399,93 @@ var swaggerSpec = []string{
"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",
- "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",
- "QcmLLA29E897+fryvwEAAP//loaU7/eGAQA=",
+ "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",
+ "nXjey9eX/w0AAP//vCFkwMGGAQA=",
}
// GetSwagger returns the content of the embedded swagger specification file
diff --git a/api/v1/server/oas/transformers/workflow.go b/api/v1/server/oas/transformers/workflow.go
index 32ea5d097..da6a6e148 100644
--- a/api/v1/server/oas/transformers/workflow.go
+++ b/api/v1/server/oas/transformers/workflow.go
@@ -11,21 +11,12 @@ import (
"github.com/hatchet-dev/hatchet/pkg/repository/prisma/dbsqlc"
)
-func ToWorkflow(workflow *db.WorkflowModel, lastRun *db.WorkflowRunModel) (*gen.Workflow, error) {
+func ToWorkflow(workflow *db.WorkflowModel) (*gen.Workflow, error) {
res := &gen.Workflow{
Metadata: *toAPIMetadata(workflow.ID, workflow.CreatedAt, workflow.UpdatedAt),
Name: workflow.Name,
}
- if lastRun != nil {
- var err error
- res.LastRun, err = ToWorkflowRun(lastRun)
-
- if err != nil {
- return nil, err
- }
- }
-
if description, ok := workflow.Description(); ok {
res.Description = &description
}
@@ -160,7 +151,7 @@ func ToWorkflowVersion(workflow *db.WorkflowModel, version *db.WorkflowVersionMo
if workflow != nil {
var err error
- res.Workflow, err = ToWorkflow(workflow, nil)
+ res.Workflow, err = ToWorkflow(workflow)
if err != nil {
return nil, err
@@ -338,6 +329,10 @@ func ToWorkflowFromSQLC(row *dbsqlc.Workflow) *gen.Workflow {
Description: &row.Description.String,
}
+ // if lastRunAt != nil && !lastRunAt.IsZero() {
+ // res.LastRunAt = lastRunAt
+ // }
+
return res
}
diff --git a/frontend/app/src/lib/api/generated/data-contracts.ts b/frontend/app/src/lib/api/generated/data-contracts.ts
index aa2c8fb23..fcda89f54 100644
--- a/frontend/app/src/lib/api/generated/data-contracts.ts
+++ b/frontend/app/src/lib/api/generated/data-contracts.ts
@@ -502,7 +502,6 @@ export interface Workflow {
versions?: WorkflowVersionMeta[];
/** The tags of the workflow. */
tags?: WorkflowTag[];
- lastRun?: WorkflowRun;
/** The jobs of the workflow. */
jobs?: Job[];
}
diff --git a/frontend/app/src/pages/main/workflows/components/workflow-table.tsx b/frontend/app/src/pages/main/workflows/components/workflow-table.tsx
index 538ab7a89..5d51190f7 100644
--- a/frontend/app/src/pages/main/workflows/components/workflow-table.tsx
+++ b/frontend/app/src/pages/main/workflows/components/workflow-table.tsx
@@ -90,13 +90,9 @@ export function WorkflowTable() {
{data.name}
- Last run{' '}
- {data.lastRun?.metadata?.createdAt ? (
-
- ) : (
- 'never'
- )}
-
+ {/* Last run{' '}
+ {data.lastRunAt ? : 'never'}
+
*/}
Created at
diff --git a/pkg/client/rest/gen.go b/pkg/client/rest/gen.go
index 583f504b3..6385518d1 100644
--- a/pkg/client/rest/gen.go
+++ b/pkg/client/rest/gen.go
@@ -981,7 +981,6 @@ type Workflow struct {
// Jobs The jobs of the workflow.
Jobs *[]Job `json:"jobs,omitempty"`
- LastRun *WorkflowRun `json:"lastRun,omitempty"`
Metadata APIResourceMeta `json:"metadata"`
// Name The name of the workflow.
diff --git a/pkg/repository/prisma/dbsqlc/workflow_runs.sql b/pkg/repository/prisma/dbsqlc/workflow_runs.sql
index 46b1ba973..56f62b053 100644
--- a/pkg/repository/prisma/dbsqlc/workflow_runs.sql
+++ b/pkg/repository/prisma/dbsqlc/workflow_runs.sql
@@ -94,7 +94,7 @@ LEFT JOIN
"Workflow" as workflow ON workflowVersion."workflowId" = workflow."id"
WHERE
runs."tenantId" = @tenantId::uuid AND
- runs."created" > NOW - INTERVAL '1 day' AND
+ runs."createdAt" > NOW - INTERVAL '1 day' AND
runs."deletedAt" IS NULL AND
workflowVersion."deletedAt" IS NULL AND
workflow."deletedAt" IS NULL AND
diff --git a/pkg/repository/prisma/dbsqlc/workflow_runs.sql.go b/pkg/repository/prisma/dbsqlc/workflow_runs.sql.go
index ff480685e..a9a6e4299 100644
--- a/pkg/repository/prisma/dbsqlc/workflow_runs.sql.go
+++ b/pkg/repository/prisma/dbsqlc/workflow_runs.sql.go
@@ -1767,7 +1767,7 @@ LEFT JOIN
"Workflow" as workflow ON workflowVersion."workflowId" = workflow."id"
WHERE
runs."tenantId" = $1::uuid AND
- runs."created" > NOW - INTERVAL '1 day' AND
+ runs."createdAt" > NOW - INTERVAL '1 day' AND
runs."deletedAt" IS NULL AND
workflowVersion."deletedAt" IS NULL AND
workflow."deletedAt" IS NULL AND
diff --git a/pkg/repository/prisma/dbsqlc/workflows.sql b/pkg/repository/prisma/dbsqlc/workflows.sql
index 9b46850bf..808c88498 100644
--- a/pkg/repository/prisma/dbsqlc/workflows.sql
+++ b/pkg/repository/prisma/dbsqlc/workflows.sql
@@ -79,52 +79,11 @@ ORDER BY
-- name: ListWorkflows :many
SELECT
sqlc.embed(workflows)
-FROM (
- SELECT
- DISTINCT ON(workflows."id") workflows.*
- FROM
- "Workflow" as workflows
- LEFT JOIN
- (
- SELECT * FROM "WorkflowVersion" as workflowVersion ORDER BY workflowVersion."order" DESC LIMIT 1
- ) as workflowVersion ON workflows."id" = workflowVersion."workflowId"
- LEFT JOIN
- "WorkflowTriggers" as workflowTrigger ON workflowVersion."id" = workflowTrigger."workflowVersionId"
- LEFT JOIN
- "WorkflowTriggerEventRef" as workflowTriggerEventRef ON workflowTrigger."id" = workflowTriggerEventRef."parentId"
- WHERE
- workflows."tenantId" = $1
- AND workflows."deletedAt" IS NULL
- AND workflowVersion."deletedAt" IS NULL
- AND
- (
- sqlc.narg('eventKey')::text IS NULL OR
- workflows."id" IN (
- SELECT
- DISTINCT ON(t1."workflowId") t1."workflowId"
- FROM
- "WorkflowVersion" AS t1
- LEFT JOIN "WorkflowTriggers" AS j2 ON j2."workflowVersionId" = t1."id"
- WHERE
- (
- j2."id" IN (
- SELECT
- t3."parentId"
- FROM
- "public"."WorkflowTriggerEventRef" AS t3
- WHERE
- t3."eventKey" = sqlc.narg('eventKey')::text
- AND t3."parentId" IS NOT NULL
- )
- AND j2."id" IS NOT NULL
- AND t1."workflowId" IS NOT NULL
- )
- ORDER BY
- t1."workflowId" DESC
- )
- )
- ORDER BY workflows."id" DESC
-) as workflows
+FROM
+ "Workflow" as workflows
+WHERE
+ workflows."tenantId" = $1 AND
+ workflows."deletedAt" IS NULL
ORDER BY
case when @orderBy = 'createdAt ASC' THEN workflows."createdAt" END ASC ,
case when @orderBy = 'createdAt DESC' then workflows."createdAt" END DESC
diff --git a/pkg/repository/prisma/dbsqlc/workflows.sql.go b/pkg/repository/prisma/dbsqlc/workflows.sql.go
index adc8a7fb4..057003e06 100644
--- a/pkg/repository/prisma/dbsqlc/workflows.sql.go
+++ b/pkg/repository/prisma/dbsqlc/workflows.sql.go
@@ -861,64 +861,22 @@ func (q *Queries) LinkOnFailureJob(ctx context.Context, db DBTX, arg LinkOnFailu
const listWorkflows = `-- name: ListWorkflows :many
SELECT
workflows.id, workflows."createdAt", workflows."updatedAt", workflows."deletedAt", workflows."tenantId", workflows.name, workflows.description
-FROM (
- SELECT
- DISTINCT ON(workflows."id") workflows.id, workflows."createdAt", workflows."updatedAt", workflows."deletedAt", workflows."tenantId", workflows.name, workflows.description
- FROM
- "Workflow" as workflows
- LEFT JOIN
- (
- SELECT id, "createdAt", "updatedAt", "deletedAt", version, "order", "workflowId", checksum, "scheduleTimeout", "onFailureJobId", sticky, kind FROM "WorkflowVersion" as workflowVersion ORDER BY workflowVersion."order" DESC LIMIT 1
- ) as workflowVersion ON workflows."id" = workflowVersion."workflowId"
- LEFT JOIN
- "WorkflowTriggers" as workflowTrigger ON workflowVersion."id" = workflowTrigger."workflowVersionId"
- LEFT JOIN
- "WorkflowTriggerEventRef" as workflowTriggerEventRef ON workflowTrigger."id" = workflowTriggerEventRef."parentId"
- WHERE
- workflows."tenantId" = $1
- AND workflows."deletedAt" IS NULL
- AND workflowVersion."deletedAt" IS NULL
- AND
- (
- $2::text IS NULL OR
- workflows."id" IN (
- SELECT
- DISTINCT ON(t1."workflowId") t1."workflowId"
- FROM
- "WorkflowVersion" AS t1
- LEFT JOIN "WorkflowTriggers" AS j2 ON j2."workflowVersionId" = t1."id"
- WHERE
- (
- j2."id" IN (
- SELECT
- t3."parentId"
- FROM
- "public"."WorkflowTriggerEventRef" AS t3
- WHERE
- t3."eventKey" = $2::text
- AND t3."parentId" IS NOT NULL
- )
- AND j2."id" IS NOT NULL
- AND t1."workflowId" IS NOT NULL
- )
- ORDER BY
- t1."workflowId" DESC
- )
- )
- ORDER BY workflows."id" DESC
-) as workflows
+FROM
+ "Workflow" as workflows
+WHERE
+ workflows."tenantId" = $1 AND
+ workflows."deletedAt" IS NULL
ORDER BY
- case when $3 = 'createdAt ASC' THEN workflows."createdAt" END ASC ,
- case when $3 = 'createdAt DESC' then workflows."createdAt" END DESC
+ case when $2 = 'createdAt ASC' THEN workflows."createdAt" END ASC ,
+ case when $2 = 'createdAt DESC' then workflows."createdAt" END DESC
OFFSET
- COALESCE($4, 0)
+ COALESCE($3, 0)
LIMIT
- COALESCE($5, 50)
+ COALESCE($4, 50)
`
type ListWorkflowsParams struct {
TenantId pgtype.UUID `json:"tenantId"`
- EventKey pgtype.Text `json:"eventKey"`
Orderby interface{} `json:"orderby"`
Offset interface{} `json:"offset"`
Limit interface{} `json:"limit"`
@@ -931,7 +889,6 @@ type ListWorkflowsRow struct {
func (q *Queries) ListWorkflows(ctx context.Context, db DBTX, arg ListWorkflowsParams) ([]*ListWorkflowsRow, error) {
rows, err := db.Query(ctx, listWorkflows,
arg.TenantId,
- arg.EventKey,
arg.Orderby,
arg.Offset,
arg.Limit,
diff --git a/pkg/repository/prisma/workflow.go b/pkg/repository/prisma/workflow.go
index 2e3b35de0..0813103e5 100644
--- a/pkg/repository/prisma/workflow.go
+++ b/pkg/repository/prisma/workflow.go
@@ -18,7 +18,6 @@ import (
"github.com/hatchet-dev/hatchet/pkg/repository/prisma/db"
"github.com/hatchet-dev/hatchet/pkg/repository/prisma/dbsqlc"
"github.com/hatchet-dev/hatchet/pkg/repository/prisma/sqlchelpers"
- "github.com/hatchet-dev/hatchet/pkg/repository/prisma/sqlctoprisma"
"github.com/hatchet-dev/hatchet/pkg/validator"
)
@@ -59,26 +58,10 @@ func (r *workflowAPIRepository) ListWorkflows(tenantId string, opts *repository.
TenantId: *pgTenantId,
}
- latestRunParams := dbsqlc.ListWorkflowsLatestRunsParams{
- TenantId: *pgTenantId,
- }
-
countParams := dbsqlc.CountWorkflowsParams{
TenantId: *pgTenantId,
}
- if opts.EventKey != nil {
- pgEventKey := &pgtype.Text{}
-
- if err := pgEventKey.Scan(*opts.EventKey); err != nil {
- return nil, err
- }
-
- queryParams.EventKey = *pgEventKey
- countParams.EventKey = *pgEventKey
- latestRunParams.EventKey = *pgEventKey
- }
-
if opts.Offset != nil {
queryParams.Offset = *opts.Offset
}
@@ -106,19 +89,6 @@ func (r *workflowAPIRepository) ListWorkflows(tenantId string, opts *repository.
return nil, fmt.Errorf("failed to fetch workflows: %w", err)
}
- latestRuns, err := r.queries.ListWorkflowsLatestRuns(context.Background(), tx, latestRunParams)
-
- if err != nil {
- return nil, fmt.Errorf("failed to fetch latest runs: %w", err)
- }
-
- latestRunsMap := map[string]*dbsqlc.WorkflowRun{}
-
- for i := range latestRuns {
- uuid := sqlchelpers.UUIDToStr(latestRuns[i].WorkflowId)
- latestRunsMap[uuid] = &latestRuns[i].WorkflowRun
- }
-
count, err := r.queries.CountWorkflows(context.Background(), tx, countParams)
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
@@ -139,25 +109,7 @@ func (r *workflowAPIRepository) ListWorkflows(tenantId string, opts *repository.
sqlcWorkflows[i] = &workflows[i].Workflow
}
- prismaWorkflows := sqlctoprisma.NewConverter[dbsqlc.Workflow, db.WorkflowModel]().ToPrismaList(sqlcWorkflows)
-
- rows := make([]*repository.ListWorkflowsRow, 0)
-
- for i, workflow := range prismaWorkflows {
-
- var prismaRun *db.WorkflowRunModel
-
- if latestRun, exists := latestRunsMap[workflow.ID]; exists {
- prismaRun = sqlctoprisma.NewConverter[dbsqlc.WorkflowRun, db.WorkflowRunModel]().ToPrisma(latestRun)
- }
-
- rows = append(rows, &repository.ListWorkflowsRow{
- WorkflowModel: prismaWorkflows[i],
- LatestRun: prismaRun,
- })
- }
-
- res.Rows = rows
+ res.Rows = sqlcWorkflows
return res, nil
}
diff --git a/pkg/repository/workflow.go b/pkg/repository/workflow.go
index c501f10cf..7fe5e7a43 100644
--- a/pkg/repository/workflow.go
+++ b/pkg/repository/workflow.go
@@ -168,19 +168,10 @@ type ListWorkflowsOpts struct {
// (optional) number of workflows to return
Limit *int
-
- // (optional) the event key to filter by
- EventKey *string
-}
-
-type ListWorkflowsRow struct {
- *db.WorkflowModel
-
- LatestRun *db.WorkflowRunModel
}
type ListWorkflowsResult struct {
- Rows []*ListWorkflowsRow
+ Rows []*dbsqlc.Workflow
Count int
}