Skip to content

Commit bc38817

Browse files
updated the link picker modal and the property editors using it. (#18059)
* updated the link picker modal and the property editors using it. * updated the last language * some minor updates to the code so that it uses the correct actions * Minor change in the language key that is being used. * use camel case * use "add" and "update" without "link" --------- Co-authored-by: Mads Rasmussen <[email protected]>
1 parent 2648d17 commit bc38817

File tree

9 files changed

+16
-3
lines changed

9 files changed

+16
-3
lines changed

src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ export default {
542542
selectIcon: 'Vælg ikon',
543543
selectItem: 'Vælg item',
544544
selectLink: 'Vælg link',
545+
addLink: 'Tilføj Link',
546+
updateLink: 'Opdater Link',
545547
selectMacro: 'Vælg makro',
546548
selectContent: 'Vælg indhold',
547549
selectContentType: 'Vælg indholdstype',

src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,8 @@ export default {
573573
selectIcon: 'Select icon',
574574
selectItem: 'Select item',
575575
selectLink: 'Configure link',
576+
addLink: 'Add Link',
577+
updateLink: 'Update Link',
576578
selectMacro: 'Select macro',
577579
selectContent: 'Select content',
578580
selectContentType: 'Select content type',

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,8 @@ export default {
565565
selectIcon: 'Select icon',
566566
selectItem: 'Select item',
567567
selectLink: 'Configure link',
568+
addLink: 'Add Link',
569+
updateLink: 'Update Link',
568570
selectMacro: 'Select macro',
569571
selectContent: 'Select content',
570572
selectContentType: 'Select content type',

src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/components/input-multi-url/input-multi-url.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ export class UmbInputMultiUrlElement extends UUIFormControlMixin(UmbLitElement,
200200
},
201201
data: {
202202
index: index,
203+
isNew: index === null,
203204
config: {
204205
hideAnchor: this.hideAnchor,
205206
},

src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.element.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,10 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement<UmbLinkPicker
200200

201201
override render() {
202202
return html`
203-
<umb-body-layout headline=${this.localize.term('defaultdialogs_selectLink')}>
203+
<umb-body-layout
204+
headline=${this.localize.term(
205+
this.modalContext?.data.isNew ? 'defaultdialogs_addLink' : 'defaultdialogs_updateLink',
206+
)}>
204207
<uui-box>
205208
${this.#renderLinkType()} ${this.#renderLinkAnchorInput()} ${this.#renderLinkTitleInput()}
206209
${this.#renderLinkTargetInput()}
@@ -210,7 +213,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement<UmbLinkPicker
210213
<uui-button
211214
color="positive"
212215
look="primary"
213-
label=${this.localize.term('general_submit')}
216+
label=${this.localize.term(this.modalContext?.data.isNew ? 'general_add' : 'general_update')}
214217
?disabled=${!this.value.link.type}
215218
@click=${this.#onSubmit}></uui-button>
216219
</div>

src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/link-picker-modal/link-picker-modal.token.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
55
export interface UmbLinkPickerModalData {
66
config: UmbLinkPickerConfig;
77
index: number | null;
8+
isNew: boolean;
89
}
910

1011
export type UmbLinkPickerModalValue = { link: UmbLinkPickerLink };

src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/monaco-markdown-editor-action/url-picker-monaco-markdown-editor-action.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export class UmbUrlPickerMonacoMarkdownEditorAction extends UmbControllerBase {
4040
modal: { size: overlaySize },
4141
data: {
4242
index: null,
43+
isNew: selectedValue === '',
4344
config: {},
4445
},
4546
value: {

src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/tiny-mce-plugin/tiny-mce-multi-url-picker.plugin.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export default class UmbTinyMceMultiUrlPickerPlugin extends UmbTinyMcePluginBase
8181
data: {
8282
config: {},
8383
index: null,
84+
isNew: currentTarget?.url === undefined,
8485
},
8586
value: {
8687
link: currentTarget ?? {},

src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/link.tiptap-toolbar-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default class UmbTiptapToolbarLinkExtensionApi extends UmbTiptapToolbarEl
1010
override async execute(editor?: Editor) {
1111
const attrs = editor?.getAttributes(UmbLink.name) ?? {};
1212
const link = this.#getLinkData(attrs);
13-
const data = { config: {}, index: null };
13+
const data = { config: {}, index: null, isNew: link?.url === undefined };
1414
const value = { link };
1515

1616
const overlaySize = this.configuration?.getValueByAlias<UUIModalSidebarSize>('overlaySize') ?? 'small';

0 commit comments

Comments
 (0)