Merge branch 'master' into site-and-navroot

CHANGELOG.md

@@ -3,11 +3,49 @@
 <!-- You should *NOT* be adding new change log entries to this file.
      You should create a file in the news directory instead.
      For helpful instructions, please see:
-     https://6.docs.plone.org/volto/developer-guidelines/contributing.html#create-a-pull-request
+     https://6.docs.plone.org/contributing/index.html#contributing-change-log-label
 -->
 
 <!-- towncrier release notes start -->
 
+## 17.0.0-alpha.25 (2023-08-25)
+
+### Breaking
+
+- Spin off relation stats action. Get relation stats with getRelationStats() instead of with queryRelations(). @ksuess
+  Refactor relations actions: slightly change the shape of the redux state for `queryRelations` to follow common signatures. @ksuess [#5041](https://github.com/plone/volto/issues/5041)
+
+### Feature
+
+- Refactor Comment -@Tishasoumya-02 [#4074](https://github.com/plone/volto/issues/4074)
+- Refactor Logout component @Tishasoumya-02 [#4860](https://github.com/plone/volto/issues/4860)
+- Refactore SearchTags @Tishasoumya-02 [#4873](https://github.com/plone/volto/issues/4873)
+
+### Bugfix
+
+- Allow a user to register when they use an email address as their username. [#5031](https://github.com/plone/volto/issues/5031) @mehedikhan72 [#5031](https://github.com/plone/volto/issues/5031)
+- Fix querystringResults subrequests id, to work properly in duplicate pages where blocks id's are the same. @giuliaghisini [#5070](https://github.com/plone/volto/issues/5070)
+- Fix i18n for link settings fieldset in the image block @iRohitSingh [#5075](https://github.com/plone/volto/issues/5075)
+- Prevent caching the outdated browser message in a shared cache. @davisagli [#5076](https://github.com/plone/volto/issues/5076)
+- Fix accessibility of the content folder buttons. @SaraBianchi [#5101](https://github.com/plone/volto/issues/5101)
+- For folders inside navigation roots, properly fetch navigation from the
+  navroot, rather then the site root  @tiberiuichim [#5106](https://github.com/plone/volto/issues/5106)
+- Fix uncached case when the widget is slate on diff @dobri1408 [#5107](https://github.com/plone/volto/issues/5107)
+- Fix load addon translations: last addon translations wins @giuliaghisini [#5113](https://github.com/plone/volto/issues/5113)
+- [Visual bugfix] Match the original mockups for PastanagaUI in regards of the error messages in form field elements @sneridagh [#5115](https://github.com/plone/volto/issues/5115)
+- Fix default toc renderer for nested entries @pnicolli [#5116](https://github.com/plone/volto/issues/5116)
+- Fix inherit checkbox in sharing view @sneridagh [#5514](https://github.com/plone/volto/issues/5514)
+
+### Internal
+
+- Improved spellcheck to keep spellings consistent. @chirayu-humar [#1190](https://github.com/plone/volto/issues/1190)
+
+### Documentation
+
+- Update links to contributing. @stevepiercy [#5084](https://github.com/plone/volto/issues/5084)
+- Accept `plone` and `volto` in labels with janky regex. Include Vale styles directory for checking spelling and styles. @stevepiercy [#5095](https://github.com/plone/volto/issues/5095)
+
+
 ## 17.0.0-alpha.24 (2023-08-09)
 
 ### Breaking
@@ -23,6 +61,9 @@
 
 - Fix 302 redirect in changelog. @stevepiercy [#5068](https://github.com/plone/volto/issues/5068)
 
+### Internal
+
+- Add https://www.dlr.de/de to "Volto in production" list. @tisto [#5112](https://github.com/plone/volto/pull/5112)
 
 ## 17.0.0-alpha.23 (2023-07-28)
 

README.md

@@ -177,6 +177,7 @@ Volto is actively developed since 2017 and used in production since 2018 on the
 - [Helmholtz-Institut Erlangen-Nürnberg für Erneuerbare Energien (HI-ERN)](https://www.hi-ern.de) (Website for HI ERN, a research institution for renewable energies, developed by [kitconcept GmbH](https://kitconcept.com), 2022)
 - [Lanku](https://www.lanku.eus) (Website for Lanku Kultur Zerbitzuak, a company offering cultural services and improvised Basque verse singing sessions across the Basque Country, developed by [CodeSyntax](https://www.codesyntax.com/en), 2023)
 - [UEU](https://www.ueu.eus) (Website for Udako Euskal Unibertsitatea, a non-profit University offering all its service only in Basque: courses, publications, ... developed by [CodeSyntax](https://www.codesyntax.com/en), 2023)
+- [German Aerospace Center (DLR)](https://www.dlr.de/de) (The German Aerospace Center (DLR) is the Federal Republic of Germany's research center for aeronautics. With more than 10.000 employees and a yearly budget of more than 1 billion euros, it is one of the largest research institutions in Germany, developed by [kitconcept GmbH](https://kitconcept.com), 2023)
 
 Please create a new [issue](https://github.com/plone/volto/issues/new) or [pull request](https://github.com/plone/volto/pulls) to add your Volto-site here!
 

cypress/tests/core/basic/logout.js

@@ -0,0 +1,20 @@
+import { ploneAuth } from '../../../support/constants';
+
+describe('Logout Tests', () => {
+  beforeEach(() => {
+    cy.visit('/');
+    cy.contains('Log in').click();
+    const user = ploneAuth[0];
+    const password = ploneAuth[1];
+
+    cy.get('#login').type(user).should('have.value', user);
+    cy.get('#password').type(password).should('have.value', password);
+    cy.get('#login-form-submit').click();
+    cy.get('body').should('have.class', 'has-toolbar');
+  });
+  it('As registered user I can logout', function () {
+    cy.get('#toolbar-personal').click();
+    cy.get('#toolbar-logout').click();
+    cy.getCookie('auth_key').should('not.exist');
+  });
+});

cypress/tests/core/basic/view.js

@@ -0,0 +1,55 @@
+describe('Add Content Tests', () => {
+    beforeEach(() => {
+      cy.intercept('GET', `/**/*?expand*`).as('content');
+      // give a logged in editor and the site root
+      cy.autologin();
+      cy.visit('/');
+      cy.wait('@content');
+    });
+
+      it('As editor I can change the view to Listing View', function () {
+
+        cy.visit('/events');
+        cy.get('#toolbar-more').click();
+        cy.findByText('Listing view').click();
+        cy.findByText('Album view').click();
+        cy.visit('/events');
+        cy.wait('@content');
+        cy.wait(2000);
+        cy.get('main').contains('Event').should('be.visible');
+      });
+
+      it('As editor I can change the view to Summary View', function () {
+
+        cy.visit('/events');
+        cy.get('#toolbar-more').click();
+        cy.findByText('Listing view').click();
+        cy.findByText('Summary view').click();
+        cy.visit('/events');
+        cy.wait('@content');
+        cy.wait(2000);
+        cy.get('main').contains('Event').should('be.visible');
+      });
+      it('As editor I can change the view to Tabular View', function () {
+
+        cy.visit('/events');
+        cy.get('#toolbar-more').click();
+        cy.findByText('Listing view').click();
+        cy.findByText('Tabular view').click();
+        cy.visit('/events');
+        cy.wait('@content');
+        cy.wait(2000);
+        cy.get('main').contains('Event').should('be.visible');
+      });
+      it('As editor I can change the view to Album View', function () {
+
+        cy.visit('/events');
+        cy.get('#toolbar-more').click();
+        cy.findByText('Listing view').click();
+        cy.visit('/events');
+        cy.wait('@content');
+        cy.wait(2000);
+        cy.get('main').contains('Event').should('be.visible');
+      });
+    });
+

cypress/tests/core/blocks/blocks-search.js

@@ -1,4 +1,5 @@
 describe('Search Block Tests', () => {
+  var results_number = 3;
   beforeEach(() => {
     cy.intercept('GET', `/**/*?expand*`).as('content');
     cy.intercept('GET', '/**/Document').as('schema');
@@ -91,6 +92,12 @@ describe('Search Block Tests', () => {
 
     cy.wait(500);
 
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
+
     // test if type facet works
     cy.get('.block.search .facets > .facet .entries > .entry label')
       .contains('Event')
@@ -158,6 +165,12 @@ describe('Search Block Tests', () => {
     cy.get('#toolbar-save > .icon').click();
 
     cy.wait(500);
+
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
   });
 
   it('Search block - test live searchbox', () => {
@@ -201,6 +214,13 @@ describe('Search Block Tests', () => {
     cy.wait('@content');
 
     cy.wait(500);
+
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
+
     // test searching for Event
     cy.get('.search-wrapper .search-input input').focus().type('Event');
     cy.get('#page-document .listing-item:first-of-type a').should(
@@ -237,6 +257,12 @@ describe('Search Block Tests', () => {
     );
     cy.url().should('not.contain', '%22SearchableText%22');
 
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
+
     // test searching for Event
     cy.get('.search-wrapper .search-input input').focus().type('Event');
     cy.get('#page-document .listing-item:first-of-type a').should(
@@ -253,6 +279,9 @@ describe('Search Block Tests', () => {
       '%7B%22i%22%3A%22SearchableText%22%2C%22o%22%3A%22paqo.string.contains%22%2C%22v%22%3A%22Event%22%7D',
     );
 
+    // test search results number
+    cy.get('.search-details').should('contain', 'Search results: 1');
+
     // test removing one char
     cy.get('.search-wrapper .search-input input').focus().type('{backspace}');
     cy.get('.search-results-count-sort .search-details em')
@@ -319,6 +348,12 @@ describe('Search Block Tests', () => {
 
     cy.wait(500);
 
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
+
     // test searching for Event
     cy.get('.search-wrapper .search-input input').focus().type('Event');
     cy.get('.search-wrapper > .ui.button').click();
@@ -337,6 +372,9 @@ describe('Search Block Tests', () => {
       '%7B%22i%22%3A%22SearchableText%22%2C%22o%22%3A%22paqo.string.contains%22%2C%22v%22%3A%22Event%22%7D',
     );
 
+    // test search results number
+    cy.get('.search-details').should('contain', 'Search results: 1');
+
     // test removing one char
     cy.get('.search-wrapper .search-input input').focus().type('{backspace}');
     cy.get('.search-wrapper > .ui.button').click();
@@ -359,6 +397,12 @@ describe('Search Block Tests', () => {
     );
     cy.url().should('not.contain', '%22SearchableText%22');
 
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
+
     // test searching for Event
     cy.get('.search-wrapper .search-input input').focus().type('Event');
     cy.get('.search-wrapper > .ui.button').click();
@@ -376,6 +420,9 @@ describe('Search Block Tests', () => {
       '%7B%22i%22%3A%22SearchableText%22%2C%22o%22%3A%22paqo.string.contains%22%2C%22v%22%3A%22Event%22%7D',
     );
 
+    // test search results number
+    cy.get('.search-details').should('contain', 'Search results: 1');
+
     // test removing one char
     cy.get('.search-wrapper .search-input input').focus().type('{backspace}');
     cy.get('.search-wrapper > .ui.button').click();
@@ -397,5 +444,11 @@ describe('Search Block Tests', () => {
       'Searched for:',
     );
     cy.url().should('not.contain', '%22SearchableText%22');
+
+    // test search results number
+    cy.get('.search-details').should(
+      'contain',
+      `Search results: ${results_number}`,
+    );
   });
 });

docs/source/addons/i18n.md

@@ -31,4 +31,7 @@ In the context of your project, run `yarn i18n` to merge the add-on translations
 
 ## Override translations
 
-The workflow allows you to override translations from your project scope, so the project translations "always win".
+If you have multiple add-ons installed in your project, the translations are loaded in the order your add-ons are listed in `package.json`.
+If two add-ons provide different translations for the same message, then the last defined add-on wins.
+
+When running `yarn i18n` in the context of your project, the project's own locales are processed last and can override translations from any add-on.

docs/source/conf.py

@@ -94,6 +94,7 @@
     r"https://github.com/plone/plone.rest#cors",
     r"https://github.com/plone/plone.volto/blob/6f5382c74f668935527e962490b81cb72bf3bc94/src/kitconcept/volto/upgrades.py#L6-L54",
     r"https://github.com/plone/volto/issues/new/choose",
+    r"https://github.com/plone/volto/blob/6fd62cb2860bc7cf3cb7c36ea86bfd8bd03247d9/src/components/manage/Form/Field.jsx#L112",
     r"https://github.com/tc39/proposals/blob/HEAD/finished-proposals.md#finished-proposals",
 ]
 linkcheck_anchors = True

locales/ca/LC_MESSAGES/volto.po

@@ -4640,7 +4640,7 @@ msgstr "a"
 #: components/manage/Widgets/RecurrenceWidget/Utils
 # defaultMessage: [month] [day], [year]
 msgid "rrule_dateFormat"
-msgstr "[mes] [dia], [any]"
+msgstr "[month] [day], [year]"
 
 #: components/manage/Widgets/RecurrenceWidget/Utils
 # defaultMessage: day

locales/de/LC_MESSAGES/volto.po

@@ -4637,7 +4637,7 @@ msgstr "Regel AT"
 #: components/manage/Widgets/RecurrenceWidget/Utils
 # defaultMessage: [month] [day], [year]
 msgid "rrule_dateFormat"
-msgstr "Regel Datumsformat"
+msgstr "[day] [month] [year]"
 
 #: components/manage/Widgets/RecurrenceWidget/Utils
 # defaultMessage: day