From f4ff886ce16e287768b1cc6176b6eb8ff04f638b Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Thu, 16 Jun 2022 01:03:09 +0700 Subject: [PATCH] Allow enum value to be used in filters (#2085) Signed-off-by: Andrey Sobolev --- models/view/src/index.ts | 4 ++++ server/core/src/adapter.ts | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/models/view/src/index.ts b/models/view/src/index.ts index 61f1660210..4fb2a38261 100644 --- a/models/view/src/index.ts +++ b/models/view/src/index.ts @@ -518,6 +518,10 @@ export function createModel (builder: Builder): void { component: view.component.ValueFilter }) + builder.mixin(core.class.EnumOf, core.class.Class, view.mixin.AttributeFilter, { + component: view.component.ValueFilter + }) + builder.mixin(core.class.RefTo, core.class.Class, view.mixin.AttributeFilter, { component: view.component.ObjectFilter }) diff --git a/server/core/src/adapter.ts b/server/core/src/adapter.ts index e3a349cd09..a392af5150 100644 --- a/server/core/src/adapter.ts +++ b/server/core/src/adapter.ts @@ -99,7 +99,11 @@ class InMemoryAdapter implements DbAdapter { async init (model: Tx[]): Promise { for (const tx of model) { - await this.modeldb.tx(tx) + try { + await this.modeldb.tx(tx) + } catch (err: any) { + console.error('skip broken TX', err) + } } }