diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/icon/icon.store.ts b/src/Umbraco.Web.UI.Client/libs/store/icon/icon.store.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/core/stores/icon/icon.store.ts rename to src/Umbraco.Web.UI.Client/libs/store/icon/icon.store.ts index e80b828c1f..522530209f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/icon/icon.store.ts +++ b/src/Umbraco.Web.UI.Client/libs/store/icon/icon.store.ts @@ -1,5 +1,5 @@ import { UUIIconRegistry } from '@umbraco-ui/uui'; -import icons from '../../../../public-assets/icons/icons.json'; +import icons from '../../../public-assets/icons/icons.json'; import { baseUrl } from '@umbraco-cms/utils'; interface UmbIconDescriptor { diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/icon/icon.stories.ts b/src/Umbraco.Web.UI.Client/libs/store/icon/icon.stories.ts similarity index 80% rename from src/Umbraco.Web.UI.Client/src/core/stores/icon/icon.stories.ts rename to src/Umbraco.Web.UI.Client/libs/store/icon/icon.stories.ts index 618d96ff8a..3ff7779ff8 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/icon/icon.stories.ts +++ b/src/Umbraco.Web.UI.Client/libs/store/icon/icon.stories.ts @@ -1,7 +1,7 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import { repeat } from 'lit/directives/repeat.js'; -import icons from '../../../../public-assets/icons/icons.json'; +import icons from '../../../public-assets/icons/icons.json'; export default { title: 'API/Icons', @@ -23,11 +23,11 @@ const Template: Story = () => { (icon) => html`
this.updateItems(data); }); - /* + /* return this.items.pipe( map( (documents) => @@ -41,8 +41,10 @@ export class UmbDocumentStore extends UmbNodeStoreBase ); */ - return createObservablePart(this.items, (documents) => - (documents.find((document) => document.key === key && isDocumentDetails(document)) as DocumentDetails) + return createObservablePart( + this.items, + (documents) => + documents.find((document) => document.key === key && isDocumentDetails(document)) as DocumentDetails ); } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts index 4a5e21868e..5bcaef4730 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbNodeStoreBase } from '../../../core/stores/store'; +import { UmbNodeStoreBase } from '@umbraco-cms/store'; import { MediaTypeResource, FolderTreeItem } from '@umbraco-cms/backend-api'; import type { MediaTypeDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts index fba7c229ae..61db13cd6e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; +import { UmbDataStoreBase } from '@umbraco-cms/store'; import type { MediaDetails } from '@umbraco-cms/models'; import { ContentTreeItem, MediaResource } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts index 9be7cc8a67..23b877768d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbNodeStoreBase } from '../../../core/stores/store'; +import { UmbNodeStoreBase } from '@umbraco-cms/store'; import { EntityTreeItem, MemberGroupResource } from '@umbraco-cms/backend-api'; import type { MemberGroupDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts index 954d28e266..8d826d9e8b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; +import { UmbDataStoreBase } from '@umbraco-cms/store'; import { MemberTypeResource, EntityTreeItem } from '@umbraco-cms/backend-api'; import type { MemberTypeDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts index 7ffda6749a..43bfee78f9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; +import { UmbDataStoreBase } from '@umbraco-cms/store'; import type { DataTypeDetails } from '@umbraco-cms/models'; import { DataTypeResource, FolderTreeItem } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts index 8a23c626b1..c8a09d48a5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts @@ -1,5 +1,5 @@ import { ContentTreeItem } from '@umbraco-cms/backend-api'; -import { UmbTreeDataStore } from '@umbraco-cms/stores/store'; +import { UmbTreeDataStore } from '@umbraco-cms/store'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextToken, UmbContextConsumerController } from '@umbraco-cms/context-api'; import { UniqueBehaviorSubject, UmbObserverController } from '@umbraco-cms/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts index 83d7affd20..9a565d115a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts @@ -11,7 +11,7 @@ import { UMB_TREE_CONTEXT_MENU_SERVICE_CONTEXT_TOKEN, } from './context-menu/tree-context-menu.service'; import type { Entity } from '@umbraco-cms/models'; -import { UmbTreeDataStore } from '@umbraco-cms/stores/store'; +import type { UmbTreeDataStore } from '@umbraco-cms/store'; import { UmbLitElement } from '@umbraco-cms/element'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts index 9af9c01147..552befc7e7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts @@ -5,7 +5,7 @@ import { repeat } from 'lit-html/directives/repeat.js'; import { UmbTreeContextBase } from './tree.context'; import type { Entity, ManifestTree } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbTreeDataStore } from '@umbraco-cms/stores/store'; +import { UmbTreeDataStore } from '@umbraco-cms/store'; import { UmbLitElement } from '@umbraco-cms/element'; import './tree-item.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts index dc605c8d92..adc7588e89 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts @@ -6,7 +6,7 @@ import { distinctUntilChanged } from 'rxjs'; import type { UmbWorkspaceContentContext } from '../workspace/workspace-content/workspace-content.context'; import type { DocumentDetails, MediaDetails } from '@umbraco-cms/models'; -import type { UmbNodeStoreBase } from '@umbraco-cms/stores/store'; +import type { UmbNodeStoreBase } from '@umbraco-cms/store'; import { UmbLitElement } from '@umbraco-cms/element'; type ContentTypeTypes = DocumentDetails | MediaDetails; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.context.ts index 8563137735..9e12012e43 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.context.ts @@ -5,7 +5,7 @@ import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN, } from '@umbraco-cms/notification'; -import { UmbNodeStoreBase } from '@umbraco-cms/stores/store'; +import { UmbNodeStoreBase } from '@umbraco-cms/store'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextConsumerController, UmbContextProviderController } from '@umbraco-cms/context-api'; import { EntityTreeItem } from '@umbraco-cms/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts index 0fcf2c3fe5..133a0ed9e9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; +import { UmbDataStoreBase } from '@umbraco-cms/store'; import { DictionaryResource, EntityTreeItem } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; import { UmbContextToken } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts index ebf7d6af87..edbb706351 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; +import { UmbDataStoreBase } from '@umbraco-cms/store'; import type { UserGroupDetails, UserGroupEntity } from '@umbraco-cms/models'; import { UmbContextToken } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts index 7399a86e63..cc3d7bee39 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts @@ -1,8 +1,8 @@ import { map, Observable } from 'rxjs'; -import { UmbDataStoreBase } from '../../../core/stores/store'; import type { UserDetails } from '@umbraco-cms/models'; import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; import { UmbContextToken } from '@umbraco-cms/context-api'; +import { UmbDataStoreBase } from '@umbraco-cms/store'; export type UmbUserStoreItemType = UserDetails; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index b7c46b0dc7..e82a3ad7e7 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -32,8 +32,8 @@ "@umbraco-cms/utils": ["src/core/utils"], "@umbraco-cms/test-utils": ["src/core/test-utils"], "@umbraco-cms/resources": ["libs/resources"], + "@umbraco-cms/store": ["libs/store"], "@umbraco-cms/components/*": ["src/backoffice/components/*"], - "@umbraco-cms/stores/*": ["src/core/stores/*"], "@umbraco-cms/sections/*": ["src/backoffice/sections/*"] } }, 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 3a41ed641b..a1c7445c71 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -21,6 +21,7 @@ export default { '@umbraco-cms/extensions-registry': './libs/extensions-registry/index.ts', '@umbraco-cms/notification': './libs/notification/index.ts', '@umbraco-cms/observable-api': './libs/observable-api/index.ts', + '@umbraco-cms/store': './libs/store/index.ts', '@umbraco-cms/utils': './src/core/utils/index.ts', '@umbraco-cms/test-utils': './src/core/test-utils/index.ts', '@umbraco-cms/resources': './libs/resources/index.ts'