From f38252940cdb4f4b32cdb833b99806bb9f3fdc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 27 Apr 2023 10:16:56 +0200 Subject: [PATCH] lint fixes --- .../property-editor-ui-date-picker.element.ts | 3 +- .../file-system-tree-item.element.ts | 2 +- .../src/backoffice/users/index.ts | 4 +- .../collection/user-collection.context.ts | 4 +- .../collection/user-collection.element.ts | 4 +- .../user-table-collection-view.element.ts | 2 +- .../sources/user-collection.server.data.ts | 2 +- .../users-section-view.element.ts | 26 ++--- .../users/workspace/user-workspace.element.ts | 4 +- .../src/error/error.element.ts | 96 ++++++++++--------- 10 files changed, 75 insertions(+), 72 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts index 52b82dcc45..764a513b7f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts @@ -3,9 +3,8 @@ import { customElement, property, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { InputType } from '@umbraco-ui/uui'; import { UmbPropertyValueChangeEvent } from '../..'; -import { UmbPropertyEditorElement } from '@umbraco-cms/backoffice/extensions-registry'; +import { UmbPropertyEditorElement , PropertyEditorConfigDefaultData } from '@umbraco-cms/backoffice/extensions-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { PropertyEditorConfigDefaultData } from '@umbraco-cms/backoffice/extensions-registry'; /** * @element umb-property-editor-ui-date-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts index ba6e395725..1f44e92dee 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.element.ts @@ -1,12 +1,12 @@ import { css, html, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; +import { UmbTreeItemElement } from '../../../../backoffice/shared/components/tree/tree-item/tree-item.element'; import { UmbFileSystemTreeItemContext } from './file-system-tree-item.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { ManifestKind } from '@umbraco-cms/backoffice/extensions-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; import { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbTreeItemElement } from '../../../../backoffice/shared/components/tree/tree-item/tree-item.element'; // TODO: Move to separate file: const manifest: ManifestKind = { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/index.ts index 4f92a3430e..5beff8aad8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/index.ts @@ -1,5 +1,3 @@ -import { UmbEntrypointOnInit } from '@umbraco-cms/backoffice/extensions-api'; -import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api'; import { manifests as userGroupManifests } from './user-groups/manifests'; import { manifests as userManifests } from './users/manifests'; import { manifests as userSectionManifests } from './user-section/manifests'; @@ -10,6 +8,8 @@ import { UmbCurrentUserHistoryStore, UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN, } from './current-user/current-user-history.store'; +import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api'; +import { UmbEntrypointOnInit } from '@umbraco-cms/backoffice/extensions-api'; import './users/components'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.context.ts index a849869a93..35331783fe 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.context.ts @@ -1,8 +1,8 @@ -import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; -import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { USER_REPOSITORY_ALIAS } from '../repository/manifests'; import { UmbCollectionContext } from '../../../shared/components/collection/collection.context'; import { UmbUserCollectionFilterModel } from '../types'; +import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; export class UmbUserCollectionContext extends UmbCollectionContext { constructor(host: UmbControllerHostElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.element.ts index 5ebc21aad2..dce27ecb65 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection.element.ts @@ -1,10 +1,10 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import type { IRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UMB_COLLECTION_CONTEXT_TOKEN } from '../../../shared/components/collection/collection.context'; import { UmbUserCollectionContext } from './user-collection.context'; +import type { IRoute } from '@umbraco-cms/backoffice/router'; +import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import './views/table/user-table-collection-view.element'; import './views/grid/user-grid-collection-view.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts index d3c8b7433f..571c5593df 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-table-collection-view.element.ts @@ -18,13 +18,13 @@ import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext, } from '../../../../../shared/components/collection/collection.context'; +import { UmbUserCollectionContext } from '../../user-collection.context'; import type { UserGroupEntity } from '@umbraco-cms/backoffice/models'; import './column-layouts/name/user-table-name-column-layout.element'; import './column-layouts/status/user-table-status-column-layout.element'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbUserCollectionContext } from '../../user-collection.context'; @customElement('umb-user-table-collection-view') export class UmbUserTableCollectionViewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/repository/sources/user-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/repository/sources/user-collection.server.data.ts index b60b5cb840..e9d83e6971 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/repository/sources/user-collection.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/repository/sources/user-collection.server.data.ts @@ -1,8 +1,8 @@ +import type { UmbUserCollectionFilterModel } from '../../types'; import { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; import { UserResponseModel, UserResource } from '@umbraco-cms/backoffice/backend-api'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { UmbUserCollectionFilterModel } from '../../types'; /** * A data source for the User that fetches data from the server diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/section-view/users-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/section-view/users-section-view.element.ts index 808861453c..b50f301370 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/section-view/users-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/section-view/users-section-view.element.ts @@ -10,18 +10,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-section-view-users') export class UmbSectionViewUsersElement extends UmbLitElement { - static styles = [ - UUITextStyles, - css` - :host { - height: 100%; - } - - #router-slot { - height: calc(100% - var(--umb-header-layout-height)); - } - `, - ]; + #routes: IRoute[] = [ { @@ -75,6 +64,19 @@ export class UmbSectionViewUsersElement extends UmbLitElement { render() { return html``; } + + static styles = [ + UUITextStyles, + css` + :host { + height: 100%; + } + + #router-slot { + height: calc(100% - var(--umb-header-layout-height)); + } + `, + ]; } export default UmbSectionViewUsersElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts index 20d2bcfd72..e54346809f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts @@ -1,10 +1,10 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { IRoute } from '@umbraco-cms/backoffice/router'; import { UmbUserWorkspaceContext } from './user-workspace.context'; import { UmbUserWorkspaceEditElement } from './user-workspace-edit.element'; +import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { IRoute } from '@umbraco-cms/backoffice/router'; import '../../../shared/components/input-user-group/input-user-group.element'; import '../../../shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element'; diff --git a/src/Umbraco.Web.UI.Client/src/error/error.element.ts b/src/Umbraco.Web.UI.Client/src/error/error.element.ts index 77a94fd6ec..08f5cf6115 100644 --- a/src/Umbraco.Web.UI.Client/src/error/error.element.ts +++ b/src/Umbraco.Web.UI.Client/src/error/error.element.ts @@ -27,53 +27,7 @@ export class UmbErrorElement extends UmbLitElement { @property() error?: unknown; - static styles = css` - #background { - position: fixed; - overflow: hidden; - background-position: 50%; - background-repeat: no-repeat; - background-size: cover; - background-image: url('${unsafeCSS(backgroundImg)}'); - width: 100vw; - height: 100vh; - } - - #logo { - position: fixed; - top: var(--uui-size-space-5); - left: var(--uui-size-space-5); - height: 30px; - } - - #logo img { - height: 100%; - } - - #container { - position: relative; - display: flex; - align-items: center; - justify-content: center; - width: 100vw; - height: 100vh; - } - - #box { - width: 50vw; - padding: var(--uui-size-space-6) var(--uui-size-space-5) var(--uui-size-space-5) var(--uui-size-space-5); - } - - details { - padding: var(--uui-size-space-2) var(--uui-size-space-3); - background: var(--uui-color-surface-alt); - } - - pre { - width: 100%; - overflow: auto; - } - `; + private renderProblemDetails = (problemDetails: ProblemDetailsModel) => html`

${problemDetails.title}

@@ -127,6 +81,54 @@ export class UmbErrorElement extends UmbLitElement { `; + + static styles = css` + #background { + position: fixed; + overflow: hidden; + background-position: 50%; + background-repeat: no-repeat; + background-size: cover; + background-image: url('${unsafeCSS(backgroundImg)}'); + width: 100vw; + height: 100vh; + } + + #logo { + position: fixed; + top: var(--uui-size-space-5); + left: var(--uui-size-space-5); + height: 30px; + } + + #logo img { + height: 100%; + } + + #container { + position: relative; + display: flex; + align-items: center; + justify-content: center; + width: 100vw; + height: 100vh; + } + + #box { + width: 50vw; + padding: var(--uui-size-space-6) var(--uui-size-space-5) var(--uui-size-space-5) var(--uui-size-space-5); + } + + details { + padding: var(--uui-size-space-2) var(--uui-size-space-3); + background: var(--uui-color-surface-alt); + } + + pre { + width: 100%; + overflow: auto; + } + `; } export default UmbErrorElement;