Skip to content

Commit

Permalink
Merge branch 'master' into rowblock
Browse files Browse the repository at this point in the history
* master: (67 commits)
  Add current page parameter to the route in the listing and search block pagination (#4159)
  Fixed wrong localization on password reset page(#4656) (#4657)
  Release notes for 16.19.0 (#4655)
  Razzle upgrade notice in upgrade guide (#4641)
  Release generate-volto 7.0.0-alpha.3
  Update to latest Razzle - needed since #3997. This fixes the duplicated Razzles issue (#4640)
  3092 improve spellcheck (#4633)
  developer process for first time contributing (#4617)
  Trigger CI on pull_request event (#4629)
  Pining of `pydata-sphinx-theme` and `sphinx-book-theme`, CI is complaining. (#4626)
  Set sameSite in `18N_LANGUAGE` cookie (#4627)
  Update simple-git (#4546)
  DefaultView (blocks disabled): Show field name as tip on hover of label (#4598)
  Fix regexp that checks valid URLs and improve tests (#4601)
  Release 17.0.0-alpha.3
  Update changelog relese 16.18.0 (#4596)
  InternalURl helper method should incorporate externalRoutes settings … (#4560)
  Update message Add-on control panel (#4574)
  Fix video warnings link errors (#4578)
  Using Vale in CI for spellcheck (#4423)
  ...
  • Loading branch information
sneridagh committed Apr 5, 2023
2 parents dc040cc + c40e772 commit e795d32
Show file tree
Hide file tree
Showing 88 changed files with 1,331 additions and 648 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Acceptance Tests
on: [push]
on: [push, pull_request]
jobs:
core:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
name: Core Basic
timeout-minutes: 45
Expand Down Expand Up @@ -56,6 +57,7 @@ jobs:
path: cypress/videos

coreblocks:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
name: Core Blocks
timeout-minutes: 35
Expand Down Expand Up @@ -110,6 +112,7 @@ jobs:
path: cypress/videos

corevoltoslate:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
name: Core Volto Slate
timeout-minutes: 45
Expand Down Expand Up @@ -164,6 +167,7 @@ jobs:
path: cypress/videos

core5:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
name: Core Basic - Plone 5
strategy:
Expand Down Expand Up @@ -217,6 +221,7 @@ jobs:
path: cypress/videos

coresandbox:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
name: Coresandbox
timeout-minutes: 35
Expand Down Expand Up @@ -270,6 +275,7 @@ jobs:
path: cypress/videos

guillotina:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Guillotina
runs-on: ubuntu-latest
timeout-minutes: 35
Expand Down Expand Up @@ -325,6 +331,7 @@ jobs:
path: cypress/videos

multilingual:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Multilingual
runs-on: ubuntu-latest
timeout-minutes: 35
Expand Down Expand Up @@ -379,6 +386,7 @@ jobs:
path: cypress/videos

workingcopy:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Working Copy
runs-on: ubuntu-latest
timeout-minutes: 35
Expand Down Expand Up @@ -458,6 +466,7 @@ jobs:
path: cypress/videos

generator:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Project Generator
runs-on: ubuntu-latest
timeout-minutes: 35
Expand Down Expand Up @@ -553,6 +562,7 @@ jobs:
working-directory: ${{env.generator-directory}}

seamless:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Seamless Mode
runs-on: ubuntu-latest
timeout-minutes: 35
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Code Analysis Check
on: [push]
on: [push, pull_request]
jobs:
prettier:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Prettier
runs-on: ubuntu-latest
strategy:
Expand All @@ -24,6 +25,7 @@ jobs:
run: yarn run prettier

eslint:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: ESlint
runs-on: ubuntu-latest
strategy:
Expand All @@ -46,6 +48,7 @@ jobs:
run: yarn run lint

i18n:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: i18n
runs-on: ubuntu-latest
strategy:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,13 @@ jobs:

- name: Build HTML documentation
run: make docs-html

- uses: errata-ai/vale-action@reviewdog
with:
# debug: true
files: all
env:
# 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}}

3 changes: 2 additions & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Unit Tests
on: [push]
on: [push, pull_request]
jobs:
unit:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Core Unit Tests
runs-on: ubuntu-latest
strategy:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ selenium-screenshot-*.png
/selenium/
cypress/videos/
cypress/screenshots
/styles/Microsoft

# Local environment setup
.env
Expand Down
10 changes: 10 additions & 0 deletions .vale.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
StylesPath = styles

MinAlertLevel = suggestion

Vocab = Base,Plone

Packages = Microsoft

[*.md]
BasedOnStyles = Vale, Microsoft
132 changes: 130 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,58 @@

<!-- towncrier release notes start -->

## 17.0.0-alpha.3 (2023-03-22)

### Feature

- Add Vale to CI for spell and style checks. @MAX-786 [#4423](https://github.com/plone/volto/issues/4423)

### Bugfix

- Fix Search is case sensitive in Block chooser @iRohitSingh [#4526](https://github.com/plone/volto/issues/4526)
- InternalURl helper method should incorporate externalRoutes settings into consideration. @iFlameing [#4559](https://github.com/plone/volto/issues/4559)
- Update message add-on control panel: remove 'buildout', update reference. @ksuess [#4574](https://github.com/plone/volto/issues/4574)

### Documentation

- Deleted duplicate import and fixed training URLs. @yahya-cloud [#4523](https://github.com/plone/volto/issues/4523)
- Fix grammar in PR #4542. @stevepiercy [#4555](https://github.com/plone/volto/issues/4555)
- Fix broken links at ReactJS.org. @stevepiercy [#4569](https://github.com/plone/volto/issues/4569)
- Fix video warnings and link errors. @stevepiercy [#4578](https://github.com/plone/volto/issues/4578)


## 17.0.0-alpha.2 (2023-03-15)

### Breaking

- Add custom CSS animation to hamburger menu. Removed `hamburgers` dependency. @danalvrz [#4433](https://github.com/plone/volto/issues/4433)
- Improve i18n script ordering of addons, so that addons can override translations from their dependencies. @davisagli [#4495](https://github.com/plone/volto/issues/4495)

### Feature

- Add option to hide empty listing blocks @ksuess [#4393](https://github.com/plone/volto/issues/4393)

### Bugfix

- Update build dependencies (razzle and react-dev-utils) @davisagli [#3997](https://github.com/plone/volto/issues/3997)
- Added block prop to BlockDataForm in the Edit component of ToC. If block is not passed, OnChangeBlock will be called with undefined block id. @tedw87 [#4110](https://github.com/plone/volto/issues/4110)
- Fix focus steal in Form @tedw87 [#4230](https://github.com/plone/volto/issues/4230)
- Fixed paste issue in Table Block and added cypress test for pasting text in Table Block. [#4301](https://github.com/plone/volto/issues/4301)
- Fixed i18n script to avoid overwriting translations with an empty msgstr @danalvrz [#4316](https://github.com/plone/volto/issues/4316)
- bugfix: conditionally render all delete items in confirm widget [#4336](https://github.com/plone/volto/issues/4336)
- Make the Site Setup control panel responsive for small screen devices. @lord2anil [#4484](https://github.com/plone/volto/issues/4484)
- The menu for the contents page was unresponsive on mobile devices. Fixed this by changing the menu overflow to scroll. @sudhanshu1309 [#4492](https://github.com/plone/volto/issues/4492)
- Make Drag and Drop list work with container-type inline-size. @robgietema [#4497](https://github.com/plone/volto/issues/4497)
- (fix): Paste button disappearing while coping from nested blocks @dobri1408 [#4505](https://github.com/plone/volto/issues/4505)
- Patch updates for some dependencies. @davisagli [#4520](https://github.com/plone/volto/issues/4520)
- Fix flaky Cypress test introduced in #4521 @sneridagh [#4522](https://github.com/plone/volto/issues/4522)

### Documentation

- Fix training urls @ksuess [#4502](https://github.com/plone/volto/issues/4502)
- Add upgrade guide for 4504 @sneridagh [#4542](https://github.com/plone/volto/issues/4542)


## 17.0.0-alpha.1 (2023-03-09)

### Feature
Expand Down Expand Up @@ -60,6 +112,82 @@
- Use a universal static path for both documentation and volto repos. @stevepiercy [#4376](https://github.com/plone/volto/issues/4376)


## 16.19.0 (2023-04-04)

### Feature

- DefaultView (view of fields for content types with blocks disabled): Show field name as tip on hover of label. @ksuess [#4598](https://github.com/plone/volto/issues/4598)
- Set sameSite in I18N_LANGUAGE cookie @sneridagh [#4627](https://github.com/plone/volto/issues/4627)

### Bugfix

- Fix regexp that checks valid URLs and improve tests [cekk] [#4601](https://github.com/plone/volto/issues/4601)

### Documentation

- Added `JavaScript` and `NodeJS` as accepted spellings, and deviations of them as rejected spellings. @utkkkarshhh [#3092](https://github.com/plone/volto/issues/3092)
- Fix documentation build, add pins @sneridagh [#4626](https://github.com/plone/volto/issues/4626)


## 16.18.0 (2023-03-22)

### Feature

- Add Vale to CI for spell and style checks. @MAX-786 [#4423](https://github.com/plone/volto/issues/4423)

### Bugfix

- Patch updates for some dependencies. @davisagli [#4520](https://github.com/plone/volto/issues/4520)
- InternalURl helper method should incorporate externalRoutes settings into consideration. @iFlameing [#4559](https://github.com/plone/volto/issues/4559)
- Update message add-on control panel: remove 'buildout', update reference. @ksuess [#4574](https://github.com/plone/volto/issues/4574)

### Documentation

- Fix broken links at ReactJS.org. @stevepiercy [#4569](https://github.com/plone/volto/issues/4569)
- Fix video warnings and link errors. @stevepiercy [#4578](https://github.com/plone/volto/issues/4578)


## 16.17.1 (2023-03-16)

### Bugfix

- Fix Search is case sensitive in Block chooser @iRohitSingh [#4526](https://github.com/plone/volto/issues/4526)

### Documentation

- Deleted duplicate import and fixed training URLs. @yahya-cloud [#4523](https://github.com/plone/volto/issues/4523)


## 16.17.0 (2023-03-15)

### Feature

- Add option to hide empty listing blocks @ksuess [#4393](https://github.com/plone/volto/issues/4393)

### Bugfix

- Added block prop to BlockDataForm in the Edit component of ToC. If block is not passed, OnChangeBlock will be called with undefined block id. @tedw87 [#4110](https://github.com/plone/volto/issues/4110)
- Fix focus steal in Form @tedw87 [#4230](https://github.com/plone/volto/issues/4230)
- Fixed paste issue in Table Block and added cypress test for pasting text in Table Block. [#4301](https://github.com/plone/volto/issues/4301)
- Fixed i18n script to avoid overwriting translations with an empty msgstr @danalvrz [#4316](https://github.com/plone/volto/issues/4316)
- bugfix: conditionally render all delete items in confirm widget [#4336](https://github.com/plone/volto/issues/4336)
- Make the Site Setup control panel responsive for small screen devices. @lord2anil [#4484](https://github.com/plone/volto/issues/4484)
- The menu for the contents page was unresponsive on mobile devices. Fixed this by changing the menu overflow to scroll. @sudhanshu1309 [#4492](https://github.com/plone/volto/issues/4492)
- (fix): Paste button disappearing while coping from nested blocks @dobri1408 [#4505](https://github.com/plone/volto/issues/4505)
- Fix flaky Cypress test introduced in #4521 @sneridagh [#4522](https://github.com/plone/volto/issues/4522)

### Documentation

- Fix training urls @ksuess [#4502](https://github.com/plone/volto/issues/4502)


## 16.16.0 (2023-03-09)

### Feature

- Add directive to cache stable resources in browser or intermediate server for 365 days by default directly in the SSR Express server, static resource that could change after a new deployment for 1 minute. @mamico [#2216](https://github.com/plone/volto/issues/2216)


## 16.15.0 (2023-03-08)

### Feature
Expand Down Expand Up @@ -2374,7 +2502,7 @@ See https://6.docs.plone.org/volto/upgrade-guide/index.html for more information
- Use Plone logo @ericof
- Update favicon and related tags with best practices @sneridagh
- Enable to be able to use the internal proxy in production as well @sneridagh
- Add runtime configuration for `@babel/plugin-transform-react-jsx` set to `automatic`. This enables the new JSX runtime: https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html So no longer `import React from 'react'` is needed anymore. @sneridagh
- Add runtime configuration for `@babel/plugin-transform-react-jsx` set to `automatic`. This enables the new JSX runtime: https://legacy.reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html So no longer `import React from 'react'` is needed anymore. @sneridagh
- Add `autocomplete` Widget component - It holds off the vocabulary endpoint pull until you search (more than 2 chars). Useful when dealing with huge vocabularies @sneridagh @reebalazs
- Add new listing block option "fullobjects" per variation @ksuess
- `FormFieldWrapper` accepts now strings and elements for description @nzambello
Expand Down Expand Up @@ -2504,7 +2632,7 @@ See https://6.docs.plone.org/volto/upgrade-guide/index.html for more information

### Feature

- Add runtime configuration for `@babel/plugin-transform-react-jsx` set to `automatic`. This enables the new JSX runtime: https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html So no longer `import React from 'react'` is needed anymore.
- Add runtime configuration for `@babel/plugin-transform-react-jsx` set to `automatic`. This enables the new JSX runtime: https://legacy.reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html So no longer `import React from 'react'` is needed anymore.
- Update favicon and related tags with best practices @sneridagh

### Bugfix
Expand Down
25 changes: 25 additions & 0 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ const PLONE_API_URL =
const SLATE_SELECTOR = '.content-area .slate-editor [contenteditable=true]';
const SLATE_TITLE_SELECTOR = '.block.inner.title [contenteditable="true"]';

const TABLE_SLATE_SELECTOR =
'.celled.fixed.table tbody tr:nth-child(1) td:first-child() [contenteditable="true"]';
const TABLE_HEAD_SLATE_SELECTOR =
'.celled.fixed.table thead tr th:first-child() [contenteditable="true"]';

const ploneAuthObj = {
user: ploneAuth[0],
pass: ploneAuth[1],
Expand Down Expand Up @@ -842,3 +847,23 @@ Cypress.Commands.add('settings', (key, value) => {
return cy.window().its('settings');
});
Cypress.Commands.add('getIfExists', getIfExists);

Cypress.Commands.add('getTableSlate', (header = false) => {
let slate;

cy.addNewBlock('table');
cy.wait(2000);

const selector = header ? TABLE_HEAD_SLATE_SELECTOR : TABLE_SLATE_SELECTOR;

cy.getIfExists(
selector,
() => {
slate = cy.get(selector).last();
},
() => {
slate = cy.get(selector, { timeout: 10000 }).last();
},
);
return slate;
});
Loading

0 comments on commit e795d32

Please sign in to comment.