@atlaskit/smart-card 18.0.21 → 18.0.22

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/smart-card
 
+## 18.0.22
+
+### Patch Changes
+
+- [`8b9f08cbc1c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8b9f08cbc1c) - [ux] Default representation for Slack links was changed from 'block' to 'inline'
+- [`f4811ca8c6a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f4811ca8c6a) - add provider based metadata to hover previews
+
 ## 18.0.21
 
 ### Patch Changes

package/dist/cjs/extractors/hover/extractMetadata.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extractMetadata = void 0;
+
+var _constants = require("../../constants");
+
+var elementNamesToItems = function elementNamesToItems(elementNames) {
+  return elementNames.filter(function (element) {
+    return element in _constants.ElementName;
+  }).map(function (elementName) {
+    return {
+      name: elementName,
+      testId: "".concat(elementName.toLowerCase(), "-metadata-element")
+    };
+  });
+};
+
+var extractMetadata = function extractMetadata(jsonLd) {
+  var _jsonLd$metadata, _metadata$primary, _metadata$secondary;
+
+  var metadata = (_jsonLd$metadata = jsonLd.metadata) !== null && _jsonLd$metadata !== void 0 ? _jsonLd$metadata : [];
+  return {
+    primary: elementNamesToItems((_metadata$primary = metadata.primary) !== null && _metadata$primary !== void 0 ? _metadata$primary : []),
+    secondary: elementNamesToItems((_metadata$secondary = metadata.secondary) !== null && _metadata$secondary !== void 0 ? _metadata$secondary : [])
+  };
+};
+
+exports.extractMetadata = extractMetadata;

package/dist/cjs/providers/editor/transformer.js

@@ -23,10 +23,6 @@ var isJwmView = function isJwmView(url) {
   return url.match(/^https:\/\/.*?\/jira\/core\/projects\/[^\/]+?\/(timeline|calendar|list|board)\/?/);
 };
 
-var isSlackMessage = function isSlackMessage(url) {
-  return url.match(/^https:\/\/.+?\.slack\.com\/archives\/[CG][A-Z0-9]+\/p[0-9]+(\?.*)?$/);
-};
-
 var Transformer = /*#__PURE__*/function () {
   function Transformer() {
     (0, _classCallCheck2.default)(this, Transformer);
@@ -68,8 +64,6 @@ var Transformer = /*#__PURE__*/function () {
     value: function toAdf(url, appearance) {
       if (isJiraRoadMap(url) || isPolarisView(url) || isJwmView(url)) {
         return this.buildEmbedAdf(url);
-      } else if (isSlackMessage(url)) {
-        return this.buildBlockAdf(url);
       } else {
         switch (appearance) {
           case 'inline':

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "18.0.21",
+	"version": "18.0.22",
 	"sideEffects": false
 }

package/dist/cjs/view/HoverCard/index.js

@@ -41,6 +41,10 @@ var _analytics2 = require("../../state/analytics");
 
 var _helpers = require("../../state/helpers");
 
+var _extractMetadata = require("../../extractors/hover/extractMetadata");
+
+var _utils = require("./utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -134,7 +138,9 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
     };
   }, [url, definitionId, extensionKey, analytics]);
 
-  var cardComponent = function cardComponent() {
+  var CardComponent = function CardComponent() {
+    //TODO: EDM-3224 deleted simulated and use real JsonLd
+    var metadataElements = (0, _extractMetadata.extractMetadata)((0, _utils.getSimulatedMetadata)(extensionKey));
     return (0, _core.jsx)("div", {
       onMouseEnter: initShowCard,
       onMouseLeave: initHideCard,
@@ -148,6 +154,9 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
       }
     }, (0, _core.jsx)(_blocks.TitleBlock, {
       actions: [openAction]
+    }), (0, _core.jsx)(_blocks.MetadataBlock, {
+      primary: metadataElements.primary,
+      secondary: metadataElements.secondary
     }), (0, _core.jsx)(_blocks.SnippetBlock, null), (0, _core.jsx)(_blocks.FooterBlock, {
       actions: smartlinkActions
     })));
@@ -161,7 +170,7 @@ var HoverCardComponent = function HoverCardComponent(_ref) {
     isOpen: isOpen,
     onClose: onClose,
     placement: "bottom-start",
-    content: cardComponent,
+    content: CardComponent,
     trigger: function trigger(triggerProps) {
       return (0, _core.jsx)("span", (0, _extends2.default)({}, triggerProps, {
         onMouseEnter: initShowCard,

package/dist/cjs/view/HoverCard/utils.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSimulatedMetadata = void 0;
+
+var getSimulatedMetadata = function getSimulatedMetadata(extensionKey) {
+  switch (extensionKey) {
+    case 'confluence-object-provider':
+      return {
+        metadata: {
+          primary: ['AuthorGroup', 'CreatedBy', 'CommentCount', 'ReactCount'],
+          secondary: []
+        }
+      };
+
+    case 'jira-object-provider':
+      return {
+        metadata: {
+          primary: ['AuthorGroup', 'State', 'Priority'],
+          secondary: []
+        }
+      };
+
+    default:
+      return {
+        metadata: {
+          primary: ['ModifiedOn'],
+          secondary: []
+        }
+      };
+  }
+};
+
+exports.getSimulatedMetadata = getSimulatedMetadata;

package/dist/es2019/extractors/hover/extractMetadata.js

@@ -0,0 +1,18 @@
+import { ElementName } from '../../constants';
+
+const elementNamesToItems = elementNames => {
+  return elementNames.filter(element => element in ElementName).map(elementName => ({
+    name: elementName,
+    testId: `${elementName.toLowerCase()}-metadata-element`
+  }));
+};
+
+export const extractMetadata = jsonLd => {
+  var _jsonLd$metadata, _metadata$primary, _metadata$secondary;
+
+  const metadata = (_jsonLd$metadata = jsonLd.metadata) !== null && _jsonLd$metadata !== void 0 ? _jsonLd$metadata : [];
+  return {
+    primary: elementNamesToItems((_metadata$primary = metadata.primary) !== null && _metadata$primary !== void 0 ? _metadata$primary : []),
+    secondary: elementNamesToItems((_metadata$secondary = metadata.secondary) !== null && _metadata$secondary !== void 0 ? _metadata$secondary : [])
+  };
+};

package/dist/es2019/providers/editor/transformer.js

@@ -4,8 +4,6 @@ const isPolarisView = url => url.match(/^https:\/\/.*?\/jira\/polaris\/projects\
 
 const isJwmView = url => url.match(/^https:\/\/.*?\/jira\/core\/projects\/[^\/]+?\/(timeline|calendar|list|board)\/?/);
 
-const isSlackMessage = url => url.match(/^https:\/\/.+?\.slack\.com\/archives\/[CG][A-Z0-9]+\/p[0-9]+(\?.*)?$/);
-
 export class Transformer {
   buildInlineAdf(url) {
     return {
@@ -38,8 +36,6 @@ export class Transformer {
   toAdf(url, appearance) {
     if (isJiraRoadMap(url) || isPolarisView(url) || isJwmView(url)) {
       return this.buildEmbedAdf(url);
-    } else if (isSlackMessage(url)) {
-      return this.buildBlockAdf(url);
     } else {
       switch (appearance) {
         case 'inline':

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "18.0.21",
+	"version": "18.0.22",
 	"sideEffects": false
 }

package/dist/es2019/view/HoverCard/index.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useCallback, useRef, useMemo } from 'react';
-import { TitleBlock, SnippetBlock, FooterBlock } from '../FlexibleCard/components/blocks';
+import { TitleBlock, SnippetBlock, FooterBlock, MetadataBlock } from '../FlexibleCard/components/blocks';
 import { Card } from '../Card';
 import Popup from '@atlaskit/popup';
 import { SmartLinkSize, ActionName } from '../../constants';
@@ -15,6 +15,8 @@ import { fireSmartLinkEvent } from '../../utils/analytics';
 import { useSmartCardState as useLinkState } from '../../state/store';
 import { useSmartLinkAnalytics } from '../../state/analytics';
 import { getExtensionKey, getDefinitionId } from '../../state/helpers';
+import { extractMetadata } from '../../extractors/hover/extractMetadata';
+import { getSimulatedMetadata } from './utils';
 export const HoverCardComponent = ({
   children,
   url,
@@ -89,22 +91,29 @@ export const HoverCardComponent = ({
     };
   }, [url, definitionId, extensionKey, analytics]);
 
-  const cardComponent = () => jsx("div", {
-    onMouseEnter: initShowCard,
-    onMouseLeave: initHideCard,
-    css: HoverCardContainer
-  }, jsx(Card, {
-    appearance: "block",
-    url: url,
-    ui: {
-      hideElevation: true,
-      size: SmartLinkSize.Large
-    }
-  }, jsx(TitleBlock, {
-    actions: [openAction]
-  }), jsx(SnippetBlock, null), jsx(FooterBlock, {
-    actions: smartlinkActions
-  })));
+  const CardComponent = () => {
+    //TODO: EDM-3224 deleted simulated and use real JsonLd
+    const metadataElements = extractMetadata(getSimulatedMetadata(extensionKey));
+    return jsx("div", {
+      onMouseEnter: initShowCard,
+      onMouseLeave: initHideCard,
+      css: HoverCardContainer
+    }, jsx(Card, {
+      appearance: "block",
+      url: url,
+      ui: {
+        hideElevation: true,
+        size: SmartLinkSize.Large
+      }
+    }, jsx(TitleBlock, {
+      actions: [openAction]
+    }), jsx(MetadataBlock, {
+      primary: metadataElements.primary,
+      secondary: metadataElements.secondary
+    }), jsx(SnippetBlock, null), jsx(FooterBlock, {
+      actions: smartlinkActions
+    })));
+  };
 
   const onClose = useCallback(() => setIsOpen(false), []);
   return jsx(Popup, {
@@ -112,7 +121,7 @@ export const HoverCardComponent = ({
     isOpen: isOpen,
     onClose: onClose,
     placement: "bottom-start",
-    content: cardComponent,
+    content: CardComponent,
     trigger: triggerProps => jsx("span", _extends({}, triggerProps, {
       onMouseEnter: initShowCard,
       onMouseLeave: initHideCard

package/dist/es2019/view/HoverCard/utils.js

@@ -0,0 +1,27 @@
+export const getSimulatedMetadata = extensionKey => {
+  switch (extensionKey) {
+    case 'confluence-object-provider':
+      return {
+        metadata: {
+          primary: ['AuthorGroup', 'CreatedBy', 'CommentCount', 'ReactCount'],
+          secondary: []
+        }
+      };
+
+    case 'jira-object-provider':
+      return {
+        metadata: {
+          primary: ['AuthorGroup', 'State', 'Priority'],
+          secondary: []
+        }
+      };
+
+    default:
+      return {
+        metadata: {
+          primary: ['ModifiedOn'],
+          secondary: []
+        }
+      };
+  }
+};

package/dist/esm/extractors/hover/extractMetadata.js

@@ -0,0 +1,22 @@
+import { ElementName } from '../../constants';
+
+var elementNamesToItems = function elementNamesToItems(elementNames) {
+  return elementNames.filter(function (element) {
+    return element in ElementName;
+  }).map(function (elementName) {
+    return {
+      name: elementName,
+      testId: "".concat(elementName.toLowerCase(), "-metadata-element")
+    };
+  });
+};
+
+export var extractMetadata = function extractMetadata(jsonLd) {
+  var _jsonLd$metadata, _metadata$primary, _metadata$secondary;
+
+  var metadata = (_jsonLd$metadata = jsonLd.metadata) !== null && _jsonLd$metadata !== void 0 ? _jsonLd$metadata : [];
+  return {
+    primary: elementNamesToItems((_metadata$primary = metadata.primary) !== null && _metadata$primary !== void 0 ? _metadata$primary : []),
+    secondary: elementNamesToItems((_metadata$secondary = metadata.secondary) !== null && _metadata$secondary !== void 0 ? _metadata$secondary : [])
+  };
+};

package/dist/esm/providers/editor/transformer.js

@@ -13,10 +13,6 @@ var isJwmView = function isJwmView(url) {
   return url.match(/^https:\/\/.*?\/jira\/core\/projects\/[^\/]+?\/(timeline|calendar|list|board)\/?/);
 };
 
-var isSlackMessage = function isSlackMessage(url) {
-  return url.match(/^https:\/\/.+?\.slack\.com\/archives\/[CG][A-Z0-9]+\/p[0-9]+(\?.*)?$/);
-};
-
 export var Transformer = /*#__PURE__*/function () {
   function Transformer() {
     _classCallCheck(this, Transformer);
@@ -58,8 +54,6 @@ export var Transformer = /*#__PURE__*/function () {
     value: function toAdf(url, appearance) {
       if (isJiraRoadMap(url) || isPolarisView(url) || isJwmView(url)) {
         return this.buildEmbedAdf(url);
-      } else if (isSlackMessage(url)) {
-        return this.buildBlockAdf(url);
       } else {
         switch (appearance) {
           case 'inline':

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "18.0.21",
+	"version": "18.0.22",
 	"sideEffects": false
 }

package/dist/esm/view/HoverCard/index.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import React, { useCallback, useRef, useMemo } from 'react';
-import { TitleBlock, SnippetBlock, FooterBlock } from '../FlexibleCard/components/blocks';
+import { TitleBlock, SnippetBlock, FooterBlock, MetadataBlock } from '../FlexibleCard/components/blocks';
 import { Card } from '../Card';
 import Popup from '@atlaskit/popup';
 import { SmartLinkSize, ActionName } from '../../constants';
@@ -16,6 +16,8 @@ import { fireSmartLinkEvent } from '../../utils/analytics';
 import { useSmartCardState as useLinkState } from '../../state/store';
 import { useSmartLinkAnalytics } from '../../state/analytics';
 import { getExtensionKey, getDefinitionId } from '../../state/helpers';
+import { extractMetadata } from '../../extractors/hover/extractMetadata';
+import { getSimulatedMetadata } from './utils';
 export var HoverCardComponent = function HoverCardComponent(_ref) {
   var children = _ref.children,
       url = _ref.url,
@@ -104,7 +106,9 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     };
   }, [url, definitionId, extensionKey, analytics]);
 
-  var cardComponent = function cardComponent() {
+  var CardComponent = function CardComponent() {
+    //TODO: EDM-3224 deleted simulated and use real JsonLd
+    var metadataElements = extractMetadata(getSimulatedMetadata(extensionKey));
     return jsx("div", {
       onMouseEnter: initShowCard,
       onMouseLeave: initHideCard,
@@ -118,6 +122,9 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
       }
     }, jsx(TitleBlock, {
       actions: [openAction]
+    }), jsx(MetadataBlock, {
+      primary: metadataElements.primary,
+      secondary: metadataElements.secondary
     }), jsx(SnippetBlock, null), jsx(FooterBlock, {
       actions: smartlinkActions
     })));
@@ -131,7 +138,7 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     isOpen: isOpen,
     onClose: onClose,
     placement: "bottom-start",
-    content: cardComponent,
+    content: CardComponent,
     trigger: function trigger(triggerProps) {
       return jsx("span", _extends({}, triggerProps, {
         onMouseEnter: initShowCard,

package/dist/esm/view/HoverCard/utils.js

@@ -0,0 +1,27 @@
+export var getSimulatedMetadata = function getSimulatedMetadata(extensionKey) {
+  switch (extensionKey) {
+    case 'confluence-object-provider':
+      return {
+        metadata: {
+          primary: ['AuthorGroup', 'CreatedBy', 'CommentCount', 'ReactCount'],
+          secondary: []
+        }
+      };
+
+    case 'jira-object-provider':
+      return {
+        metadata: {
+          primary: ['AuthorGroup', 'State', 'Priority'],
+          secondary: []
+        }
+      };
+
+    default:
+      return {
+        metadata: {
+          primary: ['ModifiedOn'],
+          secondary: []
+        }
+      };
+  }
+};

package/dist/types/extractors/hover/extractMetadata.d.ts

@@ -0,0 +1,3 @@
+import { MetadataOptions } from '../../view/HoverCard/types';
+import { JsonLd } from 'json-ld-types';
+export declare const extractMetadata: (jsonLd: JsonLd.Primitives.Property<any>) => MetadataOptions;

package/dist/types/view/HoverCard/types.d.ts

@@ -1,6 +1,11 @@
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
+import { ElementItem } from '../FlexibleCard/components/blocks/types';
 export interface HoverCardProps extends WithAnalyticsEventsProps {
     url: string;
 }
 export declare type PreviewDisplay = 'card' | 'embed';
 export declare type PreviewInvokeMethod = 'keyboard' | 'mouse_hover' | 'mouse_click';
+export interface MetadataOptions {
+    primary: Array<ElementItem>;
+    secondary: Array<ElementItem>;
+}

package/dist/types/view/HoverCard/utils.d.ts

@@ -0,0 +1,2 @@
+import { JsonLd } from 'json-ld-types';
+export declare const getSimulatedMetadata: (extensionKey: string) => JsonLd.Primitives.Property<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/smart-card",
-  "version": "18.0.21",
+  "version": "18.0.22",
   "description": "Smart card component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"