Skip to content

Commit

Permalink
Merge branch 'master' into typescript-support-in-core
Browse files Browse the repository at this point in the history
* master: (59 commits)
  (feat):Update toc block entries (#5146)
  view cypress test (#5149)
  fix search block search results number (#5171)
  fix : RecursiveWidget is incorrectly translated (#4513)
  Bugfix : Responsive Error in login page  (#4309)
  Fix default template for content type which contains block with schem… (#5159)
  Updated Spanish translation (#5120)
  ContentRules add and edit forms for languages other than English (#5162)
  Fix SelectWidget throwing error when editing a recently created conte… (#5155)
  Don't show ``No value`` option in SelectWidget and ArrayWidget if default value is 0 (#5152)
  Fix storybook config for project generator. Add support for SCSS, upgrade to webpack 5 in there as well. (#5132)
  Fix linkcheckbroken 301 redirect to https://www.dlr.de/de (#5131)
  Release 17.0.0-alpha.25
  fix: Fix querystringResults subrequests id, to work properly in dupli… (#5071)
  Fix accessibility of the content folder buttons (#5101)
  Refactor Comment (#4874)
  Refactor Search Tags (#4873)
  Logout Refactor (#4860)
  Add www.dlr.de to README (#5112)
  Fix default toc renderer for nested entries (#5116)
  ...
  • Loading branch information
sneridagh committed Sep 12, 2023
2 parents d1ea061 + d08f92a commit 97d990a
Show file tree
Hide file tree
Showing 158 changed files with 11,535 additions and 5,927 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
paths:
- 'docs/**'
- 'styles/**'

jobs:
docs:
Expand Down Expand Up @@ -46,4 +47,3 @@ jobs:
# Required, set by GitHub actions automatically:
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

102 changes: 100 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,109 @@
<!-- 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

- Update `@plone/scripts` to 3.0.0. @davisagli [#5040](https://github.com/plone/volto/issues/5040)

### Bugfix

- Fix handling of exceptions in reducers. @davisagli [#5069](https://github.com/plone/volto/issues/5069)
- Add missing i18n for ToC block. @davisagli [#5073](https://github.com/plone/volto/issues/5073)

### Documentation

- 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)

### Bugfix

- Fix regression from v17a22: It was not possible to select a block in a grid
column unless the grid was already selected. @davisagli

Fix regression from v17a22: Block outline was blocking clicks in some cases.
@davisagli [#5039](https://github.com/plone/volto/issues/5039)


## 17.0.0-alpha.22 (2023-07-28)

### Feature

- Refactor Delete -@Tishasoumya [#4890](https://github.com/plone/volto/issues/4890)
- Refactor workflow -@Tishasoumya-02 [#4902](https://github.com/plone/volto/issues/4902)
- Refactor Request Reset Password-@Tishasoumya-02 [#4938](https://github.com/plone/volto/issues/4938)
- Refactor Actions-@Tishasoumya-02 [#4939](https://github.com/plone/volto/issues/4939)
- Refactor Blocks/Maps/Edit component -@Tishasoumya-02 [#4958](https://github.com/plone/volto/issues/4958)
- Updated Italian translations @sabrina-bongiovanni [#4987](https://github.com/plone/volto/issues/4987)
- Made selectedView and className props available in the SearchBlockView.jsx to improve styling development. @danalvrz [#4997](https://github.com/plone/volto/issues/4997)

### Bugfix

- Fix Volto contents - set properties Exclude from navigation - bad request, set exclude_from_nav to boolean [#4855](https://github.com/plone/volto/issues/4855)
- Add XSendfile headers to files and images middleware @instification [#4984](https://github.com/plone/volto/issues/4984)
- search-block: translate some missing strings to german and fix a typo. @pbauer [#4996](https://github.com/plone/volto/issues/4996)
- Add image block className support (Style wrapper). @sneridagh [#5018](https://github.com/plone/volto/issues/5018)
- Fix for 'no value' entry in table of content field. @satyam4p [#5022](https://github.com/plone/volto/issues/5022)
- Fix updating roles when username contains a period (.). @nileshgulia1 [#5025](https://github.com/plone/volto/issues/5025)
- Fix hover and focused border for block child. @claudiaifrim [#5028](https://github.com/plone/volto/issues/5028)
- Enhance display and repairing of broken relations. @ksuess [#5033](https://github.com/plone/volto/issues/5033)
- Fix selecting grid block when a sub-block is selected. @davisagli [#5036](https://github.com/plone/volto/issues/5036)
- Update versions of semver and release-it. @davisagli [#5053](https://github.com/plone/volto/issues/5053)

### Documentation

- Add short comment for easier finding registered components. @ksuess [#5017](https://github.com/plone/volto/issues/5017)


## 17.0.0-alpha.21 (2023-07-23)

### Breaking
Expand Down Expand Up @@ -2872,7 +2970,7 @@ new users/evaluators. @fredvd
### Internal

- Fix URL for Climate-Energy, a Volto website @tiberiuichim
- Fix quirky Cypress test in "DX control panel schema" (see https://github.com/plone/volto/actions/runs/1692689792/jobs/2306969715) @sneridagh
- Fix quirky Cypress test in "DX control panel schema" @sneridagh

## 14.2.1 (2022-01-12)

Expand Down
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Contributing to Volto

See [Contributing to Volto](https://6.docs.plone.org/volto/developer-guidelines/contributing.html).
See the following documents.

- [Contributing to Plone](https://6.docs.plone.org/contributing/index.html)
- [Contributing to Volto](https://6.docs.plone.org/volto/contributing/index.html)
- [First-time contributors](https://6.docs.plone.org/contributing/first-time.html)
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Go to [http://localhost:3000](http://localhost:3000) in your browser.
Volto is actively developed since 2017 and used in production since 2018 on the following websites:

- [VHS Ehrenamtsportal](https://vhs-ehrenamtsportal.de) (Website to help volunteers that help refugees for the [German Adult Education Association](https://www.dvv-vhs.de/en/home/), developed by [kitconcept GmbH](https://kitconcept.com), 2018)
- [Zeelandia](https://zeelandia.de) (Corporate website for one of the leading backery ingredients manufacturers in Germany, developed by [kitconcept GmbH](https://kitconcept.com), 2019)
- [Zeelandia](https://zeelandia.de) (Corporate website for one of the leading bakery ingredients manufacturers in Germany, developed by [kitconcept GmbH](https://kitconcept.com), 2019)
- [Excellence at Humboldt-Universität zu Berlin](https://www.alles-beginnt-mit-einer-frage.de) (Website for the excellence initiative of the [Humboldt University Berlin](https://hu-berlin.de), developed by [kitconcept GmbH](https://kitconcept.com), 2019)
- [Forest Information System for Europe](https://forest.eea.europa.eu) (Thematic website focusing on European forests, developed by [Eau de Web](https://www.eaudeweb.ro), 2019)
- [Industrial Emissions portal for Europe](https://industry.eea.europa.eu) (Thematic website focusing on European industrial emissions, developed by [Eau de Web](https://www.eaudeweb.ro), 2020)
Expand Down Expand Up @@ -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!

Expand Down
57 changes: 57 additions & 0 deletions cypress/tests/core/basic/actions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
describe('actions Tests', () => {
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page-1',
contentTitle: 'My Page-1',
allow_discussion: true,
}
);
cy.visit('/contents');
});
it('copy', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('svg[class="icon dropdown-popup-trigger"]').click();
});
cy.get('a[class="item right-dropdown icon-align"]').eq(2).click();
cy.get('button[class="ui button icon item"]').click();
cy.visit('/contents');
cy.get('tr[aria-label="/copy_of_my-page-1"]').within(()=>{
cy.get('a[class="icon-align-name"]').should('have.attr', 'href', '/copy_of_my-page-1/contents');
})
});
it('delete', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(6).click();
cy.get('button[class="ui primary button"]').findByText('Delete').click();
cy.visit('/contents');
cy.get('tr').should('not.contain','/my-page-1');

});
it('cut', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('svg[class="icon dropdown-popup-trigger"]').click();
});
cy.get('a[class="item right-dropdown icon-align"]').eq(1).click();
cy.get('button[class="ui button icon item"]').click();
cy.visit('/contents');
cy.get('tr[aria-label="/my-page-1"]').within(()=>{
cy.get('a[class="icon-align-name"]').should('have.attr', 'href', '/my-page-1/contents');
})
});
it('rename', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(0).click();
cy.get('#field-0_title').clear().type('my-page-rename');
cy.get('#field-0_id').clear().type('my-page-rename');
cy.get('button[class="ui basic circular primary right floated button"]').click();
cy.get('tr[aria-label="/my-page-rename"]').within(()=>{
cy.get('a[class="icon-align-name"]').should('have.attr', 'href', '/my-page-rename/contents');
})
})
});
21 changes: 21 additions & 0 deletions cypress/tests/core/basic/delete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
describe('delete Tests', () => {
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
allow_discussion: true,
}
);
cy.visit('/contents');
});
it('delete', function () {
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(6).click();
cy.get('button[class="ui primary button"]').findByText('Delete').click();
cy.get('tr').should('not.contain','/my-page');
});
});
20 changes: 20 additions & 0 deletions cypress/tests/core/basic/logout.js
Original file line number Diff line number Diff line change
@@ -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');
});
});
23 changes: 23 additions & 0 deletions cypress/tests/core/basic/sharing.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,27 @@ describe('Sharing Tests', () => {
cy.visit('/my-page');
cy.findByRole('heading', { name: /my page/i }).should('exist');
});

it('As editor, I can uncheck the inherit permissions checkbox', function () {
cy.intercept('/**/@logout').as('logout');
cy.intercept('/**/@sharing').as('sharing');

// Click on the Toolbar > More
cy.findByRole('button', { name: /more/i }).click();
cy.findByRole('link', { name: /sharing/i }).click();
cy.wait('@sharing');

cy.findByLabelText('Inherit permissions from higher levels').click({
force: true,
});

cy.findByRole('button', { name: /save/i }).click();
cy.wait('@sharing');

cy.visit('/my-page/sharing');

cy.findByLabelText('Inherit permissions from higher levels').should(
'not.be.checked',
);
});
});
55 changes: 55 additions & 0 deletions cypress/tests/core/basic/view.js
Original file line number Diff line number Diff line change
@@ -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');
});
});

25 changes: 25 additions & 0 deletions cypress/tests/core/basic/workflow.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
describe('workflow Tests', () => {
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
allow_discussion: true,
}
);
cy.visit('/contents');
});
it('change workflow state recursively', function () {
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
})
cy.get('button[class="ui button icon item"]').eq(1).click();
cy.findByText('Select…').click();
cy.findByText('Publish').click();
cy.findByTitle('Save').click();
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('td > div').should('contain','Published');
})
});
});
Loading

0 comments on commit 97d990a

Please sign in to comment.