From 5ddddf81210e7bc5a4de5f8dedba307ef16d036f Mon Sep 17 00:00:00 2001 From: Peter Grlica Date: Mon, 16 May 2022 15:53:57 +0200 Subject: [PATCH] Fixed route search in admin --- store/rdbms/apigw_route.go | 6 ++++++ system/rest/apigw_route.go | 1 + system/types/apigw_route.go | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/store/rdbms/apigw_route.go b/store/rdbms/apigw_route.go index 3a860a4a4..e1e8187f1 100644 --- a/store/rdbms/apigw_route.go +++ b/store/rdbms/apigw_route.go @@ -1,6 +1,8 @@ package rdbms import ( + "strings" + "github.com/Masterminds/squirrel" "github.com/cortezaproject/corteza-server/pkg/filter" "github.com/cortezaproject/corteza-server/system/types" @@ -11,5 +13,9 @@ func (s Store) convertApigwRouteFilter(f types.ApigwRouteFilter) (query squirrel query = filter.StateCondition(query, "ar.deleted_at", f.Deleted) query = filter.StateConditionNegBool(query, "ar.enabled", f.Disabled) + if f.Query != "" { + query = query.Where(squirrel.Like{"LOWER(ar.endpoint)": "%" + strings.ToLower(f.Query) + "%"}) + } + return } diff --git a/system/rest/apigw_route.go b/system/rest/apigw_route.go index 511480d46..98bd48b83 100644 --- a/system/rest/apigw_route.go +++ b/system/rest/apigw_route.go @@ -46,6 +46,7 @@ func (ctrl *ApigwRoute) List(ctx context.Context, r *request.ApigwRouteList) (in var ( err error f = types.ApigwRouteFilter{ + Query: r.Query, Deleted: filter.State(r.Deleted), // todo: this should dynamic as Delete diff --git a/system/types/apigw_route.go b/system/types/apigw_route.go index e1ab542ba..19abf0381 100644 --- a/system/types/apigw_route.go +++ b/system/types/apigw_route.go @@ -33,7 +33,7 @@ type ( ApigwRouteFilter struct { Route string `json:"route"` - Group string `json:"group"` + Query string `json:"query"` Deleted filter.State `json:"deleted"` Disabled filter.State `json:"disabled"`