@atlaskit/editor-plugin-card 25.0.4 → 25.0.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-card
 
+## 25.0.5
+
+### Patch Changes
+
+- [`6d07b4f04155f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6d07b4f04155f) -
+  Cleanup `feature gate` `jim-lower-ranking-in-jira-macro-search`. Quick insert search now always
+  ranks the Jira work items (datasource) item above the legacy Jira macro when their scores are
+  close, and the Jira work items quick insert item always has a priority of 500.
+- [`109d353d55cfb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/109d353d55cfb) -
+  Add a pre-auth value proposition modal for unauthenticated third-party Smart Links created or
+  converted in the editor. `@atlaskit/smart-card/pre-auth-value-proposition-modal` exports the
+  controlled modal; editor lazy-loads it from Smart Link lifecycle events. Variants
+  `modal_text_only` and `modal_with_image` (plus `control`) are behind experiment
+  `platform_sl_3p_preauth_value_modal` and gate `platform_sl_3p_preauth_value_modal_killswitch`.
+  Connect reuses the existing auth flow. The modal shows once per provider and at most once every
+  seven days across providers. Open/close analytics use `source: 'preAuthValuePropositionModal'`.
+- Updated dependencies
+
 ## 25.0.4
 
 ### Patch Changes

package/dist/cjs/cardPlugin.js

@@ -35,6 +35,7 @@ var _EditorLinkingPlatformAnalytics = require("./ui/EditorLinkingPlatformAnalyti
 var _EditorSmartCardEvents = require("./ui/EditorSmartCardEvents");
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _PasteDisplayAsMenu = require("./ui/PasteDisplayAsMenu");
+var _PreAuthValuePropositionModal = require("./ui/PreAuthValuePropositionModal");
 var _getCardQuickInsertComponents = require("./ui/quick-insert/getCardQuickInsertComponents");
 var _toolbar = require("./ui/toolbar");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
@@ -175,7 +176,9 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref2) {
       }
       editorViewForPasteMenu = editorView;
       var breakoutEnabled = options.editorAppearance === 'full-page';
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, shouldRegisterPasteDisplayAsMenu && /*#__PURE__*/_react.default.createElement(PasteMenuSmartCardClientSync, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _fg.fg)('platform_sl_3p_preauth_value_modal_killswitch') ? /*#__PURE__*/_react.default.createElement(_PreAuthValuePropositionModal.PreAuthValuePropositionModalListener, {
+        cardPluginEvents: cardPluginEvents
+      }) : null, shouldRegisterPasteDisplayAsMenu && /*#__PURE__*/_react.default.createElement(PasteMenuSmartCardClientSync, {
         clientRef: pasteMenuSmartCardClientRef
       }), /*#__PURE__*/_react.default.createElement(_EditorSmartCardEvents.EditorSmartCardEvents, {
         editorView: editorView
@@ -341,17 +344,15 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref2) {
         if (!options.allowDatasource) {
           return quickInsertArray;
         }
-        quickInsertArray.push(_objectSpread(_objectSpread({
+        quickInsertArray.push({
           id: 'datasource',
           title: formatMessage((0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages.cardMessages.datasourceJiraIssueIssueTermRefresh : _messages.cardMessages.datasourceJiraIssue),
           description: formatMessage((0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages.cardMessages.datasourceJiraIssueDescriptionIssueTermRefresh : _messages.cardMessages.datasourceJiraIssueDescription),
           isDisabledOffline: true,
           categories: ['external-content', 'development'],
           keywords: ['jira'],
-          featured: true
-        }, (0, _fg.fg)('jim-lower-ranking-in-jira-macro-search') && {
-          priority: 500
-        }), {}, {
+          featured: true,
+          priority: 500,
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconDatasourceJiraIssue, null);
           },
@@ -360,7 +361,7 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref2) {
             (0, _actions.showDatasourceModal)('jira')(tr);
             return tr;
           }
-        }));
+        });
         if ((0, _utils.canRenderDatasource)(_assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
           quickInsertArray.push({
             id: 'datasource',

package/dist/cjs/ui/PreAuthValuePropositionModal.js

@@ -0,0 +1,58 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PreAuthValuePropositionModalListener = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _types = require("./analytics/types");
+var _utils = require("./analytics/utils");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var PreAuthValuePropositionModal = /*#__PURE__*/(0, _react.lazy)(function () {
+  return Promise.resolve().then(function () {
+    return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_smart-card-pre-auth-value-proposition-modal" */'@atlaskit/smart-card/pre-auth-value-proposition-modal'));
+  }).then(function (module) {
+    return {
+      default: module.PreAuthValuePropositionModal
+    };
+  });
+});
+var getNewSmartLinkUrl = function getNewSmartLinkUrl(event) {
+  if (event.subject !== _types.EVENT_SUBJECT.LINK || event.data.isUndo || event.data.isRedo || (0, _utils.appearanceForLink)(event.data.node) === 'url') {
+    return;
+  }
+  if (event.event === _types.EVENT.CREATED || event.event === _types.EVENT.UPDATED && event.data.previousDisplay === 'url') {
+    return (0, _utils.getUrl)(event.data.node);
+  }
+};
+var ModalListener = function ModalListener(_ref) {
+  var cardPluginEvents = _ref.cardPluginEvents;
+  var _useState = (0, _react.useState)(),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    url = _useState2[0],
+    setUrl = _useState2[1];
+  (0, _react.useEffect)(function () {
+    return cardPluginEvents.subscribe(function (event) {
+      var newSmartLinkUrl = getNewSmartLinkUrl(event);
+      if (newSmartLinkUrl) {
+        setUrl(function (currentUrl) {
+          return currentUrl !== null && currentUrl !== void 0 ? currentUrl : newSmartLinkUrl;
+        });
+      }
+    });
+  }, [cardPluginEvents]);
+  var onFinished = (0, _react.useCallback)(function () {
+    return setUrl(undefined);
+  }, []);
+  return url ? /*#__PURE__*/_react.default.createElement(_react.Suspense, {
+    fallback: null
+  }, /*#__PURE__*/_react.default.createElement(PreAuthValuePropositionModal, {
+    key: url,
+    url: url,
+    onFinished: onFinished
+  })) : null;
+};
+var PreAuthValuePropositionModalListener = exports.PreAuthValuePropositionModalListener = /*#__PURE__*/_react.default.memo(ModalListener);

package/dist/es2019/cardPlugin.js

@@ -25,6 +25,7 @@ import { EditorSmartCardEvents } from './ui/EditorSmartCardEvents';
 // eslint-disable-next-line import/no-named-as-default
 import LayoutButton from './ui/LayoutButton';
 import { getPasteDisplayAsMenuComponents } from './ui/PasteDisplayAsMenu';
+import { PreAuthValuePropositionModalListener } from './ui/PreAuthValuePropositionModal';
 import { getCardQuickInsertComponents } from './ui/quick-insert/getCardQuickInsertComponents';
 import { floatingToolbar, getEndingToolbarItems, getStartingToolbarItems } from './ui/toolbar';
 const PasteMenuSmartCardClientSync = ({
@@ -170,7 +171,9 @@ export const cardPlugin = ({
       }
       editorViewForPasteMenu = editorView;
       const breakoutEnabled = options.editorAppearance === 'full-page';
-      return /*#__PURE__*/React.createElement(React.Fragment, null, shouldRegisterPasteDisplayAsMenu && /*#__PURE__*/React.createElement(PasteMenuSmartCardClientSync, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, fg('platform_sl_3p_preauth_value_modal_killswitch') ? /*#__PURE__*/React.createElement(PreAuthValuePropositionModalListener, {
+        cardPluginEvents: cardPluginEvents
+      }) : null, shouldRegisterPasteDisplayAsMenu && /*#__PURE__*/React.createElement(PasteMenuSmartCardClientSync, {
         clientRef: pasteMenuSmartCardClientRef
       }), /*#__PURE__*/React.createElement(EditorSmartCardEvents, {
         editorView: editorView
@@ -283,9 +286,7 @@ export const cardPlugin = ({
             categories: ['external-content', 'development'],
             keywords: ['jira'],
             featured: true,
-            ...(fg('jim-lower-ranking-in-jira-macro-search') && {
-              priority: 500
-            }),
+            priority: 500,
             icon: () => /*#__PURE__*/React.createElement(IconDatasourceJiraIssue, null),
             action(insert) {
               const tr = insert(undefined);

package/dist/es2019/ui/PreAuthValuePropositionModal.js

@@ -0,0 +1,34 @@
+import React, { lazy, Suspense, useCallback, useEffect, useState } from 'react';
+import { EVENT, EVENT_SUBJECT } from './analytics/types';
+import { appearanceForLink, getUrl } from './analytics/utils';
+const PreAuthValuePropositionModal = /*#__PURE__*/lazy(() => import( /* webpackChunkName: "@atlaskit-internal_smart-card-pre-auth-value-proposition-modal" */'@atlaskit/smart-card/pre-auth-value-proposition-modal').then(module => ({
+  default: module.PreAuthValuePropositionModal
+})));
+const getNewSmartLinkUrl = event => {
+  if (event.subject !== EVENT_SUBJECT.LINK || event.data.isUndo || event.data.isRedo || appearanceForLink(event.data.node) === 'url') {
+    return;
+  }
+  if (event.event === EVENT.CREATED || event.event === EVENT.UPDATED && event.data.previousDisplay === 'url') {
+    return getUrl(event.data.node);
+  }
+};
+const ModalListener = ({
+  cardPluginEvents
+}) => {
+  const [url, setUrl] = useState();
+  useEffect(() => cardPluginEvents.subscribe(event => {
+    const newSmartLinkUrl = getNewSmartLinkUrl(event);
+    if (newSmartLinkUrl) {
+      setUrl(currentUrl => currentUrl !== null && currentUrl !== void 0 ? currentUrl : newSmartLinkUrl);
+    }
+  }), [cardPluginEvents]);
+  const onFinished = useCallback(() => setUrl(undefined), []);
+  return url ? /*#__PURE__*/React.createElement(Suspense, {
+    fallback: null
+  }, /*#__PURE__*/React.createElement(PreAuthValuePropositionModal, {
+    key: url,
+    url: url,
+    onFinished: onFinished
+  })) : null;
+};
+export const PreAuthValuePropositionModalListener = /*#__PURE__*/React.memo(ModalListener);

package/dist/esm/cardPlugin.js

@@ -31,6 +31,7 @@ import { EditorSmartCardEvents } from './ui/EditorSmartCardEvents';
 // eslint-disable-next-line import/no-named-as-default
 import LayoutButton from './ui/LayoutButton';
 import { getPasteDisplayAsMenuComponents } from './ui/PasteDisplayAsMenu';
+import { PreAuthValuePropositionModalListener } from './ui/PreAuthValuePropositionModal';
 import { getCardQuickInsertComponents } from './ui/quick-insert/getCardQuickInsertComponents';
 import { floatingToolbar, getEndingToolbarItems, getStartingToolbarItems } from './ui/toolbar';
 var PasteMenuSmartCardClientSync = function PasteMenuSmartCardClientSync(_ref) {
@@ -167,7 +168,9 @@ export var cardPlugin = function cardPlugin(_ref2) {
       }
       editorViewForPasteMenu = editorView;
       var breakoutEnabled = options.editorAppearance === 'full-page';
-      return /*#__PURE__*/React.createElement(React.Fragment, null, shouldRegisterPasteDisplayAsMenu && /*#__PURE__*/React.createElement(PasteMenuSmartCardClientSync, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, fg('platform_sl_3p_preauth_value_modal_killswitch') ? /*#__PURE__*/React.createElement(PreAuthValuePropositionModalListener, {
+        cardPluginEvents: cardPluginEvents
+      }) : null, shouldRegisterPasteDisplayAsMenu && /*#__PURE__*/React.createElement(PasteMenuSmartCardClientSync, {
         clientRef: pasteMenuSmartCardClientRef
       }), /*#__PURE__*/React.createElement(EditorSmartCardEvents, {
         editorView: editorView
@@ -333,17 +336,15 @@ export var cardPlugin = function cardPlugin(_ref2) {
         if (!options.allowDatasource) {
           return quickInsertArray;
         }
-        quickInsertArray.push(_objectSpread(_objectSpread({
+        quickInsertArray.push({
           id: 'datasource',
           title: formatMessage(fg('confluence-issue-terminology-refresh') ? messages.datasourceJiraIssueIssueTermRefresh : messages.datasourceJiraIssue),
           description: formatMessage(fg('confluence-issue-terminology-refresh') ? messages.datasourceJiraIssueDescriptionIssueTermRefresh : messages.datasourceJiraIssueDescription),
           isDisabledOffline: true,
           categories: ['external-content', 'development'],
           keywords: ['jira'],
-          featured: true
-        }, fg('jim-lower-ranking-in-jira-macro-search') && {
-          priority: 500
-        }), {}, {
+          featured: true,
+          priority: 500,
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconDatasourceJiraIssue, null);
           },
@@ -352,7 +353,7 @@ export var cardPlugin = function cardPlugin(_ref2) {
             showDatasourceModal('jira')(tr);
             return tr;
           }
-        }));
+        });
         if (canRenderDatasource(ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
           quickInsertArray.push({
             id: 'datasource',

package/dist/esm/ui/PreAuthValuePropositionModal.js

@@ -0,0 +1,47 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { lazy, Suspense, useCallback, useEffect, useState } from 'react';
+import { EVENT, EVENT_SUBJECT } from './analytics/types';
+import { appearanceForLink, getUrl } from './analytics/utils';
+var PreAuthValuePropositionModal = /*#__PURE__*/lazy(function () {
+  return import( /* webpackChunkName: "@atlaskit-internal_smart-card-pre-auth-value-proposition-modal" */'@atlaskit/smart-card/pre-auth-value-proposition-modal').then(function (module) {
+    return {
+      default: module.PreAuthValuePropositionModal
+    };
+  });
+});
+var getNewSmartLinkUrl = function getNewSmartLinkUrl(event) {
+  if (event.subject !== EVENT_SUBJECT.LINK || event.data.isUndo || event.data.isRedo || appearanceForLink(event.data.node) === 'url') {
+    return;
+  }
+  if (event.event === EVENT.CREATED || event.event === EVENT.UPDATED && event.data.previousDisplay === 'url') {
+    return getUrl(event.data.node);
+  }
+};
+var ModalListener = function ModalListener(_ref) {
+  var cardPluginEvents = _ref.cardPluginEvents;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    url = _useState2[0],
+    setUrl = _useState2[1];
+  useEffect(function () {
+    return cardPluginEvents.subscribe(function (event) {
+      var newSmartLinkUrl = getNewSmartLinkUrl(event);
+      if (newSmartLinkUrl) {
+        setUrl(function (currentUrl) {
+          return currentUrl !== null && currentUrl !== void 0 ? currentUrl : newSmartLinkUrl;
+        });
+      }
+    });
+  }, [cardPluginEvents]);
+  var onFinished = useCallback(function () {
+    return setUrl(undefined);
+  }, []);
+  return url ? /*#__PURE__*/React.createElement(Suspense, {
+    fallback: null
+  }, /*#__PURE__*/React.createElement(PreAuthValuePropositionModal, {
+    key: url,
+    url: url,
+    onFinished: onFinished
+  })) : null;
+};
+export var PreAuthValuePropositionModalListener = /*#__PURE__*/React.memo(ModalListener);

package/dist/types/ui/PreAuthValuePropositionModal.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { EditorCardPluginEvents } from './analytics/create-events-queue';
+import type { CardPluginEvent } from './analytics/types';
+type PreAuthValuePropositionModalListenerProps = {
+    cardPluginEvents: EditorCardPluginEvents<CardPluginEvent>;
+};
+export declare const PreAuthValuePropositionModalListener: React.MemoExoticComponent<(props: PreAuthValuePropositionModalListenerProps) => React.JSX.Element | null>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "25.0.4",
+	"version": "25.0.5",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/custom-steps": "^1.1.0",
 		"@atlaskit/editor-card-provider": "^7.3.0",
 		"@atlaskit/editor-plugin-analytics": "^19.0.0",
-		"@atlaskit/editor-plugin-annotation": "^19.0.0",
+		"@atlaskit/editor-plugin-annotation": "^19.1.0",
 		"@atlaskit/editor-plugin-base": "^20.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^19.0.0",
 		"@atlaskit/editor-plugin-decorations": "^19.0.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/link": "^5.1.0",
 		"@atlaskit/link-analytics": "^12.4.0",
 		"@atlaskit/link-client-extension": "^7.3.0",
-		"@atlaskit/link-datasource": "^6.13.0",
+		"@atlaskit/link-datasource": "^6.14.0",
 		"@atlaskit/link-extractors": "^4.2.0",
 		"@atlaskit/linking-common": "^12.3.0",
 		"@atlaskit/linking-types": "^15.3.0",
@@ -62,9 +62,9 @@
 		"@atlaskit/platform-feature-flags-react": "^1.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/prosemirror-history": "^1.2.0",
-		"@atlaskit/smart-card": "^45.25.0",
+		"@atlaskit/smart-card": "^45.28.0",
 		"@atlaskit/tmp-editor-statsig": "^202.0.0",
-		"@atlaskit/tokens": "^18.2.0",
+		"@atlaskit/tokens": "^18.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -73,7 +73,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.5.0",
+		"@atlaskit/editor-common": "^123.7.0",
 		"@atlaskit/link-provider": "^5.7.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -95,10 +95,10 @@
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		},
-		"platform_lp_sllv_table_settings_menu": {
+		"platform_sl_3p_preauth_value_modal_killswitch": {
 			"type": "boolean"
 		},
-		"jim-lower-ranking-in-jira-macro-search": {
+		"platform_lp_sllv_table_settings_menu": {
 			"type": "boolean"
 		}
 	},