@atlaskit/editor-core 185.15.4 → 185.16.0

package/dist/es2019/plugins/card/toolbar.js

@@ -11,7 +11,7 @@ import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
 import { richMediaClassName } from '@atlaskit/editor-common/styles';
-import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig, openDatasourceModal } from './ui/EditLinkToolbar';
+import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
 import { displayInfoForCard, findCardInfo, titleUrlPairFromNode, appearanceForNodeType } from './utils';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
@@ -165,7 +165,7 @@ const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB
 });
 const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2, _node$attrs2$datasour;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -192,7 +192,7 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
   const isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
   const shouldRenderDatasourceToolbar = isDatasource &&
   // not showing toolbar in mobile for now since not sure what our plans are for it
-  platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
+  platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$datasour = _node$attrs2.datasource) === null || _node$attrs2$datasour === void 0 ? void 0 : _node$attrs2$datasour.id);
 
   /* mobile builds toolbar natively using toolbarItems */
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -203,12 +203,6 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       featureFlags,
       pluginInjectionApi
     })];
-  } else if (pluginState !== null && pluginState !== void 0 && pluginState.showDatasourceModal) {
-    return [openDatasourceModal({
-      state,
-      node,
-      editorAnalyticsApi
-    })];
   } else if (shouldRenderDatasourceToolbar) {
     return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
   } else {
@@ -334,7 +328,7 @@ const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, nod
     metadata: metadata,
     className: 'datasource-edit',
     title: intl.formatMessage(linkToolbarMessages.editDatasource),
-    onClick: editDatasource(editorAnalyticsApi)
+    onClick: editDatasource(node, editorAnalyticsApi)
   }];
   if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({

package/dist/es2019/plugins/card/ui/DatasourceModal/ModalWithState.js

@@ -0,0 +1,19 @@
+import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { DatasourceModal } from './index';
+const ModalWithState = ({
+  api,
+  editorView
+}) => {
+  const {
+    cardState
+  } = useSharedPluginState(api, ['card']);
+  if (!(cardState !== null && cardState !== void 0 && cardState.showDatasourceModal)) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(DatasourceModal, {
+    view: editorView,
+    modalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
+  });
+};
+export default ModalWithState;

package/dist/es2019/plugins/card/ui/DatasourceModal/index.js

@@ -0,0 +1,48 @@
+import React, { useCallback } from 'react';
+import { JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { hideDatasourceModal } from '../../pm-plugins/actions';
+import { updateExistingDatasource, insertDatasource } from '../../pm-plugins/doc';
+import { NodeSelection } from 'prosemirror-state';
+export const DatasourceModal = ({
+  view,
+  modalType
+}) => {
+  const {
+    dispatch,
+    state
+  } = view;
+  const {
+    selection
+  } = state;
+  const existingNode = selection instanceof NodeSelection ? selection.node : undefined;
+  const onClose = useCallback(() => {
+    dispatch(hideDatasourceModal(state.tr));
+  }, [dispatch, state.tr]);
+  const onInsert = useCallback(newAdf => {
+    if (existingNode) {
+      updateExistingDatasource(state, existingNode, newAdf, view);
+    } else {
+      insertDatasource(state, newAdf, view);
+    }
+  }, [existingNode, state, view]);
+  if (modalType === 'jira') {
+    var _existingNode$attrs, _tableView$properties;
+    const {
+      id: datasourceId = JIRA_LIST_OF_LINKS_DATASOURCE_ID,
+      parameters,
+      views = []
+    } = (existingNode === null || existingNode === void 0 ? void 0 : (_existingNode$attrs = existingNode.attrs) === null || _existingNode$attrs === void 0 ? void 0 : _existingNode$attrs.datasource) || {};
+    const [tableView] = views;
+    const visibleColumnKeys = tableView === null || tableView === void 0 ? void 0 : (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns.map(column => column.key);
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "jira-config-modal"
+    }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
+      datasourceId: datasourceId,
+      visibleColumnKeys: visibleColumnKeys,
+      parameters: parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
+  return null; // null for now until we have modal component that handles other datasources
+};

package/dist/es2019/plugins/card/ui/EditLinkToolbar.js

@@ -10,8 +10,8 @@ import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
-import { DatasourceModal } from './DatasourceModal';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 const HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkAddToolbarWithState);
 export function HyperlinkAddToolbarWithState({
   linkPickerOptions = {},
@@ -202,12 +202,14 @@ export const editLinkToolbarConfig = (showLinkingToolbar, lpLinkPicker) => {
     forcePlacement: true
   } : {};
 };
-export const editDatasource = editorAnalyticsApi => (state, dispatch) => {
-  if (dispatch) {
+export const editDatasource = (node, editorAnalyticsApi) => (state, dispatch) => {
+  var _node$attrs;
+  const modalType = ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource.id) === JIRA_LIST_OF_LINKS_DATASOURCE_ID ? 'jira' : undefined;
+  if (dispatch && modalType) {
     const {
       tr
     } = state;
-    showDatasourceModal(tr);
+    showDatasourceModal(modalType)(tr);
     // editorAnalyticsApi?.attachAnalyticsEvent(
     //   buildEditLinkPayload(
     //     type as
@@ -220,26 +222,4 @@ export const editDatasource = editorAnalyticsApi => (state, dispatch) => {
     return true;
   }
   return false;
-};
-export const openDatasourceModal = ({
-  state,
-  node,
-  editorAnalyticsApi
-}) => {
-  return {
-    type: 'custom',
-    disableArrowNavigation: true,
-    fallback: [],
-    render: view => {
-      if (!view) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(DatasourceModal, {
-        state: state,
-        view: view,
-        node: node,
-        editorAnalyticsApi: editorAnalyticsApi
-      });
-    }
-  };
 };

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.15.4";
+export const version = "185.16.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.15.4",
+	"version": "185.16.0",
 	"sideEffects": false
 }

package/dist/esm/plugins/card/index.js

@@ -13,6 +13,12 @@ import { EditorSmartCardEventsNext } from './ui/EditorSmartCardEventsNext';
 import LayoutButton from './ui/LayoutButton';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { mountHyperlinkPlugin } from './pm-plugins/mountHyperlink';
+import { showDatasourceModal } from './pm-plugins/actions';
+import DatasourceModalWithState from './ui/DatasourceModal/ModalWithState';
+import { messages } from './messages';
+import { IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
+import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 var cardPlugin = function cardPlugin(options, api) {
   var _api$dependencies, _api$dependencies$fea;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
@@ -87,6 +93,9 @@ var cardPlugin = function cardPlugin(options, api) {
         mountPoint: popupsMountPoint,
         scrollableElement: popupsScrollableElement,
         boundariesElement: popupsBoundariesElement
+      }), /*#__PURE__*/React.createElement(DatasourceModalWithState, {
+        api: api,
+        editorView: editorView
       }));
     },
     actions: {
@@ -96,7 +105,27 @@ var cardPlugin = function cardPlugin(options, api) {
       setSelectedCardAppearance: setSelectedCardAppearance
     },
     pluginsOptions: {
-      floatingToolbar: floatingToolbar(options, featureFlags, options.platform, options.linkPicker, api)
+      floatingToolbar: floatingToolbar(options, featureFlags, options.platform, options.linkPicker, api),
+      quickInsert: function quickInsert(_ref3) {
+        var formatMessage = _ref3.formatMessage;
+        if (canRenderDatasource(JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
+          return [{
+            id: 'datasource',
+            title: formatMessage(messages.datasourceJiraIssue),
+            description: formatMessage(messages.datasourceJiraIssueDescription),
+            keywords: ['jira'],
+            icon: function icon() {
+              return /*#__PURE__*/React.createElement(IconDatasourceJiraIssue, null);
+            },
+            action: function action(insert) {
+              var tr = insert(undefined);
+              showDatasourceModal('jira')(tr);
+              return tr;
+            }
+          }];
+        }
+        return [];
+      }
     }
   };
 };

package/dist/esm/plugins/card/messages.js

@@ -0,0 +1,13 @@
+import { defineMessages } from 'react-intl-next';
+export var messages = defineMessages({
+  datasourceJiraIssue: {
+    id: 'fabric.editor.datasource.jiraIssue',
+    defaultMessage: 'Jira Issues',
+    description: 'Insert a jira datasource table'
+  },
+  datasourceJiraIssueDescription: {
+    id: 'fabric.editor.datasource.jiraIssue.description',
+    defaultMessage: 'Insert issues from Jira Cloud with enhanced search, filtering, and configuration',
+    description: 'Insert a jira datasource table'
+  }
+});

package/dist/esm/plugins/card/pm-plugins/actions.js

@@ -87,10 +87,13 @@ export var hideLinkToolbar = function hideLinkToolbar(tr) {
     type: 'HIDE_LINK_TOOLBAR'
   });
 };
-export var showDatasourceModal = function showDatasourceModal(tr) {
-  return cardAction(tr, {
-    type: 'SHOW_DATASOURCE_MODAL'
-  });
+export var showDatasourceModal = function showDatasourceModal(modalType) {
+  return function (tr) {
+    return cardAction(tr, {
+      type: 'SHOW_DATASOURCE_MODAL',
+      modalType: modalType
+    });
+  };
 };
 export var hideDatasourceModal = function hideDatasourceModal(tr) {
   return cardAction(tr, {

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -419,13 +419,17 @@ export var updateExistingDatasource = function updateExistingDatasource(state, n
 
   // datasource to datasource
   if (newAdf.type === 'blockCard' && newAdf.attrs.datasource && node.attrs.datasource) {
-    var _ref, _ref2, _newViews$, _newViews$$properties, _oldViews$, _oldViews$$properties, _newAdf$attrs, _node$attrs;
-    var newViews = (_ref = newAdf.attrs.datasource.views) !== null && _ref !== void 0 ? _ref : [];
-    var oldViews = (_ref2 = node.attrs.datasource.views) !== null && _ref2 !== void 0 ? _ref2 : [];
-    var newColumnKeys = (_newViews$ = newViews[0]) === null || _newViews$ === void 0 ? void 0 : (_newViews$$properties = _newViews$.properties) === null || _newViews$$properties === void 0 ? void 0 : _newViews$$properties.columns.map(function (column) {
+    var _ref3, _ref6, _newViews$properties, _oldViews$properties, _newAdf$attrs, _node$attrs;
+    var _ref = (_ref3 = newAdf.attrs.datasource.views) !== null && _ref3 !== void 0 ? _ref3 : [],
+      _ref2 = _slicedToArray(_ref, 1),
+      newViews = _ref2[0];
+    var _ref4 = (_ref6 = node.attrs.datasource.views) !== null && _ref6 !== void 0 ? _ref6 : [],
+      _ref5 = _slicedToArray(_ref4, 1),
+      oldViews = _ref5[0];
+    var newColumnKeys = newViews === null || newViews === void 0 ? void 0 : (_newViews$properties = newViews.properties) === null || _newViews$properties === void 0 ? void 0 : _newViews$properties.columns.map(function (column) {
       return column.key;
     });
-    var oldColumnKeys = (_oldViews$ = oldViews[0]) === null || _oldViews$ === void 0 ? void 0 : (_oldViews$$properties = _oldViews$.properties) === null || _oldViews$$properties === void 0 ? void 0 : _oldViews$$properties.columns.map(function (column) {
+    var oldColumnKeys = oldViews === null || oldViews === void 0 ? void 0 : (_oldViews$properties = oldViews.properties) === null || _oldViews$properties === void 0 ? void 0 : _oldViews$properties.columns.map(function (column) {
       return column.key;
     });
     var isColumnChange = !isEqual(oldColumnKeys, newColumnKeys);
@@ -439,4 +443,18 @@ export var updateExistingDatasource = function updateExistingDatasource(state, n
   }
   hideDatasourceModal(tr);
   view.dispatch(tr.scrollIntoView());
+};
+export var insertDatasource = function insertDatasource(state, adf, view) {
+  var tr = state.tr,
+    from = state.selection.from,
+    schemaNodes = state.schema.nodes;
+  var attrs = adf.attrs,
+    type = adf.type;
+  var schemaNode = type === 'inlineCard' ? schemaNodes.inlineCard : schemaNodes.blockCard;
+  var newNode = schemaNode.createChecked(attrs);
+  // in future, if we decide to do datasource insertion from the main toolbar, we should probably consider editor-plugin-content-insertion instead of tr.insert
+  // this will allow us to deal with insertions from multiple paths in a more consistent way
+  newNode && tr.insert(from, newNode);
+  hideDatasourceModal(tr);
+  view.dispatch(tr.scrollIntoView());
 };

package/dist/esm/plugins/card/pm-plugins/main.js

@@ -47,6 +47,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             smartLinkEventsNext: undefined,
             editorAppearance: editorAppearance,
             showDatasourceModal: false,
+            datasourceModalType: undefined,
             datasourceTableRef: undefined,
             layout: undefined
           };
@@ -158,8 +159,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var hasIntlContext = true;
             var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
             if (isDatasource) {
-              var _node$attrs4;
-              if (platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+              var _node$attrs4, _node$attrs4$datasour;
+              if (platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : (_node$attrs4$datasour = _node$attrs4.datasource) === null || _node$attrs4$datasour === void 0 ? void 0 : _node$attrs4$datasour.id)) {
                 return new Datasource({
                   node: node,
                   view: view,

package/dist/esm/plugins/card/pm-plugins/reducers.js

@@ -60,9 +60,16 @@ var setLinkToolbar = function setLinkToolbar(state, action) {
     showLinkingToolbar: action.type === 'SHOW_LINK_TOOLBAR'
   });
 };
-var setDatasourceModal = function setDatasourceModal(state, action) {
+var showDatasourceModal = function showDatasourceModal(state, action) {
   return _objectSpread(_objectSpread({}, state), {}, {
-    showDatasourceModal: action.type === 'SHOW_DATASOURCE_MODAL'
+    showDatasourceModal: true,
+    datasourceModalType: action.type === 'SHOW_DATASOURCE_MODAL' ? action.modalType : undefined
+  });
+};
+var hideDatasourceModal = function hideDatasourceModal(state) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    showDatasourceModal: false,
+    datasourceModalType: undefined
   });
 };
 export default (function (state, action) {
@@ -89,7 +96,8 @@ export default (function (state, action) {
     case 'HIDE_LINK_TOOLBAR':
       return setLinkToolbar(state, action);
     case 'SHOW_DATASOURCE_MODAL':
+      return showDatasourceModal(state, action);
     case 'HIDE_DATASOURCE_MODAL':
-      return setDatasourceModal(state, action);
+      return hideDatasourceModal(state);
   }
 });

package/dist/esm/plugins/card/toolbar.js

@@ -15,7 +15,7 @@ import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
 import { richMediaClassName } from '@atlaskit/editor-common/styles';
-import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig, openDatasourceModal } from './ui/EditLinkToolbar';
+import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
 import { displayInfoForCard, findCardInfo, titleUrlPairFromNode, appearanceForNodeType } from './utils';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
@@ -163,7 +163,7 @@ var withToolbarMetadata = function withToolbarMetadata(command) {
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2, _node$attrs2$datasour;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.analytics) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
@@ -186,7 +186,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     var isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
     var shouldRenderDatasourceToolbar = isDatasource &&
     // not showing toolbar in mobile for now since not sure what our plans are for it
-    platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
+    platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$datasour = _node$attrs2.datasource) === null || _node$attrs2$datasour === void 0 ? void 0 : _node$attrs2$datasour.id);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -197,12 +197,6 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         featureFlags: featureFlags,
         pluginInjectionApi: pluginInjectionApi
       })];
-    } else if (pluginState !== null && pluginState !== void 0 && pluginState.showDatasourceModal) {
-      return [openDatasourceModal({
-        state: state,
-        node: node,
-        editorAnalyticsApi: editorAnalyticsApi
-      })];
     } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
@@ -325,7 +319,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     metadata: metadata,
     className: 'datasource-edit',
     title: intl.formatMessage(linkToolbarMessages.editDatasource),
-    onClick: editDatasource(editorAnalyticsApi)
+    onClick: editDatasource(node, editorAnalyticsApi)
   }];
   if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({

package/dist/esm/plugins/card/ui/DatasourceModal/ModalWithState.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { DatasourceModal } from './index';
+var ModalWithState = function ModalWithState(_ref) {
+  var api = _ref.api,
+    editorView = _ref.editorView;
+  var _useSharedPluginState = useSharedPluginState(api, ['card']),
+    cardState = _useSharedPluginState.cardState;
+  if (!(cardState !== null && cardState !== void 0 && cardState.showDatasourceModal)) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(DatasourceModal, {
+    view: editorView,
+    modalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
+  });
+};
+export default ModalWithState;

package/dist/esm/plugins/card/ui/DatasourceModal/index.js

@@ -0,0 +1,49 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useCallback } from 'react';
+import { JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { hideDatasourceModal } from '../../pm-plugins/actions';
+import { updateExistingDatasource, insertDatasource } from '../../pm-plugins/doc';
+import { NodeSelection } from 'prosemirror-state';
+export var DatasourceModal = function DatasourceModal(_ref) {
+  var view = _ref.view,
+    modalType = _ref.modalType;
+  var dispatch = view.dispatch,
+    state = view.state;
+  var selection = state.selection;
+  var existingNode = selection instanceof NodeSelection ? selection.node : undefined;
+  var onClose = useCallback(function () {
+    dispatch(hideDatasourceModal(state.tr));
+  }, [dispatch, state.tr]);
+  var onInsert = useCallback(function (newAdf) {
+    if (existingNode) {
+      updateExistingDatasource(state, existingNode, newAdf, view);
+    } else {
+      insertDatasource(state, newAdf, view);
+    }
+  }, [existingNode, state, view]);
+  if (modalType === 'jira') {
+    var _existingNode$attrs, _tableView$properties;
+    var _ref2 = (existingNode === null || existingNode === void 0 ? void 0 : (_existingNode$attrs = existingNode.attrs) === null || _existingNode$attrs === void 0 ? void 0 : _existingNode$attrs.datasource) || {},
+      _ref2$id = _ref2.id,
+      datasourceId = _ref2$id === void 0 ? JIRA_LIST_OF_LINKS_DATASOURCE_ID : _ref2$id,
+      parameters = _ref2.parameters,
+      _ref2$views = _ref2.views,
+      views = _ref2$views === void 0 ? [] : _ref2$views;
+    var _ref3 = views,
+      _ref4 = _slicedToArray(_ref3, 1),
+      tableView = _ref4[0];
+    var visibleColumnKeys = tableView === null || tableView === void 0 ? void 0 : (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns.map(function (column) {
+      return column.key;
+    });
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "jira-config-modal"
+    }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
+      datasourceId: datasourceId,
+      visibleColumnKeys: visibleColumnKeys,
+      parameters: parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
+  return null; // null for now until we have modal component that handles other datasources
+};

package/dist/esm/plugins/card/ui/EditLinkToolbar.js

@@ -18,8 +18,8 @@ import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
-import { DatasourceModal } from './DatasourceModal';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkAddToolbarWithState);
 export function HyperlinkAddToolbarWithState(_ref) {
   var _ref$linkPickerOption = _ref.linkPickerOptions,
@@ -220,11 +220,13 @@ export var editLinkToolbarConfig = function editLinkToolbarConfig(showLinkingToo
     forcePlacement: true
   } : {};
 };
-export var editDatasource = function editDatasource(editorAnalyticsApi) {
+export var editDatasource = function editDatasource(node, editorAnalyticsApi) {
   return function (state, dispatch) {
-    if (dispatch) {
+    var _node$attrs;
+    var modalType = ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource.id) === JIRA_LIST_OF_LINKS_DATASOURCE_ID ? 'jira' : undefined;
+    if (dispatch && modalType) {
       var tr = state.tr;
-      showDatasourceModal(tr);
+      showDatasourceModal(modalType)(tr);
       // editorAnalyticsApi?.attachAnalyticsEvent(
       //   buildEditLinkPayload(
       //     type as
@@ -238,25 +240,4 @@ export var editDatasource = function editDatasource(editorAnalyticsApi) {
     }
     return false;
   };
-};
-export var openDatasourceModal = function openDatasourceModal(_ref3) {
-  var state = _ref3.state,
-    node = _ref3.node,
-    editorAnalyticsApi = _ref3.editorAnalyticsApi;
-  return {
-    type: 'custom',
-    disableArrowNavigation: true,
-    fallback: [],
-    render: function render(view) {
-      if (!view) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(DatasourceModal, {
-        state: state,
-        view: view,
-        node: node,
-        editorAnalyticsApi: editorAnalyticsApi
-      });
-    }
-  };
 };

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.15.4";
+export var version = "185.16.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.15.4",
+	"version": "185.16.0",
 	"sideEffects": false
 }

package/dist/types/plugins/card/messages.d.ts

@@ -0,0 +1,12 @@
+export declare const messages: {
+    datasourceJiraIssue: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    datasourceJiraIssueDescription: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+};

package/dist/types/plugins/card/pm-plugins/actions.d.ts

@@ -3,6 +3,7 @@ import { CardProvider } from '@atlaskit/editor-common/provider-factory';
 import { CardPluginAction, Request, CardInfo, SmartLinkEventsNext } from '../types';
 import { SmartLinkEvents } from '@atlaskit/smart-card';
 import { DatasourceTableLayout } from '../ui/LayoutButton/types';
+import { DatasourceModalType } from '@atlaskit/editor-common/types';
 export declare const cardAction: (tr: Transaction, action: CardPluginAction) => Transaction;
 export declare const resolveCard: (url: string) => (tr: Transaction) => Transaction;
 export declare const queueCards: (requests: Request[]) => (tr: Transaction) => Transaction;
@@ -18,5 +19,5 @@ export declare const setCardLayoutAndDatasourceTableRef: ({ layout, datasourceTa
 }) => (tr: Transaction) => Transaction;
 export declare const showLinkToolbar: (tr: Transaction) => Transaction;
 export declare const hideLinkToolbar: (tr: Transaction) => Transaction;
-export declare const showDatasourceModal: (tr: Transaction) => Transaction;
+export declare const showDatasourceModal: (modalType: DatasourceModalType) => (tr: Transaction) => Transaction;
 export declare const hideDatasourceModal: (tr: Transaction) => Transaction;

package/dist/types/plugins/card/pm-plugins/doc.d.ts

@@ -20,3 +20,4 @@ export declare const updateCard: (href: string, sourceEvent?: UIAnalyticsEvent |
 export declare const changeSelectedCardToText: (text: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const setSelectedCardAppearance: (appearance: CardAppearance, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
 export declare const updateExistingDatasource: (state: EditorState, node: Node, newAdf: DatasourceAdf | InlineCardAdf, view: EditorView) => void;
+export declare const insertDatasource: (state: EditorState, adf: DatasourceAdf | InlineCardAdf, view: EditorView) => void;

package/dist/types/plugins/card/pm-plugins/util/state.d.ts

@@ -24,6 +24,7 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
     smartLinkEventsNext?: import("../../types").SmartLinkEventsNext | undefined;
     editorAppearance?: import("@atlaskit/editor-common/types").EditorAppearance | undefined;
     showDatasourceModal: boolean;
+    datasourceModalType?: "jira" | undefined;
     datasourceTableRef?: HTMLElement | undefined;
     layout?: import("../../ui/LayoutButton/types").DatasourceTableLayout | undefined;
 };

package/dist/types/plugins/card/types.d.ts

@@ -6,6 +6,7 @@ import type { CardOptions, CardReplacementInputMethod } from '@atlaskit/editor-c
 import type { EditorAppearance } from '@atlaskit/editor-common/types';
 import { LinkPickerOptions } from '@atlaskit/editor-common/types';
 import { DatasourceTableLayout } from './ui/LayoutButton/types';
+import { DatasourceModalType } from '@atlaskit/editor-common/types';
 export type CardInfo = {
     title?: string;
     url?: string;
@@ -101,6 +102,7 @@ export type CardPluginState = {
     smartLinkEventsNext?: SmartLinkEventsNext;
     editorAppearance?: EditorAppearance;
     showDatasourceModal: boolean;
+    datasourceModalType?: DatasourceModalType;
     datasourceTableRef?: HTMLElement;
     layout?: DatasourceTableLayout;
 };
@@ -134,6 +136,7 @@ export type HideLinkToolbar = {
 };
 export type ShowDatasourceModal = {
     type: 'SHOW_DATASOURCE_MODAL';
+    modalType: DatasourceModalType;
 };
 export type HideDatasourceModal = {
     type: 'HIDE_DATASOURCE_MODAL';

package/dist/types/plugins/card/ui/DatasourceModal/ModalWithState.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import { EditorView } from 'prosemirror-view';
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type cardPlugin from '../../index';
+declare const ModalWithState: ({ api, editorView, }: {
+    api: ExtractInjectionAPI<typeof cardPlugin> | undefined;
+    editorView: EditorView;
+}) => JSX.Element | null;
+export default ModalWithState;