Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix: Content Picker, gets dynamic root value from menu context #2212

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Bugfix: Content Picker, gets dynamic root value from menu context #2212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af1d1fe
Content Picker: refactors gathering dynamic root current and parent u…
leekelleher Aug 14, 2024
14093d6
Merge branch 'main' into v14/bugfix/content-picker-dynamic-root-nested
madsrasmussen Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/packages/property-editors/content-picker/property-editor-ui-content-picker.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { UmbFormControlMixin } from '@umbraco-cms/backoffice/validation';
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
import { UMB_DOCUMENT_ENTITY_TYPE } from '@umbraco-cms/backoffice/document';
import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
import { UMB_MEDIA_ENTITY_TYPE } from '@umbraco-cms/backoffice/media';
import { UMB_MEMBER_ENTITY_TYPE } from '@umbraco-cms/backoffice/member';
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
Expand Down Expand Up @@ -114,13 +113,11 @@ export class UmbPropertyEditorUIContentPickerElement
if (this._rootUnique) return;
if (!this.#dynamicRoot) return;

const workspaceContext = await this.getContext(UMB_ENTITY_WORKSPACE_CONTEXT);
const unique = workspaceContext.getUnique();
if (!unique) return;

const menuStructureWorkspaceContext = (await this.getContext('UmbMenuStructureWorkspaceContext')) as any;
const parent = (await this.observe(menuStructureWorkspaceContext.parent, () => {})?.asPromise()) as any;
const parentUnique = parent?.unique;
const structure = (await this.observe(menuStructureWorkspaceContext.structure, () => {})?.asPromise()) as any[];
const [parentUnique, unique] = structure?.slice(-2).map((x) => x.unique) ?? [];

if (!unique) return;

const result = await this.#dynamicRootRepository.requestRoot(this.#dynamicRoot, unique, parentUnique);
if (result && result.length > 0) {
Expand Down
Loading