@atlaskit/editor-plugin-card 1.10.3 → 1.11.1

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

@@ -7,50 +7,61 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useCallback } from 'react';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, CONFLUENCE_SEARCH_DATASOURCE_ID, ConfluenceSearchConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hideDatasourceModal } from '../../pm-plugins/actions';
 import { insertDatasource, updateCardViaDatasource } from '../../pm-plugins/doc';
 import { useFetchDatasourceInfo } from '../useFetchDatasourceInfo';
 export var DatasourceModal = function DatasourceModal(_ref) {
-  var _existingNode, _existingNode2, _existingNode3;
+  var _existingNode$attrs, _existingNode$attrs2;
   var view = _ref.view,
-    modalType = _ref.modalType,
-    cardContext = _ref.cardContext;
+    cardContext = _ref.cardContext,
+    defaultDatasourceId = _ref.datasourceId,
+    Component = _ref.componentType;
+  var state = view.state;
+  var existingNode = getExistingNode(state);
   var dispatch = view.dispatch,
-    state = view.state;
-  var selection = state.selection;
-  var existingNode;
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    // Check if the selection contains a link mark
-    var $pos = state.doc.resolve(selection.from);
-    var isLinkMark = $pos.marks().some(function (mark) {
-      return mark.type === state.schema.marks.link;
-    });
-
-    // When selection is a TextNode and a link Mark is present return that node
-    if (selection instanceof NodeSelection) {
-      existingNode = selection.node;
-    } else if (isLinkMark) {
-      var _state$doc$nodeAt;
-      existingNode = (_state$doc$nodeAt = state.doc.nodeAt(selection.from)) !== null && _state$doc$nodeAt !== void 0 ? _state$doc$nodeAt : undefined;
-    }
-  } else {
-    existingNode = selection instanceof NodeSelection ? selection.node : undefined;
-  }
-  var isRegularCardNode = !!(existingNode && !((_existingNode = existingNode) !== null && _existingNode !== void 0 && (_existingNode = _existingNode.attrs) !== null && _existingNode !== void 0 && _existingNode.datasource));
+    transaction = view.state.tr;
+  var onClose = useCallback(function () {
+    dispatch(hideDatasourceModal(transaction));
+  }, [dispatch, transaction]);
+  var onInsert = useOnInsert(view, existingNode);
+  var isRegularCardNode = !!(existingNode && !(existingNode !== null && existingNode !== void 0 && (_existingNode$attrs = existingNode.attrs) !== null && _existingNode$attrs !== void 0 && _existingNode$attrs.datasource));
+  var _ref2 = (existingNode === null || existingNode === void 0 || (_existingNode$attrs2 = existingNode.attrs) === null || _existingNode$attrs2 === void 0 ? void 0 : _existingNode$attrs2.datasource) || {},
+    _ref2$id = _ref2.id,
+    datasourceId = _ref2$id === void 0 ? defaultDatasourceId : _ref2$id,
+    _ref2$views = _ref2.views,
+    views = _ref2$views === void 0 ? [] : _ref2$views,
+    nodeParameters = _ref2.parameters;
+  var _resolveColumnsConfig = resolveColumnsConfig(views),
+    visibleColumnKeys = _resolveColumnsConfig.visibleColumnKeys,
+    wrappedColumnKeys = _resolveColumnsConfig.wrappedColumnKeys,
+    columnCustomSizes = _resolveColumnsConfig.columnCustomSizes;
   var _useFetchDatasourceIn = useFetchDatasourceInfo({
       isRegularCardNode: isRegularCardNode,
-      url: (_existingNode2 = existingNode) === null || _existingNode2 === void 0 ? void 0 : _existingNode2.attrs.url,
+      url: existingNode === null || existingNode === void 0 ? void 0 : existingNode.attrs.url,
       cardContext: cardContext,
-      nodeParameters: (_existingNode3 = existingNode) === null || _existingNode3 === void 0 || (_existingNode3 = _existingNode3.attrs) === null || _existingNode3 === void 0 || (_existingNode3 = _existingNode3.datasource) === null || _existingNode3 === void 0 ? void 0 : _existingNode3.parameters
+      nodeParameters: nodeParameters
     }),
     parameters = _useFetchDatasourceIn.parameters,
     ready = _useFetchDatasourceIn.ready;
-  var onClose = useCallback(function () {
-    dispatch(hideDatasourceModal(view.state.tr));
-  }, [dispatch, view.state.tr]);
-  var onInsert = useCallback(function (newAdf, analyticEvent) {
+  if (!ready) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Component, {
+    datasourceId: datasourceId,
+    viewMode: isRegularCardNode ? 'inline' : 'table' // Want non-datasource cards to open in inline view since they are in table view
+    ,
+    parameters: parameters,
+    url: existingNode === null || existingNode === void 0 ? void 0 : existingNode.attrs.url,
+    visibleColumnKeys: visibleColumnKeys,
+    columnCustomSizes: columnCustomSizes,
+    wrappedColumnKeys: wrappedColumnKeys,
+    onCancel: onClose,
+    onInsert: onInsert
+  });
+};
+var useOnInsert = function useOnInsert(view, existingNode) {
+  return useCallback(function (newAdf, analyticEvent) {
     if (analyticEvent) {
       analyticEvent.update(function (payload) {
         return _objectSpread(_objectSpread({}, payload), {}, {
@@ -72,143 +83,63 @@ export var DatasourceModal = function DatasourceModal(_ref) {
       insertDatasource(view.state, newAdf, view, analyticEvent);
     }
   }, [existingNode, view]);
-  if (modalType === 'jira') {
-    var _existingNode4, _tableView$properties, _existingNode5;
-    if (!ready) {
-      return null;
-    }
-    var _ref2 = ((_existingNode4 = existingNode) === null || _existingNode4 === void 0 || (_existingNode4 = _existingNode4.attrs) === null || _existingNode4 === void 0 ? void 0 : _existingNode4.datasource) || {},
-      _ref2$id = _ref2.id,
-      datasourceId = _ref2$id === void 0 ? JIRA_LIST_OF_LINKS_DATASOURCE_ID : _ref2$id,
-      _ref2$views = _ref2.views,
-      views = _ref2$views === void 0 ? [] : _ref2$views;
-    var _ref3 = views,
-      _ref4 = _slicedToArray(_ref3, 1),
-      tableView = _ref4[0];
-    var visibleColumnKeys = [];
-    var wrappedColumnKeys = [];
-    var columnCustomSizes;
-    var columns = tableView === null || tableView === void 0 || (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns;
-    if (columns) {
-      columnCustomSizes = {};
-      var _iterator = _createForOfIteratorHelper(columns),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _step$value = _step.value,
-            _key = _step$value.key,
-            width = _step$value.width,
-            isWrapped = _step$value.isWrapped;
-          visibleColumnKeys.push(_key);
-          if (width) {
-            columnCustomSizes[_key] = width;
-          }
-          if (isWrapped) {
-            wrappedColumnKeys.push(_key);
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    }
-    return /*#__PURE__*/React.createElement("div", {
-      "data-testid": "jira-config-modal"
-    }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
-      datasourceId: datasourceId,
-      viewMode: isRegularCardNode ? 'inline' : 'table' // Want non-datasource cards to open in inline view since they are in table view
-      ,
-      visibleColumnKeys: visibleColumnKeys,
-      parameters: parameters,
-      url: (_existingNode5 = existingNode) === null || _existingNode5 === void 0 ? void 0 : _existingNode5.attrs.url,
-      columnCustomSizes: columnCustomSizes,
-      wrappedColumnKeys: wrappedColumnKeys,
-      onCancel: onClose,
-      onInsert: onInsert
-    }));
-  }
-  if (modalType === 'assets') {
-    var _existingNode6, _tableView$properties2;
-    var _ref5 = ((_existingNode6 = existingNode) === null || _existingNode6 === void 0 || (_existingNode6 = _existingNode6.attrs) === null || _existingNode6 === void 0 ? void 0 : _existingNode6.datasource) || {},
-      _ref5$id = _ref5.id,
-      _datasourceId = _ref5$id === void 0 ? ASSETS_LIST_OF_LINKS_DATASOURCE_ID : _ref5$id,
-      _parameters = _ref5.parameters,
-      _ref5$views = _ref5.views,
-      _views = _ref5$views === void 0 ? [] : _ref5$views;
-    var _ref6 = _views,
-      _ref7 = _slicedToArray(_ref6, 1),
-      _tableView = _ref7[0];
-    var _visibleColumnKeys = _tableView === null || _tableView === void 0 || (_tableView$properties2 = _tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.map(function (column) {
-      return column.key;
+};
+var getExistingNode = function getExistingNode(state) {
+  var selection = state.selection;
+  var existingNode;
+  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    // Check if the selection contains a link mark
+    var isLinkMark = state.doc.resolve(selection.from).marks().some(function (mark) {
+      return mark.type === state.schema.marks.link;
     });
-    return /*#__PURE__*/React.createElement("div", {
-      "data-testid": "assets-config-modal"
-    }, /*#__PURE__*/React.createElement(AssetsConfigModal, {
-      datasourceId: _datasourceId,
-      visibleColumnKeys: _visibleColumnKeys,
-      parameters: _parameters,
-      onCancel: onClose,
-      onInsert: onInsert
-    }));
-  }
 
-  // TODO: further refactor in https://product-fabric.atlassian.net/browse/EDM-9637
-  if (modalType === 'confluence-search') {
-    var _existingNode7, _tableView2$propertie, _existingNode8;
-    if (!ready) {
-      return null;
+    // When selection is a TextNode and a link Mark is present return that node
+    if (selection instanceof NodeSelection) {
+      existingNode = selection.node;
+    } else if (isLinkMark) {
+      var _state$doc$nodeAt;
+      existingNode = (_state$doc$nodeAt = state.doc.nodeAt(selection.from)) !== null && _state$doc$nodeAt !== void 0 ? _state$doc$nodeAt : undefined;
     }
-    var _ref8 = ((_existingNode7 = existingNode) === null || _existingNode7 === void 0 || (_existingNode7 = _existingNode7.attrs) === null || _existingNode7 === void 0 ? void 0 : _existingNode7.datasource) || {},
-      _ref8$id = _ref8.id,
-      _datasourceId2 = _ref8$id === void 0 ? CONFLUENCE_SEARCH_DATASOURCE_ID : _ref8$id,
-      _parameters2 = _ref8.parameters,
-      _ref8$views = _ref8.views,
-      _views2 = _ref8$views === void 0 ? [] : _ref8$views;
-    var _ref9 = _views2,
-      _ref10 = _slicedToArray(_ref9, 1),
-      _tableView2 = _ref10[0];
-    var _visibleColumnKeys2 = [];
-    var _wrappedColumnKeys = [];
-    var _columnCustomSizes;
-    var _columns = _tableView2 === null || _tableView2 === void 0 || (_tableView2$propertie = _tableView2.properties) === null || _tableView2$propertie === void 0 ? void 0 : _tableView2$propertie.columns;
-    if (_columns) {
-      _columnCustomSizes = {};
-      var _iterator2 = _createForOfIteratorHelper(_columns),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _step2$value = _step2.value,
-            _key2 = _step2$value.key,
-            _width = _step2$value.width,
-            _isWrapped = _step2$value.isWrapped;
-          _visibleColumnKeys2.push(_key2);
-          if (_width) {
-            _columnCustomSizes[_key2] = _width;
-          }
-          if (_isWrapped) {
-            _wrappedColumnKeys.push(_key2);
-          }
+  } else {
+    existingNode = selection instanceof NodeSelection ? selection.node : undefined;
+  }
+  return existingNode;
+};
+var resolveColumnsConfig = function resolveColumnsConfig(views) {
+  var _tableView$properties;
+  var _views = _slicedToArray(views, 1),
+    tableView = _views[0];
+  var visibleColumnKeys = [];
+  var wrappedColumnKeys = [];
+  var columnCustomSizes;
+  var columns = tableView === null || tableView === void 0 || (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns;
+  if (columns) {
+    columnCustomSizes = {};
+    var _iterator = _createForOfIteratorHelper(columns),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = _step.value,
+          _key = _step$value.key,
+          width = _step$value.width,
+          isWrapped = _step$value.isWrapped;
+        visibleColumnKeys.push(_key);
+        if (width) {
+          columnCustomSizes[_key] = width;
+        }
+        if (isWrapped) {
+          wrappedColumnKeys.push(_key);
         }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
       }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
-    return /*#__PURE__*/React.createElement("div", {
-      "data-testid": "confluence-search-config-modal"
-    }, /*#__PURE__*/React.createElement(ConfluenceSearchConfigModal, {
-      datasourceId: _datasourceId2,
-      viewMode: isRegularCardNode ? 'inline' : 'table',
-      visibleColumnKeys: _visibleColumnKeys2,
-      parameters: _parameters2,
-      url: (_existingNode8 = existingNode) === null || _existingNode8 === void 0 ? void 0 : _existingNode8.attrs.url,
-      columnCustomSizes: _columnCustomSizes,
-      wrappedColumnKeys: _wrappedColumnKeys,
-      onCancel: onClose,
-      onInsert: onInsert
-    }));
   }
-  return null; // null for now until we have modal component that handles other datasources
+  return {
+    visibleColumnKeys: visibleColumnKeys,
+    wrappedColumnKeys: wrappedColumnKeys,
+    columnCustomSizes: columnCustomSizes
+  };
 };

package/dist/types/ui/DatasourceIcon/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import type { GlyphProps } from '@atlaskit/icon/types';
+export declare const DatasourceIcon: (props: GlyphProps) => JSX.Element;

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

@@ -1,9 +1,19 @@
-/// <reference types="react" />
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import React from 'react';
+import type { DatasourceModalType, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { ConfigModalProps } from '@atlaskit/link-datasource/src/common/types';
+import type { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common';
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import type { cardPlugin } from '../../plugin';
 declare const ModalWithState: ({ api, editorView, }: {
     api: ExtractInjectionAPI<typeof cardPlugin> | undefined;
     editorView: EditorView;
 }) => JSX.Element | null;
+export type ModalTypeToComponentMap = {
+    componentType: React.ComponentType<ConfigModalProps<InlineCardAdf | DatasourceAdf, DatasourceParameters>>;
+    datasourceId: string;
+};
+export declare const modalTypeToComponentMap: {
+    [key in DatasourceModalType]: ModalTypeToComponentMap;
+};
 export default ModalWithState;

package/dist/types/ui/DatasourceModal/index.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="react" />
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { DatasourceModalType } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CardContext } from '@atlaskit/smart-card';
+import type { ModalTypeToComponentMap } from './ModalWithState';
 type DatasourceModalProps = {
     view: EditorView;
     editorAnalyticsApi?: EditorAnalyticsAPI;
-    modalType?: DatasourceModalType;
     cardContext?: CardContext;
-};
-export declare const DatasourceModal: ({ view, modalType, cardContext, }: DatasourceModalProps) => JSX.Element | null;
+} & ModalTypeToComponentMap;
+export declare const DatasourceModal: ({ view, cardContext, datasourceId: defaultDatasourceId, componentType: Component, }: DatasourceModalProps) => JSX.Element | null;
 export {};

package/dist/types-ts4.5/ui/DatasourceIcon/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import type { GlyphProps } from '@atlaskit/icon/types';
+export declare const DatasourceIcon: (props: GlyphProps) => JSX.Element;

package/dist/types-ts4.5/ui/DatasourceModal/ModalWithState.d.ts

@@ -1,9 +1,19 @@
-/// <reference types="react" />
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import React from 'react';
+import type { DatasourceModalType, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { ConfigModalProps } from '@atlaskit/link-datasource/src/common/types';
+import type { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common';
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import type { cardPlugin } from '../../plugin';
 declare const ModalWithState: ({ api, editorView, }: {
     api: ExtractInjectionAPI<typeof cardPlugin> | undefined;
     editorView: EditorView;
 }) => JSX.Element | null;
+export type ModalTypeToComponentMap = {
+    componentType: React.ComponentType<ConfigModalProps<InlineCardAdf | DatasourceAdf, DatasourceParameters>>;
+    datasourceId: string;
+};
+export declare const modalTypeToComponentMap: {
+    [key in DatasourceModalType]: ModalTypeToComponentMap;
+};
 export default ModalWithState;

package/dist/types-ts4.5/ui/DatasourceModal/index.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="react" />
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { DatasourceModalType } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CardContext } from '@atlaskit/smart-card';
+import type { ModalTypeToComponentMap } from './ModalWithState';
 type DatasourceModalProps = {
     view: EditorView;
     editorAnalyticsApi?: EditorAnalyticsAPI;
-    modalType?: DatasourceModalType;
     cardContext?: CardContext;
-};
-export declare const DatasourceModal: ({ view, modalType, cardContext, }: DatasourceModalProps) => JSX.Element | null;
+} & ModalTypeToComponentMap;
+export declare const DatasourceModal: ({ view, cardContext, datasourceId: defaultDatasourceId, componentType: Component, }: DatasourceModalProps) => JSX.Element | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.10.3",
+  "version": "1.11.1",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "@atlaskit/adf-schema": "^35.12.2",
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/custom-steps": "^0.1.0",
-    "@atlaskit/editor-common": "^79.1.0",
+    "@atlaskit/editor-common": "^79.2.0",
     "@atlaskit/editor-plugin-analytics": "^1.1.0",
     "@atlaskit/editor-plugin-decorations": "^1.1.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
@@ -50,12 +50,12 @@
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/link-analytics": "^8.3.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/link-datasource": "^2.0.0",
+    "@atlaskit/link-datasource": "^2.1.0",
     "@atlaskit/linking-common": "^5.6.0",
     "@atlaskit/linking-types": "^8.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/primitives": "^6.1.0",
-    "@atlaskit/smart-card": "^26.60.0",
+    "@atlaskit/smart-card": "^26.62.0",
     "@atlaskit/theme": "^12.7.0",
     "@atlaskit/tokens": "^1.45.0",
     "@babel/runtime": "^7.0.0",