@atlaskit/editor-plugin-card 3.0.2 → 3.0.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-card
 
+## 3.0.4
+
+### Patch Changes
+
+- [#142271](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142271)
+  [`b6147e8a87a2d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b6147e8a87a2d) -
+  Add try/catch around localStorage usages
+
+## 3.0.3
+
+### Patch Changes
+
+- [#142202](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142202)
+  [`bd97acf1388d4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bd97acf1388d4) -
+  Fix edit datasource option not available on links with empty result or invalid jql
+
 ## 3.0.2
 
 ### Patch Changes

package/dist/cjs/common/local-storage.js

@@ -12,9 +12,18 @@ var LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR = exports.LOCAL_STORAGE_DISCOVERY_KEY_TO
 var ONE_DAY_IN_MILLISECONDS = exports.ONE_DAY_IN_MILLISECONDS = 86400000;
 var storageClient = new _frontendUtilities.StorageClient(LOCAL_STORAGE_CLIENT_KEY);
 var isLocalStorageKeyDiscovered = exports.isLocalStorageKeyDiscovered = function isLocalStorageKeyDiscovered(key) {
-  var localStorageValue = storageClient.getItem(key);
-  return !!localStorageValue && localStorageValue === LOCAL_STORAGE_DISCOVERED_KEY;
+  try {
+    var localStorageValue = storageClient.getItem(key);
+    return !!localStorageValue && localStorageValue === LOCAL_STORAGE_DISCOVERED_KEY;
+  } catch (_unused) {
+    // If localStorage is not available, don't show feature discovery component. Treat it as 'discovered'.
+    return true;
+  }
 };
 var markLocalStorageKeyDiscovered = exports.markLocalStorageKeyDiscovered = function markLocalStorageKeyDiscovered(key, expiration) {
-  storageClient.setItemWithExpiry(key, LOCAL_STORAGE_DISCOVERED_KEY, expiration);
+  try {
+    storageClient.setItemWithExpiry(key, LOCAL_STORAGE_DISCOVERED_KEY, expiration);
+  } catch (_unused2) {
+    // silent error
+  }
 };

package/dist/cjs/toolbar.js

@@ -188,7 +188,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;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
     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 : {},
@@ -208,8 +208,9 @@ 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$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
+    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);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [(0, _EditLinkToolbar.buildEditLinkToolbar)({
         providerFactory: providerFactory,
@@ -341,6 +342,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           fallback: [],
           render: function render(editorView) {
             return /*#__PURE__*/_react.default.createElement(_EditDatasourceButton.EditDatasourceButton, {
+              datasourceId: datasourceId,
               intl: intl,
               editorAnalyticsApi: editorAnalyticsApi,
               url: url,
@@ -392,7 +394,7 @@ var getSettingsButtonGroup = exports.getSettingsButtonGroup = function getSettin
   }];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) {
-  var _node$attrs2;
+  var _node$attrs3;
   var toolbarItems = [];
   if ((0, _utils3.isDatasourceConfigEditable)(datasourceId) && !(0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
     toolbarItems.push({
@@ -477,7 +479,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       }
     });
   }
-  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',

package/dist/cjs/ui/EditDatasourceButton.js

@@ -30,6 +30,7 @@ var buttonStyles = (0, _react2.css)({
 // if they can resolve into a datasource.
 var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardContext(_ref) {
   var cardContext = _ref.cardContext,
+    datasourceIdFromAdf = _ref.datasourceId,
     intl = _ref.intl,
     editorAnalyticsApi = _ref.editorAnalyticsApi,
     url = _ref.url,
@@ -40,8 +41,9 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
       url: url,
       cardContext: cardContext
     }),
-    datasourceId = _useFetchDatasourceIn.datasourceId,
+    datasourceIdFromUrl = _useFetchDatasourceIn.datasourceId,
     extensionKey = _useFetchDatasourceIn.extensionKey;
+  var datasourceId = datasourceIdFromUrl !== null && datasourceIdFromUrl !== void 0 ? datasourceIdFromUrl : datasourceIdFromAdf;
   var onEditDatasource = (0, _react.useCallback)(function () {
     if (editorView && datasourceId) {
       editDatasource(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
@@ -68,7 +70,8 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
   }), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
 };
 var EditDatasourceButton = exports.EditDatasourceButton = function EditDatasourceButton(_ref2) {
-  var intl = _ref2.intl,
+  var datasourceId = _ref2.datasourceId,
+    intl = _ref2.intl,
     editorAnalyticsApi = _ref2.editorAnalyticsApi,
     url = _ref2.url,
     editorView = _ref2.editorView,
@@ -76,6 +79,7 @@ var EditDatasourceButton = exports.EditDatasourceButton = function EditDatasourc
   return (0, _react2.jsx)(_CardContextProvider.CardContextProvider, null, function (_ref3) {
     var cardContext = _ref3.cardContext;
     return (0, _react2.jsx)(EditDatasourceButtonWithCardContext, {
+      datasourceId: datasourceId,
       url: url,
       intl: intl,
       editorAnalyticsApi: editorAnalyticsApi,

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

@@ -159,6 +159,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
 var EditToolbarButtonWithUrl = function EditToolbarButtonWithUrl(props) {
   var cardContext = props.cardContext,
     currentAppearance = props.currentAppearance,
+    datasourceIdFromAdf = props.datasourceId,
     editorAnalyticsApi = props.editorAnalyticsApi,
     editorView = props.editorView,
     intl = props.intl,
@@ -170,7 +171,8 @@ var EditToolbarButtonWithUrl = function EditToolbarButtonWithUrl(props) {
       cardContext: cardContext
     }),
     extensionKey = _useFetchDatasourceIn2.extensionKey,
-    datasourceId = _useFetchDatasourceIn2.datasourceId;
+    datasourceIdFromUrl = _useFetchDatasourceIn2.datasourceId;
+  var datasourceId = datasourceIdFromUrl !== null && datasourceIdFromUrl !== void 0 ? datasourceIdFromUrl : datasourceIdFromAdf;
   var editVariant = (0, _react.useMemo)(function () {
     var _cardContext$store2, _urlState$error2;
     if (!datasourceId || !(0, _utils.isDatasourceConfigEditable)(datasourceId)) {
@@ -254,6 +256,7 @@ var EditToolbarButton = exports.EditToolbarButton = function EditToolbarButton(p
     if ((0, _platformFeatureFlags.fg)('enable_datasource_nourl_edit_dropdown_datafetch')) {
       if (props.url) {
         return (0, _react2.jsx)(EditToolbarButtonWithUrl, {
+          datasourceId: datasourceId,
           url: props.url,
           intl: intl,
           editorAnalyticsApi: editorAnalyticsApi,

package/dist/es2019/common/local-storage.js

@@ -6,9 +6,18 @@ export const LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR = 'toolbar-upgrade-pulse';
 export const ONE_DAY_IN_MILLISECONDS = 86400000;
 const storageClient = new StorageClient(LOCAL_STORAGE_CLIENT_KEY);
 export const isLocalStorageKeyDiscovered = key => {
-  const localStorageValue = storageClient.getItem(key);
-  return !!localStorageValue && localStorageValue === LOCAL_STORAGE_DISCOVERED_KEY;
+  try {
+    const localStorageValue = storageClient.getItem(key);
+    return !!localStorageValue && localStorageValue === LOCAL_STORAGE_DISCOVERED_KEY;
+  } catch {
+    // If localStorage is not available, don't show feature discovery component. Treat it as 'discovered'.
+    return true;
+  }
 };
 export const markLocalStorageKeyDiscovered = (key, expiration) => {
-  storageClient.setItemWithExpiry(key, LOCAL_STORAGE_DISCOVERED_KEY, expiration);
+  try {
+    storageClient.setItemWithExpiry(key, LOCAL_STORAGE_DISCOVERED_KEY, expiration);
+  } catch {
+    // silent error
+  }
 };

package/dist/es2019/toolbar.js

@@ -176,7 +176,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;
+  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs$datasourc, _node$attrs2, _node$attrs2$datasour;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -200,8 +200,9 @@ 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$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 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);
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
     return [buildEditLinkToolbar({
       providerFactory,
@@ -330,6 +331,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
         type: 'custom',
         fallback: [],
         render: editorView => /*#__PURE__*/React.createElement(EditDatasourceButton, {
+          datasourceId: datasourceId,
           intl: intl,
           editorAnalyticsApi: editorAnalyticsApi,
           url: url,
@@ -379,7 +381,7 @@ export const getSettingsButtonGroup = (intl, editorAnalyticsApi, userPreferences
   }];
 };
 const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) => {
-  var _node$attrs2;
+  var _node$attrs3;
   const toolbarItems = [];
   if (isDatasourceConfigEditable(datasourceId) && !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
     toolbarItems.push({
@@ -464,7 +466,7 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       })
     });
   }
-  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',

package/dist/es2019/ui/EditDatasourceButton.js

@@ -23,6 +23,7 @@ const buttonStyles = css({
 // if they can resolve into a datasource.
 const EditDatasourceButtonWithCardContext = ({
   cardContext,
+  datasourceId: datasourceIdFromAdf,
   intl,
   editorAnalyticsApi,
   url,
@@ -30,13 +31,14 @@ const EditDatasourceButtonWithCardContext = ({
   currentAppearance
 }) => {
   const {
-    datasourceId,
+    datasourceId: datasourceIdFromUrl,
     extensionKey
   } = useFetchDatasourceInfo({
     isRegularCardNode: true,
     url,
     cardContext
   });
+  const datasourceId = datasourceIdFromUrl !== null && datasourceIdFromUrl !== void 0 ? datasourceIdFromUrl : datasourceIdFromAdf;
   const onEditDatasource = useCallback(() => {
     if (editorView && datasourceId) {
       editDatasource(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
@@ -63,6 +65,7 @@ const EditDatasourceButtonWithCardContext = ({
   }), jsx(Separator, null));
 };
 export const EditDatasourceButton = ({
+  datasourceId,
   intl,
   editorAnalyticsApi,
   url,
@@ -72,6 +75,7 @@ export const EditDatasourceButton = ({
   return jsx(CardContextProvider, null, ({
     cardContext
   }) => jsx(EditDatasourceButtonWithCardContext, {
+    datasourceId: datasourceId,
     url: url,
     intl: intl,
     editorAnalyticsApi: editorAnalyticsApi,

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

@@ -145,6 +145,7 @@ const EditToolbarButtonWithUrl = props => {
   const {
     cardContext,
     currentAppearance,
+    datasourceId: datasourceIdFromAdf,
     editorAnalyticsApi,
     editorView,
     intl,
@@ -153,12 +154,13 @@ const EditToolbarButtonWithUrl = props => {
   } = props;
   const {
     extensionKey,
-    datasourceId
+    datasourceId: datasourceIdFromUrl
   } = useFetchDatasourceInfo({
     isRegularCardNode: true,
     url,
     cardContext
   });
+  const datasourceId = datasourceIdFromUrl !== null && datasourceIdFromUrl !== void 0 ? datasourceIdFromUrl : datasourceIdFromAdf;
   const editVariant = useMemo(() => {
     var _cardContext$store2, _urlState$error2;
     if (!datasourceId || !isDatasourceConfigEditable(datasourceId)) {
@@ -246,6 +248,7 @@ export const EditToolbarButton = props => {
     if (fg('enable_datasource_nourl_edit_dropdown_datafetch')) {
       if (props.url) {
         return jsx(EditToolbarButtonWithUrl, {
+          datasourceId: datasourceId,
           url: props.url,
           intl: intl,
           editorAnalyticsApi: editorAnalyticsApi,

package/dist/esm/common/local-storage.js

@@ -6,9 +6,18 @@ export var LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR = 'toolbar-upgrade-pulse';
 export var ONE_DAY_IN_MILLISECONDS = 86400000;
 var storageClient = new StorageClient(LOCAL_STORAGE_CLIENT_KEY);
 export var isLocalStorageKeyDiscovered = function isLocalStorageKeyDiscovered(key) {
-  var localStorageValue = storageClient.getItem(key);
-  return !!localStorageValue && localStorageValue === LOCAL_STORAGE_DISCOVERED_KEY;
+  try {
+    var localStorageValue = storageClient.getItem(key);
+    return !!localStorageValue && localStorageValue === LOCAL_STORAGE_DISCOVERED_KEY;
+  } catch (_unused) {
+    // If localStorage is not available, don't show feature discovery component. Treat it as 'discovered'.
+    return true;
+  }
 };
 export var markLocalStorageKeyDiscovered = function markLocalStorageKeyDiscovered(key, expiration) {
-  storageClient.setItemWithExpiry(key, LOCAL_STORAGE_DISCOVERED_KEY, expiration);
+  try {
+    storageClient.setItemWithExpiry(key, LOCAL_STORAGE_DISCOVERED_KEY, expiration);
+  } catch (_unused2) {
+    // silent error
+  }
 };

package/dist/esm/toolbar.js

@@ -178,7 +178,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;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
     var _titleUrlPairFromNode2 = 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 : {},
@@ -198,8 +198,9 @@ 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 = 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 = pluginKey.getState(state);
-    var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && 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);
+    var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && 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);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [buildEditLinkToolbar({
         providerFactory: providerFactory,
@@ -331,6 +332,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           fallback: [],
           render: function render(editorView) {
             return /*#__PURE__*/React.createElement(EditDatasourceButton, {
+              datasourceId: datasourceId,
               intl: intl,
               editorAnalyticsApi: editorAnalyticsApi,
               url: url,
@@ -382,7 +384,7 @@ export var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editor
   }];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance) {
-  var _node$attrs2;
+  var _node$attrs3;
   var toolbarItems = [];
   if (isDatasourceConfigEditable(datasourceId) && !fg('platform.linking-platform.enable-datasource-edit-dropdown-toolbar')) {
     toolbarItems.push({
@@ -467,7 +469,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       }
     });
   }
-  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       id: 'editor.link.openLink',
       type: 'button',

package/dist/esm/ui/EditDatasourceButton.js

@@ -23,6 +23,7 @@ var buttonStyles = css({
 // if they can resolve into a datasource.
 var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardContext(_ref) {
   var cardContext = _ref.cardContext,
+    datasourceIdFromAdf = _ref.datasourceId,
     intl = _ref.intl,
     editorAnalyticsApi = _ref.editorAnalyticsApi,
     url = _ref.url,
@@ -33,8 +34,9 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
       url: url,
       cardContext: cardContext
     }),
-    datasourceId = _useFetchDatasourceIn.datasourceId,
+    datasourceIdFromUrl = _useFetchDatasourceIn.datasourceId,
     extensionKey = _useFetchDatasourceIn.extensionKey;
+  var datasourceId = datasourceIdFromUrl !== null && datasourceIdFromUrl !== void 0 ? datasourceIdFromUrl : datasourceIdFromAdf;
   var onEditDatasource = useCallback(function () {
     if (editorView && datasourceId) {
       editDatasource(datasourceId, editorAnalyticsApi, currentAppearance, extensionKey)(editorView.state, editorView.dispatch);
@@ -61,7 +63,8 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
   }), jsx(Separator, null));
 };
 export var EditDatasourceButton = function EditDatasourceButton(_ref2) {
-  var intl = _ref2.intl,
+  var datasourceId = _ref2.datasourceId,
+    intl = _ref2.intl,
     editorAnalyticsApi = _ref2.editorAnalyticsApi,
     url = _ref2.url,
     editorView = _ref2.editorView,
@@ -69,6 +72,7 @@ export var EditDatasourceButton = function EditDatasourceButton(_ref2) {
   return jsx(CardContextProvider, null, function (_ref3) {
     var cardContext = _ref3.cardContext;
     return jsx(EditDatasourceButtonWithCardContext, {
+      datasourceId: datasourceId,
       url: url,
       intl: intl,
       editorAnalyticsApi: editorAnalyticsApi,

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

@@ -153,6 +153,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
 var EditToolbarButtonWithUrl = function EditToolbarButtonWithUrl(props) {
   var cardContext = props.cardContext,
     currentAppearance = props.currentAppearance,
+    datasourceIdFromAdf = props.datasourceId,
     editorAnalyticsApi = props.editorAnalyticsApi,
     editorView = props.editorView,
     intl = props.intl,
@@ -164,7 +165,8 @@ var EditToolbarButtonWithUrl = function EditToolbarButtonWithUrl(props) {
       cardContext: cardContext
     }),
     extensionKey = _useFetchDatasourceIn2.extensionKey,
-    datasourceId = _useFetchDatasourceIn2.datasourceId;
+    datasourceIdFromUrl = _useFetchDatasourceIn2.datasourceId;
+  var datasourceId = datasourceIdFromUrl !== null && datasourceIdFromUrl !== void 0 ? datasourceIdFromUrl : datasourceIdFromAdf;
   var editVariant = useMemo(function () {
     var _cardContext$store2, _urlState$error2;
     if (!datasourceId || !isDatasourceConfigEditable(datasourceId)) {
@@ -248,6 +250,7 @@ export var EditToolbarButton = function EditToolbarButton(props) {
     if (fg('enable_datasource_nourl_edit_dropdown_datafetch')) {
       if (props.url) {
         return jsx(EditToolbarButtonWithUrl, {
+          datasourceId: datasourceId,
           url: props.url,
           intl: intl,
           editorAnalyticsApi: editorAnalyticsApi,

package/dist/types/ui/EditDatasourceButton.d.ts

@@ -6,6 +6,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CardContext } from '@atlaskit/link-provider';
 import { type CardType } from '../types';
 export interface EditDatasourceButtonProps {
+    datasourceId?: string;
     intl: IntlShape;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     url?: string;
@@ -13,5 +14,5 @@ export interface EditDatasourceButtonProps {
     cardContext?: CardContext;
     currentAppearance?: CardType;
 }
-export declare const EditDatasourceButton: ({ intl, editorAnalyticsApi, url, editorView, currentAppearance, }: EditDatasourceButtonProps) => jsx.JSX.Element;
+export declare const EditDatasourceButton: ({ datasourceId, intl, editorAnalyticsApi, url, editorView, currentAppearance, }: EditDatasourceButtonProps) => jsx.JSX.Element;
 export declare const editDatasource: (datasourceId: string, editorAnalyticsApi?: EditorAnalyticsAPI, appearance?: CardType, extensionKey?: string) => Command;

package/dist/types/ui/EditToolbarButton/types.d.ts

@@ -15,6 +15,7 @@ export interface EditDatasourceToolbarButtonWithCommonProps {
 }
 export interface EditDatasourceToolbarButtonWithUrlProps extends EditDatasourceToolbarButtonWithCommonProps {
     cardContext?: CardContext;
+    datasourceId?: string;
     url: string;
 }
 export interface EditDatasourceToolbarButtonWithDatasourceIdProps extends EditDatasourceToolbarButtonWithCommonProps {

package/dist/types-ts4.5/ui/EditDatasourceButton.d.ts

@@ -6,6 +6,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CardContext } from '@atlaskit/link-provider';
 import { type CardType } from '../types';
 export interface EditDatasourceButtonProps {
+    datasourceId?: string;
     intl: IntlShape;
     editorAnalyticsApi?: EditorAnalyticsAPI;
     url?: string;
@@ -13,5 +14,5 @@ export interface EditDatasourceButtonProps {
     cardContext?: CardContext;
     currentAppearance?: CardType;
 }
-export declare const EditDatasourceButton: ({ intl, editorAnalyticsApi, url, editorView, currentAppearance, }: EditDatasourceButtonProps) => jsx.JSX.Element;
+export declare const EditDatasourceButton: ({ datasourceId, intl, editorAnalyticsApi, url, editorView, currentAppearance, }: EditDatasourceButtonProps) => jsx.JSX.Element;
 export declare const editDatasource: (datasourceId: string, editorAnalyticsApi?: EditorAnalyticsAPI, appearance?: CardType, extensionKey?: string) => Command;

package/dist/types-ts4.5/ui/EditToolbarButton/types.d.ts

@@ -15,6 +15,7 @@ export interface EditDatasourceToolbarButtonWithCommonProps {
 }
 export interface EditDatasourceToolbarButtonWithUrlProps extends EditDatasourceToolbarButtonWithCommonProps {
     cardContext?: CardContext;
+    datasourceId?: string;
     url: string;
 }
 export interface EditDatasourceToolbarButtonWithDatasourceIdProps extends EditDatasourceToolbarButtonWithCommonProps {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "3.0.2",
+	"version": "3.0.4",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",