From b6adec8a9c055854ba5cf236b12427184c5e5d97 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Mon, 23 May 2022 19:05:59 +0200 Subject: [PATCH] Fix Role filter, add mising name attribute --- store/adapters/rdbms/filters.gen.go | 4 ++++ system/role.cue | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/store/adapters/rdbms/filters.gen.go b/store/adapters/rdbms/filters.gen.go index 147e4ac1b..f018b6845 100644 --- a/store/adapters/rdbms/filters.gen.go +++ b/store/adapters/rdbms/filters.gen.go @@ -1078,6 +1078,10 @@ func RoleFilter(f systemType.RoleFilter) (ee []goqu.Expression, _ systemType.Rol ee = append(ee, goqu.C("id").In(f.RoleID)) } + if val := strings.TrimSpace(f.Name); len(val) > 0 { + ee = append(ee, goqu.C("name").Eq(f.Name)) + } + if val := strings.TrimSpace(f.Handle); len(val) > 0 { ee = append(ee, goqu.C("handle").Eq(f.Handle)) } diff --git a/system/role.cue b/system/role.cue index 4dc08f4fc..fc34f1f4e 100644 --- a/system/role.cue +++ b/system/role.cue @@ -20,7 +20,7 @@ role: schema.#Resource & { filter: { struct: { role_id: {goType: "[]uint64", ident: "roleID", storeIdent: "id" } - member_id: {goType: "uint64"} + member_id: {goType: "uint64" } handle: {goType: "string"} name: {goType: "string"} @@ -29,7 +29,7 @@ role: schema.#Resource & { } query: ["handle", "name"] - byValue: ["role_id", "handle"] + byValue: ["role_id", "name", "handle"] byNilState: ["deleted", "archived"] }