From adfe233b3f6596c165bb515356a95ffe55228e6e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 4 Feb 2024 19:54:56 +0100 Subject: [PATCH] clean up --- .../query-builder/query-builder-modal.element.ts | 4 ++-- .../repository/query/template-query.repository.ts | 4 ++-- .../query/template-query.server.data-source.ts | 10 +--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts index 71527ce5ac..98622abe35 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts @@ -86,12 +86,12 @@ export default class UmbTemplateQueryBuilderModalElement extends UmbModalBaseEle } async #getTemplateQuerySettings() { - const { data, error } = await this.#templateQueryRepository.getTemplateQuerySettings(); + const { data } = await this.#templateQueryRepository.requestTemplateQuerySettings(); if (data) this._queryBuilderSettings = data; } #executeTemplateQuery = async () => { - const { data, error } = await this.#templateQueryRepository.executeTemplateQuery(); + const { data } = await this.#templateQueryRepository.executeTemplateQuery(); if (data) { this._templateQuery = { ...data }; this.value = { value: this._templateQuery?.queryExpression ?? '' }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.repository.ts index 7eee6918b2..8755615d39 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.repository.ts @@ -10,11 +10,11 @@ export class UmbTemplateQueryRepository extends UmbRepositoryBase { this.#querySource = new UmbTemplateQueryServerDataSource(this); } - async getTemplateQuerySettings() { + async requestTemplateQuerySettings() { return this.#querySource.getTemplateQuerySettings(); } - async postTemplateQueryExecute() { + async executeTemplateQuery() { return this.#querySource.executeTemplateQuery(); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts index 51b45d69c1..fba6a7f27f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts @@ -29,15 +29,7 @@ export class UmbTemplateQueryServerDataSource { * @memberof UmbTemplateQueryServerDataSource */ async getTemplateQuerySettings() { - const { data, error } = await tryExecuteAndNotify(this.#host, TemplateResource.getTemplateQuerySettings()); - - if (data) { - const model = {}; - - return { data: model }; - } - - return { error }; + return tryExecuteAndNotify(this.#host, TemplateResource.getTemplateQuerySettings()); } /** * Executes a query builder query on the server