@atlaskit/editor-plugin-card 2.14.1 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-card
 
+## 2.15.0
+
+### Minor Changes
+
+- [#137404](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137404)
+  [`e7ce490e04b4f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e7ce490e04b4f) -
+  [ux] Adds button to Smart Link toolbar to switch to Smart Link List View for supporting links (by
+  cleanup of platform.linking-platform.enable-datasource-appearance-toolbar).
+- [#137156](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137156)
+  [`058afdc0d3145`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/058afdc0d3145) -
+  [ux] Introduces Confluence Smart Link List View as a valid list view modal by removing feature
+  flag platform.linking-platform.datasource.enable-confluence-search-modal
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.14.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/datasource.js

@@ -247,23 +247,14 @@ var Datasource = exports.Datasource = /*#__PURE__*/function (_ReactNodeView) {
   // Otherwise, the node view will still consider the node as a Datasource and render a such.
   (0, _createClass2.default)(Datasource, [{
     key: "validUpdate",
-    value: function validUpdate(currentNode, newNode) {
-      if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-        var _newNode$attrs;
-        return !!((_newNode$attrs = newNode.attrs) !== null && _newNode$attrs !== void 0 && _newNode$attrs.datasource);
-      }
-      return true;
+    value: function validUpdate(_, newNode) {
+      var _newNode$attrs;
+      return !!((_newNode$attrs = newNode.attrs) !== null && _newNode$attrs !== void 0 && _newNode$attrs.datasource);
     }
   }, {
     key: "update",
     value: function update(node, decorations, _innerDecorations) {
-      var validUpdate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function () {
-        return true;
-      };
-      if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-        return (0, _get2.default)((0, _getPrototypeOf2.default)(Datasource.prototype), "update", this).call(this, node, decorations, _innerDecorations, this.validUpdate);
-      }
-      return (0, _get2.default)((0, _getPrototypeOf2.default)(Datasource.prototype), "update", this).call(this, node, decorations, _innerDecorations, validUpdate);
+      return (0, _get2.default)((0, _getPrototypeOf2.default)(Datasource.prototype), "update", this).call(this, node, decorations, _innerDecorations, this.validUpdate);
     }
   }, {
     key: "createDomRef",

package/dist/cjs/pm-plugins/doc.js

@@ -380,21 +380,10 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
       }
       return false;
     }
-    var attrs;
-    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      if ((0, _utils2.appearanceForNodeType)(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
-        return false;
-      }
-      attrs = getAttrsForAppearance(appearance, selectedNode);
-    } else {
-      if ((0, _utils2.appearanceForNodeType)(selectedNode.type) === appearance) {
-        return false;
-      }
-      var isEmbed = appearance === 'embed';
-      attrs = isEmbed ? _objectSpread(_objectSpread({}, selectedNode.attrs), {}, {
-        layout: 'center'
-      }) : selectedNode.attrs;
+    if ((0, _utils2.appearanceForNodeType)(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
+      return false;
     }
+    var attrs = getAttrsForAppearance(appearance, selectedNode);
     var _state$selection = state.selection,
       from = _state$selection.from,
       to = _state$selection.to;
@@ -471,9 +460,7 @@ var updateCardViaDatasource = exports.updateCardViaDatasource = function updateC
       if (isColumnChange || isUrlChange) {
         tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, oldAttrs), newAdf.attrs));
       }
-    } else if (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
+    } else if (node.type.isText) {
       // url to datasource
       var link;
       state.doc.nodesBetween(from, to, function (node, pos) {
@@ -553,12 +540,10 @@ var getAttrsForAppearance = exports.getAttrsForAppearance = function getAttrsFor
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
-  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if ((0, _utils2.isDatasourceNode)(selectedNode) && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
-      (0, _actions.setDatasourceStash)(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+  if ((0, _utils2.isDatasourceNode)(selectedNode) && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
+    (0, _actions.setDatasourceStash)(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
   }
 };

package/dist/cjs/pm-plugins/main.js

@@ -125,7 +125,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             var events = (0, _eventsFromTr.eventsFromTransaction)(tr, prevEditorState);
             cardPluginEvents.push.apply(cardPluginEvents, (0, _toConsumableArray2.default)(events));
           }
-          if (!meta && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+          if (!meta) {
             if (pluginState.datasourceTableRef) {
               if (!(tr.selection instanceof _state.NodeSelection) || !tr.selection.node.attrs.datasource) {
                 // disable resize button when switching from datasource to block card

package/dist/cjs/toolbar.js

@@ -303,7 +303,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       // This code will be executed only for appearances such as "inline", "block" & "embed"
       // For url appearance, please see HyperlinkToolbarAppearanceProps
       if (currentAppearance) {
-        var showDatasourceAppearance = allowDatasource && url && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar');
+        var showDatasourceAppearance = allowDatasource && url;
         toolbarItems.unshift.apply(toolbarItems, (0, _toConsumableArray2.default)(getToolbarViewedItem(url, currentAppearance)).concat([{
           type: 'custom',
           fallback: [],
@@ -418,11 +418,6 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     if (!metadata.url) {
       return false;
     }
-    if (
-    // FF that controls visibily of the additional toolbar buttons
-    !(0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      return false;
-    }
 
     // FF to enable additional toolbar buttons based on if the datasource is configurable or not
     return (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !(0, _utils3.isDatasourceConfigEditable)(datasourceId);

package/dist/cjs/ui/DatasourceAppearanceButton.js

@@ -11,7 +11,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _linkDatasource = require("@atlaskit/link-datasource");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _doc = require("../pm-plugins/doc");
 var _pluginKey = require("../pm-plugins/plugin-key");
@@ -58,22 +57,18 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
     }, url);
     var selection = editorState.selection;
     var existingNode;
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      // Check if the selection contains a link mark
-      var $pos = editorState.doc.resolve(selection.from);
-      var isLinkMark = $pos.marks().some(function (mark) {
-        return mark.type === editorState.schema.marks.link;
-      });
+    // Check if the selection contains a link mark
+    var $pos = editorState.doc.resolve(selection.from);
+    var isLinkMark = $pos.marks().some(function (mark) {
+      return mark.type === editorState.schema.marks.link;
+    });
 
-      // When selection is a TextNode and a link Mark is present return that node
-      if (selection instanceof _state.NodeSelection) {
-        existingNode = selection.node;
-      } else if (isLinkMark) {
-        var _editorState$doc$node;
-        existingNode = (_editorState$doc$node = editorState.doc.nodeAt(selection.from)) !== null && _editorState$doc$node !== void 0 ? _editorState$doc$node : undefined;
-      }
-    } else {
-      existingNode = selection instanceof _state.NodeSelection ? selection.node : undefined;
+    // When selection is a TextNode and a link Mark is present return that node
+    if (selection instanceof _state.NodeSelection) {
+      existingNode = selection.node;
+    } else if (isLinkMark) {
+      var _editorState$doc$node;
+      existingNode = (_editorState$doc$node = editorState.doc.nodeAt(selection.from)) !== null && _editorState$doc$node !== void 0 ? _editorState$doc$node : undefined;
     }
     if (existingNode) {
       (0, _doc.updateCardViaDatasource)({

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

@@ -10,7 +10,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../../pm-plugins/actions");
 var _doc = require("../../pm-plugins/doc");
 var _useFetchDatasourceInfo = require("../useFetchDatasourceInfo");
@@ -97,21 +96,17 @@ var useUpdateAdf = function useUpdateAdf(view, existingNode) {
 var getExistingNode = function getExistingNode(state) {
   var selection = state.selection;
   var existingNode;
-  if ((0, _platformFeatureFlags.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;
-    });
+  // 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;
+  });
 
-    // When selection is a TextNode and a link Mark is present return that node
-    if (selection instanceof _state.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 _state.NodeSelection ? selection.node : undefined;
+  // When selection is a TextNode and a link Mark is present return that node
+  if (selection instanceof _state.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;
   }
   return existingNode;
 };

package/dist/cjs/ui/HyperlinkToolbarAppearance.js

@@ -162,7 +162,7 @@ function HyperlinkToolbarAppearanceFunctional(props) {
     allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
     platform: platform,
     editorAnalyticsApi: editorAnalyticsApi
-  }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar') && /*#__PURE__*/_react.default.createElement(_DatasourceAppearanceButton.DatasourceAppearanceButton, {
+  }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/_react.default.createElement(_DatasourceAppearanceButton.DatasourceAppearanceButton, {
     intl: intl,
     url: url,
     editorState: editorState,
@@ -340,7 +340,7 @@ var HyperlinkToolbarAppearanceClass = /*#__PURE__*/function (_Component) {
         allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
         platform: platform,
         editorAnalyticsApi: editorAnalyticsApi
-      }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar') && /*#__PURE__*/_react.default.createElement(_DatasourceAppearanceButton.DatasourceAppearanceButton, {
+      }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/_react.default.createElement(_DatasourceAppearanceButton.DatasourceAppearanceButton, {
         intl: intl,
         url: url,
         editorState: editorState,

package/dist/cjs/utils.js

@@ -10,7 +10,6 @@ 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') {
@@ -81,10 +80,7 @@ var getResolvedAttributesFromStore = exports.getResolvedAttributesFromStore = fu
   }, urlState === null || urlState === void 0 ? void 0 : urlState.details);
 };
 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.fg)('platform.linking-platform.datasource.enable-confluence-search-modal')) {
-    datasourcesWithConfigModal.push(_linkDatasource.CONFLUENCE_SEARCH_DATASOURCE_ID);
-  }
+  var datasourcesWithConfigModal = [_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID, _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID, _linkDatasource.CONFLUENCE_SEARCH_DATASOURCE_ID];
   return datasourcesWithConfigModal.includes(datasourceId);
 };
 

package/dist/es2019/nodeviews/datasource.js

@@ -204,18 +204,12 @@ export class Datasource extends ReactNodeView {
   // Need this function to check if the datasource attribute was added or not to a blockCard.
   // If not, we return false so we can get the node to re-render properly as a block node instead.
   // Otherwise, the node view will still consider the node as a Datasource and render a such.
-  validUpdate(currentNode, newNode) {
-    if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      var _newNode$attrs;
-      return !!((_newNode$attrs = newNode.attrs) !== null && _newNode$attrs !== void 0 && _newNode$attrs.datasource);
-    }
-    return true;
+  validUpdate(_, newNode) {
+    var _newNode$attrs;
+    return !!((_newNode$attrs = newNode.attrs) !== null && _newNode$attrs !== void 0 && _newNode$attrs.datasource);
   }
-  update(node, decorations, _innerDecorations, validUpdate = () => true) {
-    if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      return super.update(node, decorations, _innerDecorations, this.validUpdate);
-    }
-    return super.update(node, decorations, _innerDecorations, validUpdate);
+  update(node, decorations, _innerDecorations) {
+    return super.update(node, decorations, _innerDecorations, this.validUpdate);
   }
   createDomRef() {
     const domRef = document.createElement('div');

package/dist/es2019/pm-plugins/doc.js

@@ -354,22 +354,10 @@ export const setSelectedCardAppearance = (appearance, editorAnalyticsApi) => (st
     }
     return false;
   }
-  let attrs;
-  if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (appearanceForNodeType(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
-      return false;
-    }
-    attrs = getAttrsForAppearance(appearance, selectedNode);
-  } else {
-    if (appearanceForNodeType(selectedNode.type) === appearance) {
-      return false;
-    }
-    const isEmbed = appearance === 'embed';
-    attrs = isEmbed ? {
-      ...selectedNode.attrs,
-      layout: 'center'
-    } : selectedNode.attrs;
+  if (appearanceForNodeType(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
+    return false;
   }
+  const attrs = getAttrsForAppearance(appearance, selectedNode);
   const {
     from,
     to
@@ -452,9 +440,7 @@ export const updateCardViaDatasource = args => {
           ...newAdf.attrs
         });
       }
-    } else if (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
+    } else if (node.type.isText) {
       // url to datasource
       let link;
       state.doc.nodesBetween(from, to, (node, pos) => {
@@ -541,12 +527,10 @@ export const getAttrsForAppearance = (appearance, selectedNode) => {
   return selectedNode.attrs;
 };
 const updateDatasourceStash = (tr, selectedNode) => {
-  if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
-      setDatasourceStash(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+  if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
+    setDatasourceStash(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
   }
 };

package/dist/es2019/pm-plugins/main.js

@@ -111,7 +111,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           const events = eventsFromTransaction(tr, prevEditorState);
           cardPluginEvents.push(...events);
         }
-        if (!meta && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+        if (!meta) {
           if (pluginState.datasourceTableRef) {
             if (!(tr.selection instanceof NodeSelection) || !tr.selection.node.attrs.datasource) {
               // disable resize button when switching from datasource to block card

package/dist/es2019/toolbar.js

@@ -297,7 +297,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     // This code will be executed only for appearances such as "inline", "block" & "embed"
     // For url appearance, please see HyperlinkToolbarAppearanceProps
     if (currentAppearance) {
-      const showDatasourceAppearance = allowDatasource && url && fg('platform.linking-platform.enable-datasource-appearance-toolbar');
+      const showDatasourceAppearance = allowDatasource && url;
       toolbarItems.unshift(...getToolbarViewedItem(url, currentAppearance), {
         type: 'custom',
         fallback: [],
@@ -405,11 +405,6 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
     if (!metadata.url) {
       return false;
     }
-    if (
-    // FF that controls visibily of the additional toolbar buttons
-    !fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      return false;
-    }
 
     // FF to enable additional toolbar buttons based on if the datasource is configurable or not
     return fg('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !isDatasourceConfigEditable(datasourceId);

package/dist/es2019/ui/DatasourceAppearanceButton.js

@@ -11,7 +11,6 @@ import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { buildDatasourceAdf } from '@atlaskit/link-datasource';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { updateCardViaDatasource } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -55,20 +54,16 @@ const DatasourceAppearanceButtonWithCardContext = ({
       selection
     } = editorState;
     let existingNode;
-    if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      // Check if the selection contains a link mark
-      const $pos = editorState.doc.resolve(selection.from);
-      const isLinkMark = $pos.marks().some(mark => mark.type === editorState.schema.marks.link);
+    // Check if the selection contains a link mark
+    const $pos = editorState.doc.resolve(selection.from);
+    const isLinkMark = $pos.marks().some(mark => mark.type === editorState.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 _editorState$doc$node;
-        existingNode = (_editorState$doc$node = editorState.doc.nodeAt(selection.from)) !== null && _editorState$doc$node !== void 0 ? _editorState$doc$node : undefined;
-      }
-    } else {
-      existingNode = selection instanceof NodeSelection ? selection.node : undefined;
+    // 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 _editorState$doc$node;
+      existingNode = (_editorState$doc$node = editorState.doc.nodeAt(selection.from)) !== null && _editorState$doc$node !== void 0 ? _editorState$doc$node : undefined;
     }
     if (existingNode) {
       updateCardViaDatasource({

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

@@ -1,6 +1,5 @@
 import React, { useCallback } from 'react';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hideDatasourceModal } from '../../pm-plugins/actions';
 import { insertDatasource, updateCardViaDatasource } from '../../pm-plugins/doc';
 import { useFetchDatasourceInfo } from '../useFetchDatasourceInfo';
@@ -90,19 +89,15 @@ const getExistingNode = state => {
     selection
   } = state;
   let existingNode;
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    // Check if the selection contains a link mark
-    const isLinkMark = state.doc.resolve(selection.from).marks().some(mark => mark.type === state.schema.marks.link);
+  // Check if the selection contains a link mark
+  const isLinkMark = state.doc.resolve(selection.from).marks().some(mark => 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;
+  // 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;
   }
   return existingNode;
 };

package/dist/es2019/ui/HyperlinkToolbarAppearance.js

@@ -77,7 +77,7 @@ function HyperlinkToolbarAppearanceFunctional(props) {
     allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
     platform: platform,
     editorAnalyticsApi: editorAnalyticsApi
-  }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && fg('platform.linking-platform.enable-datasource-appearance-toolbar') && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
+  }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
     intl: intl,
     url: url,
     editorState: editorState,
@@ -173,7 +173,7 @@ class HyperlinkToolbarAppearanceClass extends Component {
       allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
       platform: platform,
       editorAnalyticsApi: editorAnalyticsApi
-    }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && fg('platform.linking-platform.enable-datasource-appearance-toolbar') && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
+    }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
       intl: intl,
       url: url,
       editorState: editorState,

package/dist/es2019/utils.js

@@ -2,7 +2,6 @@ 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, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { pluginKey } from './pm-plugins/plugin-key';
 export const appearanceForNodeType = spec => {
   if (spec.name === 'inlineCard') {
@@ -67,10 +66,7 @@ export const getResolvedAttributesFromStore = (url, display, store) => {
   }, urlState === null || urlState === void 0 ? void 0 : urlState.details);
 };
 export const isDatasourceConfigEditable = datasourceId => {
-  const datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
-  if (fg('platform.linking-platform.datasource.enable-confluence-search-modal')) {
-    datasourcesWithConfigModal.push(CONFLUENCE_SEARCH_DATASOURCE_ID);
-  }
+  const datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID];
   return datasourcesWithConfigModal.includes(datasourceId);
 };
 

package/dist/esm/nodeviews/datasource.js

@@ -243,23 +243,14 @@ export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
   // Otherwise, the node view will still consider the node as a Datasource and render a such.
   _createClass(Datasource, [{
     key: "validUpdate",
-    value: function validUpdate(currentNode, newNode) {
-      if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-        var _newNode$attrs;
-        return !!((_newNode$attrs = newNode.attrs) !== null && _newNode$attrs !== void 0 && _newNode$attrs.datasource);
-      }
-      return true;
+    value: function validUpdate(_, newNode) {
+      var _newNode$attrs;
+      return !!((_newNode$attrs = newNode.attrs) !== null && _newNode$attrs !== void 0 && _newNode$attrs.datasource);
     }
   }, {
     key: "update",
     value: function update(node, decorations, _innerDecorations) {
-      var validUpdate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function () {
-        return true;
-      };
-      if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-        return _get(_getPrototypeOf(Datasource.prototype), "update", this).call(this, node, decorations, _innerDecorations, this.validUpdate);
-      }
-      return _get(_getPrototypeOf(Datasource.prototype), "update", this).call(this, node, decorations, _innerDecorations, validUpdate);
+      return _get(_getPrototypeOf(Datasource.prototype), "update", this).call(this, node, decorations, _innerDecorations, this.validUpdate);
     }
   }, {
     key: "createDomRef",

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

@@ -374,21 +374,10 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
       }
       return false;
     }
-    var attrs;
-    if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      if (appearanceForNodeType(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
-        return false;
-      }
-      attrs = getAttrsForAppearance(appearance, selectedNode);
-    } else {
-      if (appearanceForNodeType(selectedNode.type) === appearance) {
-        return false;
-      }
-      var isEmbed = appearance === 'embed';
-      attrs = isEmbed ? _objectSpread(_objectSpread({}, selectedNode.attrs), {}, {
-        layout: 'center'
-      }) : selectedNode.attrs;
+    if (appearanceForNodeType(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
+      return false;
     }
+    var attrs = getAttrsForAppearance(appearance, selectedNode);
     var _state$selection = state.selection,
       from = _state$selection.from,
       to = _state$selection.to;
@@ -465,9 +454,7 @@ export var updateCardViaDatasource = function updateCardViaDatasource(args) {
       if (isColumnChange || isUrlChange) {
         tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, oldAttrs), newAdf.attrs));
       }
-    } else if (
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
+    } else if (node.type.isText) {
       // url to datasource
       var link;
       state.doc.nodesBetween(from, to, function (node, pos) {
@@ -547,12 +534,10 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
-  if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
-      setDatasourceStash(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+  if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
+    setDatasourceStash(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
   }
 };

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

@@ -112,7 +112,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var events = eventsFromTransaction(tr, prevEditorState);
             cardPluginEvents.push.apply(cardPluginEvents, _toConsumableArray(events));
           }
-          if (!meta && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+          if (!meta) {
             if (pluginState.datasourceTableRef) {
               if (!(tr.selection instanceof NodeSelection) || !tr.selection.node.attrs.datasource) {
                 // disable resize button when switching from datasource to block card

package/dist/esm/toolbar.js

@@ -293,7 +293,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       // This code will be executed only for appearances such as "inline", "block" & "embed"
       // For url appearance, please see HyperlinkToolbarAppearanceProps
       if (currentAppearance) {
-        var showDatasourceAppearance = allowDatasource && url && fg('platform.linking-platform.enable-datasource-appearance-toolbar');
+        var showDatasourceAppearance = allowDatasource && url;
         toolbarItems.unshift.apply(toolbarItems, _toConsumableArray(getToolbarViewedItem(url, currentAppearance)).concat([{
           type: 'custom',
           fallback: [],
@@ -408,11 +408,6 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
     if (!metadata.url) {
       return false;
     }
-    if (
-    // FF that controls visibily of the additional toolbar buttons
-    !fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      return false;
-    }
 
     // FF to enable additional toolbar buttons based on if the datasource is configurable or not
     return fg('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !isDatasourceConfigEditable(datasourceId);

package/dist/esm/ui/DatasourceAppearanceButton.js

@@ -11,7 +11,6 @@ import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { buildDatasourceAdf } from '@atlaskit/link-datasource';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { updateCardViaDatasource } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -51,22 +50,18 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
     }, url);
     var selection = editorState.selection;
     var existingNode;
-    if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-      // Check if the selection contains a link mark
-      var $pos = editorState.doc.resolve(selection.from);
-      var isLinkMark = $pos.marks().some(function (mark) {
-        return mark.type === editorState.schema.marks.link;
-      });
+    // Check if the selection contains a link mark
+    var $pos = editorState.doc.resolve(selection.from);
+    var isLinkMark = $pos.marks().some(function (mark) {
+      return mark.type === editorState.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 _editorState$doc$node;
-        existingNode = (_editorState$doc$node = editorState.doc.nodeAt(selection.from)) !== null && _editorState$doc$node !== void 0 ? _editorState$doc$node : undefined;
-      }
-    } else {
-      existingNode = selection instanceof NodeSelection ? selection.node : undefined;
+    // 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 _editorState$doc$node;
+      existingNode = (_editorState$doc$node = editorState.doc.nodeAt(selection.from)) !== null && _editorState$doc$node !== void 0 ? _editorState$doc$node : undefined;
     }
     if (existingNode) {
       updateCardViaDatasource({

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

@@ -7,7 +7,6 @@ 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hideDatasourceModal } from '../../pm-plugins/actions';
 import { insertDatasource, updateCardViaDatasource } from '../../pm-plugins/doc';
 import { useFetchDatasourceInfo } from '../useFetchDatasourceInfo';
@@ -87,21 +86,17 @@ var useUpdateAdf = function useUpdateAdf(view, existingNode) {
 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;
-    });
+  // 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;
+  });
 
-    // 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;
+  // 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;
   }
   return existingNode;
 };

package/dist/esm/ui/HyperlinkToolbarAppearance.js

@@ -152,7 +152,7 @@ function HyperlinkToolbarAppearanceFunctional(props) {
     allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
     platform: platform,
     editorAnalyticsApi: editorAnalyticsApi
-  }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && fg('platform.linking-platform.enable-datasource-appearance-toolbar') && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
+  }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
     intl: intl,
     url: url,
     editorState: editorState,
@@ -330,7 +330,7 @@ var HyperlinkToolbarAppearanceClass = /*#__PURE__*/function (_Component) {
         allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
         platform: platform,
         editorAnalyticsApi: editorAnalyticsApi
-      }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && fg('platform.linking-platform.enable-datasource-appearance-toolbar') && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
+      }), (cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowDatasource) && /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
         intl: intl,
         url: url,
         editorState: editorState,

package/dist/esm/utils.js

@@ -3,7 +3,6 @@ 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, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { pluginKey } from './pm-plugins/plugin-key';
 export var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -74,10 +73,7 @@ export var getResolvedAttributesFromStore = function getResolvedAttributesFromSt
   }, urlState === null || urlState === void 0 ? void 0 : urlState.details);
 };
 export var isDatasourceConfigEditable = function isDatasourceConfigEditable(datasourceId) {
-  var datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
-  if (fg('platform.linking-platform.datasource.enable-confluence-search-modal')) {
-    datasourcesWithConfigModal.push(CONFLUENCE_SEARCH_DATASOURCE_ID);
-  }
+  var datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID];
   return datasourcesWithConfigModal.includes(datasourceId);
 };
 

package/dist/types/nodeviews/datasource.d.ts

@@ -46,8 +46,8 @@ export declare class Datasource extends ReactNodeView<DatasourceProps> {
     private tableWidth;
     private isNodeNested;
     constructor(props: DatasourceProps);
-    validUpdate(currentNode: PMNode, newNode: PMNode): boolean;
-    update(node: PMNode, decorations: ReadonlyArray<Decoration>, _innerDecorations?: DecorationSource, validUpdate?: (currentNode: PMNode, newNode: PMNode) => boolean): boolean;
+    validUpdate(_: PMNode, newNode: PMNode): boolean;
+    update(node: PMNode, decorations: ReadonlyArray<Decoration>, _innerDecorations?: DecorationSource): boolean;
     createDomRef(): HTMLElement;
     /**
      * Node views may render interactive elements that should not have their events reach editor

package/dist/types-ts4.5/nodeviews/datasource.d.ts

@@ -46,8 +46,8 @@ export declare class Datasource extends ReactNodeView<DatasourceProps> {
     private tableWidth;
     private isNodeNested;
     constructor(props: DatasourceProps);
-    validUpdate(currentNode: PMNode, newNode: PMNode): boolean;
-    update(node: PMNode, decorations: ReadonlyArray<Decoration>, _innerDecorations?: DecorationSource, validUpdate?: (currentNode: PMNode, newNode: PMNode) => boolean): boolean;
+    validUpdate(_: PMNode, newNode: PMNode): boolean;
+    update(node: PMNode, decorations: ReadonlyArray<Decoration>, _innerDecorations?: DecorationSource): boolean;
     createDomRef(): HTMLElement;
     /**
      * Node views may render interactive elements that should not have their events reach editor

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "2.14.1",
+	"version": "2.15.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,28 +34,28 @@
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/custom-steps": "^0.7.0",
-		"@atlaskit/editor-common": "^88.8.0",
+		"@atlaskit/editor-common": "^88.11.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^1.11.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^1.12.0",
 		"@atlaskit/editor-plugin-grid": "^1.2.0",
 		"@atlaskit/editor-plugin-width": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/frontend-utilities": "^2.7.0",
-		"@atlaskit/icon": "^22.15.0",
+		"@atlaskit/icon": "^22.16.0",
 		"@atlaskit/link-analytics": "^8.5.0",
 		"@atlaskit/link-client-extension": "^2.3.0",
-		"@atlaskit/link-datasource": "^2.11.0",
+		"@atlaskit/link-datasource": "^2.12.0",
 		"@atlaskit/linking-common": "^5.11.0",
 		"@atlaskit/linking-types": "^9.0.0",
 		"@atlaskit/menu": "2.12.2",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^12.1.0",
-		"@atlaskit/smart-card": "^27.19.0",
+		"@atlaskit/smart-card": "^27.20.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tokens": "^1.59.0",
 		"@babel/runtime": "^7.0.0",
@@ -122,15 +122,9 @@
 		"platform.linking-platform.datasource-word_wrap": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.enable-datasource-appearance-toolbar": {
-			"type": "boolean"
-		},
 		"platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.datasource.enable-confluence-search-modal": {
-			"type": "boolean"
-		},
 		"platform_editor_lazy-node-views": {
 			"type": "boolean"
 		},