Skip to content

Commit

Permalink
Merge branch 'main' into enhance_undo_ctrl_panel
Browse files Browse the repository at this point in the history
  • Loading branch information
giuliaghisini committed Feb 10, 2025
2 parents 4ab2c7d + 3330285 commit 5ba44db
Show file tree
Hide file tree
Showing 301 changed files with 11,721 additions and 8,221 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: Bug report
about: Create a report to help us improve Volto
name: '🐞 Bug report'
about: 'Create a report to help us improve Volto'
title: ''
labels: ['01 type: bug', 'needs: triage']
labels: ['01 type: bug', '30 needs: triage']
assignees: ''
---

Expand All @@ -13,23 +13,23 @@ A clear and concise description of what the bug is.
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
2. Click on '...'
3. Scroll down to '...'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.
If applicable, add screenshots or videos to help explain your problem.

**Software (please complete the following information):**

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Volto Version [e.g. 8.5.0]
- Plone Version [e.g. 5.2.2]
- Plone REST API Version [e.g. 7.0.1]
- Browser [e.g. firefox, chrome, safari]
- Volto Version [e.g. 18.4.0]
- Plone Version [e.g. 6.1.0]
- Plone REST API Version [e.g. 9.1.0]

**Additional context**
Add any other context about the problem here.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Suggest an idea for Volto
name: '🦄 Feature request'
about: 'Suggest an idea for Volto'
title: ''
labels: '04 type: enhancement'
assignees: ''
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
---
name: "\U0001F680 PLIP"
about: Plone Improvement Proposal
name: '🚀 PLIP'
about: 'A Plone Improvement Proposal (PLIP) is a change to a Plone package that would affect everyone who uses that package.'
title: ''
labels: '03 type: feature (plip)'
type: 'PLIP'
assignees: ''
projects: 'plone/47'

---

<!-- Keep this admonition when you submit your PLIP -->

> [!IMPORTANT]
> If you are not a member of the Volto Team or Developers Team in the Plone GitHub organization, then do not work on or comment on this issue.
## PLIP (Plone Improvement Proposal)

<!--
Expand Down
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/4_PLIP_task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: "📋 PLIP task"
about: 'Plone Improvement Proposal (PLIP) tasks are sub-issues of the umbrella PLIP.'
title: ''
labels: '06 type: plip task'
type: 'Feature'
assignees: ''
projects: 'plone/47'
---

<!-- Keep this admonition when you submit your PLIP task -->

> [!IMPORTANT]
> If you are not a member of the Volto Team or Developers Team in the Plone GitHub organization, then do not work on or comment on this issue.
**Describe the PLIP task**

A clear and concise description of what you want to happen, even if it is already in the PLIP. A conversation about this PLIP task should continue and extend from the PLIP.

**Link to the parent PLIP**



**Additional context**

Add any other context or screenshots about the PLIP task here.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Get support
url: https://community.plone.org/
about: Get support for Plone in the Community Forum.
- name: Chat
url: https://discord.gg/zFY3EBbjaj
about: Chat on Discord.
6 changes: 6 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
> [!CAUTION]
The Volto Team has suspended its review of new pull requests from first-time contributors until the [release of Plone 7](https://plone.org/download/release-schedule), which is preliminarily scheduled for the second quarter of 2026.
> [Read details](https://6.docs.plone.org/volto/contributing/index.html).
-----

- [ ] I signed and returned the [Plone Contributor Agreement](https://plone.org/foundation/contributors-agreement), and received and accepted an invitation to join a team in the Plone GitHub organization.
- [ ] I verified there aren't other open [pull requests](https://github.com/plone/volto/pulls) for the same change.
- [ ] I followed the guidelines in [Contributing to Volto](https://6.docs.plone.org/volto/contributing/index.html).
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/node_env_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:

- name: Enable corepack
shell: bash
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down
139 changes: 139 additions & 0 deletions .github/boring-cyborg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
# boring-cyborg.yml
# https://probot.github.io/apps/boring-cyborg/

##### Labeler ##########################################################################################################
## Enable "labeler" for your PR that would add labels to PRs based on the paths that are modified in the PR.
#labelPRBasedOnFilePath:
# # Add 'label1' to any changes within 'example' folder or any subfolders
# label1:
# - example/**/*
#
# # Add 'label2' to any file changes within 'example2' folder
# label2:
# - example2/*
#
# # Complex: Add 'area/core' label to any change within the 'core' package
# area/core:
# - src/core/*
# - src/core/**/*
#
# # Add 'test' label to any change to *.spec.js files within the source dir
# test:
# - src/**/*.spec.js
#
# Various Flags to control behaviour of the "Labeler"
#labelerFlags:
# # If this flag is changed to 'false', labels would only be added when the PR is first created and not when existing
# # PR is updated.
# # The default is 'true' which means the labels would be added when PR is updated even if they were removed by the user
# labelOnPRUpdates: true

##### Reviewer #########################################################################################################
# Enable "Reviewer" for your PR that would add reviewers to PRs based on the labels that exist on the PR.
# You have the option to set a default reviewer that gets added to every PR, or you can omit that config variable to skip it.
#addReviewerBasedOnLabel:
# add list of reviewers to add by default to all PRs
# defaultReviewers:
# - stevepiercy
# specify PR labels that you want to auto assign reviewers based on
# labels:
# label1:
# - tyler-mairose-sp
# - jordan-violet-sp
# label2:
# - kaxil

##### Greetings ########################################################################################################
# Comment to be posted to welcome users when they open their first PR
firstPRWelcomeComment: >
> [!CAUTION]
> The Volto Team has suspended its review of new pull requests from first-time contributors until the [release of Plone 7](https://plone.org/download/release-schedule), which is preliminarily scheduled for the second quarter of 2026.
> [Read details](https://6.docs.plone.org/volto/contributing/index.html).
Thanks for submitting your first pull request! You are awesome! :hugs:
<br>If you haven't done so already, read
[Plone's Code of Conduct](https://plone.org/foundation/about/materials/foundation-resolutions/code-of-conduct),
[Contributing to Plone](https://6.docs.plone.org/contributing/index.html),
[First-time contributors](https://6.docs.plone.org/contributing/first-time.html), and
[Contributing to Volto](https://6.docs.plone.org/volto/contributing/index.html),
as this will greatly help the review process.
<br>Welcome to the Plone community! :tada:
# Comment to be posted to congratulate user on their first merged PR
firstPRMergeComment: >
Congratulations on your first merged pull request in this project! :tada:
![Congratulations](https://raw.githubusercontent.com/plone/documentation/fda4eadee4b0b71c4bcd0da739847444f74d3fc5/.github/images/congratulations.jpg)
<br>Thank you for contributing, we are very proud of you! :heart:
# Comment to be posted to on first time issues
firstIssueWelcomeComment: >
Thanks for opening your first issue here!
Your engagement is essential for open source projects, including Plone. :hugs:
<br>If you haven't done so already,
read [Plone's Code of Conduct](https://plone.org/foundation/about/materials/foundation-resolutions/code-of-conduct).
Also please follow the issue template, as it helps both you and other community members contribute more effectively.
<br>If your issue is a feature request, others may raise its prominence through
[feature voting](https://github.com/plone/volto/issues?q=is%3Aissue%20state%3Aopen%20sort%3Areactions-%2B1-desc%20).
<br>Welcome to the Plone community! :tada:
###### IssueLink Adder #################################################################################################
# Insert Issue (Jira/Github etc) link in PR description based on the Issue ID in PR title.
#insertIssueLinkInPrDescription:
# # specify the placeholder for the issue link that should be present in the description
# descriptionIssuePlaceholderRegexp: "^Issue link: (.*)$"
# matchers:
# # you can have several matches - for different types of issues
# # only the first matching entry is replaced
# jiraIssueMatch:
# # specify the regexp of issue id that you can find in the title of the PR
# # the match groups can be used to build the issue id (${1}, ${2}, etc.).
# titleIssueIdRegexp: \[(AIRFLOW-[0-9]{4})\]
# # the issue link to be added. ${1}, ${2} ... are replaced with the match groups from the
# # title match (remember to use quotes)
# descriptionIssueLink: "[${1}](https://issues.apache.org/jira/browse/${1}/)"
# docOnlyIssueMatch:
# titleIssueIdRegexp: \[(AIRFLOW-X{4})\]
# descriptionIssueLink: "`Document only change, no JIRA issue`"
#
###### Title Validator #################################################################################################
# Verifies if commit/PR titles match the regexp specified
#verifyTitles:
# # Regular expression that should be matched by titles of commits or PR
# titleRegexp: ^\[AIRFLOW-[0-9]{4}\].*$|^\[AIRFLOW-XXXX\].*$
# # If set to true, it will always check the PR title (as opposed to the individual commits).
# alwaysUsePrTitle: true
# # If set to true, it will only check the commit in case there is a single commit.
# # In case of multiple commits it will check PR title.
# # This reflects the standard behaviour of Github that for `Squash & Merge` GitHub
# # uses the PR title rather than commit messages for the squashed commit ¯\_(ツ)_/¯
# # For single-commit PRs it takes the squashed commit message from the commit as expected.
# #
# # If set to false it will check all commit messages. This is useful when you do not squash commits at merge.
# validateEitherPrOrSingleCommitTitle: true
# # The title the GitHub status should appear from.
# statusTitle: "Title Validator"
# # A custom message to be displayed when the title passes validation.
# successMessage: "Validation successful!"
# # A custom message to be displayed when the title fails validation.
# # Allows insertion of ${type} (commit/PR), ${title} (the title validated) and ${regex} (the titleRegexp above).
# failureMessage: "Wrong ${type} title: ${title}"
#
###### PR/Branch Up-To-Date Checker ####################################################################################
## Check if the branch is up to date with master when certain files are modified
#checkUpToDate:
# # The default branch is "master", change the branch if you want to check against a different target branch
# targetBranch: master
# files:
# # File paths that you want to check for
# # In this example, it checks if the branch is up to date when alembic migrations are modified in the PR.
# # It helps avoid multiple heads in alembic migrations in a collaborative development project.
# - airflow/migrations/*
# - airflow/migrations/**/*
# - airflow/alembic.ini
48 changes: 48 additions & 0 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -691,3 +691,51 @@ jobs:
with:
name: cypress-videos
path: packages/volto/cypress/videos

seven:
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: Seven
timeout-minutes: 45
strategy:
fail-fast: false
matrix:
node-version: [22.x]
steps:
- uses: actions/checkout@v4

- name: Set up Node.js environment
uses: ./.github/actions/node_env_setup
with:
node-version: ${{ matrix.node-version }}

- 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
working-directory: packages/seven
browser: chrome
spec: cypress/tests/core/basic/**/*.cy.ts
start: |
make ci-acceptance-backend-start
make acceptance-frontend-prod-start
wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'

# Upload Cypress screenshots
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
path: packages/seven/cypress/screenshots
# Upload Cypress videos
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-videos
path: packages/seven/cypress/videos
8 changes: 4 additions & 4 deletions .github/workflows/api-first.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ jobs:
- 'packages/slots/**'
theming:
- 'packages/theming/**'
seven:
- 'packages/seven/**'
wrongNews:
- added|modified: 'news/**'
Expand Down Expand Up @@ -150,6 +152,14 @@ jobs:
env:
BASE_BRANCH: ${{ github.base_ref }}

- name: seven changelog check
if: steps.filter.outputs.seven == 'true'
run: |
git fetch --no-tags origin main
towncrier check --compare-with origin/main --dir packages/seven
env:
BASE_BRANCH: ${{ github.base_ref }}

- name: Wrong location of news changelog check
if: steps.filter.outputs.wrongNews == 'true'
run: echo "News items should be moved from the repository root to the appropriate package root in `packages/package-name`." && exit 1
Expand Down
Loading

0 comments on commit 5ba44db

Please sign in to comment.