Skip to content

Allow selection of unpublished documents in link picker and align display of URLs #19296

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

Merged
leekelleher merged 3 commits into from
May 12, 2025
Merged

Allow selection of unpublished documents in link picker and align display of URLs #19296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4548c5a
Allow selection of unpublished documents in link picker and align dis…
AndyButland May 12, 2025
26f6c9b
Using nullish coalescing rather than a ternary
leekelleher May 12, 2025
c9e9c6c
Reverted/amended nullish coalescing check
leekelleher May 12, 2025
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
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,7 +2799,7 @@ export default {
modalSource: 'Source',
modalManual: 'Manual',
modalAnchorValidationMessage:
'Please enter an anchor or querystring, or select a published document or media item, or manually configure the URL.',
'Please enter an anchor or querystring, select a document or media item, or manually configure the URL.',
resetUrlHeadline: 'Reset URL?',
resetUrlMessage: 'Are you sure you want to reset this URL?',
resetUrlLabel: 'Reset',
Expand Down
51 changes: 41 additions & 10 deletions ...eb.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@
}

this.#getMediaTypes();
this.populateLinkUrl();
}

protected override firstUpdated() {
this._linkAnchorInput?.addValidator(
'valueMissing',
() => this.localize.term('linkPicker_modalAnchorValidationMessage'),
() => !this.value.link.url && !this.value.link.queryString,
() => !this.value.link.name && !this.value.link.queryString,
);
}

Expand All @@ -74,6 +75,30 @@
(mediaTypes?.items.map((x) => x.unique).filter((x) => x && !isUmbracoFolder(x)) as Array<string>) ?? [];
}

async populateLinkUrl() {
// Documents and media have URLs saved in the local link format. Display the actual URL to align with what
// the user sees when they selected it initially.
if (!this.value.link?.unique || this.value.link?.url?.indexOf('localLink') === -1) return;

let url: string | undefined = undefined;
switch (this.value.link.type) {
case 'document': {
url = await this.#getUrlForDocument(this.value.link.unique);
break;
}
case 'media': {
url = await this.#getUrlForMedia(this.value.link.unique);
break;
}
default:
break;
}

if (url) {
this.#partialUpdateLink({ url });
}
}

Check warning on line 100 in src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (release/16.0)

❌ New issue: Complex Method 

UmbLinkPickerModalElement.populateLinkUrl has a cyclomatic complexity of 9, threshold = 9. This function has many conditional statements (e.g. if, for, while), leading to lower code health. Avoid adding more conditionals and code to it without refactoring.

#partialUpdateLink(linkObject: Partial<UmbLinkPickerLink>) {
this.modalContext?.updateValue({ link: { ...this.value.link, ...linkObject } });
}
Expand Down Expand Up @@ -136,10 +161,7 @@
if (documentData) {
icon = documentData.documentType.icon;
name = documentData.variants[0].name;

const documentUrlRepository = new UmbDocumentUrlRepository(this);
const { data: documentUrlData } = await documentUrlRepository.requestItems([unique]);
url = documentUrlData?.[0].urls[0].url ?? '';
url = await this.#getUrlForDocument(unique);
}
break;
}
Expand All @@ -149,10 +171,7 @@
if (mediaData) {
icon = mediaData.mediaType.icon;
name = mediaData.variants[0].name;

const mediaUrlRepository = new UmbMediaUrlRepository(this);
const { data: mediaUrlData } = await mediaUrlRepository.requestItems([unique]);
url = mediaUrlData?.[0].url ?? '';
url = await this.#getUrlForMedia(unique);
}
break;
}
Expand All @@ -163,7 +182,7 @@

const link = {
icon,
name: this.value.link.name || name,
name: name || this.value.link.name,
type: unique ? type : undefined,
unique,
url: url ?? this.value.link.url,
Expand All @@ -174,6 +193,18 @@
await this.#validationContext.validate();
}

async #getUrlForDocument(unique: string) {
const documentUrlRepository = new UmbDocumentUrlRepository(this);
const { data: documentUrlData } = await documentUrlRepository.requestItems([unique]);
return documentUrlData && documentUrlData[0].urls.length > 0 ? (documentUrlData?.[0].urls[0].url ?? '') : '';
}

async #getUrlForMedia(unique: string) {
const mediaUrlRepository = new UmbMediaUrlRepository(this);
const { data: mediaUrlData } = await mediaUrlRepository.requestItems([unique]);
return mediaUrlData?.[0].url ?? '';
}

async #onResetUrl() {
if (this.value.link.url) {
await umbConfirmModal(this, {
Expand Down
Loading