From 29fc5fdcc6238a26dfd5ead9016d996dc31b3c0f Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 20 Aug 2024 09:53:28 +0100 Subject: [PATCH 1/4] Media info, opens SVG in new window --- .../info/media-workspace-view-info.element.ts | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info.element.ts index 7d1251a4cb..26f78f33c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info.element.ts @@ -95,6 +95,20 @@ export class UmbMediaWorkspaceViewInfoElement extends UmbLitElement { this._updateDate = Array.isArray(variants) ? variants[0].updateDate || 'Unknown' : 'Unknown'; }); } + #openSvg(imagePath: string) { + const popup = window.open('', '_blank'); + if (!popup) return; + + const html = ` + + + +`; + + popup.document.open(); + popup.document.write(html); + popup.document.close(); + } override render() { return html` @@ -118,18 +132,12 @@ export class UmbMediaWorkspaceViewInfoElement extends UmbLitElement { } #renderLinksSection() { - /** TODO Make sure link section is completed */ if (this._urls && this._urls.length) { return html` ${repeat( this._urls, - (url) => url.url, - (url) => html` - - ${url.url} - - - `, + (item) => item.url, + (item) => this.#renderLinkItem(item), )} `; } else { @@ -141,6 +149,25 @@ export class UmbMediaWorkspaceViewInfoElement extends UmbLitElement { } } + #renderLinkItem(item: MediaUrlInfoModel) { + const ext = item.url.split(/[#?]/)[0].split('.').pop()?.trim(); + if (ext === 'svg') { + return html` + this.#openSvg(item.url)}> + ${item.url} + + + `; + } else { + return html` + + ${item.url} + + + `; + } + } + #renderGeneralSection() { return html`
From 891ba3426db752f92a4ee55b14211416a0e036ee Mon Sep 17 00:00:00 2001 From: leekelleher Date: Wed, 21 Aug 2024 10:54:20 +0100 Subject: [PATCH 2/4] Added `RELEASE_INSTRUCTION.md` --- .../.github/RELEASE_INSTRUCTION.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md diff --git a/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md b/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md new file mode 100644 index 0000000000..61598574de --- /dev/null +++ b/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md @@ -0,0 +1,31 @@ +# Bellissima release instructions + + +## Build + +> _See internal documentation on the build/release workflow._ + + +## GitHub Release Notes + +To generate release notes on GitHub. + +1. Go to the [**Releases** area](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases) +2. Press the [**"Draft a new release"** button](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases/new) +3. In the combobox for "Choose a tag", expand then select or enter the next version number, e.g. `v14.2.0` + - If the tag does not already exist, an option labelled "Create new tag: v14.2.0 on publish" will appear, select that +4. In the combobox for "Target: main", expand then select the release branch for the next version, e.g. `release/14.2` +5. In the combobox for "Previous tag: auto": + - If the next release is an RC, then you can leave as `auto` + - Otherwise, select the previous stable version, e.g. `v14.1.1` +6. Press the **"Generate release notes"** button, this will populate the main textarea +7. Check the details, view in the "Preview" tab +8. What type of release is this? + - If it's an RC, then check "Set as a pre-release" + - If it's stable, then check "Set as the latest release" +9. Once you're happy with the contents and ready to save... + - If you need more time to review, press the **"Save draft"** button and you can come back to it later + - If you are ready to make the release notes public, then press **"Publish release"** button! :tada: + +> If you're curious about how the content is generated, take a look at the `release.yml` configuration: +> https://github.com/umbraco/Umbraco.CMS.Backoffice/blob/main/.github/release.yml From e22c3c7b860f0753d1ae70fb36dbfc4000633c71 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Wed, 21 Aug 2024 11:01:15 +0100 Subject: [PATCH 3/4] Updated `RELEASE_INSTRUCTION.md` Markdown formatting corrections. --- .../.github/RELEASE_INSTRUCTION.md | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md b/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md index 61598574de..cfd5e491e7 100644 --- a/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md +++ b/src/Umbraco.Web.UI.Client/.github/RELEASE_INSTRUCTION.md @@ -10,21 +10,21 @@ To generate release notes on GitHub. -1. Go to the [**Releases** area](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases) -2. Press the [**"Draft a new release"** button](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases/new) -3. In the combobox for "Choose a tag", expand then select or enter the next version number, e.g. `v14.2.0` - - If the tag does not already exist, an option labelled "Create new tag: v14.2.0 on publish" will appear, select that -4. In the combobox for "Target: main", expand then select the release branch for the next version, e.g. `release/14.2` -5. In the combobox for "Previous tag: auto": +- Go to the [**Releases** area](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases) +- Press the [**"Draft a new release"** button](https://github.com/umbraco/Umbraco.CMS.Backoffice/releases/new) +- In the combobox for "Choose a tag", expand then select or enter the next version number, e.g. `v14.2.0` + - If the tag does not already exist, an option labelled "Create new tag: v14.2.0 on publish" will appear, select that option +- In the combobox for "Target: main", expand then select the release branch for the next version, e.g. `release/14.2` +- In the combobox for "Previous tag: auto": - If the next release is an RC, then you can leave as `auto` - - Otherwise, select the previous stable version, e.g. `v14.1.1` -6. Press the **"Generate release notes"** button, this will populate the main textarea -7. Check the details, view in the "Preview" tab -8. What type of release is this? + - Otherwise, select the previous stable version, e.g. `v14.1.1` +- Press the **"Generate release notes"** button, this will populate the main textarea +- Check the details, view in the "Preview" tab +- What type of release is this? - If it's an RC, then check "Set as a pre-release" - - If it's stable, then check "Set as the latest release" -9. Once you're happy with the contents and ready to save... - - If you need more time to review, press the **"Save draft"** button and you can come back to it later + - If it's stable, then check "Set as the latest release" +- Once you're happy with the contents and ready to save... + - If you need more time to review, press the **"Save draft"** button and you can come back to it later - If you are ready to make the release notes public, then press **"Publish release"** button! :tada: > If you're curious about how the content is generated, take a look at the `release.yml` configuration: From 9fcbd9cd0fe602d1175e558b7c7efc701bc3e7f0 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 22 Aug 2024 11:31:06 +0200 Subject: [PATCH 4/4] add back reexport --- .../workspace-action/common/submit/submit.action.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts index 9a1fc41596..20bd6d3e05 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/common/submit/submit.action.ts @@ -37,3 +37,8 @@ export class UmbSubmitWorkspaceAction extends UmbWorkspaceActionBase