@atlaskit/editor-plugin-card 4.3.5 → 4.3.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-card
 
+## 4.3.7
+
+### Patch Changes
+
+- [#155058](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/155058)
+  [`789a3e0517247`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/789a3e0517247) -
+  [ux] Removing platform.linking-platform.enable-datasource-edit-dropdown-toolbar feature flag
+- Updated dependencies
+
+## 4.3.6
+
+### Patch Changes
+
+- [#154186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/154186)
+  [`5c316170d29dd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5c316170d29dd) -
+  Bump @atlaskit/adf-schema to 42.3.1
+- Updated dependencies
+
 ## 4.3.5
 
 ### Patch Changes

package/dist/cjs/toolbar.js

@@ -15,7 +15,6 @@ var _card = require("@atlaskit/editor-common/card");
 var _link = require("@atlaskit/editor-common/link");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _styles = require("@atlaskit/editor-common/styles");
-var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
@@ -27,11 +26,9 @@ var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove
 var _settings2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _doc = require("./pm-plugins/doc");
 var _main = require("./pm-plugins/main");
 var _DatasourceAppearanceButton = require("./ui/DatasourceAppearanceButton");
-var _EditDatasourceButton = require("./ui/EditDatasourceButton");
 var _EditLinkToolbar = require("./ui/EditLinkToolbar");
 var _EditToolbarButton = require("./ui/EditToolbarButton");
 var _HyperlinkToolbarAppearance = require("./ui/HyperlinkToolbarAppearance");
@@ -192,7 +189,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
     var _titleUrlPairFromNode2 = (0, _utils3.titleUrlPairFromNode)(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -212,9 +209,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = (0, _utils3.isDatasourceNode)(node);
-    var datasourceId = node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id;
     var pluginState = _main.pluginKey.getState(state);
-    var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 || (_node$attrs2 = _node$attrs2.datasource) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.id);
+    var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [(0, _EditLinkToolbar.buildEditLinkToolbar)({
         providerFactory: providerFactory,
@@ -227,8 +223,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance);
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
-      var isEditDropdownEnabled = cardOptions.allowDatasource && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar');
-      var editItems = isEditDropdownEnabled ? [{
+      var editItems = cardOptions.allowDatasource ? [{
         type: 'custom',
         fallback: [],
         render: function render(editorView) {
@@ -238,7 +233,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
             intl: intl,
             editorAnalyticsApi: editorAnalyticsApi,
             editorView: editorView,
-            onLinkEditClick: (0, _EditLinkToolbar.editLink)(editorAnalyticsApi, true),
+            onLinkEditClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true),
             currentAppearance: currentAppearance
           });
         }
@@ -250,7 +245,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         title: intl.formatMessage(_messages.linkToolbarMessages.editLink),
         showTitle: true,
         testId: 'link-toolbar-edit-link-button',
-        onClick: (0, _EditLinkToolbar.editLink)(editorAnalyticsApi, true)
+        onClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true)
       }, {
         type: 'separator'
       }];
@@ -343,23 +338,6 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           type: 'separator'
         }]));
       }
-      var shouldShowDatasourceEditButton = allowDatasource && !(0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar');
-      if (shouldShowDatasourceEditButton) {
-        toolbarItems.unshift({
-          type: 'custom',
-          fallback: [],
-          render: function render(editorView) {
-            return /*#__PURE__*/_react.default.createElement(_EditDatasourceButton.EditDatasourceButton, {
-              datasourceId: datasourceId,
-              intl: intl,
-              editorAnalyticsApi: editorAnalyticsApi,
-              url: url,
-              editorView: editorView,
-              currentAppearance: currentAppearance
-            });
-          }
-        });
-      }
       return toolbarItems;
     }
   };
@@ -390,22 +368,8 @@ var getSettingsButton = exports.getSettingsButton = function getSettingsButton(i
   };
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) {
-  var _node$attrs3;
+  var _node$attrs2;
   var toolbarItems = [];
-  if ((0, _utils3.isDatasourceConfigEditable)(datasourceId) && !(0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
-    toolbarItems.push({
-      id: 'editor.edit.datasource',
-      type: 'button',
-      icon: _ui.SmallerEditIcon,
-      metadata: metadata,
-      className: 'datasource-edit',
-      title: intl.formatMessage(_messages.linkToolbarMessages.editDatasource),
-      onClick: (0, _EditDatasourceButton.editDatasource)(datasourceId, editorAnalyticsApi, 'datasource'),
-      testId: 'datasource-edit-button'
-    }, {
-      type: 'separator'
-    });
-  }
   var canShowAppearanceSwitch = function canShowAppearanceSwitch() {
     // we do not show smart-link or the datasource icons when the node does not have a url to resolve
     if (!metadata.url) {
@@ -454,26 +418,24 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
-  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
-    toolbarItems.push({
-      type: 'custom',
-      fallback: [],
-      render: function render(editorView) {
-        return /*#__PURE__*/_react.default.createElement(_EditToolbarButton.EditToolbarButton, {
-          datasourceId: datasourceId,
-          node: node,
-          key: "edit-toolbar-item",
-          url: metadata.url,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          editorView: editorView,
-          onLinkEditClick: (0, _EditLinkToolbar.editLink)(editorAnalyticsApi, false),
-          currentAppearance: "datasource"
-        });
-      }
-    });
-  }
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  toolbarItems.push({
+    type: 'custom',
+    fallback: [],
+    render: function render(editorView) {
+      return /*#__PURE__*/_react.default.createElement(_EditToolbarButton.EditToolbarButton, {
+        datasourceId: datasourceId,
+        node: node,
+        key: "edit-toolbar-item",
+        url: metadata.url,
+        intl: intl,
+        editorAnalyticsApi: editorAnalyticsApi,
+        editorView: editorView,
+        onLinkEditClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, false),
+        currentAppearance: "datasource"
+      });
+    }
+  });
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',
@@ -519,8 +481,7 @@ var shouldRenderToolbarPulse = exports.shouldRenderToolbarPulse = function shoul
 };
 var getStartingToolbarItems = exports.getStartingToolbarItems = function getStartingToolbarItems(options, api) {
   return function (intl, link, onEditLink, metadata) {
-    var isEditDropdownEnabled = options.allowDatasource && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar');
-    var editLinkItem = isEditDropdownEnabled ? [{
+    var editLinkItem = options.allowDatasource ? [{
       type: 'custom',
       fallback: [],
       render: function render(editorView) {

package/dist/cjs/ui/EditLinkToolbar.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EditLinkToolbar = void 0;
 exports.HyperlinkAddToolbarWithState = HyperlinkAddToolbarWithState;
-exports.editLinkToolbarConfig = exports.editLink = exports.buildEditLinkToolbar = void 0;
+exports.getEditLinkCallback = exports.editLinkToolbarConfig = exports.buildEditLinkToolbar = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
@@ -133,7 +133,7 @@ var EditLinkToolbar = exports.EditLinkToolbar = /*#__PURE__*/function (_React$Co
   }]);
   return EditLinkToolbar;
 }(_react.default.Component);
-var editLink = exports.editLink = function editLink(editorAnalyticsApi, scrollIntoView) {
+var getEditLinkCallback = exports.getEditLinkCallback = function getEditLinkCallback(editorAnalyticsApi, scrollIntoView) {
   return function (state, dispatch) {
     var type = 'hyperlink';
     if (state.selection instanceof _state.NodeSelection) {

package/dist/cjs/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -16,7 +16,7 @@ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-
 var _menu = require("@atlaskit/menu");
 var _primitives = require("@atlaskit/primitives");
 var _utils = require("../../utils");
-var _EditDatasourceButton = require("../EditDatasourceButton");
+var _editDatasourceAction = require("../editDatasourceAction");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -57,7 +57,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
   }, [editorView, onLinkEditClick]);
   var onEditDatasource = (0, _react.useCallback)(function () {
     if (editorView && datasourceId) {
-      (0, _EditDatasourceButton.editDatasource)(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
+      (0, _editDatasourceAction.editDatasource)(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
       (0, _utils.focusEditorView)(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);

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

@@ -17,9 +17,9 @@ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-
 var _menu = require("@atlaskit/menu");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
-var _EditDatasourceButton = require("../../ui/EditDatasourceButton");
 var _utils = require("../../utils");
 var _CardContextProvider = require("../CardContextProvider");
+var _editDatasourceAction = require("../editDatasourceAction");
 var _useFetchDatasourceDataInfo = require("../useFetchDatasourceDataInfo");
 var _useFetchDatasourceInfo = require("../useFetchDatasourceInfo");
 var _EditToolbarButtonPresentation = _interopRequireDefault(require("./EditToolbarButtonPresentation"));
@@ -89,7 +89,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
   }, [cardContext === null || cardContext === void 0 ? void 0 : cardContext.store, datasourceId, url]);
   var onEditDatasource = (0, _react.useCallback)(function () {
     if (editorView && datasourceId) {
-      (0, _EditDatasourceButton.editDatasource)(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
+      (0, _editDatasourceAction.editDatasource)(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
       (0, _utils.focusEditorView)(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);

package/dist/cjs/ui/HyperlinkToolbarAppearance.js

@@ -12,10 +12,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _ui = require("@atlaskit/editor-common/ui");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _DatasourceAppearanceButton = require("./DatasourceAppearanceButton");
-var _EditDatasourceButton = require("./EditDatasourceButton");
 var _LinkToolbarAppearance = require("./LinkToolbarAppearance");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -136,13 +134,7 @@ function HyperlinkToolbarAppearance(props) {
   if (!supportedUrlsMap.get(url)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_primitives.Flex, null, !(0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar') && /*#__PURE__*/_react.default.createElement(_EditDatasourceButton.EditDatasourceButton, {
-    url: url,
-    intl: intl,
-    editorView: editorView,
-    editorAnalyticsApi: editorAnalyticsApi,
-    currentAppearance: "url"
-  }), /*#__PURE__*/_react.default.createElement(_LinkToolbarAppearance.LinkToolbarAppearance, {
+  return /*#__PURE__*/_react.default.createElement(_primitives.Flex, null, /*#__PURE__*/_react.default.createElement(_LinkToolbarAppearance.LinkToolbarAppearance, {
     key: "link-appearance",
     url: url,
     intl: intl,

package/dist/cjs/ui/editDatasourceAction.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.editDatasource = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils = require("@atlaskit/editor-common/utils");
+var _actions = require("../pm-plugins/actions");
+var editDatasource = exports.editDatasource = function editDatasource(datasourceId, editorAnalyticsApi, appearance, extensionKey) {
+  return function (state, dispatch) {
+    var datasourceType = (0, _utils.getDatasourceType)(datasourceId);
+    if (dispatch && datasourceType) {
+      var tr = state.tr;
+      (0, _actions.showDatasourceModal)(datasourceType)(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
+        action: _analytics.ACTION.CLICKED,
+        actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.EDIT_DATASOURCE,
+        eventType: _analytics.EVENT_TYPE.UI,
+        attributes: {
+          extensionKey: extensionKey,
+          appearance: appearance
+        }
+      })(tr);
+      dispatch(tr);
+      return true;
+    }
+    return false;
+  };
+};

package/dist/es2019/toolbar.js

@@ -5,7 +5,6 @@ import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
 import commonMessages, { linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
-import { SmallerEditIcon } from '@atlaskit/editor-common/ui';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
@@ -17,17 +16,15 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToText } from './pm-plugins/doc';
 import { pluginKey } from './pm-plugins/main';
 import { DatasourceAppearanceButton } from './ui/DatasourceAppearanceButton';
-import { editDatasource, EditDatasourceButton } from './ui/EditDatasourceButton';
-import { buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
+import { buildEditLinkToolbar, editLinkToolbarConfig, getEditLinkCallback } from './ui/EditLinkToolbar';
 import { EditToolbarButton } from './ui/EditToolbarButton';
 import { HyperlinkToolbarAppearance } from './ui/HyperlinkToolbarAppearance';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { ToolbarViewedEvent } from './ui/ToolbarViewedEvent';
-import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceConfigEditable, isDatasourceNode, titleUrlPairFromNode } from './utils';
+import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceNode, titleUrlPairFromNode } from './utils';
 export const removeCard = editorAnalyticsApi => commandWithMetadata((state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -180,7 +177,7 @@ const getToolbarViewedItem = (url, display) => {
   }];
 };
 const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs$datasourc, _node$attrs2, _node$attrs2$datasour;
+  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs$datasourc;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -204,9 +201,8 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     hoverDecoration
   } = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {};
   const isDatasource = isDatasourceNode(node);
-  const datasourceId = node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$datasourc = _node$attrs.datasource) === null || _node$attrs$datasourc === void 0 ? void 0 : _node$attrs$datasourc.id;
   const pluginState = pluginKey.getState(state);
-  const shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && 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);
+  const shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$datasourc = _node$attrs.datasource) === null || _node$attrs$datasourc === void 0 ? void 0 : _node$attrs$datasourc.id);
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
     return [buildEditLinkToolbar({
       providerFactory,
@@ -221,8 +217,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     const {
       inlineCard
     } = state.schema.nodes;
-    const isEditDropdownEnabled = cardOptions.allowDatasource && fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar');
-    const editItems = isEditDropdownEnabled ? [{
+    const editItems = cardOptions.allowDatasource ? [{
       type: 'custom',
       fallback: [],
       render: editorView => /*#__PURE__*/React.createElement(EditToolbarButton, {
@@ -231,7 +226,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
         intl: intl,
         editorAnalyticsApi: editorAnalyticsApi,
         editorView: editorView,
-        onLinkEditClick: editLink(editorAnalyticsApi, true),
+        onLinkEditClick: getEditLinkCallback(editorAnalyticsApi, true),
         currentAppearance: currentAppearance
       })
     }] : [{
@@ -242,7 +237,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       title: intl.formatMessage(linkToolbarMessages.editLink),
       showTitle: true,
       testId: 'link-toolbar-edit-link-button',
-      onClick: editLink(editorAnalyticsApi, true)
+      onClick: getEditLinkCallback(editorAnalyticsApi, true)
     }, {
       type: 'separator'
     }];
@@ -333,21 +328,6 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
         type: 'separator'
       });
     }
-    const shouldShowDatasourceEditButton = allowDatasource && !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar');
-    if (shouldShowDatasourceEditButton) {
-      toolbarItems.unshift({
-        type: 'custom',
-        fallback: [],
-        render: editorView => /*#__PURE__*/React.createElement(EditDatasourceButton, {
-          datasourceId: datasourceId,
-          intl: intl,
-          editorAnalyticsApi: editorAnalyticsApi,
-          url: url,
-          editorView: editorView,
-          currentAppearance: currentAppearance
-        })
-      });
-    }
     return toolbarItems;
   }
 };
@@ -377,22 +357,8 @@ export const getSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink)
   };
 };
 const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) => {
-  var _node$attrs3;
+  var _node$attrs2;
   const toolbarItems = [];
-  if (isDatasourceConfigEditable(datasourceId) && !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
-    toolbarItems.push({
-      id: 'editor.edit.datasource',
-      type: 'button',
-      icon: SmallerEditIcon,
-      metadata: metadata,
-      className: 'datasource-edit',
-      title: intl.formatMessage(linkToolbarMessages.editDatasource),
-      onClick: editDatasource(datasourceId, editorAnalyticsApi, 'datasource'),
-      testId: 'datasource-edit-button'
-    }, {
-      type: 'separator'
-    });
-  }
   const canShowAppearanceSwitch = () => {
     // we do not show smart-link or the datasource icons when the node does not have a url to resolve
     if (!metadata.url) {
@@ -443,24 +409,22 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       type: 'separator'
     });
   }
-  if (fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
-    toolbarItems.push({
-      type: 'custom',
-      fallback: [],
-      render: editorView => /*#__PURE__*/React.createElement(EditToolbarButton, {
-        datasourceId: datasourceId,
-        node: node,
-        key: "edit-toolbar-item",
-        url: metadata.url,
-        intl: intl,
-        editorAnalyticsApi: editorAnalyticsApi,
-        editorView: editorView,
-        onLinkEditClick: editLink(editorAnalyticsApi, false),
-        currentAppearance: "datasource"
-      })
-    });
-  }
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  toolbarItems.push({
+    type: 'custom',
+    fallback: [],
+    render: editorView => /*#__PURE__*/React.createElement(EditToolbarButton, {
+      datasourceId: datasourceId,
+      node: node,
+      key: "edit-toolbar-item",
+      url: metadata.url,
+      intl: intl,
+      editorAnalyticsApi: editorAnalyticsApi,
+      editorView: editorView,
+      onLinkEditClick: getEditLinkCallback(editorAnalyticsApi, false),
+      currentAppearance: "datasource"
+    })
+  });
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',
@@ -506,8 +470,7 @@ export const shouldRenderToolbarPulse = (embedEnabled, appearance, status, isDis
 };
 export const getStartingToolbarItems = (options, api) => {
   return (intl, link, onEditLink, metadata) => {
-    const isEditDropdownEnabled = options.allowDatasource && fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar');
-    const editLinkItem = isEditDropdownEnabled ? [{
+    const editLinkItem = options.allowDatasource ? [{
       type: 'custom',
       fallback: [],
       render: editorView => {

package/dist/es2019/ui/EditLinkToolbar.js

@@ -107,7 +107,7 @@ export class EditLinkToolbar extends React.Component {
     });
   }
 }
-export const editLink = (editorAnalyticsApi, scrollIntoView) => (state, dispatch) => {
+export const getEditLinkCallback = (editorAnalyticsApi, scrollIntoView) => (state, dispatch) => {
   let type = 'hyperlink';
   if (state.selection instanceof NodeSelection) {
     type = state.selection.node.type.name;

package/dist/es2019/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -14,7 +14,7 @@ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { Flex } from '@atlaskit/primitives';
 import { focusEditorView } from '../../utils';
-import { editDatasource } from '../EditDatasourceButton';
+import { editDatasource } from '../editDatasourceAction';
 const dropdownExpandContainer = css({
   margin: `0px ${"var(--ds-space-negative-050, -4px)"}`
 });

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

@@ -14,9 +14,9 @@ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
-import { editDatasource } from '../../ui/EditDatasourceButton';
 import { focusEditorView, isDatasourceConfigEditable } from '../../utils';
 import { CardContextProvider } from '../CardContextProvider';
+import { editDatasource } from '../editDatasourceAction';
 import { useFetchDatasourceDataInfo } from '../useFetchDatasourceDataInfo';
 import { useFetchDatasourceInfo } from '../useFetchDatasourceInfo';
 import EditToolbarButtonPresentation from './EditToolbarButtonPresentation';

package/dist/es2019/ui/HyperlinkToolbarAppearance.js

@@ -1,10 +1,8 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
-import { EditDatasourceButton } from './EditDatasourceButton';
 import { LinkToolbarAppearance } from './LinkToolbarAppearance';
 export function HyperlinkToolbarAppearance(props) {
   var _props$cardOptions3;
@@ -59,13 +57,7 @@ export function HyperlinkToolbarAppearance(props) {
   if (!supportedUrlsMap.get(url)) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(Flex, null, !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar') && /*#__PURE__*/React.createElement(EditDatasourceButton, {
-    url: url,
-    intl: intl,
-    editorView: editorView,
-    editorAnalyticsApi: editorAnalyticsApi,
-    currentAppearance: "url"
-  }), /*#__PURE__*/React.createElement(LinkToolbarAppearance, {
+  return /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(LinkToolbarAppearance, {
     key: "link-appearance",
     url: url,
     intl: intl,

package/dist/es2019/ui/editDatasourceAction.js

@@ -0,0 +1,25 @@
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { getDatasourceType } from '@atlaskit/editor-common/utils';
+import { showDatasourceModal } from '../pm-plugins/actions';
+export const editDatasource = (datasourceId, editorAnalyticsApi, appearance, extensionKey) => (state, dispatch) => {
+  const datasourceType = getDatasourceType(datasourceId);
+  if (dispatch && datasourceType) {
+    const {
+      tr
+    } = state;
+    showDatasourceModal(datasourceType)(tr);
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
+      action: ACTION.CLICKED,
+      actionSubject: ACTION_SUBJECT.BUTTON,
+      actionSubjectId: ACTION_SUBJECT_ID.EDIT_DATASOURCE,
+      eventType: EVENT_TYPE.UI,
+      attributes: {
+        extensionKey,
+        appearance
+      }
+    })(tr);
+    dispatch(tr);
+    return true;
+  }
+  return false;
+};