Skip to content

Commit

Permalink
Merge branch 'main' into registryinownpackage
Browse files Browse the repository at this point in the history
* main: (38 commits)
  A11y - Updated aria-labels for landmarks, added landmark for sidebar and plug skiplinks (#5290)
  (FIX): put padding so the text is not clipped (#5305)
  Add upgrade docs for users of `@kitconcept/volto-blocks-grid` addon (#5333)
  Add new multilingual acceptance tests with Seamless mode enabled (#5332)
  Fix reference to installation (#5328)
  Fix compare translations view (#5327)
  Release 17.2.0
  Fix to return correct results when loading the search block from a URL (#5298)
  Allow multiple path criteria (#5317)
  Release 17.1.1
  Added guard in `flattenScales` in edge case image is undefined (#5318)
  Normalize the shape of the image component `item` prop if it contains the serialized object after creation to match the one in the catalog. (#5266)
  Release 17.1.0
  move the function to get the lead image sizes to the block configuration (#5289)
  Removed default aspect-ratio from Image component (#5278)
  Added support for `blocksConfig` configuration in the listing block (#5310)
  fix: logo and login storybook (#5286)
  Refactor Logo component to improve the conditional link to the root (#5280)
  Fix hierarchy of readme headings
  Clean up readme and install docs (#5287)
  ...
  • Loading branch information
sneridagh committed Oct 25, 2023
2 parents 53ea1dd + 6520d8e commit 7af83d7
Show file tree
Hide file tree
Showing 105 changed files with 1,402 additions and 1,216 deletions.
54 changes: 54 additions & 0 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -745,3 +745,57 @@ jobs:
with:
name: cypress-videos
path: cypress/videos

multilingualseamless:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: Multilingual in Seamless Mode
runs-on: ubuntu-latest
timeout-minutes: 25
strategy:
fail-fast: false
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3

# node setup
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

# node install
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
browser: chrome
spec: cypress/tests/multilingual/**/*.js
config: baseUrl=http://localhost
start: |
make start-test-acceptance-server-seamless-multilingual
make start-test-acceptance-frontend-seamless-multilingual
make start-test-acceptance-webserver-seamless
wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000 http://localhost'

# Upload Cypress screenshots
- uses: actions/upload-artifact@v1
if: failure()
with:
name: cypress-screenshots
path: cypress/screenshots
# Upload Cypress videos
- uses: actions/upload-artifact@v1
if: failure()
with:
name: cypress-videos
path: cypress/videos
17 changes: 8 additions & 9 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,18 @@ jobs:
run: pip install virtualenv

- name: pip install requirements
run: pip install -r requirements-docs.txt
run: |
pip install -r requirements-docs.txt
sudo snap install --edge vale
- name: Check for broken links
run: make docs-linkcheckbroken

- 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}}
- name: Run vale
run: |
git clone https://github.com/errata-ai/Microsoft.git
cp -r ./Microsoft/Microsoft ./styles
vale --no-exit ./docs
66 changes: 66 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,73 @@

<!-- towncrier release notes start -->

## 17.2.0 (2023-10-16)

### Feature

- add cypress test for search block via url - @ionlizarazu [#5298](https://github.com/plone/volto/issues/5298)

### Bugfix

- Fix adding multiple path criteria in search and listing blocks. @davisagli [#5317](https://github.com/plone/volto/issues/5317)


## 17.1.1 (2023-10-13)

### Bugfix

- Normalize the shape of the image component item prop if it contains the serialized object after creation to match the one in the catalog. @sneridagh [#5266](https://github.com/plone/volto/issues/5266)
- Added guard in `flattenScales` in edge case image is undefined @sneridagh [#5318](https://github.com/plone/volto/issues/5318)


## 17.1.0 (2023-10-11)

### Feature

- storybook Header-@Tishasoumya [#5085](https://github.com/plone/volto/issues/5085)
- Storybook EventDetails-@Tishasoumya [#5088](https://github.com/plone/volto/issues/5088)
- Storybook CommentEditModal-@Tishasoumya [#5091](https://github.com/plone/volto/issues/5091)
- Storybook SearchWidget-@Tishasoumya [#5092](https://github.com/plone/volto/issues/5092)
- Upgrade to @plone/scripts 3.0.1 @sneridagh [#5282](https://github.com/plone/volto/issues/5282)
- Make LeadImage block sizes configurable through a function @erral [#5289](https://github.com/plone/volto/issues/5289)

### Bugfix

- Remove the default aspect-ratio from Image component. It was redundant and hard to override. @pnicolli [#5096](https://github.com/plone/volto/issues/5096)
- Update translate pt_br to fix merge fail @luxcas [#5217](https://github.com/plone/volto/issues/5217)
- Ensure .gitignore gets copied when running yo @plone/volto-addon @instification [#5258](https://github.com/plone/volto/issues/5258)
- Configure the `prettier` and `prettier:fix` yarn commands to also include the root js files and the `cypress` subfolder @tiberiuichim [#5260](https://github.com/plone/volto/issues/5260)
- Emit a proper URL for the Plone root in a listing, we use the `config.publicURL` for it @tiberiuichim [#5263](https://github.com/plone/volto/issues/5263)
- fixed logo and login storybook @nileshgulia1 [#5264](https://github.com/plone/volto/issues/5264)
- Refactor Logo component to improve the conditional link to the root @sneridagh [#5280](https://github.com/plone/volto/issues/5280)
- Update webpack-bundle-analyzer to 4.9.0. @davisagli [#5283](https://github.com/plone/volto/issues/5283)
- Added support for blocksConfig configuration in the listing block @sneridagh [#5310](https://github.com/plone/volto/issues/5310)

### Documentation

- Added notice in release notes for Volto 17 final to clarify that it's a summary for all changes during the alpha stage. @sneridagh
Added an omitted change log entry for the Relations Control Panel. @sneridagh [#5281](https://github.com/plone/volto/issues/5281)
- Updated readme and removed outdated install docs. @davisagli [#5287](https://github.com/plone/volto/issues/5287)


## 17.0.1 (2023-10-03)

### Bugfix

- issue #5126 a11y for checkboxes on the sharing page @Wagner3UB [#5201](https://github.com/plone/volto/issues/5201)
- Adjust DNS resolution to prefer IPv4 addresses when both IPv4 and IPv6 are resolved. @davisagli [#5261](https://github.com/plone/volto/issues/5261)

### Documentation

- Fix tests and documentation broken because the renaming master->main @sneridagh [#5251](https://github.com/plone/volto/issues/5251)
- Disable GHA vale checking, it started to fail with a gazillion of violations. @sneridagh [#5253](https://github.com/plone/volto/issues/5253)
- Reenable GHA vale checking, but with configuration from `plone/documentation`. It now runs Vale, but with the flag `--no-exit` which means "Don't return a nonzero exit code on errors." It also eliminates reviewdog as the test runner. @stevepiercy [#5256](https://github.com/plone/volto/issues/5256)


## 17.0.0 (2023-09-30)

**These Release Notes summarize all the changes during the alpha stage of Volto 17.**

### Breaking

- Volto 17 drops support for NodeJS 14, and adds support for Node.js 18.
Expand Down Expand Up @@ -41,6 +106,7 @@

### Feature

- Added a control panel for relations. @ksuess [#3382](https://github.com/plone/volto/pull/3382)
- 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)
- Use popperjs in BlockChooser, move the markup to the bottom of the body tag. @sneridagh [#4141](https://github.com/plone/volto/issues/4141)
- Improvements to the dev API proxy:
Expand Down
22 changes: 22 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,28 @@ test-acceptance-multilingual-headless: ## Start Multilingual Cypress Acceptance
full-test-acceptance-multilingual: ## Runs Multilingual Full Acceptance Testing in headless mode
$(NODEBIN)/start-test "make start-test-acceptance-server-multilingual" http-get://127.0.0.1:55001/plone "make start-test-acceptance-frontend-multilingual" http://127.0.0.1:3000 "make test-acceptance-multilingual-headless"

######### Seamless Multilingual Acceptance tests

.PHONY: start-test-acceptance-server-seamless-multilingual test-acceptance-server-seamless-multilingual
start-test-acceptance-server-seamless-multilingual test-acceptance-server-seamless-multilingual: ## Start Seamless Multilingual Acceptance Server Multilingual Fixture (docker container)
docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:multilingual $(DOCKER_IMAGE_ACCEPTANCE)

.PHONY: start-test-acceptance-frontend-seamless-multilingual
start-test-acceptance-frontend-seamless-multilingual: ## Start the Seamless Multilingual Acceptance Frontend Fixture
ADDONS=coresandbox:multilingualFixture yarn build && yarn start:prod

.PHONY: test-acceptance-seamless-multilingual
test-acceptance-seamless-multilingual: ## Start Seamless Multilingual Cypress Acceptance Tests
NODE_ENV=production CYPRESS_API=plone $(NODEBIN)/cypress open --config baseUrl='http://localhost',specPattern='cypress/tests/multilingual/**/*.{js,jsx,ts,tsx}'

.PHONY: test-acceptance-seamless-multilingual-headless
test-acceptance-seamless-multilingual-headless: ## Start Seamless Multilingual Cypress Acceptance Tests in headless mode
NODE_ENV=production CYPRESS_API=plone $(NODEBIN)/cypress run --config specPattern='cypress/tests/multilingual/**/*.{js,jsx,ts,tsx}'

.PHONY: full-test-acceptance-seamless-multilingual
full-test-acceptance-seamless-multilingual: ## Runs Seamless Multilingual Full Acceptance Testing in headless mode
$(NODEBIN)/start-test "make start-test-acceptance-server-seamless-multilingual" http-get://127.0.0.1:55001/plone "make start-test-acceptance-frontend-seamless-multilingual" http://127.0.0.1:3000 "make test-acceptance-multilingual-headless"

######### WorkingCopy Acceptance tests

.PHONY: start-test-acceptance-server-workingcopy test-acceptance-server-workingcopy
Expand Down
Loading

0 comments on commit 7af83d7

Please sign in to comment.