yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temp "hack" to set the root path name

Browse Source
This commit is contained in:
Mads Rasmussen
2023-11-22 13:22:08 +01:00
parent 5dc4bffb32
commit e44a096e2c
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.context.ts
View File

@@ -2,7 +2,7 @@ import { UmbCollectionConfiguration, UmbCollectionContext } from './types.js';
import { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository';
import { UmbBaseController, type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbArrayState, UmbNumberState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
import { UmbArrayState, UmbNumberState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
import {
UmbApi,
UmbExtensionApiInitializer,
@@ -39,8 +39,10 @@ export class UmbDefaultCollectionContext<ItemType = any, FilterModelType extends
#currentView = new UmbObjectState<ManifestCollectionView | undefined>(undefined);
public readonly currentView = this.#currentView.asObservable();
#rootPathname = new UmbStringState('');
public readonly rootPathname = this.#rootPathname.asObservable();
repository?: UmbCollectionRepository;
collectionRootPathname: string;
#initResolver?: () => void;
#initialized = false;
@@ -58,8 +60,11 @@ export class UmbDefaultCollectionContext<ItemType = any, FilterModelType extends
// listen for page changes on the pagination manager
this.pagination.addEventListener(UmbChangeEvent.TYPE, this.#onPageChange);
const currentUrl = new URL(window.location.href);
this.collectionRootPathname = currentUrl.pathname.substring(0, currentUrl.pathname.lastIndexOf('/'));
// TODO: hack - we need to figure out how to get the "parent path" from the router
setTimeout(() => {
const currentUrl = new URL(window.location.href);
this.#rootPathname.next(currentUrl.pathname.substring(0, currentUrl.pathname.lastIndexOf('/')));
}, 100);
this.#configure(config);

14
src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
View File

@@ -13,7 +13,7 @@ export class UmbCollectionViewBundleElement extends UmbLitElement {
_currentView?: ManifestCollectionView;
@state()
private _collectionRootPathname = '';
private _collectionRootPathname?: string;
#collectionContext?: UmbDefaultCollectionContext<any, any>;
@@ -23,12 +23,22 @@ export class UmbCollectionViewBundleElement extends UmbLitElement {
this.consumeContext(UMB_COLLECTION_CONTEXT, (context) => {
this.#collectionContext = context;
if (!this.#collectionContext) return;
this._collectionRootPathname = this.#collectionContext.collectionRootPathname;
this.#observeRootPathname();
this.#observeViews();
this.#observeCurrentView();
});
}
#observeRootPathname() {
this.observe(
this.#collectionContext!.rootPathname,
(rootPathname) => {
this._collectionRootPathname = rootPathname;
},
'umbCollectionRootPathnameObserver',
);
}
#observeCurrentView() {
this.observe(
this.#collectionContext!.currentView,