('');
filterExpression = createObservablePart(this.#filterExpression, (data) => data);
@@ -101,18 +104,7 @@ export class UmbLogViewerWorkspaceContext {
this.#repository = new UmbLogViewerRepository(this.#host);
}
- async init() {
- this.validateLogSize();
- }
-
- reset() {
- this.#logs.next({ items: [], total: 0 });
- this.setCurrentPage(1);
- }
-
onChangeState = () => {
- this.reset();
-
const searchQuery = query();
let sanitizedQuery = '';
if (searchQuery.lq) {
@@ -262,10 +254,14 @@ export class UmbLogViewerWorkspaceContext {
}
getLogs = async () => {
- if (!this.#canShowLogs.getValue()) {
+ if (this.#canShowLogs.getValue() === false) {
return;
}
+ const isPollingEnabled = this.#polling.getValue().enabled;
+
+ if (!isPollingEnabled) this.#isLoadingLogs.next(true);
+
const skip = (this.currentPage - 1) * 100;
const take = 100;
@@ -279,7 +275,7 @@ export class UmbLogViewerWorkspaceContext {
};
const { data } = await this.#repository.getLogs(options);
-
+ this.#isLoadingLogs.next(false);
if (data) {
this.#logs.next(data);
}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
index dc9221a549..b093239de7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
@@ -8,8 +8,6 @@ import { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/backend-api
//TODO: implement the saved searches pagination when the API total bug is fixed
@customElement('umb-log-viewer-saved-searches-overview')
export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
-
-
@state()
private _savedSearches: SavedLogSearchResponseModel[] = [];
@@ -33,12 +31,12 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
#renderSearchItem = (searchListItem: SavedLogSearchResponseModel) => {
return html`
-
- ${searchListItem.name}
-
+ ${searchListItem.name}
+
`;
};
@@ -49,7 +47,7 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
`;
}
-
+
static styles = [
UUITextStyles,
css`
@@ -75,6 +73,10 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
li uui-icon {
margin-right: 1em;
}
+
+ uui-menu-item {
+ width: 100%;
+ }
`,
];
}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
index afeaf47ad0..2d01b009de 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
@@ -7,8 +7,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
//TODO: add a disabled attribute to the show more button when the total number of items is correctly returned from the endpoint
@customElement('umb-log-viewer-overview-view')
export class UmbLogViewerOverviewViewElement extends UmbLitElement {
-
-
@state()
private _errorCount = 0;
@@ -58,12 +56,12 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
href=${`section/settings/workspace/logviewer/search/?lq=${encodeURIComponent(
`@Level='Fatal' or @Level='Error' or Has(@Exception)`
)}`}>
- ${this._errorCount}
${this._errorCount}
-
+
@@ -81,7 +79,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
`;
}
-
+
static styles = [
css`
:host {
@@ -106,7 +104,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
align-self: start;
display: grid;
grid-template-columns: repeat(2, 1fr);
- grid-template-rows: repeat(4, 1fr);
+ grid-template-rows: repeat(4, max-content);
gap: 20px 20px;
}
@@ -116,15 +114,21 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
#errors {
grid-area: 2 / 1 / 3 / 2;
+ --uui-box-default-padding: 0;
+ }
+
+ #errors > uui-button {
+ width: 100%;
}
#level {
grid-area: 2 / 2 / 3 / 3;
}
- #log-lever {
+ #log-level {
color: var(--uui-color-positive);
text-align: center;
+ margin: 0;
}
#types {
@@ -152,9 +156,10 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
}
#error-count {
- font-size: 4rem;
+ font-size: 3rem;
text-align: center;
color: var(--uui-color-danger);
+ margin: 0;
}
`,
];
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
index ff96a79e5f..3841324b7a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
@@ -9,8 +9,6 @@ import { query as getQuery, toQueryString } from '@umbraco-cms/backoffice/router
//TODO: check how to display EventId field in the message properties
@customElement('umb-log-viewer-message')
export class UmbLogViewerMessageElement extends UmbLitElement {
-
-
@query('details')
details!: HTMLDetailsElement;
@@ -141,7 +139,7 @@ export class UmbLogViewerMessageElement extends UmbLitElement {
${this.properties.find((property) => property.name === 'MachineName')?.value}
- ${this.renderedMessage}
+ ${this.renderedMessage}
${this.exception ? html`${this.exception}` : ''}