diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.context.ts b/src/Umbraco.Web.UI.Client/libs/collection/collection.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.context.ts rename to src/Umbraco.Web.UI.Client/libs/collection/collection.context.ts diff --git a/src/Umbraco.Web.UI.Client/libs/collection/index.ts b/src/Umbraco.Web.UI.Client/libs/collection/index.ts new file mode 100644 index 0000000000..7dc5e58379 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/collection/index.ts @@ -0,0 +1 @@ +export * from './collection.context'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts index 39ab0f0a8d..fa7a9a3222 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts @@ -2,6 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import { UmbTableColumn, UmbTableConfig, @@ -11,10 +12,6 @@ import { UmbTableOrderedEvent, UmbTableSelectedEvent, } from '../../../../../shared/components/table'; -import { - UMB_COLLECTION_CONTEXT_TOKEN, - UmbCollectionContext, -} from '../../../../../shared/components/collection/collection.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { DocumentTreeItemResponseModel, EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-grid-collection-view.element.ts index 195bfcadd4..157daab33e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-grid-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-grid-collection-view.element.ts @@ -2,13 +2,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { - UmbCollectionContext, - UMB_COLLECTION_CONTEXT_TOKEN, -} from '../../../shared/components/collection/collection.context'; +import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -// TODO: this should be a lib import @customElement('umb-media-grid-collection-view') export class UmbMediaGridCollectionViewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts index ae71670acf..f419cfabea 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts @@ -1,6 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import type { UmbTableColumn, UmbTableConfig, @@ -11,10 +12,6 @@ import type { UmbTableSelectedEvent, } from '../../../shared/components/table'; import type { MediaDetails } from '../'; -import { - UmbCollectionContext, - UMB_COLLECTION_CONTEXT_TOKEN, -} from '../../../shared/components/collection/collection.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-selection-actions.element.ts index 8ed0457f26..925f23c1c9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-selection-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection-selection-actions.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { map } from 'rxjs'; -import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from './collection.context'; +import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import type { ManifestEntityBulkAction } from '@umbraco-cms/backoffice/extensions-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.element.ts index fab5c9a23f..bbbdce71f0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/collection.element.ts @@ -4,7 +4,7 @@ import { customElement, state, property } from 'lit/decorators.js'; import { map } from 'rxjs'; import './collection-selection-actions.element'; import './collection-toolbar.element'; -import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from './collection.context'; +import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; import type { ManifestCollectionView } from '@umbraco-cms/backoffice/extensions-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.element.ts index 638836c4a1..d1a2621301 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/collection/dashboards/dashboard-collection.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '../collection.context'; +import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import type { ManifestDashboardCollection } from '@umbraco-cms/backoffice/extensions-registry'; import type { FolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts index 885b1ffb82..00d1f82ac5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts @@ -2,11 +2,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { - UmbCollectionContext, - UMB_COLLECTION_CONTEXT_TOKEN, -} from '../../../../../../shared/components/collection/collection.context'; - +import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import type { FolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import type { ManifestWorkspaceViewCollection } from '@umbraco-cms/backoffice/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts index f6d9438206..38598ef0b8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/user-collection-header.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UUIPopoverElement } from '@umbraco-ui/uui'; -import { UMB_COLLECTION_CONTEXT_TOKEN } from '../../../shared/components/collection/collection.context'; +import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbUserCollectionContext } from './user-collection.context'; import { UMB_CREATE_USER_MODAL, 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..02f26536e2 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 { UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; +import { USER_REPOSITORY_ALIAS } from '../repository/manifests'; +import { UmbUserCollectionFilterModel } from '../types'; 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'; 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..879559e159 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 { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; +import { UmbUserCollectionContext } from './user-collection.context'; 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 './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/grid/user-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/grid/user-grid-collection-view.element.ts index fb49273650..9927eb072c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/grid/user-grid-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/grid/user-grid-collection-view.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { UMB_COLLECTION_CONTEXT_TOKEN } from '../../../../../shared/components/collection/collection.context'; +import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { getLookAndColorFromUserStatus } from '../../../../utils'; import { UmbUserCollectionContext } from '../../user-collection.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-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..429e2fb286 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 @@ -1,6 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; +import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbTableElement, UmbTableColumn, @@ -14,17 +15,13 @@ import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN, } from '../../../../user-groups/repository/user-group.store'; -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/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index ab455f8298..b909227882 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -42,6 +42,7 @@ "@umbraco-cms/backoffice/workspace": ["libs/workspace"], "@umbraco-cms/backoffice/picker-input": ["libs/picker-input"], "@umbraco-cms/backoffice/id": ["libs/id"], + "@umbraco-cms/backoffice/collection": ["libs/collection"], "@umbraco-cms/internal/lit-element": ["src/core/lit-element"], "@umbraco-cms/internal/modal": ["src/core/modal"], "@umbraco-cms/internal/router": ["src/core/router"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 2c0ff4e222..1a6c838292 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -58,6 +58,7 @@ export default { '@umbraco-cms/backoffice/workspace': './libs/workspace/index.ts', '@umbraco-cms/backoffice/picker-input': './libs/picker-input/index.ts', '@umbraco-cms/backoffice/id': './libs/id/index.ts', + '@umbraco-cms/backoffice/collection': './libs/collection/index.ts', '@umbraco-cms/internal/lit-element': './src/core/lit-element/index.ts', '@umbraco-cms/internal/modal': './src/core/modal/index.ts', '@umbraco-cms/internal/router': './src/core/router/index.ts',