@atlaskit/editor-plugin-card 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-card
 
+## 1.6.2
+
+### Patch Changes
+
+- [#89921](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89921) [`411822b4d808`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/411822b4d808) - The changes here updates the datasource toolbar to display smart-link icons for config and non-config based datasources.
+
+## 1.6.1
+
+### Patch Changes
+
+- [#88724](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88724) [`df44cd13bfac`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/df44cd13bfac) - Fix datasources breakout layout button to refresh node reference when making a layout change transaction
+
 ## 1.6.0
 
 ### Minor Changes

package/dist/cjs/toolbar.js

@@ -383,9 +383,17 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
+  var canShowMainToolbar = function canShowMainToolbar() {
+    if (
+    // FF that controls visibily of the additional toolbar buttons
+    !(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+      return false;
+    }
 
-  // Smart card view buttons only allowed for non-config datasources
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && !(0, _utils3.isDatasourceConfigEditable)(datasourceId) && cardOptions) {
+    // FF to enable additional toolbar buttons based on if the datasource is configurable or not
+    return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !(0, _utils3.isDatasourceConfigEditable)(datasourceId);
+  };
+  if (canShowMainToolbar()) {
     var allowBlockCards = cardOptions.allowBlockCards,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;

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

@@ -210,6 +210,7 @@ var DatasourceModal = exports.DatasourceModal = function DatasourceModal(_ref) {
       "data-testid": "confluence-search-config-modal"
     }, /*#__PURE__*/_react.default.createElement(_linkDatasource.ConfluenceSearchConfigModal, {
       datasourceId: _datasourceId2,
+      viewMode: isRegularCardNode ? 'inline' : 'table',
       visibleColumnKeys: _visibleColumnKeys2,
       parameters: _parameters2,
       url: (_existingNode8 = existingNode) === null || _existingNode8 === void 0 ? void 0 : _existingNode8.attrs.url,

package/dist/cjs/ui/EditDatasourceButton.js

@@ -10,6 +10,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _primitives = require("@atlaskit/primitives");
 var _actions = require("../pm-plugins/actions");
+var _utils2 = require("../utils");
 var _CardContextProvider = require("./CardContextProvider");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
 /** @jsx jsx */
@@ -33,7 +34,7 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
       cardContext: cardContext
     }),
     datasourceId = _useFetchDatasourceIn.datasourceId;
-  if (!datasourceId || !(0, _utils.canRenderDatasource)(datasourceId, false)) {
+  if (!datasourceId || !(0, _utils2.isDatasourceConfigEditable)(datasourceId)) {
     return null;
   }
   if (url) {

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

@@ -89,12 +89,15 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
     layout = _ref3$layout === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || 'center' : _ref3$layout;
   var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.datasource);
   var onLayoutChange = function onLayoutChange(layout) {
+    var _getDatasource$node;
     if (pos === undefined) {
       return;
     }
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node === null || node === void 0 ? void 0 : node.attrs), {}, {
+    // If the button does not re-render due to no card state change, node reference will be stale
+    var datasourceNode = (_getDatasource$node = (0, _utils2.getDatasource)(editorView).node) !== null && _getDatasource$node !== void 0 ? _getDatasource$node : node;
+    var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, datasourceNode === null || datasourceNode === void 0 ? void 0 : datasourceNode.attrs), {}, {
       layout: layout
     }));
     tr.setMeta('scrollIntoView', false);

package/dist/es2019/toolbar.js

@@ -374,9 +374,17 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       type: 'separator'
     });
   }
+  const canShowMainToolbar = () => {
+    if (
+    // FF that controls visibily of the additional toolbar buttons
+    !getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+      return false;
+    }
 
-  // Smart card view buttons only allowed for non-config datasources
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && !isDatasourceConfigEditable(datasourceId) && cardOptions) {
+    // FF to enable additional toolbar buttons based on if the datasource is configurable or not
+    return getBooleanFF('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !isDatasourceConfigEditable(datasourceId);
+  };
+  if (canShowMainToolbar()) {
     const {
       allowBlockCards,
       allowEmbeds,

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

@@ -170,6 +170,7 @@ export const DatasourceModal = ({
       "data-testid": "confluence-search-config-modal"
     }, /*#__PURE__*/React.createElement(ConfluenceSearchConfigModal, {
       datasourceId: datasourceId,
+      viewMode: isRegularCardNode ? 'inline' : 'table',
       visibleColumnKeys: visibleColumnKeys,
       parameters: parameters,
       url: (_existingNode8 = existingNode) === null || _existingNode8 === void 0 ? void 0 : _existingNode8.attrs.url,

package/dist/es2019/ui/EditDatasourceButton.js

@@ -2,9 +2,10 @@
 import { css, jsx } from '@emotion/react';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator, SmallerEditIcon } from '@atlaskit/editor-common/ui';
-import { canRenderDatasource, getDatasourceType } from '@atlaskit/editor-common/utils';
+import { getDatasourceType } from '@atlaskit/editor-common/utils';
 import { Flex } from '@atlaskit/primitives';
 import { showDatasourceModal } from '../pm-plugins/actions';
+import { isDatasourceConfigEditable } from '../utils';
 import { CardContextProvider } from './CardContextProvider';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 const buttonStyles = css({
@@ -28,7 +29,7 @@ const EditDatasourceButtonWithCardContext = ({
     url,
     cardContext
   });
-  if (!datasourceId || !canRenderDatasource(datasourceId, false)) {
+  if (!datasourceId || !isDatasourceConfigEditable(datasourceId)) {
     return null;
   }
   if (url) {

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

@@ -84,6 +84,7 @@ const LayoutButtonWrapper = ({
   } = cardState !== null && cardState !== void 0 ? cardState : {};
   const isDatasource = !!(node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.datasource);
   const onLayoutChange = layout => {
+    var _getDatasource$node;
     if (pos === undefined) {
       return;
     }
@@ -91,8 +92,10 @@ const LayoutButtonWrapper = ({
       state,
       dispatch
     } = editorView;
+    // If the button does not re-render due to no card state change, node reference will be stale
+    const datasourceNode = (_getDatasource$node = getDatasource(editorView).node) !== null && _getDatasource$node !== void 0 ? _getDatasource$node : node;
     const tr = state.tr.setNodeMarkup(pos, undefined, {
-      ...(node === null || node === void 0 ? void 0 : node.attrs),
+      ...(datasourceNode === null || datasourceNode === void 0 ? void 0 : datasourceNode.attrs),
       layout
     });
     tr.setMeta('scrollIntoView', false);

package/dist/esm/toolbar.js

@@ -373,9 +373,17 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       type: 'separator'
     });
   }
+  var canShowMainToolbar = function canShowMainToolbar() {
+    if (
+    // FF that controls visibily of the additional toolbar buttons
+    !getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+      return false;
+    }
 
-  // Smart card view buttons only allowed for non-config datasources
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && !isDatasourceConfigEditable(datasourceId) && cardOptions) {
+    // FF to enable additional toolbar buttons based on if the datasource is configurable or not
+    return getBooleanFF('platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources') ? true : !isDatasourceConfigEditable(datasourceId);
+  };
+  if (canShowMainToolbar()) {
     var allowBlockCards = cardOptions.allowBlockCards,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;

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

@@ -200,6 +200,7 @@ export var DatasourceModal = function DatasourceModal(_ref) {
       "data-testid": "confluence-search-config-modal"
     }, /*#__PURE__*/React.createElement(ConfluenceSearchConfigModal, {
       datasourceId: _datasourceId2,
+      viewMode: isRegularCardNode ? 'inline' : 'table',
       visibleColumnKeys: _visibleColumnKeys2,
       parameters: _parameters2,
       url: (_existingNode8 = existingNode) === null || _existingNode8 === void 0 ? void 0 : _existingNode8.attrs.url,

package/dist/esm/ui/EditDatasourceButton.js

@@ -2,9 +2,10 @@
 import { css, jsx } from '@emotion/react';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator, SmallerEditIcon } from '@atlaskit/editor-common/ui';
-import { canRenderDatasource, getDatasourceType } from '@atlaskit/editor-common/utils';
+import { getDatasourceType } from '@atlaskit/editor-common/utils';
 import { Flex } from '@atlaskit/primitives';
 import { showDatasourceModal } from '../pm-plugins/actions';
+import { isDatasourceConfigEditable } from '../utils';
 import { CardContextProvider } from './CardContextProvider';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 var buttonStyles = css({
@@ -26,7 +27,7 @@ var EditDatasourceButtonWithCardContext = function EditDatasourceButtonWithCardC
       cardContext: cardContext
     }),
     datasourceId = _useFetchDatasourceIn.datasourceId;
-  if (!datasourceId || !canRenderDatasource(datasourceId, false)) {
+  if (!datasourceId || !isDatasourceConfigEditable(datasourceId)) {
     return null;
   }
   if (url) {

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

@@ -83,12 +83,15 @@ var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
     layout = _ref3$layout === void 0 ? (node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || 'center' : _ref3$layout;
   var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.datasource);
   var onLayoutChange = function onLayoutChange(layout) {
+    var _getDatasource$node;
     if (pos === undefined) {
       return;
     }
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node === null || node === void 0 ? void 0 : node.attrs), {}, {
+    // If the button does not re-render due to no card state change, node reference will be stale
+    var datasourceNode = (_getDatasource$node = getDatasource(editorView).node) !== null && _getDatasource$node !== void 0 ? _getDatasource$node : node;
+    var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, datasourceNode === null || datasourceNode === void 0 ? void 0 : datasourceNode.attrs), {}, {
       layout: layout
     }));
     tr.setMeta('scrollIntoView', false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -49,12 +49,12 @@
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/link-analytics": "^8.3.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/link-datasource": "^1.26.0",
+    "@atlaskit/link-datasource": "^1.27.0",
     "@atlaskit/linking-common": "^5.6.0",
     "@atlaskit/linking-types": "^8.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/primitives": "^5.5.0",
-    "@atlaskit/smart-card": "^26.53.0",
+    "@atlaskit/smart-card": "^26.55.0",
     "@atlaskit/theme": "^12.7.0",
     "@atlaskit/tokens": "^1.43.0",
     "@babel/runtime": "^7.0.0",
@@ -113,6 +113,9 @@
     "platform.linking-platform.enable-datasource-appearance-toolbar": {
       "type": "boolean"
     },
+    "platform.linking-platform.datasource-enable-toolbar-buttons-for-all-datasources": {
+      "type": "boolean"
+    },
     "platform.editor.card.fix-embed-card-select-all": {
       "type": "boolean"
     },