@ndla/article-converter 6.0.4 → 6.0.6

package/es/plugins/embed/contactBlockEmbedPlugin.js

@@ -10,6 +10,7 @@ import { ContactBlock } from '@ndla/ui';
 import { attributesToProps } from 'html-react-parser';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export var contactBlockEmbedPlugin = function contactBlockEmbedPlugin(element, _, opts) {
+  var _opts$canonicalUrls;
   var props = attributesToProps(element.attribs);
   var embedData = JSON.parse(props['data-json']);
   var _embedData$embedData = embedData.embedData,
@@ -18,15 +19,18 @@ export var contactBlockEmbedPlugin = function contactBlockEmbedPlugin(element, _
     description = _embedData$embedData.description,
     blob = _embedData$embedData.blob,
     blobColor = _embedData$embedData.blobColor,
-    jobTitle = _embedData$embedData.jobTitle;
+    jobTitle = _embedData$embedData.jobTitle,
+    alt = _embedData$embedData.alt;
   return _jsx(ContactBlock, {
     image: embedData.status === 'success' ? embedData.data.image : undefined,
+    embedAlt: alt,
     description: description,
     email: email,
     blobColor: blobColor,
     jobTitle: jobTitle,
     name: name,
     blob: blob,
-    lang: opts.articleLanguage
+    lang: opts.articleLanguage,
+    imageCanonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image
   });
 };

package/es/plugins/embed/imageEmbedPlugin.js

@@ -10,7 +10,7 @@ import { ImageEmbed } from '@ndla/ui';
 import { attributesToProps } from 'html-react-parser';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export var imageEmbedPlugin = function imageEmbedPlugin(element, _, opts) {
-  var _element$parentNode, _element$parentNode$p, _element$parentNode$p2, _opts$components;
+  var _element$parentNode, _element$parentNode$p, _element$parentNode$p2, _opts$components, _opts$canonicalUrls;
   var props = attributesToProps(element.attribs);
   var data = JSON.parse(props['data-json']);
   var inGrid = ((_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 ? void 0 : (_element$parentNode$p = _element$parentNode.parentNode) === null || _element$parentNode$p === void 0 ? void 0 : (_element$parentNode$p2 = _element$parentNode$p.attribs) === null || _element$parentNode$p2 === void 0 ? void 0 : _element$parentNode$p2['data-type']) === 'grid';
@@ -20,6 +20,7 @@ export var imageEmbedPlugin = function imageEmbedPlugin(element, _, opts) {
     path: opts.path,
     previewAlt: opts.previewAlt,
     heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
+    canonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image,
     lang: opts.articleLanguage,
     renderContext: opts.renderContext
   });

package/lib/plugins/embed/contactBlockEmbedPlugin.js

@@ -16,6 +16,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 var contactBlockEmbedPlugin = function contactBlockEmbedPlugin(element, _, opts) {
+  var _opts$canonicalUrls;
   var props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   var embedData = JSON.parse(props['data-json']);
   var _embedData$embedData = embedData.embedData,
@@ -24,16 +25,19 @@ var contactBlockEmbedPlugin = function contactBlockEmbedPlugin(element, _, opts)
     description = _embedData$embedData.description,
     blob = _embedData$embedData.blob,
     blobColor = _embedData$embedData.blobColor,
-    jobTitle = _embedData$embedData.jobTitle;
+    jobTitle = _embedData$embedData.jobTitle,
+    alt = _embedData$embedData.alt;
   return (0, _jsxRuntime.jsx)(_ui.ContactBlock, {
     image: embedData.status === 'success' ? embedData.data.image : undefined,
+    embedAlt: alt,
     description: description,
     email: email,
     blobColor: blobColor,
     jobTitle: jobTitle,
     name: name,
     blob: blob,
-    lang: opts.articleLanguage
+    lang: opts.articleLanguage,
+    imageCanonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image
   });
 };
 exports.contactBlockEmbedPlugin = contactBlockEmbedPlugin;

package/lib/plugins/embed/imageEmbedPlugin.js

@@ -16,7 +16,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 
 var imageEmbedPlugin = function imageEmbedPlugin(element, _, opts) {
-  var _element$parentNode, _element$parentNode$p, _element$parentNode$p2, _opts$components;
+  var _element$parentNode, _element$parentNode$p, _element$parentNode$p2, _opts$components, _opts$canonicalUrls;
   var props = (0, _htmlReactParser.attributesToProps)(element.attribs);
   var data = JSON.parse(props['data-json']);
   var inGrid = ((_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 ? void 0 : (_element$parentNode$p = _element$parentNode.parentNode) === null || _element$parentNode$p === void 0 ? void 0 : (_element$parentNode$p2 = _element$parentNode$p.attribs) === null || _element$parentNode$p2 === void 0 ? void 0 : _element$parentNode$p2['data-type']) === 'grid';
@@ -26,6 +26,7 @@ var imageEmbedPlugin = function imageEmbedPlugin(element, _, opts) {
     path: opts.path,
     previewAlt: opts.previewAlt,
     heartButton: (_opts$components = opts.components) === null || _opts$components === void 0 ? void 0 : _opts$components.heartButton,
+    canonicalUrl: (_opts$canonicalUrls = opts.canonicalUrls) === null || _opts$canonicalUrls === void 0 ? void 0 : _opts$canonicalUrls.image,
     lang: opts.articleLanguage,
     renderContext: opts.renderContext
   });

package/lib/plugins/types.d.ts

@@ -6,7 +6,7 @@
  *
  */
 /// <reference types="react" />
-import { HeartButtonType, RenderContext } from '@ndla/ui';
+import { HeartButtonType, RenderContext, CanonicalUrlFuncs } from '@ndla/ui';
 import { Element, HTMLReactParserOptions } from 'html-react-parser';
 export interface DynamicComponents {
     heartButton?: HeartButtonType;
@@ -19,6 +19,7 @@ export interface TransformOptions {
     frontendDomain?: string;
     components?: DynamicComponents;
     articleLanguage?: string;
+    canonicalUrls?: CanonicalUrlFuncs;
     renderContext?: RenderContext;
 }
 export type PluginType = (element: Element, options: HTMLReactParserOptions, metaData: TransformOptions) => JSX.Element | undefined | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -27,11 +27,12 @@
     "src"
   ],
   "devDependencies": {
-    "@ndla/types-embed": "^4.0.6"
+    "@ndla/types-backend": "^0.2.21",
+    "@ndla/types-embed": "^4.0.7"
   },
   "dependencies": {
-    "@ndla/code": "^5.0.11",
-    "@ndla/ui": "^49.0.5",
+    "@ndla/code": "^5.0.13",
+    "@ndla/ui": "^49.0.7",
     "html-react-parser": "^4.2.2",
     "lodash": "^4.17.20"
   },
@@ -44,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7255979a24e5c51aa60ef292092fba45904cd9ab"
+  "gitHead": "5b6502dbc509b761ddea72112df15ee4fe633255"
 }

package/src/plugins/embed/contactBlockEmbedPlugin.tsx

@@ -14,10 +14,11 @@ import { PluginType } from '../types';
 export const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {
   const props = attributesToProps(element.attribs);
   const embedData = JSON.parse(props['data-json']) as ContactBlockMetaData;
-  const { name, email, description, blob, blobColor, jobTitle } = embedData.embedData;
+  const { name, email, description, blob, blobColor, jobTitle, alt } = embedData.embedData;
   return (
     <ContactBlock
       image={embedData.status === 'success' ? embedData.data.image : undefined}
+      embedAlt={alt}
       description={description}
       email={email}
       blobColor={blobColor}
@@ -25,6 +26,7 @@ export const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {
       name={name}
       blob={blob}
       lang={opts.articleLanguage}
+      imageCanonicalUrl={opts.canonicalUrls?.image}
     />
   );
 };

package/src/plugins/embed/imageEmbedPlugin.tsx

@@ -23,6 +23,7 @@ export const imageEmbedPlugin: PluginType = (element, _, opts) => {
       path={opts.path}
       previewAlt={opts.previewAlt}
       heartButton={opts.components?.heartButton}
+      canonicalUrl={opts.canonicalUrls?.image}
       lang={opts.articleLanguage}
       renderContext={opts.renderContext}
     />

package/src/plugins/types.ts

@@ -6,7 +6,7 @@
  *
  */
 
-import { HeartButtonType, RenderContext } from '@ndla/ui';
+import { HeartButtonType, RenderContext, CanonicalUrlFuncs } from '@ndla/ui';
 import { Element, HTMLReactParserOptions } from 'html-react-parser';
 
 export interface DynamicComponents {
@@ -21,6 +21,7 @@ export interface TransformOptions {
   frontendDomain?: string;
   components?: DynamicComponents;
   articleLanguage?: string;
+  canonicalUrls?: CanonicalUrlFuncs;
   renderContext?: RenderContext;
 }