From 07795423cee55c1d5587ab62e89e3676487b4aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 2 Apr 2024 09:20:06 +0200 Subject: [PATCH] tsc fixes --- .../src/packages/core/index.ts | 1 - .../language/language-workspace.context.ts | 7 ++++++- .../workspace/user-group-workspace.context.ts | 18 ++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts index 99eefba43c..1896412056 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts @@ -15,7 +15,6 @@ export * from './entity-action/index.js'; export * from './entity-bulk-action/index.js'; export * from './extension-registry/index.js'; export * from './id/index.js'; -export * from './form/index.js'; export * from './menu/index.js'; export * from './modal/index.js'; export * from './notification/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts index 4c18b7e0ad..b1ab71f294 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts @@ -121,11 +121,16 @@ export class UmbLanguageWorkspaceContext const { data } = await this.repository.create(newData); if (data) { this.setIsNew(false); + return true; } } else { - await this.repository.save(newData); + const { data } = await this.repository.save(newData); + if (data) { + return true; + } // TODO: Show validation errors as warnings? } + return false; } destroy(): void { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts index 8350eaabdc..c720b98629 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.context.ts @@ -101,15 +101,21 @@ export class UmbUserGroupWorkspaceContext async submit() { if (!this.#data.value) return; - //TODO: Could we clean this code up? if (this.getIsNew()) { - await this.repository.create(this.#data.value); + const { data } = await this.repository.create(this.#data.value); + if (data) { + // If it went well, then its not new anymore?. + this.setIsNew(false); + return true; + } } else if (this.#data.value.unique) { - await this.repository.save(this.#data.value); - } else return; + const { data } = await this.repository.save(this.#data.value); + if (data) { + return true; + } + } - // If it went well, then its not new anymore?. - this.setIsNew(false); + return false; } destroy(): void {