Fixed queue and route search in admin

system/apigw_route.cue

@@ -28,12 +28,13 @@ apigw_route: schema.#Resource & {
 	filter: {
 		struct: {
 			route: {}
+			query: {goType: "string"}
 
 			deleted: {goType: "filter.State", storeIdent: "deleted_at"}
 			disabled: {goType: "filter.State", storeIdent: "enabled"}
 		}
 
-		byValue: ["route"]
+		query: ["endpoint"]
 		byNilState: ["deleted"]
 		byFalseState: ["disabled"]
 	}

system/queue.cue

@@ -25,11 +25,11 @@ queue: schema.#Resource & {
 
 	filter: {
 		struct: {
-			queue: {goType: "string"}
+			query: {goType: "string"}
 			deleted: {goType: "filter.State", storeIdent: "deleted_at"}
 		}
 
-		byValue: ["queue"]
+		query: ["queue", "consumer"]
 		byNilState: ["deleted"]
 	}
 

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

system/rest/queues.go

@@ -46,6 +46,7 @@ func (ctrl *Queue) List(ctx context.Context, r *request.QueuesList) (interface{}
 	var (
 		err error
 		f   = types.QueueFilter{
+			Query:   r.Query,
 			Deleted: filter.State(r.Deleted),
 		}
 	)

system/service/queue.go

@@ -87,11 +87,10 @@ func (svc *queue) SearchQueues(ctx context.Context, ff mt.QueueFilter) (l []mt.Q
 
 func makeFilter(ff *mt.QueueFilter) (f *types.QueueFilter) {
 	return &types.QueueFilter{
-		Queue:    ff.Queue,
-		Consumer: ff.Consumer,
-		Deleted:  ff.Deleted,
-		Sorting:  ff.Sorting,
-		Paging:   ff.Paging,
+		Query:   ff.Query,
+		Deleted: ff.Deleted,
+		Sorting: ff.Sorting,
+		Paging:  ff.Paging,
 	}
 }
 

system/types/apigw_route.go

@@ -33,6 +33,7 @@ type (
 
 	ApigwRouteFilter struct {
 		Route string `json:"route"`
+		Query string `json:"query"`
 
 		Deleted  filter.State `json:"deleted"`
 		Disabled filter.State `json:"disabled"`

system/types/queue.go

@@ -27,9 +27,7 @@ type (
 	}
 
 	QueueFilter struct {
-		Queue    string `json:"queue"`
-		Consumer string `json:"handler"`
-
+		Query   string       `json:"query"`
 		Deleted filter.State `json:"deleted"`
 
 		// Check fn is called by store backend for each resource found function can