@atlaskit/editor-plugin-card 1.4.3 → 1.4.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-card
 
+## 1.4.4
+
+### Patch Changes
+
+- [#88295](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88295) [`6b703183b847`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b703183b847) - [ux] Remove (Beta) from the /Assets and + Assets elements description for GA
+- [#88531](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88531) [`2362c633e4e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2362c633e4e9) - Adds confluence-search modal integration
+- Updated dependencies
+
 ## 1.4.3
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -12,6 +12,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
 var _linkDatasource = require("@atlaskit/link-datasource");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _createEventsQueue = require("./analytics/create-events-queue");
 var _actions = require("./pm-plugins/actions");
 var _doc = require("./pm-plugins/doc");
@@ -150,7 +151,7 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
         if ((0, _utils.canRenderDatasource)(_linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
           quickInsertArray.push({
             id: 'datasource',
-            title: formatMessage(_messages.cardMessages.datasourceAssetsObjects),
+            title: (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_objects_remove_beta') ? formatMessage(_messages.cardMessages.datasourceAssetsObjectsGeneralAvailability) : formatMessage(_messages.cardMessages.datasourceAssetsObjects),
             description: formatMessage(_messages.cardMessages.datasourceAssetsObjectsDescription),
             categories: ['external-content', 'development'],
             keywords: ['assets'],

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

@@ -162,5 +162,61 @@ var DatasourceModal = exports.DatasourceModal = function DatasourceModal(_ref) {
       onInsert: onInsert
     }));
   }
+  if (modalType === 'confluence-search') {
+    var _existingNode7, _tableView2$propertie, _existingNode8;
+    if (!ready) {
+      return null;
+    }
+    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 ? _linkDatasource.CONFLUENCE_SEARCH_DATASOURCE_ID : _ref8$id,
+      _parameters2 = _ref8.parameters,
+      _ref8$views = _ref8.views,
+      _views2 = _ref8$views === void 0 ? [] : _ref8$views;
+    var _ref9 = _views2,
+      _ref10 = (0, _slicedToArray2.default)(_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);
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+    return /*#__PURE__*/_react.default.createElement("div", {
+      "data-testid": "confluence-search-config-modal"
+    }, /*#__PURE__*/_react.default.createElement(_linkDatasource.ConfluenceSearchConfigModal, {
+      datasourceId: _datasourceId2,
+      viewMode: 'issue',
+      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
 };

package/dist/cjs/utils.js

@@ -8,6 +8,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _resolvedAttributes = require("@atlaskit/link-analytics/resolved-attributes");
 var _linkDatasource = require("@atlaskit/link-datasource");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var appearanceForNodeType = exports.appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -79,5 +80,8 @@ var getResolvedAttributesFromStore = exports.getResolvedAttributesFromStore = fu
 };
 var isDatasourceConfigEditable = exports.isDatasourceConfigEditable = function isDatasourceConfigEditable(datasourceId) {
   var datasourcesWithConfigModal = [_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID, _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-confluence-search-modal')) {
+    datasourcesWithConfigModal.push(_linkDatasource.CONFLUENCE_SEARCH_DATASOURCE_ID);
+  }
   return datasourcesWithConfigModal.includes(datasourceId);
 };

package/dist/es2019/plugin.js

@@ -4,6 +4,7 @@ import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconDatasourceAssetsObjects, IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { createEventsQueue } from './analytics/create-events-queue';
 import { hideLinkToolbar, showDatasourceModal } from './pm-plugins/actions';
 import { changeSelectedCardToLink, queueCardsFromChangedTr, setSelectedCardAppearance } from './pm-plugins/doc';
@@ -141,7 +142,7 @@ export const cardPlugin = ({
         if (canRenderDatasource(ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
           quickInsertArray.push({
             id: 'datasource',
-            title: formatMessage(messages.datasourceAssetsObjects),
+            title: getBooleanFF('platform.linking-platform.datasource-assets_objects_remove_beta') ? formatMessage(messages.datasourceAssetsObjectsGeneralAvailability) : formatMessage(messages.datasourceAssetsObjects),
             description: formatMessage(messages.datasourceAssetsObjectsDescription),
             categories: ['external-content', 'development'],
             keywords: ['assets'],

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

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+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';
@@ -133,5 +133,50 @@ export const DatasourceModal = ({
       onInsert: onInsert
     }));
   }
+  if (modalType === 'confluence-search') {
+    var _existingNode7, _existingNode7$attrs, _tableView$properties3, _existingNode8;
+    if (!ready) {
+      return null;
+    }
+    const {
+      id: datasourceId = CONFLUENCE_SEARCH_DATASOURCE_ID,
+      parameters,
+      views = []
+    } = ((_existingNode7 = existingNode) === null || _existingNode7 === void 0 ? void 0 : (_existingNode7$attrs = _existingNode7.attrs) === null || _existingNode7$attrs === void 0 ? void 0 : _existingNode7$attrs.datasource) || {};
+    const [tableView] = views;
+    const visibleColumnKeys = [];
+    const wrappedColumnKeys = [];
+    let columnCustomSizes;
+    const columns = tableView === null || tableView === void 0 ? void 0 : (_tableView$properties3 = tableView.properties) === null || _tableView$properties3 === void 0 ? void 0 : _tableView$properties3.columns;
+    if (columns) {
+      columnCustomSizes = {};
+      for (const {
+        key,
+        width,
+        isWrapped
+      } of columns) {
+        visibleColumnKeys.push(key);
+        if (width) {
+          columnCustomSizes[key] = width;
+        }
+        if (isWrapped) {
+          wrappedColumnKeys.push(key);
+        }
+      }
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "confluence-search-config-modal"
+    }, /*#__PURE__*/React.createElement(ConfluenceSearchConfigModal, {
+      datasourceId: datasourceId,
+      viewMode: 'issue',
+      visibleColumnKeys: visibleColumnKeys,
+      parameters: parameters,
+      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
 };

package/dist/es2019/utils.js

@@ -1,7 +1,8 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getResolvedAttributes } from '@atlaskit/link-analytics/resolved-attributes';
-import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { pluginKey } from './pm-plugins/plugin-key';
 export const appearanceForNodeType = spec => {
   if (spec.name === 'inlineCard') {
@@ -67,5 +68,8 @@ export const getResolvedAttributesFromStore = (url, display, store) => {
 };
 export const isDatasourceConfigEditable = datasourceId => {
   const datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
+  if (getBooleanFF('platform.linking-platform.datasource.enable-confluence-search-modal')) {
+    datasourcesWithConfigModal.push(CONFLUENCE_SEARCH_DATASOURCE_ID);
+  }
   return datasourcesWithConfigModal.includes(datasourceId);
 };

package/dist/esm/plugin.js

@@ -7,6 +7,7 @@ import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconDatasourceAssetsObjects, IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { createEventsQueue } from './analytics/create-events-queue';
 import { hideLinkToolbar, showDatasourceModal } from './pm-plugins/actions';
 import { changeSelectedCardToLink, queueCardsFromChangedTr, setSelectedCardAppearance } from './pm-plugins/doc';
@@ -143,7 +144,7 @@ export var cardPlugin = function cardPlugin(_ref) {
         if (canRenderDatasource(ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
           quickInsertArray.push({
             id: 'datasource',
-            title: formatMessage(messages.datasourceAssetsObjects),
+            title: getBooleanFF('platform.linking-platform.datasource-assets_objects_remove_beta') ? formatMessage(messages.datasourceAssetsObjectsGeneralAvailability) : formatMessage(messages.datasourceAssetsObjects),
             description: formatMessage(messages.datasourceAssetsObjectsDescription),
             categories: ['external-content', 'development'],
             keywords: ['assets'],

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

@@ -7,7 +7,7 @@ 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, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+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';
@@ -152,5 +152,61 @@ export var DatasourceModal = function DatasourceModal(_ref) {
       onInsert: onInsert
     }));
   }
+  if (modalType === 'confluence-search') {
+    var _existingNode7, _tableView2$propertie, _existingNode8;
+    if (!ready) {
+      return null;
+    }
+    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);
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "confluence-search-config-modal"
+    }, /*#__PURE__*/React.createElement(ConfluenceSearchConfigModal, {
+      datasourceId: _datasourceId2,
+      viewMode: 'issue',
+      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
 };

package/dist/esm/utils.js

@@ -1,7 +1,8 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getResolvedAttributes } from '@atlaskit/link-analytics/resolved-attributes';
-import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { pluginKey } from './pm-plugins/plugin-key';
 export var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -73,5 +74,8 @@ export var getResolvedAttributesFromStore = function getResolvedAttributesFromSt
 };
 export var isDatasourceConfigEditable = function isDatasourceConfigEditable(datasourceId) {
   var datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
+  if (getBooleanFF('platform.linking-platform.datasource.enable-confluence-search-modal')) {
+    datasourcesWithConfigModal.push(CONFLUENCE_SEARCH_DATASOURCE_ID);
+  }
   return datasourcesWithConfigModal.includes(datasourceId);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "@atlaskit/adf-schema": "^35.8.0",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/custom-steps": "^0.0.17",
-    "@atlaskit/editor-common": "^78.23.0",
+    "@atlaskit/editor-common": "^78.24.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
@@ -49,7 +49,7 @@
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/link-analytics": "^8.3.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/link-datasource": "^1.25.0",
+    "@atlaskit/link-datasource": "^1.26.0",
     "@atlaskit/linking-common": "^5.6.0",
     "@atlaskit/linking-types": "^8.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -118,6 +118,12 @@
     },
     "platform.editor.card.fix-embed-card-select-all": {
       "type": "boolean"
+    },
+    "platform.linking-platform.datasource.enable-confluence-search-modal": {
+      "type": "boolean"
+    },
+    "platform.linking-platform.datasource-assets_objects_remove_beta": {
+      "type": "boolean"
     }
   },
   "stricter": {