From 5b2ba54280f29df9f615abd60899ae88108aaeb3 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sun, 23 Oct 2022 09:36:17 +0200 Subject: [PATCH] Fix sub-workflow filtering --- automation/workflow.cue | 4 ++-- store/adapters/rdbms/filters.gen.go | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/automation/workflow.cue b/automation/workflow.cue index 2a531ec51..312a1aefd 100644 --- a/automation/workflow.cue +++ b/automation/workflow.cue @@ -63,14 +63,14 @@ workflow: { filter: { struct: { workflow_id: { goType: "[]string", ident: "workflowID", storeIdent: "id" } - sub_workflow: { goType: "filter.State", storeIdent: "deleted_at" } + sub_workflow: { goType: "filter.State" } deleted: { goType: "filter.State", storeIdent: "deleted_at" } disabled: { goType: "filter.State", storeIdent: "enabled" } } query: ["handle"] byValue: ["workflow_id"] - byNilState: ["deleted", "sub_workflow"] + byNilState: ["deleted"] byFalseState: ["disabled"] } diff --git a/store/adapters/rdbms/filters.gen.go b/store/adapters/rdbms/filters.gen.go index ba8ca928d..31809d11e 100644 --- a/store/adapters/rdbms/filters.gen.go +++ b/store/adapters/rdbms/filters.gen.go @@ -451,10 +451,6 @@ func AutomationWorkflowFilter(f automationType.WorkflowFilter) (ee []goqu.Expres ee = append(ee, expr) } - if expr := stateNilComparison("deleted_at", f.SubWorkflow); expr != nil { - ee = append(ee, expr) - } - if expr := stateFalseComparison("enabled", f.Disabled); expr != nil { ee = append(ee, expr) }