From 9385b840decd4f50fefb9cefadeb94c9d0d6dc45 Mon Sep 17 00:00:00 2001 From: Julia Gru <56249914+julczka@users.noreply.github.com> Date: Thu, 2 Mar 2023 17:28:22 +0100 Subject: [PATCH] add dates checks --- .../settings/logviewer/workspace/logviewer.context.ts | 8 ++++++++ .../logviewer/workspace/views/log-overview.element.ts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts index 70c9d1b5f2..50090a1f62 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts @@ -108,6 +108,14 @@ export class UmbLogViewerWorkspaceContext { } setDateRange(dateRange: LogViewerDateRange) { + const { startDate, endDate } = dateRange; + + const isAnyDateInTheFuture = new Date(startDate) > new Date() || new Date(endDate) > new Date(); + const isStartDateBiggerThenEndDate = new Date(startDate) > new Date(endDate); + if (isAnyDateInTheFuture || isStartDateBiggerThenEndDate) { + return; + } + this.#dateRange.next(dateRange); this.getLogCount(dateRange); } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/log-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/log-overview.element.ts index 245eeb70c5..933cf0825c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/log-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/log-overview.element.ts @@ -92,6 +92,13 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement { width: 100%; text-align: inherit; outline: none; + position: relative; + border-bottom: 2px solid transparent; + } + + /* find out better validation for that */ + input:out-of-range { + border-color: var(--uui-color-danger); } ul { @@ -334,6 +341,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement { id="end-date" type="date" label="To" + .min=${this._startDate} .max=${this.#logViewerContext?.today ?? ''} .value=${this._endDate}>