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.

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

Backport #5725 to 17.x.x #5914

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,18 @@ jobs:
run: yarn config set -H enableImmutableInstalls false && yarn
working-directory: ${{env.project-directory}}

- name: Running lint on a project works
run: yarn lint
working-directory: ${{env.project-directory}}

- name: Running prettier on a project works
run: yarn prettier
working-directory: ${{env.project-directory}}

- name: Running stylelint on a project works
run: yarn stylelint
working-directory: ${{env.project-directory}}

- name: Cypress acceptance tests
uses: cypress-io/github-action@v6
env:
Expand Down
35 changes: 35 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,41 @@ myst:

<!-- towncrier release notes start -->

## 17.6.1 (2023-11-27)

### Bugfix

- Revert "Improvements and completeness of the ContentMetadataTags component (#5433) @sneridagh [#5450](https://github.com/plone/volto/issues/5450)

## 17.6.0 (2023-11-25)

### Feature

- Use container from component registry in sitemap component and also refactor the class
to functional component. @iRohitSingh [#5418](https://github.com/plone/volto/issues/5418)
- Improvements and completeness of the ContentMetadataTags component @ericof @sneridagh [#5433](https://github.com/plone/volto/issues/5433)

### Bugfix

- Searchbox and clear button inside blocks-chooser with visible focus and fixed the clear button label - @Wagner3UB [#5335](https://github.com/plone/volto/issues/5335)
- Fix image paths in development mode. @robgietema [#5429](https://github.com/plone/volto/issues/5429)

## 17.5.0 (2023-11-10)

### Feature

- List plone.app.linkintegrity breaches with links to the pages in the delete confirmation modal.
@jaroel [#5234](https://github.com/plone/volto/issues/5234)

### Bugfix

- Fix empty link element left hanging when hit enter at end of link. @iFlameing @tiberiuichim [#5291](https://github.com/plone/volto/issues/5291)

### Internal

- Added shim to keep working with value instead of initialValue after Slate upgrade @davisagli [#5291](https://github.com/plone/volto/issues/5291)
- Update internal Plone version to 6.0.8 @sneridagh [#5384](https://github.com/plone/volto/issues/5384)

## 17.4.0 (2023-11-04)

### Feature
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ MAKEFLAGS+=--no-builtin-rules
# Project settings

INSTANCE_PORT=8080
DOCKER_IMAGE=plone/server-dev:6.0.7
DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.7
DOCKER_IMAGE=plone/server-dev:6.0.8
DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.8
KGS=
NODEBIN = ./node_modules/.bin
SCRIPTSPACKAGE = ./packages/scripts
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ On Plone 5, Volto is currently tested with the following packages pinned to spec
- plone.rest 2.0.0
- plone.volto 4.0.3


## Volto in Production

Volto is actively developed since 2017 and used in production since 2018 on the following websites:
Expand Down
5 changes: 3 additions & 2 deletions api/buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[buildout]
index = https://pypi.org/simple/
extends =
http://dist.plone.org/release/6.0.6/versions.cfg
http://dist.plone.org/release/6.0.8/versions.cfg
version-constraints.cfg
versions.cfg
parts = instance plonesite site-packages test robot-server
Expand All @@ -16,8 +16,9 @@ show-picked-versions = true

[sources]
plone.volto = git https://github.com/plone/plone.volto.git branch=main
plone.rest = git git@github.com:plone/plone.rest.git branch=master
plone.rest = git git@github.com:plone/plone.rest.git branch=main
plone.restapi = git https://github.com/plone/plone.restapi.git pushurl=git@github.com:plone/plone.restapi.git branch=main
plone.app.linkintegrity = git https://github.com/plone/plone.app.linkintegrity.git pushurl=git@github.com:plone/plone.app.linkintegrity.git branch=master

[instance]
recipe = plone.recipe.zope2instance
Expand Down
2 changes: 1 addition & 1 deletion cypress/tests/core/content/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ describe('Add Content Tests', () => {
cy.findByLabelText('/my-page').children('td').eq(1).click();

cy.get('.top-menu-menu .delete').click();
cy.get('.modal.active').contains('View broken links list');
cy.get('.modal.active').contains('View links and references to this item');
cy.get('.actions').contains('Delete').click();
});

Expand Down
28 changes: 28 additions & 0 deletions cypress/tests/core/volto-slate/06-block-slate-format-link.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,32 @@ describe('Block Tests: Links', () => {
cy.get('[id="page-document"] p a').contains('Colorless green ideas');
cy.get('[id="page-document"] p a').contains('sleep furiously');
});

it('As editor I can add a link and pressing enter does not add another link in the next block', function () {
// https://github.com/plone/volto/pull/5186
cy.get('#toolbar').click();
cy.getSlate().type('Colorless green ideas sleep furiously');

cy.log('Create a Link');

cy.setSlateSelection('ideas', 'furiously');
cy.clickSlateButton('Add link');

cy.get('.slate-toolbar .link-form-container input').type(
'https://google.com{enter}',
);
cy.getSlate().should('have.descendants', 'a.slate-editor-link');
cy.getSlate().type('{rightarrow}').type('{enter}');
cy.getSlate().type('Hello').type('{enter}');

cy.toolbarSave();

cy.log('Then the page view should contain a link');
cy.get('.ui.container p').contains('Colorless green ideas sleep furiously');
// It should be only one, it will fail if there are two
cy.get('.ui.container p a')
.should('have.text', 'ideas sleep furiously')
.and('have.attr', 'href')
.and('include', 'https://google.com');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ is simply dummy text of the printing and typesetting industry.
// Save
cy.toolbarSave();

cy.get('[id="page-document"] p a').should('have.length', 1);
cy.get('[id="page-document"] p a').should('have.length', 0);
});
});
35 changes: 35 additions & 0 deletions docs/source/release-notes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,41 @@ myst:

<!-- towncrier release notes start -->

## 17.6.1 (2023-11-27)

### Bugfix

- Revert "Improvements and completeness of the ContentMetadataTags component (#5433) @sneridagh [#5450](https://github.com/plone/volto/issues/5450)

## 17.6.0 (2023-11-25)

### Feature

- Use container from component registry in sitemap component and also refactor the class
to functional component. @iRohitSingh [#5418](https://github.com/plone/volto/issues/5418)
- Improvements and completeness of the ContentMetadataTags component @ericof @sneridagh [#5433](https://github.com/plone/volto/issues/5433)

### Bugfix

- Searchbox and clear button inside blocks-chooser with visible focus and fixed the clear button label - @Wagner3UB [#5335](https://github.com/plone/volto/issues/5335)
- Fix image paths in development mode. @robgietema [#5429](https://github.com/plone/volto/issues/5429)

## 17.5.0 (2023-11-10)

### Feature

- List plone.app.linkintegrity breaches with links to the pages in the delete confirmation modal.
@jaroel [#5234](https://github.com/plone/volto/issues/5234)

### Bugfix

- Fix empty link element left hanging when hit enter at end of link. @iFlameing @tiberiuichim [#5291](https://github.com/plone/volto/issues/5291)

### Internal

- Added shim to keep working with value instead of initialValue after Slate upgrade @davisagli [#5291](https://github.com/plone/volto/issues/5291)
- Update internal Plone version to 6.0.8 @sneridagh [#5384](https://github.com/plone/volto/issues/5384)

## 17.4.0 (2023-11-04)

### Feature
Expand Down
25 changes: 15 additions & 10 deletions locales/ca/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,11 @@ msgstr "Clar"
msgid "Clear filters"
msgstr "Esborra filtres"

#: components/manage/BlockChooser/BlockChooserSearch
# defaultMessage: Clear search
msgid "Clear search"
msgstr ""

#: components/theme/View/ImageView
# defaultMessage: Click to download full sized image
msgid "Click to download full sized image"
Expand Down Expand Up @@ -1019,6 +1024,11 @@ msgstr ""
msgid "Deleted"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3688,11 +3698,6 @@ msgstr "Aquesta és una còpia de treball de {title}"
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4101,16 +4106,16 @@ msgstr "URL del vídeo"
msgid "View"
msgstr "veure"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Veure els canvis"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
25 changes: 15 additions & 10 deletions locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,11 @@ msgstr "Löschen"
msgid "Clear filters"
msgstr "Filter entfernen"

#: components/manage/BlockChooser/BlockChooserSearch
# defaultMessage: Clear search
msgid "Clear search"
msgstr ""

#: components/theme/View/ImageView
# defaultMessage: Click to download full sized image
msgid "Click to download full sized image"
Expand Down Expand Up @@ -1016,6 +1021,11 @@ msgstr ""
msgid "Deleted"
msgstr "Gelöscht"

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3685,11 +3695,6 @@ msgstr "Das ist eine Arbeitskopie von {title}"
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4098,16 +4103,16 @@ msgstr "Video URL"
msgid "View"
msgstr "Anzeigen"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Änderungen anzeigen"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
25 changes: 15 additions & 10 deletions locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,11 @@ msgstr ""
msgid "Clear filters"
msgstr ""

#: components/manage/BlockChooser/BlockChooserSearch
# defaultMessage: Clear search
msgid "Clear search"
msgstr ""

#: components/theme/View/ImageView
# defaultMessage: Click to download full sized image
msgid "Click to download full sized image"
Expand Down Expand Up @@ -1010,6 +1015,11 @@ msgstr ""
msgid "Deleted"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3679,11 +3689,6 @@ msgstr ""
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4092,16 +4097,16 @@ msgstr ""
msgid "View"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
Loading
Loading