@atlaskit/editor-plugin-card 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-card
 
+## 1.0.4
+
+### Patch Changes
+
+- [#75549](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75549) [`cdb2d5721cce`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cdb2d5721cce) - Fix an issue where view switching from toolbar was causing js error.
+- Updated dependencies
+
+## 1.0.3
+
+### Patch Changes
+
+- [#72875](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72875) [`0d1e8b03af0b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0d1e8b03af0b) - Adding datasource stash to save datasource views when switching to inline/block and then back to datasource view
+
 ## 1.0.2
 
 ### Patch Changes

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showLinkToolbar = exports.showDatasourceModal = exports.setProvider = exports.setDatasourceTableRef = exports.setCardLayoutAndDatasourceTableRef = exports.setCardLayout = exports.resolveCard = exports.registerSmartCardEvents = exports.registerRemoveOverlay = exports.registerCard = exports.queueCards = exports.hideLinkToolbar = exports.hideDatasourceModal = exports.clearOverlayCandidate = exports.cardAction = void 0;
+exports.showLinkToolbar = exports.showDatasourceModal = exports.setProvider = exports.setDatasourceTableRef = exports.setDatasourceStash = exports.setCardLayoutAndDatasourceTableRef = exports.setCardLayout = exports.resolveCard = exports.removeDatasourceStash = exports.registerSmartCardEvents = exports.registerRemoveOverlay = exports.registerCard = exports.queueCards = exports.hideLinkToolbar = exports.hideDatasourceModal = exports.clearOverlayCandidate = exports.cardAction = void 0;
 var _pluginKey = require("./plugin-key");
 var cardAction = exports.cardAction = function cardAction(tr, action) {
   return tr.setMeta(_pluginKey.pluginKey, action);
@@ -110,4 +110,16 @@ var clearOverlayCandidate = exports.clearOverlayCandidate = function clearOverla
   return cardAction(tr, {
     type: 'CLEAR_OVERLAY_CANDIDATE'
   });
+};
+var setDatasourceStash = exports.setDatasourceStash = function setDatasourceStash(tr, datasourceStash) {
+  return cardAction(tr, {
+    type: 'SET_DATASOURCE_STASH',
+    datasourceStash: datasourceStash
+  });
+};
+var removeDatasourceStash = exports.removeDatasourceStash = function removeDatasourceStash(tr, url) {
+  return cardAction(tr, {
+    type: 'REMOVE_DATASOURCE_STASH',
+    url: url
+  });
 };

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

@@ -251,13 +251,14 @@ var convertHyperlinkToSmartCard = exports.convertHyperlinkToSmartCard = function
 };
 var changeSelectedCardToLink = exports.changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos, editorAnalyticsApi) {
   return function (state, dispatch) {
+    var selectedNode = state.selection instanceof _state.NodeSelection ? state.selection.node : undefined;
     var tr;
     if (node && pos) {
       tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
     } else {
       tr = cardToLinkWithTransaction(state, text, href);
     }
-    var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
+    updateDatasourceStash(tr, selectedNode);
     if (sendAnalytics) {
       if (selectedNode) {
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
@@ -356,7 +357,7 @@ var changeSelectedCardToText = exports.changeSelectedCardToText = function chang
 var setSelectedCardAppearance = exports.setSelectedCardAppearance = function setSelectedCardAppearance(appearance, editorAnalyticsApi) {
   return function (state, dispatch) {
     var _previousNode$type;
-    var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
+    var selectedNode = state.selection instanceof _state.NodeSelection ? state.selection.node : undefined;
     if (!selectedNode) {
       // When there is no selected node, we insert a new one
       // and replace the existing blue link
@@ -389,6 +390,7 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
       to = _state$selection.to;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
+    updateDatasourceStash(tr, selectedNode);
 
     // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
     if (tr.doc.nodeSize - 2 === to) {
@@ -430,7 +432,7 @@ var getLinkNodeType = exports.getLinkNodeType = function getLinkNodeType(appeara
 };
 
 // Apply an update made from a datasource ui interaction
-var updateCardViaDatasource = exports.updateCardViaDatasource = function updateCardViaDatasource(state, node, newAdf, view, sourceEvent) {
+var updateCardViaDatasource = exports.updateCardViaDatasource = function updateCardViaDatasource(state, node, newAdf, view, sourceEvent, isDeletingConfig) {
   var tr = state.tr,
     from = state.selection.from,
     schemaNodes = state.schema.nodes;
@@ -468,7 +470,11 @@ var updateCardViaDatasource = exports.updateCardViaDatasource = function updateC
     action: _analytics.ACTION.UPDATED,
     sourceEvent: sourceEvent
   });
-  (0, _actions.hideDatasourceModal)(tr);
+  if (isDeletingConfig) {
+    (0, _actions.removeDatasourceStash)(tr, node.attrs.url);
+  } else {
+    (0, _actions.hideDatasourceModal)(tr);
+  }
   view.dispatch(tr.scrollIntoView());
 };
 var insertDatasource = exports.insertDatasource = function insertDatasource(state, adf, view, sourceEvent) {
@@ -505,4 +511,13 @@ var getAttrsForAppearance = exports.getAttrsForAppearance = function getAttrsFor
     };
   }
   return selectedNode.attrs;
+};
+var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
+  var _selectedNode$attrs;
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id)) {
+    (0, _actions.setDatasourceStash)(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
+  }
 };

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

@@ -82,6 +82,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             requests: [],
             provider: null,
             cards: [],
+            datasourceStash: {},
             showLinkingToolbar: false,
             smartLinkEvents: undefined,
             editorAppearance: editorAppearance,

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

@@ -1,11 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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) { (0, _defineProperty2.default)(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; }
 var queue = function queue(state, action) {
@@ -84,6 +88,22 @@ var registerRemoveOverlayOnInsertedLink = function registerRemoveOverlayOnInsert
     removeOverlay: action.callback
   });
 };
+var setDatasourceStash = function setDatasourceStash(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    datasourceStash: _objectSpread(_objectSpread({}, state.datasourceStash), {}, (0, _defineProperty2.default)({}, action.datasourceStash.url, {
+      views: action.datasourceStash.views
+    }))
+  });
+};
+var removeDatasourceStash = function removeDatasourceStash(state, action) {
+  var _state$datasourceStas = state.datasourceStash,
+    _action$url = action.url,
+    _ = _state$datasourceStas[_action$url],
+    datasourceStash = (0, _objectWithoutProperties2.default)(_state$datasourceStas, [_action$url].map(_toPropertyKey));
+  return _objectSpread(_objectSpread({}, state), {}, {
+    datasourceStash: datasourceStash
+  });
+};
 var _default = exports.default = function _default(state, action) {
   switch (action.type) {
     case 'QUEUE':
@@ -113,5 +133,9 @@ var _default = exports.default = function _default(state, action) {
       return clearOverlayCandidate(state);
     case 'REGISTER_REMOVE_OVERLAY_ON_INSERTED_LINK':
       return registerRemoveOverlayOnInsertedLink(state, action);
+    case 'SET_DATASOURCE_STASH':
+      return setDatasourceStash(state, action);
+    case 'REMOVE_DATASOURCE_STASH':
+      return removeDatasourceStash(state, action);
   }
 };

package/dist/cjs/ui/DatasourceAppearanceButton.js

@@ -15,6 +15,7 @@ var _table = _interopRequireDefault(require("@atlaskit/icon/glyph/table"));
 var _linkDatasource = require("@atlaskit/link-datasource");
 var _primitives = require("@atlaskit/primitives");
 var _doc = require("../pm-plugins/doc");
+var _pluginKey = require("../pm-plugins/plugin-key");
 var _CardContextProvider = require("./CardContextProvider");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
 /** @jsx jsx */
@@ -37,20 +38,22 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
     datasourceId = _useFetchDatasourceIn.datasourceId,
     parameters = _useFetchDatasourceIn.parameters;
   var onChangeAppearance = (0, _react.useCallback)(function () {
+    var _state$datasourceStas, _state$datasourceStas2;
     if (!editorView || !datasourceId || !parameters) {
       return;
     }
+    var state = _pluginKey.pluginKey.getState(editorState);
     var newAdf = (0, _linkDatasource.buildDatasourceAdf)({
       id: datasourceId,
       parameters: parameters,
-      views: [{
+      views: (_state$datasourceStas = state === null || state === void 0 || (_state$datasourceStas2 = state.datasourceStash[url]) === null || _state$datasourceStas2 === void 0 ? void 0 : _state$datasourceStas2.views) !== null && _state$datasourceStas !== void 0 ? _state$datasourceStas : [{
         type: 'table'
       }]
     }, url);
     var selection = editorState.selection;
     var existingNode = selection instanceof _state.NodeSelection ? selection.node : undefined;
     if (existingNode) {
-      (0, _doc.updateCardViaDatasource)(editorState, existingNode, newAdf, editorView, undefined);
+      (0, _doc.updateCardViaDatasource)(editorState, existingNode, newAdf, editorView, undefined, true);
     }
   }, [parameters, datasourceId, editorState, editorView, url]);
   if (!parameters || !datasourceId || !(0, _utils.canRenderDatasource)(datasourceId)) {

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

@@ -57,4 +57,12 @@ export const hideDatasourceModal = tr => cardAction(tr, {
 });
 export const clearOverlayCandidate = tr => cardAction(tr, {
   type: 'CLEAR_OVERLAY_CANDIDATE'
+});
+export const setDatasourceStash = (tr, datasourceStash) => cardAction(tr, {
+  type: 'SET_DATASOURCE_STASH',
+  datasourceStash
+});
+export const removeDatasourceStash = (tr, url) => cardAction(tr, {
+  type: 'REMOVE_DATASOURCE_STASH',
+  url
 });

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

@@ -6,8 +6,8 @@ import { getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { appearanceForNodeType, selectedCardAppearance } from '../utils';
-import { hideDatasourceModal, queueCards, resolveCard } from './actions';
+import { appearanceForNodeType, isDatasourceConfigEditable, selectedCardAppearance } from '../utils';
+import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
 /**
@@ -228,13 +228,14 @@ export const convertHyperlinkToSmartCard = (state, source, appearance, normalize
   return queueCards(requests)(state.tr);
 };
 export const changeSelectedCardToLink = (text, href, sendAnalytics, node, pos, editorAnalyticsApi) => (state, dispatch) => {
+  const selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
   let tr;
   if (node && pos) {
     tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
   } else {
     tr = cardToLinkWithTransaction(state, text, href);
   }
-  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+  updateDatasourceStash(tr, selectedNode);
   if (sendAnalytics) {
     if (selectedNode) {
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
@@ -329,7 +330,7 @@ export const changeSelectedCardToText = (text, editorAnalyticsApi) => (state, di
 };
 export const setSelectedCardAppearance = (appearance, editorAnalyticsApi) => (state, dispatch) => {
   var _previousNode$type;
-  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+  const selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
   if (!selectedNode) {
     // When there is no selected node, we insert a new one
     // and replace the existing blue link
@@ -364,6 +365,7 @@ export const setSelectedCardAppearance = (appearance, editorAnalyticsApi) => (st
   } = state.selection;
   const nodeType = getLinkNodeType(appearance, state.schema.nodes);
   const tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
+  updateDatasourceStash(tr, selectedNode);
 
   // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
   if (tr.doc.nodeSize - 2 === to) {
@@ -404,7 +406,7 @@ export const getLinkNodeType = (appearance, linkNodes) => {
 };
 
 // Apply an update made from a datasource ui interaction
-export const updateCardViaDatasource = (state, node, newAdf, view, sourceEvent) => {
+export const updateCardViaDatasource = (state, node, newAdf, view, sourceEvent, isDeletingConfig) => {
   const {
     tr,
     selection: {
@@ -443,7 +445,11 @@ export const updateCardViaDatasource = (state, node, newAdf, view, sourceEvent)
     action: ACTION.UPDATED,
     sourceEvent
   });
-  hideDatasourceModal(tr);
+  if (isDeletingConfig) {
+    removeDatasourceStash(tr, node.attrs.url);
+  } else {
+    hideDatasourceModal(tr);
+  }
   view.dispatch(tr.scrollIntoView());
 };
 export const insertDatasource = (state, adf, view, sourceEvent) => {
@@ -489,4 +495,13 @@ export const getAttrsForAppearance = (appearance, selectedNode) => {
     };
   }
   return selectedNode.attrs;
+};
+const updateDatasourceStash = (tr, selectedNode) => {
+  var _selectedNode$attrs;
+  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
+    setDatasourceStash(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
+  }
 };

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

@@ -67,6 +67,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           requests: [],
           provider: null,
           cards: [],
+          datasourceStash: {},
           showLinkingToolbar: false,
           smartLinkEvents: undefined,
           editorAppearance,

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

@@ -85,6 +85,27 @@ const registerRemoveOverlayOnInsertedLink = (state, action) => {
     removeOverlay: action.callback
   };
 };
+const setDatasourceStash = (state, action) => {
+  return {
+    ...state,
+    datasourceStash: {
+      ...state.datasourceStash,
+      [action.datasourceStash.url]: {
+        views: action.datasourceStash.views
+      }
+    }
+  };
+};
+const removeDatasourceStash = (state, action) => {
+  const {
+    [action.url]: _,
+    ...datasourceStash
+  } = state.datasourceStash;
+  return {
+    ...state,
+    datasourceStash
+  };
+};
 export default ((state, action) => {
   switch (action.type) {
     case 'QUEUE':
@@ -114,5 +135,9 @@ export default ((state, action) => {
       return clearOverlayCandidate(state);
     case 'REGISTER_REMOVE_OVERLAY_ON_INSERTED_LINK':
       return registerRemoveOverlayOnInsertedLink(state, action);
+    case 'SET_DATASOURCE_STASH':
+      return setDatasourceStash(state, action);
+    case 'REMOVE_DATASOURCE_STASH':
+      return removeDatasourceStash(state, action);
   }
 });

package/dist/es2019/ui/DatasourceAppearanceButton.js

@@ -9,6 +9,7 @@ import TableIcon from '@atlaskit/icon/glyph/table';
 import { buildDatasourceAdf } from '@atlaskit/link-datasource';
 import { Flex } from '@atlaskit/primitives';
 import { updateCardViaDatasource } from '../pm-plugins/doc';
+import { pluginKey } from '../pm-plugins/plugin-key';
 import { CardContextProvider } from './CardContextProvider';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 const buttonStyles = css({
@@ -31,13 +32,15 @@ const DatasourceAppearanceButtonWithCardContext = ({
     cardContext
   });
   const onChangeAppearance = useCallback(() => {
+    var _state$datasourceStas, _state$datasourceStas2;
     if (!editorView || !datasourceId || !parameters) {
       return;
     }
+    const state = pluginKey.getState(editorState);
     const newAdf = buildDatasourceAdf({
       id: datasourceId,
       parameters,
-      views: [{
+      views: (_state$datasourceStas = state === null || state === void 0 ? void 0 : (_state$datasourceStas2 = state.datasourceStash[url]) === null || _state$datasourceStas2 === void 0 ? void 0 : _state$datasourceStas2.views) !== null && _state$datasourceStas !== void 0 ? _state$datasourceStas : [{
         type: 'table'
       }]
     }, url);
@@ -46,7 +49,7 @@ const DatasourceAppearanceButtonWithCardContext = ({
     } = editorState;
     const existingNode = selection instanceof NodeSelection ? selection.node : undefined;
     if (existingNode) {
-      updateCardViaDatasource(editorState, existingNode, newAdf, editorView, undefined);
+      updateCardViaDatasource(editorState, existingNode, newAdf, editorView, undefined, true);
     }
   }, [parameters, datasourceId, editorState, editorView, url]);
   if (!parameters || !datasourceId || !canRenderDatasource(datasourceId)) {

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

@@ -104,4 +104,16 @@ export var clearOverlayCandidate = function clearOverlayCandidate(tr) {
   return cardAction(tr, {
     type: 'CLEAR_OVERLAY_CANDIDATE'
   });
+};
+export var setDatasourceStash = function setDatasourceStash(tr, datasourceStash) {
+  return cardAction(tr, {
+    type: 'SET_DATASOURCE_STASH',
+    datasourceStash: datasourceStash
+  });
+};
+export var removeDatasourceStash = function removeDatasourceStash(tr, url) {
+  return cardAction(tr, {
+    type: 'REMOVE_DATASOURCE_STASH',
+    url: url
+  });
 };

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

@@ -10,8 +10,8 @@ import { getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { appearanceForNodeType, selectedCardAppearance } from '../utils';
-import { hideDatasourceModal, queueCards, resolveCard } from './actions';
+import { appearanceForNodeType, isDatasourceConfigEditable, selectedCardAppearance } from '../utils';
+import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
 /**
@@ -244,13 +244,14 @@ export var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(st
 };
 export var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos, editorAnalyticsApi) {
   return function (state, dispatch) {
+    var selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
     var tr;
     if (node && pos) {
       tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
     } else {
       tr = cardToLinkWithTransaction(state, text, href);
     }
-    var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+    updateDatasourceStash(tr, selectedNode);
     if (sendAnalytics) {
       if (selectedNode) {
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
@@ -349,7 +350,7 @@ export var changeSelectedCardToText = function changeSelectedCardToText(text, ed
 export var setSelectedCardAppearance = function setSelectedCardAppearance(appearance, editorAnalyticsApi) {
   return function (state, dispatch) {
     var _previousNode$type;
-    var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+    var selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
     if (!selectedNode) {
       // When there is no selected node, we insert a new one
       // and replace the existing blue link
@@ -382,6 +383,7 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
       to = _state$selection.to;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
+    updateDatasourceStash(tr, selectedNode);
 
     // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
     if (tr.doc.nodeSize - 2 === to) {
@@ -423,7 +425,7 @@ export var getLinkNodeType = function getLinkNodeType(appearance, linkNodes) {
 };
 
 // Apply an update made from a datasource ui interaction
-export var updateCardViaDatasource = function updateCardViaDatasource(state, node, newAdf, view, sourceEvent) {
+export var updateCardViaDatasource = function updateCardViaDatasource(state, node, newAdf, view, sourceEvent, isDeletingConfig) {
   var tr = state.tr,
     from = state.selection.from,
     schemaNodes = state.schema.nodes;
@@ -461,7 +463,11 @@ export var updateCardViaDatasource = function updateCardViaDatasource(state, nod
     action: ACTION.UPDATED,
     sourceEvent: sourceEvent
   });
-  hideDatasourceModal(tr);
+  if (isDeletingConfig) {
+    removeDatasourceStash(tr, node.attrs.url);
+  } else {
+    hideDatasourceModal(tr);
+  }
   view.dispatch(tr.scrollIntoView());
 };
 export var insertDatasource = function insertDatasource(state, adf, view, sourceEvent) {
@@ -498,4 +504,13 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
     };
   }
   return selectedNode.attrs;
+};
+var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
+  var _selectedNode$attrs;
+  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
+    setDatasourceStash(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
+  }
 };

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

@@ -70,6 +70,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             requests: [],
             provider: null,
             cards: [],
+            datasourceStash: {},
             showLinkingToolbar: false,
             smartLinkEvents: undefined,
             editorAppearance: editorAppearance,

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

@@ -1,4 +1,8 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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; }
 var queue = function queue(state, action) {
@@ -77,6 +81,22 @@ var registerRemoveOverlayOnInsertedLink = function registerRemoveOverlayOnInsert
     removeOverlay: action.callback
   });
 };
+var setDatasourceStash = function setDatasourceStash(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    datasourceStash: _objectSpread(_objectSpread({}, state.datasourceStash), {}, _defineProperty({}, action.datasourceStash.url, {
+      views: action.datasourceStash.views
+    }))
+  });
+};
+var removeDatasourceStash = function removeDatasourceStash(state, action) {
+  var _state$datasourceStas = state.datasourceStash,
+    _action$url = action.url,
+    _ = _state$datasourceStas[_action$url],
+    datasourceStash = _objectWithoutProperties(_state$datasourceStas, [_action$url].map(_toPropertyKey));
+  return _objectSpread(_objectSpread({}, state), {}, {
+    datasourceStash: datasourceStash
+  });
+};
 export default (function (state, action) {
   switch (action.type) {
     case 'QUEUE':
@@ -106,5 +126,9 @@ export default (function (state, action) {
       return clearOverlayCandidate(state);
     case 'REGISTER_REMOVE_OVERLAY_ON_INSERTED_LINK':
       return registerRemoveOverlayOnInsertedLink(state, action);
+    case 'SET_DATASOURCE_STASH':
+      return setDatasourceStash(state, action);
+    case 'REMOVE_DATASOURCE_STASH':
+      return removeDatasourceStash(state, action);
   }
 });

package/dist/esm/ui/DatasourceAppearanceButton.js

@@ -9,6 +9,7 @@ import TableIcon from '@atlaskit/icon/glyph/table';
 import { buildDatasourceAdf } from '@atlaskit/link-datasource';
 import { Flex } from '@atlaskit/primitives';
 import { updateCardViaDatasource } from '../pm-plugins/doc';
+import { pluginKey } from '../pm-plugins/plugin-key';
 import { CardContextProvider } from './CardContextProvider';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 var buttonStyles = css({
@@ -29,20 +30,22 @@ var DatasourceAppearanceButtonWithCardContext = function DatasourceAppearanceBut
     datasourceId = _useFetchDatasourceIn.datasourceId,
     parameters = _useFetchDatasourceIn.parameters;
   var onChangeAppearance = useCallback(function () {
+    var _state$datasourceStas, _state$datasourceStas2;
     if (!editorView || !datasourceId || !parameters) {
       return;
     }
+    var state = pluginKey.getState(editorState);
     var newAdf = buildDatasourceAdf({
       id: datasourceId,
       parameters: parameters,
-      views: [{
+      views: (_state$datasourceStas = state === null || state === void 0 || (_state$datasourceStas2 = state.datasourceStash[url]) === null || _state$datasourceStas2 === void 0 ? void 0 : _state$datasourceStas2.views) !== null && _state$datasourceStas !== void 0 ? _state$datasourceStas : [{
         type: 'table'
       }]
     }, url);
     var selection = editorState.selection;
     var existingNode = selection instanceof NodeSelection ? selection.node : undefined;
     if (existingNode) {
-      updateCardViaDatasource(editorState, existingNode, newAdf, editorView, undefined);
+      updateCardViaDatasource(editorState, existingNode, newAdf, editorView, undefined, true);
     }
   }, [parameters, datasourceId, editorState, editorView, url]);
   if (!parameters || !datasourceId || !canRenderDatasource(datasourceId)) {

package/dist/types/pm-plugins/actions.d.ts

@@ -1,6 +1,7 @@
 import type { CardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { DatasourceModalType } from '@atlaskit/editor-common/types';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { DatasourceAdfView } from '@atlaskit/linking-common';
 import type { SmartLinkEvents } from '@atlaskit/smart-card';
 import type { CardInfo, CardPluginAction, Request } from '../types';
 import type { DatasourceTableLayout } from '../ui/LayoutButton/types';
@@ -22,3 +23,8 @@ export declare const hideLinkToolbar: (tr: Transaction) => Transaction;
 export declare const showDatasourceModal: (modalType: DatasourceModalType) => (tr: Transaction) => Transaction;
 export declare const hideDatasourceModal: (tr: Transaction) => Transaction;
 export declare const clearOverlayCandidate: (tr: Transaction) => Transaction;
+export declare const setDatasourceStash: (tr: Transaction, datasourceStash: {
+    url: string;
+    views: DatasourceAdfView[];
+}) => Transaction;
+export declare const removeDatasourceStash: (tr: Transaction, url: string) => Transaction;

package/dist/types/pm-plugins/doc.d.ts

@@ -23,7 +23,7 @@ export type LinkNodes = {
     [key in 'inlineCard' | 'blockCard' | 'embedCard']: NodeType;
 };
 export declare const getLinkNodeType: (appearance: CardAppearance, linkNodes: LinkNodes) => NodeType;
-export declare const updateCardViaDatasource: (state: EditorState, node: Node, newAdf: DatasourceAdf | InlineCardAdf, view: EditorView, sourceEvent?: UIAnalyticsEvent) => void;
+export declare const updateCardViaDatasource: (state: EditorState, node: Node, newAdf: DatasourceAdf | InlineCardAdf, view: EditorView, sourceEvent?: UIAnalyticsEvent, isDeletingConfig?: boolean) => void;
 export declare const insertDatasource: (state: EditorState, adf: DatasourceAdf | InlineCardAdf, view: EditorView, sourceEvent?: UIAnalyticsEvent) => void;
 /**
  * Get attributes for new Card Appearance

package/dist/types/pm-plugins/util/state.d.ts

@@ -19,6 +19,11 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
         url?: string | undefined;
     }[];
     provider: import("@atlaskit/editor-common/provider-factory").CardProvider | null;
+    datasourceStash: {
+        [x: string]: {
+            views: import("@atlaskit/linking-common").DatasourceAdfTableView[];
+        };
+    };
     showLinkingToolbar: boolean;
     smartLinkEvents?: import("@atlaskit/smart-card").SmartLinkEvents | undefined;
     editorAppearance?: import("@atlaskit/editor-common/types").EditorAppearance | undefined;

package/dist/types/types.d.ts

@@ -3,6 +3,7 @@ import type { ACTION } from '@atlaskit/editor-common/analytics';
 import type { CardOptions, CardReplacementInputMethod } from '@atlaskit/editor-common/card';
 import type { CardAppearance, CardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { DatasourceModalType, EditorAppearance, LinkPickerOptions } from '@atlaskit/editor-common/types';
+import type { DatasourceAdfView } from '@atlaskit/linking-common';
 import type { SmartLinkEvents } from '@atlaskit/smart-card';
 import type { EditorCardPluginEvents } from './analytics/create-events-queue';
 import type { CardPluginEvent } from './analytics/types';
@@ -65,10 +66,18 @@ export type Request = {
      */
     sourceEvent?: UIAnalyticsEvent | null | undefined;
 };
+/**
+ * Each key in the stash is URL.
+ * For any given URL we might temporarily stash some user preferences, like view settings for the datasource.
+ */
+type DatasourceStash = Record<string, {
+    views: DatasourceAdfView[];
+}>;
 export type CardPluginState = {
     requests: Request[];
     provider: CardProvider | null;
     cards: CardInfo[];
+    datasourceStash: DatasourceStash;
     showLinkingToolbar: boolean;
     smartLinkEvents?: SmartLinkEvents;
     editorAppearance?: EditorAppearance;
@@ -144,4 +153,16 @@ export type RegisterRemoveOverlayOnInsertedLink = {
     type: 'REGISTER_REMOVE_OVERLAY_ON_INSERTED_LINK';
     callback: () => void;
 };
-export type CardPluginAction = SetProvider | Queue | Resolve | Register | ShowLinkToolbar | HideLinkToolbar | ShowDatasourceModal | HideDatasourceModal | RegisterSmartCardEvents | SetDatasourceTableRef | SetCardLayout | SetCardLayoutAndDatasourceTableRef | ClearOverlayCandidate | RegisterRemoveOverlayOnInsertedLink;
+export type SetDatasourceStash = {
+    type: 'SET_DATASOURCE_STASH';
+    datasourceStash: {
+        url: string;
+        views: DatasourceAdfView[];
+    };
+};
+export type RemoveDatasourceStash = {
+    type: 'REMOVE_DATASOURCE_STASH';
+    url: string;
+};
+export type CardPluginAction = SetProvider | Queue | Resolve | Register | ShowLinkToolbar | HideLinkToolbar | ShowDatasourceModal | HideDatasourceModal | RegisterSmartCardEvents | SetDatasourceTableRef | SetCardLayout | SetCardLayoutAndDatasourceTableRef | ClearOverlayCandidate | RegisterRemoveOverlayOnInsertedLink | SetDatasourceStash | RemoveDatasourceStash;
+export {};

package/dist/types-ts4.5/pm-plugins/actions.d.ts

@@ -1,6 +1,7 @@
 import type { CardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { DatasourceModalType } from '@atlaskit/editor-common/types';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { DatasourceAdfView } from '@atlaskit/linking-common';
 import type { SmartLinkEvents } from '@atlaskit/smart-card';
 import type { CardInfo, CardPluginAction, Request } from '../types';
 import type { DatasourceTableLayout } from '../ui/LayoutButton/types';
@@ -22,3 +23,8 @@ export declare const hideLinkToolbar: (tr: Transaction) => Transaction;
 export declare const showDatasourceModal: (modalType: DatasourceModalType) => (tr: Transaction) => Transaction;
 export declare const hideDatasourceModal: (tr: Transaction) => Transaction;
 export declare const clearOverlayCandidate: (tr: Transaction) => Transaction;
+export declare const setDatasourceStash: (tr: Transaction, datasourceStash: {
+    url: string;
+    views: DatasourceAdfView[];
+}) => Transaction;
+export declare const removeDatasourceStash: (tr: Transaction, url: string) => Transaction;

package/dist/types-ts4.5/pm-plugins/doc.d.ts

@@ -23,7 +23,7 @@ export type LinkNodes = {
     [key in 'inlineCard' | 'blockCard' | 'embedCard']: NodeType;
 };
 export declare const getLinkNodeType: (appearance: CardAppearance, linkNodes: LinkNodes) => NodeType;
-export declare const updateCardViaDatasource: (state: EditorState, node: Node, newAdf: DatasourceAdf | InlineCardAdf, view: EditorView, sourceEvent?: UIAnalyticsEvent) => void;
+export declare const updateCardViaDatasource: (state: EditorState, node: Node, newAdf: DatasourceAdf | InlineCardAdf, view: EditorView, sourceEvent?: UIAnalyticsEvent, isDeletingConfig?: boolean) => void;
 export declare const insertDatasource: (state: EditorState, adf: DatasourceAdf | InlineCardAdf, view: EditorView, sourceEvent?: UIAnalyticsEvent) => void;
 /**
  * Get attributes for new Card Appearance

package/dist/types-ts4.5/pm-plugins/util/state.d.ts

@@ -19,6 +19,11 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
         url?: string | undefined;
     }[];
     provider: import("@atlaskit/editor-common/provider-factory").CardProvider | null;
+    datasourceStash: {
+        [x: string]: {
+            views: import("@atlaskit/linking-common").DatasourceAdfTableView[];
+        };
+    };
     showLinkingToolbar: boolean;
     smartLinkEvents?: import("@atlaskit/smart-card").SmartLinkEvents | undefined;
     editorAppearance?: import("@atlaskit/editor-common/types").EditorAppearance | undefined;

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

@@ -3,6 +3,7 @@ import type { ACTION } from '@atlaskit/editor-common/analytics';
 import type { CardOptions, CardReplacementInputMethod } from '@atlaskit/editor-common/card';
 import type { CardAppearance, CardProvider } from '@atlaskit/editor-common/provider-factory';
 import type { DatasourceModalType, EditorAppearance, LinkPickerOptions } from '@atlaskit/editor-common/types';
+import type { DatasourceAdfView } from '@atlaskit/linking-common';
 import type { SmartLinkEvents } from '@atlaskit/smart-card';
 import type { EditorCardPluginEvents } from './analytics/create-events-queue';
 import type { CardPluginEvent } from './analytics/types';
@@ -65,10 +66,18 @@ export type Request = {
      */
     sourceEvent?: UIAnalyticsEvent | null | undefined;
 };
+/**
+ * Each key in the stash is URL.
+ * For any given URL we might temporarily stash some user preferences, like view settings for the datasource.
+ */
+type DatasourceStash = Record<string, {
+    views: DatasourceAdfView[];
+}>;
 export type CardPluginState = {
     requests: Request[];
     provider: CardProvider | null;
     cards: CardInfo[];
+    datasourceStash: DatasourceStash;
     showLinkingToolbar: boolean;
     smartLinkEvents?: SmartLinkEvents;
     editorAppearance?: EditorAppearance;
@@ -144,4 +153,16 @@ export type RegisterRemoveOverlayOnInsertedLink = {
     type: 'REGISTER_REMOVE_OVERLAY_ON_INSERTED_LINK';
     callback: () => void;
 };
-export type CardPluginAction = SetProvider | Queue | Resolve | Register | ShowLinkToolbar | HideLinkToolbar | ShowDatasourceModal | HideDatasourceModal | RegisterSmartCardEvents | SetDatasourceTableRef | SetCardLayout | SetCardLayoutAndDatasourceTableRef | ClearOverlayCandidate | RegisterRemoveOverlayOnInsertedLink;
+export type SetDatasourceStash = {
+    type: 'SET_DATASOURCE_STASH';
+    datasourceStash: {
+        url: string;
+        views: DatasourceAdfView[];
+    };
+};
+export type RemoveDatasourceStash = {
+    type: 'REMOVE_DATASOURCE_STASH';
+    url: string;
+};
+export type CardPluginAction = SetProvider | Queue | Resolve | Register | ShowLinkToolbar | HideLinkToolbar | ShowDatasourceModal | HideDatasourceModal | RegisterSmartCardEvents | SetDatasourceTableRef | SetCardLayout | SetCardLayoutAndDatasourceTableRef | ClearOverlayCandidate | RegisterRemoveOverlayOnInsertedLink | SetDatasourceStash | RemoveDatasourceStash;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,28 +35,28 @@
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/custom-steps": "^0.0.13",
-    "@atlaskit/editor-common": "^78.0.0",
+    "@atlaskit/editor-common": "^78.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
-    "@atlaskit/editor-plugin-floating-toolbar": "^1.1.0",
+    "@atlaskit/editor-plugin-floating-toolbar": "^1.2.0",
     "@atlaskit/editor-plugin-grid": "^1.0.0",
     "@atlaskit/editor-plugin-hyperlink": "^1.0.0",
     "@atlaskit/editor-plugin-width": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/frontend-utilities": "^2.7.0",
-    "@atlaskit/icon": "^22.0.0",
+    "@atlaskit/icon": "^22.1.0",
     "@atlaskit/link-analytics": "^8.3.0",
     "@atlaskit/link-client-extension": "^1.8.0",
     "@atlaskit/link-datasource": "^1.22.0",
     "@atlaskit/linking-common": "^5.3.0",
     "@atlaskit/linking-types": "^8.6.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^2.0.0",
+    "@atlaskit/primitives": "^2.1.0",
     "@atlaskit/smart-card": "^26.47.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.37.0",
+    "@atlaskit/tokens": "^1.38.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "lodash": "^4.17.21",