Merge branch '17.x.x' into volto_17_toolbar_handler_color_for_homepage

RedTurtle · Sep 17, 2024 · b17aba9 · b17aba9
2 parents 305a546 + 8818fb3
commit b17aba9
Show file tree

Hide file tree

Showing 14 changed files with 133 additions and 102 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -41,13 +41,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -93,13 +93,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -145,13 +145,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -197,13 +197,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -249,13 +249,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -301,13 +301,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -352,13 +352,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -403,13 +403,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -456,13 +456,13 @@ jobs:
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:8081 http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -508,13 +508,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -585,13 +585,13 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -686,14 +686,14 @@ jobs:
           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@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
 
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -746,13 +746,13 @@ jobs:
           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
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos
@@ -800,13 +800,13 @@ jobs:
           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
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
       # Upload Cypress videos
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-videos

diff --git a/Makefile b/Makefile
@@ -192,7 +192,7 @@ start-frontend-docker:
 
 .PHONY: start-backend-docker-guillotina
 start-backend-docker-guillotina:
-	docker-compose -f g-api/docker-compose.yml up -d
+	docker compose -f g-api/docker-compose.yml up -d
 
 ##### Acceptance tests (Cypress)
 
@@ -217,7 +217,7 @@ start-test-backend: ## Start Test Plone Backend (api folder)
 
 .PHONY: stop-backend-docker-guillotina
 stop-backend-docker-guillotina:
-	docker-compose -f g-api/docker-compose.yml down
+	docker compose -f g-api/docker-compose.yml down
 
 
 .PHONY: test-acceptance-server-old
@@ -264,7 +264,7 @@ test-acceptance-seamless: ## Start Seamless Cypress Acceptance Tests
 
 .PHONY: start-test-acceptance-webserver-seamless
 start-test-acceptance-webserver-seamless: ## Start the seamless webserver
-	cd cypress/docker && docker-compose -f seamless.yml up
+	cd cypress/docker && docker compose -f seamless.yml up
 
 .PHONY: full-test-acceptance-seamless
 full-test-acceptance-seamless: ## Runs Seamless Core Full Acceptance Testing in headless mode
@@ -374,7 +374,7 @@ full-test-acceptance-workingcopy: ## Runs WorkingCopy Full Acceptance Testing in
 
 .PHONY: start-test-acceptance-server-guillotina
 start-test-acceptance-server-guillotina: ## Start Guillotina Test Acceptance Server (docker container)
-	docker-compose -f g-api/docker-compose.yml up > /dev/null
+	docker compose -f g-api/docker-compose.yml up > /dev/null
 
 .PHONY: start-test-acceptance-frontend-guillotina
 start-test-acceptance-frontend-guillotina: ## Start the Guillotina Acceptance Frontend Fixture

diff --git a/cypress/tests/core/blocks/listing/blocks-listing-templates.js b/cypress/tests/core/blocks/listing/blocks-listing-templates.js
@@ -34,11 +34,7 @@ describe('Folder Contents Tests', () => {
 
     cy.visit('/my-folder/my-document');
     cy.get('.edit').click();
-    cy.getSlate().click();
-    cy.get('button.block-add-button').click();
-    cy.get(
-      '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui',
-    ).click();
+    cy.addNewBlock('listing');
     cy.get('#field-variation').click().type('summary{enter}');
     cy.get('#toolbar-save').click();
     cy.wait('@content');
@@ -74,11 +70,7 @@ describe('Folder Contents Tests', () => {
 
     cy.visit('/my-folder/my-document');
     cy.get('.edit').click();
-    cy.getSlate().click();
-    cy.get('button.block-add-button').click();
-    cy.get(
-      '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui',
-    ).click();
+    cy.addNewBlock('listing');
     cy.get('#field-variation').click().type('summary{enter}');
     cy.get('#toolbar-save').click();
     cy.wait('@content');
@@ -116,11 +108,7 @@ describe('Folder Contents Tests', () => {
 
     cy.visit('/my-folder/my-document');
     cy.get('.edit').click();
-    cy.getSlate().click();
-    cy.get('button.block-add-button').click();
-    cy.get(
-      '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui',
-    ).click();
+    cy.addNewBlock('listing');
     cy.get('#field-variation').click().type('imageGallery{enter}');
     cy.get('#toolbar-save').click();
     cy.wait('@content');

diff --git a/g-api/README.md b/g-api/README.md
@@ -7,7 +7,7 @@ Configuration demonstrating how to run Volto with Guillotina as a backend.
 _Disclaimer:_ Guillotina doesn't support the full API/features that Plone provides. Contributors are welcome.
 
 ```shell
-docker-compose -f g-api/docker-compose.yml up -d
+docker compose -f g-api/docker-compose.yml up -d
 ```
 
 or using the convenience makefile command:

diff --git a/news/6248.feature b/news/6248.feature
@@ -0,0 +1,2 @@
+The schema for the `ContentsPropertiesModal` can be enhanced using the `contentPropertiesSchemaEnhancer` setting.
+Also, the properties form is now prepopulated with values if all selected items share the same value. @davisagli
diff --git a/news/6250.bugfix b/news/6250.bugfix
@@ -0,0 +1 @@
+Disable save button when loading POST query @sabrina-bongiovanni
diff --git a/news/6253.internal b/news/6253.internal
@@ -0,0 +1 @@
+Bump actions/upload-artifact to v4 and replace `docker-compose` with `docker compose`. @stevepiercy, @davisagli
diff --git a/news/6273.bugfix b/news/6273.bugfix
@@ -0,0 +1 @@
+Fix error in `SortOn` component when no sort is selected. @davisagli
diff --git a/packages/generator-volto/Makefile b/packages/generator-volto/Makefile
@@ -29,4 +29,4 @@ test-acceptance-server:
 
 .PHONY: test-acceptance-guillotina
 test-acceptance-guillotina:
-	docker-compose -f g-api/docker-compose.yml up > /dev/null
+	docker compose -f g-api/docker-compose.yml up > /dev/null
diff --git a/src/components/manage/Add/Add.jsx b/src/components/manage/Add/Add.jsx
@@ -408,6 +408,7 @@ class Add extends Component {
                       aria-label={this.props.intl.formatMessage(messages.save)}
                       onClick={() => this.form.current.onSubmit()}
                       loading={this.props.createRequest.loading}
+                      disabled={this.props.createRequest.loading}
                     >
                       <Icon
                         name={saveSVG}

diff --git a/src/components/manage/Blocks/Search/components/SortOn.jsx b/src/components/manage/Blocks/Search/components/SortOn.jsx
@@ -60,7 +60,7 @@ const SortOn = (props) => {
 
   const showSelectField = sortOnOptions.length > 1;
   if (!showSelectField && !activeSortOn) {
-    return;
+    return null;
   }
   const value = {
     value: activeSortOn || intl.formatMessage(messages.noSelection),

diff --git a/src/components/manage/Contents/Contents.jsx b/src/components/manage/Contents/Contents.jsx
@@ -1529,6 +1529,9 @@ class Contents extends Component {
                     onCancel={this.onPropertiesCancel}
                     onOk={this.onPropertiesOk}
                     items={this.state.selected}
+                    values={map(this.state.selected, (id) =>
+                      find(this.state.items, { '@id': id }),
+                    ).filter((item) => item)}
                   />
                   {this.state.showWorkflow && (
                     <ContentsWorkflowModal
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The schema for the `ContentsPropertiesModal` can be enhanced using the `contentPropertiesSchemaEnhancer` setting.
		Also, the properties form is now prepopulated with values if all selected items share the same value. @davisagli
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Disable save button when loading POST query @sabrina-bongiovanni
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Bump actions/upload-artifact to v4 and replace `docker-compose` with `docker compose`. @stevepiercy, @davisagli
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix error in `SortOn` component when no sort is selected. @davisagli