@quintype/seo 1.40.6 → 1.40.8-embed-url.0

package/.vscode/settings.json

@@ -3,8 +3,8 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.tabSize": 2,
-  "editor.formatOnSave": true,
   "editor.detectIndentation": false,
+  "editor.formatOnSave": true,
   "files.insertFinalNewline": true,
   "files.trimTrailingWhitespace": true,
   "editor.codeActionsOnSave": {

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.40.7](https://github.com/quintype/quintype-node-seo/compare/v1.40.6...v1.40.7) (2022-07-11)
+
+
+### Bug Fixes
+
+* Amphtml error  ([#526](https://github.com/quintype/quintype-node-seo/issues/526)) ([24b6c61](https://github.com/quintype/quintype-node-seo/commit/24b6c616118f3db1a2cdda0d98d2827bf2a0d099))
+
 ### [1.40.6](https://github.com/quintype/quintype-node-seo/compare/v1.40.5...v1.40.6) (2022-07-11)
 
 ### [1.40.5](https://github.com/quintype/quintype-node-seo/compare/v1.40.1...v1.40.5) (2022-06-30)

package/dist/index.cjs.js

@@ -822,9 +822,30 @@ function generateLiveBlogPostingData(structuredData = {}, story = {}, publisherC
   };
 }
 
+function getEmbedUrl(cards) {
+  let embedUrl = "";
+
+  // not using the return value of top level find
+  // coz we only need the embed url
+  // find is used for early exit
+  cards.find(card => {
+    const storyElements = card["story-elements"];
+    return storyElements.find((elem, index) => {
+      if (elem["embed-url"]) {
+        embedUrl = elem["embed-url"];
+        return true;
+      }
+      return false;
+    });
+  });
+
+  return embedUrl;
+}
+
 function generateVideoArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const metaKeywords = story.seo && story.seo["meta-keywords"] || [];
-  const embedUrl = get__default["default"](story, ["cards", "0", "story-elements", "0", "embed-url"], "");
+  const storyCards = get__default["default"](story, ["cards"], []);
+  const embedUrl = getEmbedUrl(storyCards);
   const socialShareMsg = get__default["default"](story, ["summary"], "");
   const metaDescription = get__default["default"](story, ["seo", "meta-description"], "");
   const subHeadline = get__default["default"](story, ["subheadline"], "");
@@ -1090,11 +1111,13 @@ function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
   const ampUrlAppend = seoConfig.appendHostToAmpUrl ? getDomain(currentHostUrl, domainSlug) || config['sketches-host'] : '';
   const storySlug = seoConfig.decodeAmpUrl ? decodeURIComponent(story.slug) : encodeURIComponent(story.slug);
+  const ampUrl = story["story-template"] === "visual-story" ? `${ampUrlAppend}/${storySlug}` : `${ampUrlAppend}/amp/story/${storySlug}`;
+
   if (showAmpTag(seoConfig, pageType, story)) {
     return [{
       tag: 'link',
       rel: 'amphtml',
-      href: `${ampUrlAppend}/amp/story/${storySlug}`
+      href: ampUrl
     }];
   } else {
     return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/seo",
-  "version": "1.40.6",
+  "version": "1.40.8-embed-url.0",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",

package/src/amp-tags.js

@@ -40,11 +40,13 @@ export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
   const ampUrlAppend = seoConfig.appendHostToAmpUrl ? getDomain(currentHostUrl, domainSlug) || config['sketches-host'] : '';
   const storySlug = seoConfig.decodeAmpUrl ? decodeURIComponent(story.slug): encodeURIComponent(story.slug);
+  const ampUrl = story["story-template"] === "visual-story" ? `${ampUrlAppend}/${storySlug}` : `${ampUrlAppend}/amp/story/${storySlug}`;
+
   if (showAmpTag(seoConfig, pageType, story)) {
     return [{
       tag: 'link',
       rel: 'amphtml',
-      href: `${ampUrlAppend}/amp/story/${storySlug}`
+      href: ampUrl
     }];
   } else {
     return [];

package/src/structured-data/structured-data-tags.js

@@ -11,7 +11,7 @@ import {
   getSchemaPerson,
   getSchemaPublisher,
   getSchemaType,
-  getSchemaWebsite
+  getSchemaWebsite,
 } from "./schema";
 
 function getLdJsonFields(type, fields) {
@@ -254,9 +254,30 @@ function generateLiveBlogPostingData(structuredData = {}, story = {}, publisherC
   };
 }
 
+function getEmbedUrl(cards) {
+  let embedUrl = "";
+
+  // not using the return value of top level find
+  // coz we only need the embed url
+  // find is used for early exit
+  cards.find((card) => {
+    const storyElements = card["story-elements"];
+    return storyElements.find((elem, index) => {
+      if (elem["embed-url"]) {
+        embedUrl = elem["embed-url"];
+        return true;
+      }
+      return false;
+    });
+  });
+
+  return embedUrl;
+}
+
 function generateVideoArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const metaKeywords = (story.seo && story.seo["meta-keywords"]) || [];
-  const embedUrl = get(story, ["cards", "0", "story-elements", "0", "embed-url"], "");
+  const storyCards = get(story, ["cards"], []);
+  const embedUrl = getEmbedUrl(storyCards);
   const socialShareMsg = get(story, ["summary"], "");
   const metaDescription = get(story, ["seo", "meta-description"], "");
   const subHeadline = get(story, ["subheadline"], "");
@@ -476,10 +497,7 @@ export function StructuredDataTags({ structuredData = {} }, config, pageType, re
     }
 
     if (structuredData.enableVideo && story["story-template"] === "video") {
-      return ldJson(
-        "VideoObject",
-        generateVideoArticleData(structuredData, story, publisherConfig, timezone)
-      );
+      return ldJson("VideoObject", generateVideoArticleData(structuredData, story, publisherConfig, timezone));
     }
 
     if (structuredData.enableNewsArticle !== "withoutArticleSchema") {

package/test/amp_tags_test.js

@@ -19,6 +19,12 @@ describe('AmpTags', function () {
     assertContains('<link rel="amphtml" href="/amp/story/section%2Fslug"/>', string);
   });
 
+  it("it does not append `/amp/story` to the amp tag when it's a visual story", function () {
+    const story = { slug: "section/slug", "is-amp-supported": true };
+    const string = getSeoMetadata(seoConfig, config, "story-page", { data: { story: { ...story, "story-template": "visual-story" } } }, {});
+    assertContains('<link rel="amphtml" href="/section%2Fslug"/>', string);
+  });
+
   it("does not rely on is-amp-supported in story API", function () {
     const story = { slug: "section/slug", "is-amp-supported": false };
     const string = getSeoMetadata(seoConfig, config, "story-page", { data: { story: story } }, {});