Merge branch 'develop' into feature/content-search-debounce

Author: fabiankaegy

components/content-picker/SortableList.tsx

@@ -97,7 +97,23 @@ const SortableList: React.FC<SortableListProps> = ({
 			const { getEntityRecord, hasFinishedResolution } = select(coreStore);
 
 			return posts.reduce<{ [key: string]: PickedItemType | null }>((acc, item) => {
-				const getEntityRecordParameters = [entityKind, item.type, item.id] as const;
+				const fields = ['link', 'type', 'id'];
+				if (mode === 'user') {
+					fields.push('name');
+				} else if (mode === 'post') {
+					fields.push('title');
+					fields.push('url');
+					fields.push('subtype');
+				} else {
+					fields.push('name');
+					fields.push('taxonomy');
+				}
+				const getEntityRecordParameters = [
+					entityKind,
+					item.type,
+					item.id,
+					{ _fields: fields },
+				] as const;
 				const result = getEntityRecord<Post | Term | User>(...getEntityRecordParameters);
 
 				if (result) {

components/content-search/utils.ts

@@ -51,6 +51,7 @@ export const prepareSearchQuery = ({
 		case 'user':
 			searchQuery = addQueryArgs('wp/v2/users', {
 				search: keyword,
+				_fields: ['id', 'link', 'url', 'type', 'name', 'subtype'],
 			});
 			break;
 		default:
@@ -61,6 +62,7 @@ export const prepareSearchQuery = ({
 				_embed: true,
 				per_page: perPage,
 				page,
+				_fields: ['id', 'link', 'url', 'type', 'title', 'subtype'],
 			});
 
 			break;

cypress/e2e/Link.spec.js

@@ -14,13 +14,13 @@ context('Link', () => {
         cy.get('.tenup-block-components-link__label').first().click();
         cy.wait(50);
         cy.get('.tenup-block-components-link__label').first().scrollIntoView({offset: {top: 100}}).type('First Link Label', { delay: 50, waitForAnimations: true });
-        cy.get('.block-editor-url-input__input').first().type('https://10up.com/{enter}', { delay: 50, waitForAnimations: true });
+        cy.get('.components-input-control__input').first().type('https://10up.com/{enter}', { delay: 50, waitForAnimations: true });
 
         // create the second link
         cy.get('.tenup-block-components-link__label').eq(1).click();
         cy.wait(50);
         cy.get('.tenup-block-components-link__label').eq(1).type('Second Link Label', { delay: 50, waitForAnimations: true });
-        cy.get('.block-editor-url-input__input').first().type('https://10up.com/our-work/{enter}', { delay: 50, waitForAnimations: true });
+        cy.get('.components-input-control__input').first().type('https://10up.com/our-work/{enter}', { delay: 50, waitForAnimations: true });
 
         cy.savePost();
 

cypress/e2e/PostFeaturedImage.spec.js

@@ -44,13 +44,8 @@ context('PostFeaturedImage', () => {
 
         cy.get('[data-tab-id="edit-post/document"]').click();
 
-        cy.get('.components-button.components-panel__body-toggle').contains('Featured image').then($button => {
-            if ($button.attr('aria-expanded') === 'false') {
-                cy.get('.components-button.components-panel__body-toggle').contains('Featured image').click();
-            }
-        })
 
-        cy.get('.editor-post-featured-image img').should('exist').then(($a) => {
+        cy.get('.editor-post-featured-image__preview-image').should('exist').then(($a) => {
             const src1 = $a.attr('src');
             const cleanedSrc1 = src1.replace(/-\d+x\d+(?=\.\w+$)/, '');
 
@@ -65,7 +60,7 @@ context('PostFeaturedImage', () => {
             });
         });
 
-        cy.get('.components-button.editor-post-featured-image__action').contains('Remove').click();
+        cy.get('.editor-post-featured-image__action').contains('Remove').click({force: true});
         cy.get('.wp-block-example-custom-post-featured-image__image').should('not.exist');
     })
 })

cypress/support/commands.js

@@ -84,7 +84,7 @@ Cypress.Commands.add('savePost', () => {
 Cypress.Commands.add('insertBlock', (blockName) => {
 	cy.get('button[aria-label="Add block"]').first().click();
 	cy.focused().type(blockName);
-	cy.get('button').contains(blockName).click();
+	cy.get('.block-editor-inserter__quick-inserter-results button').contains(blockName).click();
 });
 
 Cypress.Commands.add('openSettingsSidebar', () => {

example/.wp-env.json

@@ -1,5 +1,5 @@
 {
-    "plugins": [ ".", "https://downloads.wordpress.org/plugin/wordpress-seo.21.9.1.zip" ],
+    "plugins": [ ".", "https://downloads.wordpress.org/plugin/wordpress-seo.24.6.zip" ],
     "mappings": {
         "/var/www/html/images": "./images"
     }

example/src/blocks/color-settings-example/block.json

@@ -1,5 +1,5 @@
 {
-	"apiVersion": 3,
+	"apiVersion": 2,
 	"name": "example/color-settings-example",
 	"title": "Color Settings Component Example",
 	"description": "Example Block to show the Color settings component",