Merge branch 'main' into importer-error-surfacing

Author: 9larsons

apps/sodo-search/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/sodo-search",
-  "version": "1.8.22",
+  "version": "1.8.23",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",

apps/sodo-search/src/components/popup-modal.js

@@ -507,7 +507,7 @@ function SearchResultBox() {
     return null;
 }
 
-function Results({posts, authors, tags}) {
+export function Results({posts, authors, tags}) {
     const {searchValue} = useContext(AppContext);
 
     const allResults = useMemo(() => {
@@ -527,7 +527,11 @@ function Results({posts, authors, tags}) {
     }, [allResults]);
 
     useEffect(() => {
-        let keyUphandler = (event) => {
+        let keyDownHandler = (event) => {
+            // keyCode 229 is the IME composition key for legacy browsers
+            if (event.isComposing || event.keyCode === 229) {
+                return;
+            }
             const selectedResultIdx = allResults.findIndex((d) => {
                 return d.id === selectedResult;
             });
@@ -548,11 +552,12 @@ function Results({posts, authors, tags}) {
         };
 
         const containeRefNode = containerRef?.current;
-        containeRefNode?.ownerDocument.removeEventListener('keyup', keyUphandler);
-        containeRefNode?.ownerDocument.addEventListener('keyup', keyUphandler);
+        const doc = containeRefNode?.ownerDocument;
+        doc?.removeEventListener('keydown', keyDownHandler);
+        doc?.addEventListener('keydown', keyDownHandler);
 
         return () => {
-            containeRefNode?.ownerDocument?.removeEventListener('keyup', keyUphandler);
+            doc?.removeEventListener('keydown', keyDownHandler);
         };
     }, [allResults, selectedResult]);
 

apps/sodo-search/test/unit/popup-modal.test.js

@@ -0,0 +1,55 @@
+import AppContext from '../../src/app-context';
+import React from 'react';
+import {Results} from '../../src/components/popup-modal';
+import {fireEvent, render} from '@testing-library/react';
+
+describe('Results keyboard navigation', () => {
+    const posts = [
+        {id: 'post-1', title: 'First post', excerpt: 'First post excerpt', url: 'https://example.com/first-post/'},
+        {id: 'post-2', title: 'Second post', excerpt: 'Second post excerpt', url: 'https://example.com/second-post/'}
+    ];
+
+    const renderResults = () => {
+        return render(
+            <AppContext.Provider value={{searchValue: 'post', t: str => str}}>
+                <Results posts={posts} authors={[]} tags={[]} />
+            </AppContext.Provider>
+        );
+    };
+
+    let originalLocation;
+
+    beforeEach(() => {
+        originalLocation = window.location;
+        delete window.location;
+        window.location = {href: 'https://example.com/'};
+    });
+
+    afterEach(() => {
+        window.location = originalLocation;
+    });
+
+    test('navigates to the selected result on Enter', () => {
+        renderResults();
+
+        fireEvent.keyDown(document, {key: 'Enter'});
+
+        expect(window.location.href).toBe('https://example.com/first-post/');
+    });
+
+    test('does not navigate on Enter during IME composition', () => {
+        renderResults();
+
+        fireEvent.keyDown(document, {key: 'Enter', isComposing: true});
+
+        expect(window.location.href).toBe('https://example.com/');
+    });
+
+    test('does not navigate on Enter with keyCode 229 (legacy IME)', () => {
+        renderResults();
+
+        fireEvent.keyDown(document, {key: 'Enter', keyCode: 229});
+
+        expect(window.location.href).toBe('https://example.com/');
+    });
+});

ghost/core/core/server/services/oembed/oembed-service.js

@@ -180,7 +180,7 @@ class OEmbedService {
                     'user-agent': USER_AGENT
                 },
                 timeout: {
-                    request: 2000
+                    request: 5000
                 },
                 followRedirect: true,
                 ...options
@@ -294,6 +294,7 @@ class OEmbedService {
         };
 
         const metascraper = require('metascraper')([
+            require('metascraper-amazon')(),
             require('metascraper-url')(),
             require('metascraper-title')(),
             require('metascraper-description')(),

ghost/core/package.json

@@ -204,6 +204,7 @@
     "luxon": "3.7.2",
     "mailgun.js": "10.4.0",
     "metascraper": "5.45.15",
+    "metascraper-amazon": "5.45.10",
     "metascraper-author": "5.45.10",
     "metascraper-description": "5.45.10",
     "metascraper-image": "5.45.10",

ghost/core/test/unit/server/services/oembed/oembed-service.test.js

@@ -104,6 +104,24 @@ describe('oembed-service', function () {
         });
     });
 
+    describe('fetchPage', function () {
+        it('requests pages with a 5 second timeout', async function () {
+            const externalRequest = sinon.stub().resolves({});
+
+            const service = new OembedService({
+                config: {get() {
+                    return true;
+                }},
+                externalRequest
+            });
+
+            await service.fetchPage('https://www.example.com', {});
+
+            const options = externalRequest.firstCall.args[1];
+            assert.equal(options.timeout.request, 5000);
+        });
+    });
+
     describe('fetchOembedData', function () {
         const pageHtml = `<html><head><link type="application/json+oembed" href="https://www.example.com/oembed"></head></html>`;
 
@@ -182,6 +200,24 @@ describe('oembed-service', function () {
             assert.equal(response.metadata.title, 'Example');
         });
 
+        it('extracts Amazon product metadata via the metascraper-amazon ruleset', async function () {
+            nock('https://www.amazon.com')
+                .get('/dp/B08N5WRWNW')
+                .query(true)
+                .reply(200, `<html><head><title>Amazon.com</title></head><body>
+                    <span id="productTitle">Example Product Title</span>
+                    <img class="a-dynamic-image" src="https://m.media-amazon.com/images/I/example.jpg" data-old-hires="https://m.media-amazon.com/images/I/example-hires.jpg">
+                </body></html>`);
+
+            const response = await oembedService.fetchOembedDataFromUrl('https://www.amazon.com/dp/B08N5WRWNW', 'bookmark');
+
+            assert.equal(response.version, '1.0');
+            assert.equal(response.type, 'bookmark');
+            assert.equal(response.metadata.title, 'Example Product Title');
+            assert.equal(response.metadata.publisher, 'Amazon');
+            assert.equal(response.metadata.thumbnail, 'https://m.media-amazon.com/images/I/example-hires.jpg');
+        });
+
         it('should return a bookmark response when the oembed endpoint returns a link type', async function () {
             nock('https://www.example.com')
                 .get('/')