yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugs from issue tracker

Browse Source
This commit is contained in:
Lone Iversen
2023-12-18 16:10:58 +01:00
committed by Jacob Overgaard
parent 6188862f78
commit 6441e0626a
5 changed files with 87 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
View File

@@ -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`
<div class="input-container">
<uui-label for="start-date">From:</uui-label>
<input
@click=${(e: Event) => {
(e.target as HTMLInputElement).showPicker();
}}
id="start-date"
type="date"
label="From"
.max=${this.#logViewerContext?.today ?? ''}
.value=${this._startDate}>
</input>
</div>
<div class="input-container">
<uui-label for="end-date">To: </uui-label>
<input
@click=${(e: Event) => {
(e.target as HTMLInputElement).showPicker();
}}
id="end-date"
type="date"
label="To"
.min=${this._startDate}
.max=${this.#logViewerContext?.today ?? ''}
.value=${this._endDate}>
</input>
</div>
`;
<div class="input-container">
<uui-label for="start-date">From:</uui-label>
<input
@click=${(e: Event) => {
(e.target as HTMLInputElement).showPicker();
}}
id="start-date"
type="date"
label="From"
.max=${this.#logViewerContext?.today ?? ''}
.value=${this._startDate} />
</div>
<div class="input-container">
<uui-label for="end-date">To: </uui-label>
<input
@click=${(e: Event) => {
(e.target as HTMLInputElement).showPicker();
}}
id="end-date"
type="date"
label="To"
.min=${this._startDate}
.max=${this.#logViewerContext?.today ?? ''}
.value=${this._endDate} />
</div>
`;
}
static styles = [

2
src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts
View File

@@ -52,7 +52,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
<uui-box id="errors" headline="Number of Errors">
<uui-button
label="Show error logs"
href=${`section/settings/workspace/logviewer/search/?lq=${encodeURIComponent(
href=${`section/settings/workspace/logviewer/view/search/?lq=${encodeURIComponent(
`@Level='Fatal' or @Level='Error' or Has(@Exception)`,
)}`}>
<h2 id="error-count">${this._errorCount}</h2></uui-button

48
src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts
View File

@@ -97,32 +97,37 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
render() {
// TODO: the table should scroll instead of the whole main div
return html`
<div id="header" slot="header">
<div id="timestamp">
Timestamp
<uui-button compact @click=${this.#sortLogs} label="Sort logs">
<uui-symbol-sort
?descending=${this._sortingDirection === DirectionModel.DESCENDING}
active></uui-symbol-sort>
</uui-button>
return html`<uui-box>
<div id="header" slot="header">
<div id="timestamp">
Timestamp
<uui-button compact @click=${this.#sortLogs} label="Sort logs">
<uui-symbol-sort
?descending=${this._sortingDirection === DirectionModel.DESCENDING}
active></uui-symbol-sort>
</uui-button>
</div>
<div id="level">Level</div>
<div id="machine">Machine name</div>
<div id="message">Message</div>
</div>
<div id="level">Level</div>
<div id="machine">Machine name</div>
<div id="message">Message</div>
</div>
<div id="main">
${this._isLoading
? html`<umb-empty-state size="small"
><span id="empty"> <uui-loader-circle></uui-loader-circle>Loading log messages... </span></umb-empty-state
>`
: html`${this.#renderLogs()}${this._renderPagination()}`}
</div>
`;
<div id="main">
${this._isLoading
? html`<umb-empty-state size="small">
<span id="empty"> <uui-loader-circle></uui-loader-circle>Loading log messages... </span>
</umb-empty-state>`
: html`${this.#renderLogs()}`}
</div>
</uui-box>
${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;
}
`,

19
src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts
View File

@@ -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 {
><uui-icon name="icon-delete"></uui-icon
></uui-button>`
: html``}
<umb-dropdown id="search-dropdown" slot="append" label="Saved searches">
<span slot="label">Saved searches</span>
<umb-dropdown id="search-dropdown" slot="append" label=${this.localize.term('logViewer_savedSearches')}>
<span slot="label"><umb-localize key="logViewer_savedSearches">Saved searches</umb-localize></span>
<uui-scroll-container id="saved-searches-container" role="list">
${this._savedSearches.map(
(search) =>

9
src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts
View File

@@ -46,12 +46,9 @@ export class UmbLogViewerSearchViewElement extends UmbLitElement {
</div>
</div>
<uui-box>
${this._canShowLogs
? html`<umb-log-viewer-messages-list></umb-log-viewer-messages-list>`
: html`<umb-log-viewer-to-many-logs-warning
id="to-many-logs-warning"></umb-log-viewer-to-many-logs-warning>`}
</uui-box>
${this._canShowLogs
? html`<umb-log-viewer-messages-list></umb-log-viewer-messages-list>`
: html`<umb-log-viewer-to-many-logs-warning id="to-many-logs-warning"></umb-log-viewer-to-many-logs-warning>`}
</umb-body-layout>
`;
}