From 6adfdd926f5dec315537919f5ecf1c2a4c47fd43 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 1 Jun 2023 13:53:07 +0200 Subject: [PATCH] change export to import and move components around --- .../packages/settings/logviewer/components/index.ts | 2 ++ .../log-viewer-date-range-selector.element.ts | 4 ++-- .../log-viewer-too-many-logs-warning.element.ts} | 8 ++++---- .../workspace/logviewer-root/components/index.ts | 3 --- .../logviewer-root-workspace.element.ts | 4 ++-- .../workspace/views/search/components/index.ts | 11 ++++++----- .../components/log-viewer-level-tag.element.ts | 0 7 files changed, 16 insertions(+), 16 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/{workspace/logviewer-root => }/components/log-viewer-date-range-selector.element.ts (95%) rename src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/{workspace/logviewer-root/components/log-viewer-to-many-logs-warning.element.ts => components/log-viewer-too-many-logs-warning.element.ts} (59%) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/index.ts rename src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/{logviewer-root => views/search}/components/log-viewer-level-tag.element.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/index.ts index 0faf257d88..7192343b25 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/index.ts @@ -1 +1,3 @@ import './donut-chart/index.js'; +import './log-viewer-date-range-selector.element.js'; +import './log-viewer-too-many-logs-warning.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/log-viewer-date-range-selector.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/log-viewer-date-range-selector.element.ts index f73a2de4c9..f8931e6552 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-date-range-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/log-viewer-date-range-selector.element.ts @@ -2,9 +2,9 @@ import { LogViewerDateRange, UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN, -} from '../../logviewer.context.js'; +} from '../workspace/logviewer.context.js'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; -import { css, html , customElement, property, queryAll, state } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, customElement, property, queryAll, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/router'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-to-many-logs-warning.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/log-viewer-too-many-logs-warning.element.ts similarity index 59% rename from src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-to-many-logs-warning.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/log-viewer-too-many-logs-warning.element.ts index 5fad56ca6e..476a9632e1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-to-many-logs-warning.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/components/log-viewer-too-many-logs-warning.element.ts @@ -1,7 +1,7 @@ -import { css, html, LitElement , customElement } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, LitElement, customElement } from '@umbraco-cms/backoffice/external/lit'; -@customElement('umb-log-viewer-to-many-logs-warning') -export class UmbLogViewerToManyLogsWarningElement extends LitElement { +@customElement('umb-log-viewer-too-many-logs-warning') +export class UmbLogViewerTooManyLogsWarningElement extends LitElement { render() { return html`

Unable to view logs

@@ -21,6 +21,6 @@ export class UmbLogViewerToManyLogsWarningElement extends LitElement { declare global { interface HTMLElementTagNameMap { - 'umb-log-viewer-to-many-logs-warning': UmbLogViewerToManyLogsWarningElement; + 'umb-log-viewer-too-many-logs-warning': UmbLogViewerTooManyLogsWarningElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/index.ts deleted file mode 100644 index cb7798c7a6..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './log-viewer-date-range-selector.element.js'; -export * from './log-viewer-level-tag.element.js'; -export * from './log-viewer-to-many-logs-warning.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts index 9edf111b12..5a301989ee 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts @@ -1,4 +1,4 @@ -// import './components/index.js'; +import '../../components/index.js'; import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../logviewer.context.js'; import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { @@ -19,7 +19,7 @@ import { umbExtensionsRegistry, } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent, UmbRoute } from '@umbraco-cms/backoffice/router'; -// import '../../components/index.js'; + //TODO make uui-input accept min and max values @customElement('umb-logviewer-workspace') export class UmbLogViewerWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/index.ts index 74b566249e..6cb8a3b6bd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/index.ts @@ -1,5 +1,6 @@ -export * from './log-viewer-log-level-filter-menu.element.js'; -export * from './log-viewer-message.element.js'; -export * from './log-viewer-messages-list.element.js'; -export * from './log-viewer-polling-button.element.js'; -export * from './log-viewer-search-input.element.js'; +import './log-viewer-level-tag.element.js'; +import './log-viewer-log-level-filter-menu.element.js'; +import './log-viewer-message.element.js'; +import './log-viewer-messages-list.element.js'; +import './log-viewer-polling-button.element.js'; +import './log-viewer-search-input.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-level-tag.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-level-tag.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/components/log-viewer-level-tag.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-level-tag.element.ts