From 6441e0626aaf106a0388ddbc2e4273424255906b Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:10:58 +0100 Subject: [PATCH] bugs from issue tracker --- .../log-viewer-date-range-selector.element.ts | 73 ++++++++++--------- .../overview/log-overview-view.element.ts | 2 +- .../log-viewer-messages-list.element.ts | 48 ++++++------ .../log-viewer-search-input.element.ts | 19 ++++- .../views/search/log-search-view.element.ts | 9 +-- 5 files changed, 87 insertions(+), 64 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts index 23e3587136..7c074e8518 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts @@ -23,6 +23,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement { horizontal = false; #logViewerContext?: UmbLogViewerWorkspaceContext; + constructor() { super(); this.addEventListener('input', this.#setDates); @@ -31,13 +32,21 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement { this.#observeStuff(); }); } + disconnectedCallback(): void { + super.disconnectedCallback(); + this.removeEventListener('input', this.#setDates); + } #observeStuff() { if (!this.#logViewerContext) return; - this.observe(this.#logViewerContext.dateRange, (dateRange: LogViewerDateRange) => { - this._startDate = dateRange?.startDate; - this._endDate = dateRange?.endDate; - }); + this.observe( + this.#logViewerContext.dateRange, + (dateRange: LogViewerDateRange) => { + this._startDate = dateRange.startDate; + this._endDate = dateRange.endDate; + }, + '_observeDateRange', + ); } #setDates() { @@ -48,6 +57,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement { this._endDate = input.value; } }); + this.#logViewerContext?.setDateRange({ startDate: this._startDate, endDate: this._endDate }); const query = getQuery(); const qs = toQueryString({ @@ -61,35 +71,32 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement { render() { return html` -
- From: - { - (e.target as HTMLInputElement).showPicker(); - }} - - id="start-date" - type="date" - label="From" - .max=${this.#logViewerContext?.today ?? ''} - .value=${this._startDate}> - -
-
- To: - { - (e.target as HTMLInputElement).showPicker(); - }} - id="end-date" - type="date" - label="To" - .min=${this._startDate} - .max=${this.#logViewerContext?.today ?? ''} - .value=${this._endDate}> - -
- `; +
+ From: + { + (e.target as HTMLInputElement).showPicker(); + }} + id="start-date" + type="date" + label="From" + .max=${this.#logViewerContext?.today ?? ''} + .value=${this._startDate} /> +
+
+ To: + { + (e.target as HTMLInputElement).showPicker(); + }} + id="end-date" + type="date" + label="To" + .min=${this._startDate} + .max=${this.#logViewerContext?.today ?? ''} + .value=${this._endDate} /> +
+ `; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts index f0f66462d7..fc39a5921b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts @@ -52,7 +52,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {

${this._errorCount}

 -
- Timestamp - - - + return html` + -
Level
-
Machine name
-
Message
-
-
- ${this._isLoading - ? html` Loading log messages... ` - : html`${this.#renderLogs()}${this._renderPagination()}`} -
- `; +
+ ${this._isLoading + ? html` + Loading log messages... + ` + : html`${this.#renderLogs()}`} +
+ + ${this._renderPagination()} `; } static styles = [ css` + uui-box { + --uui-box-default-padding: 0; + } + :host { height: 100%; display: flex; @@ -168,6 +173,7 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement { } #pagination { + display: block; margin: var(--uui-size-space-5, 18px) 0; } `, diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts index da76b9abfe..3e83fb593a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts @@ -10,6 +10,7 @@ import { UmbModalManagerContext, UmbModalContext, UmbModalToken, + UMB_CONFIRM_MODAL, } from '@umbraco-cms/backoffice/modal'; import './log-viewer-search-input-modal.element.js'; @@ -130,7 +131,19 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement { } #removeSearch(name: string) { - this.#logViewerContext?.removeSearch({ name }); + const modalContext = this._modalContext?.open(UMB_CONFIRM_MODAL, { + data: { + headline: this.localize.term('logViewer_deleteSavedSearch'), + content: `${this.localize.term('defaultdialogs_confirmdelete')} ${name}?`, + color: 'danger', + confirmLabel: 'Delete', + }, + }); + + modalContext?.onSubmit().then(() => { + this.#logViewerContext?.removeSearch({ name }); + //this.dispatchEvent(new UmbDeleteEvent()); + }); } #openSaveSearchDialog() { @@ -168,8 +181,8 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement { >` : html``} - - Saved searches + + Saved searches ${this._savedSearches.map( (search) => diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts index 0bf2df6d26..cad0ee6293 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts @@ -46,12 +46,9 @@ export class UmbLogViewerSearchViewElement extends UmbLitElement { - - ${this._canShowLogs - ? html`` - : html``} - + ${this._canShowLogs + ? html`` + : html``} `; }