From 8a07de73abedf62e3301ed5dce53d04e4fcf4587 Mon Sep 17 00:00:00 2001
From: Julia Gru <56249914+julczka@users.noreply.github.com>
Date: Fri, 30 Jun 2023 15:29:44 +0200
Subject: [PATCH] fix sort order button, cleanup

---
 .../templating-insert-menu.element.ts         |  2 +-
 .../query-builder/query-builder.element.ts    | 37 ++++++++++---------
 .../template-workspace-editor.element.ts      |  5 +--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts
index 9276c05e4b..19d5ab55df 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts
@@ -106,7 +106,7 @@ export class UmbTemplatingInsertMenuElement extends UmbLitElement {
 		this.dispatchEvent(new CustomEvent('insert', { bubbles: false, cancelable: true, composed: false }));
 	}
 
-	@property()
+	@property({ type: Boolean })
 	hidePartialView = false;
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts
index 5f6c55a903..c1b3d52c49 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts
@@ -8,9 +8,7 @@ import {
 	UmbModalManagerContext,
 } from '@umbraco-cms/backoffice/modal';
 import {
-	TemplateQueryExecuteFilterPresentationModel,
 	TemplateQueryExecuteModel,
-	TemplateQueryExecuteSortModel,
 	TemplateQueryResultResponseModel,
 	TemplateQuerySettingsResponseModel,
 } from '@umbraco-cms/backoffice/backend-api';
@@ -49,27 +47,12 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 	@queryAll('umb-query-builder-filter')
 	private _filterElements!: UmbQueryBuilderFilterElement[];
 
-	#close() {
-		this.modalContext?.reject();
-	}
-
-	#submit() {
-		this.modalContext?.submit({
-			value: this._templateQuery?.queryExpression ?? '',
-		});
-	}
-
 	@state()
 	private _templateQuery?: TemplateQueryResultResponseModel;
 
 	@state()
 	private _queryRequest: TemplateQueryExecuteModel = <TemplateQueryExecuteModel>{};
 
-	#updateQueryRequest(update: TemplateQueryExecuteModel) {
-		this._queryRequest = { ...this._queryRequest, ...update };
-		this.#postTemplateQuery();
-	}
-
 	@state()
 	private _queryBuilderSettings?: TemplateQuerySettingsResponseModel;
 
@@ -77,7 +60,7 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 	private _selectedRootContentName = 'all pages';
 
 	@state()
-	private _defaultSortDirection: SortOrder = SortOrder.Ascending;
+	private _defaultSortDirection: SortOrder = SortOrder.Descending;
 
 	#documentRepository: UmbDocumentRepository;
 	#modalManagerContext?: UmbModalManagerContext;
@@ -99,6 +82,21 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 		this.#postTemplateQuery();
 	}
 
+	#close() {
+		this.modalContext?.reject();
+	}
+
+	#submit() {
+		this.modalContext?.submit({
+			value: this._templateQuery?.queryExpression ?? '',
+		});
+	}
+
+	#updateQueryRequest(update: TemplateQueryExecuteModel) {
+		this._queryRequest = { ...this._queryRequest, ...update };
+		this.#postTemplateQuery();
+	}
+
 	async #getTemplateQuerySettings() {
 		const { data, error } = await this.#templateRepository.getTemplateQuerySettings();
 		if (data) this._queryBuilderSettings = data;
@@ -155,6 +153,9 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 
 	#setSortProperty(event: Event) {
 		const target = event.target as UUIComboboxListElement;
+
+		if (!this._queryRequest.sort) this.#setSortDirection();
+
 		this.#updateQueryRequest({
 			sort: { ...this._queryRequest.sort, propertyAlias: (target.value as string) ?? '' },
 		});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
index 9d106416df..fb4575d41b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
@@ -1,5 +1,7 @@
 import type { UmbTemplatingInsertMenuElement } from '../../components/insert-menu/templating-insert-menu.element.js';
 import { UMB_MODAL_TEMPLATING_INSERT_SECTION_MODAL } from '../../modals/insert-section-modal/insert-section-modal.element.js';
+import { UMB_TEMPLATE_QUERY_BUILDER_MODAL } from '../modals/modal-tokens.js';
+import { getQuerySnippet } from '../../utils.js';
 import type { UmbTemplateWorkspaceContext } from './template-workspace.context.js';
 import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
 import { camelCase } from '@umbraco-cms/backoffice/external/lodash';
@@ -12,9 +14,6 @@ import {
 } from '@umbraco-cms/backoffice/modal';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { Subject, debounceTime } from '@umbraco-cms/backoffice/external/rxjs';
-import { UMB_MODAL_TEMPLATING_QUERY_BUILDER_SIDEBAR_ALIAS } from '../modals/manifests.js';
-import { UMB_TEMPLATE_QUERY_BUILDER_MODAL } from '../modals/modal-tokens.js';
-import { getQuerySnippet } from '../../utils.js';
 
 @customElement('umb-template-workspace-editor')
 export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {