@atlaskit/editor-plugin-card 0.16.2 → 0.16.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-card
 
+## 0.16.3
+
+### Patch Changes
+
+- [#66961](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66961) [`2e4913393f85`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2e4913393f85) - Add logic to prevent showing datasource edit button in toolbar if datasource does not support editing.
+- Updated dependencies
+
 ## 0.16.2
 
 ### Patch Changes

package/dist/cjs/toolbar.js

@@ -348,20 +348,23 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyti
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state) {
   var _node$attrs3;
-  var toolbarItems = [{
-    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),
-    testId: 'datasource-edit-button'
-  }];
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  var toolbarItems = [];
+  if ((0, _utils3.isDatasourceConfigEditable)(datasourceId)) {
     toolbarItems.push({
-      type: 'separator'
+      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),
+      testId: 'datasource-edit-button'
     }, {
+      type: 'separator'
+    });
+  }
+  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',
       icon: _shortcut.default,
@@ -369,11 +372,11 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(_messages.linkMessages.openLink),
       onClick: visitCardLink(editorAnalyticsApi)
+    }, {
+      type: 'separator'
     });
   }
   toolbarItems.push({
-    type: 'separator'
-  }, {
     type: 'copy-button',
     items: [{
       state: state,

package/dist/cjs/utils.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.titleUrlPairFromNode = exports.selectedCardAppearance = exports.mergeCardInfo = exports.isEmbedSupportedAtPosition = exports.isBlockSupportedAtPosition = exports.getResolvedAttributesFromStore = exports.findCardInfo = exports.displayInfoForCard = exports.appearanceForNodeType = void 0;
+exports.titleUrlPairFromNode = exports.selectedCardAppearance = exports.mergeCardInfo = exports.isEmbedSupportedAtPosition = exports.isDatasourceConfigEditable = exports.isBlockSupportedAtPosition = exports.getResolvedAttributesFromStore = exports.findCardInfo = exports.displayInfoForCard = exports.appearanceForNodeType = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _resolvedAttributes = require("@atlaskit/link-analytics/resolved-attributes");
+var _linkDatasource = require("@atlaskit/link-datasource");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var appearanceForNodeType = exports.appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -75,4 +76,8 @@ var getResolvedAttributesFromStore = exports.getResolvedAttributesFromStore = fu
     url: url,
     displayCategory: displayCategory
   }, urlState === null || urlState === void 0 ? void 0 : urlState.details);
+};
+var isDatasourceConfigEditable = exports.isDatasourceConfigEditable = function isDatasourceConfigEditable(datasourceId) {
+  var datasourcesWithConfigModal = [_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID, _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
+  return datasourcesWithConfigModal.includes(datasourceId);
 };

package/dist/es2019/toolbar.js

@@ -19,7 +19,7 @@ import { editDatasource, EditDatasourceButton } from './ui/EditDatasourceButton'
 import { buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { ToolbarViewedEvent } from './ui/ToolbarViewedEvent';
-import { appearanceForNodeType, displayInfoForCard, findCardInfo, titleUrlPairFromNode } from './utils';
+import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceConfigEditable, titleUrlPairFromNode } from './utils';
 export const removeCard = editorAnalyticsApi => commandWithMetadata((state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -341,20 +341,23 @@ const getSettingsButtonGroup = (intl, editorAnalyticsApi) => {
 };
 const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state) => {
   var _node$attrs3;
-  const toolbarItems = [{
-    id: 'editor.edit.datasource',
-    type: 'button',
-    icon: SmallerEditIcon,
-    metadata: metadata,
-    className: 'datasource-edit',
-    title: intl.formatMessage(linkToolbarMessages.editDatasource),
-    onClick: editDatasource(datasourceId, editorAnalyticsApi),
-    testId: 'datasource-edit-button'
-  }];
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  const toolbarItems = [];
+  if (isDatasourceConfigEditable(datasourceId)) {
     toolbarItems.push({
-      type: 'separator'
+      id: 'editor.edit.datasource',
+      type: 'button',
+      icon: SmallerEditIcon,
+      metadata: metadata,
+      className: 'datasource-edit',
+      title: intl.formatMessage(linkToolbarMessages.editDatasource),
+      onClick: editDatasource(datasourceId, editorAnalyticsApi),
+      testId: 'datasource-edit-button'
     }, {
+      type: 'separator'
+    });
+  }
+  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',
       icon: OpenIcon,
@@ -362,11 +365,11 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
       onClick: visitCardLink(editorAnalyticsApi)
+    }, {
+      type: 'separator'
     });
   }
   toolbarItems.push({
-    type: 'separator'
-  }, {
     type: 'copy-button',
     items: [{
       state,

package/dist/es2019/utils.js

@@ -1,6 +1,7 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getResolvedAttributes } from '@atlaskit/link-analytics/resolved-attributes';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { pluginKey } from './pm-plugins/plugin-key';
 export const appearanceForNodeType = spec => {
   if (spec.name === 'inlineCard') {
@@ -63,4 +64,8 @@ export const getResolvedAttributesFromStore = (url, display, store) => {
     url,
     displayCategory
   }, urlState === null || urlState === void 0 ? void 0 : urlState.details);
+};
+export const isDatasourceConfigEditable = datasourceId => {
+  const datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
+  return datasourcesWithConfigModal.includes(datasourceId);
 };

package/dist/esm/toolbar.js

@@ -23,7 +23,7 @@ import { editDatasource, EditDatasourceButton } from './ui/EditDatasourceButton'
 import { buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { ToolbarViewedEvent } from './ui/ToolbarViewedEvent';
-import { appearanceForNodeType, displayInfoForCard, findCardInfo, titleUrlPairFromNode } from './utils';
+import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceConfigEditable, titleUrlPairFromNode } from './utils';
 export var removeCard = function removeCard(editorAnalyticsApi) {
   return commandWithMetadata(function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
@@ -338,20 +338,23 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyti
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state) {
   var _node$attrs3;
-  var toolbarItems = [{
-    id: 'editor.edit.datasource',
-    type: 'button',
-    icon: SmallerEditIcon,
-    metadata: metadata,
-    className: 'datasource-edit',
-    title: intl.formatMessage(linkToolbarMessages.editDatasource),
-    onClick: editDatasource(datasourceId, editorAnalyticsApi),
-    testId: 'datasource-edit-button'
-  }];
-  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
+  var toolbarItems = [];
+  if (isDatasourceConfigEditable(datasourceId)) {
     toolbarItems.push({
-      type: 'separator'
+      id: 'editor.edit.datasource',
+      type: 'button',
+      icon: SmallerEditIcon,
+      metadata: metadata,
+      className: 'datasource-edit',
+      title: intl.formatMessage(linkToolbarMessages.editDatasource),
+      onClick: editDatasource(datasourceId, editorAnalyticsApi),
+      testId: 'datasource-edit-button'
     }, {
+      type: 'separator'
+    });
+  }
+  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',
       icon: OpenIcon,
@@ -359,11 +362,11 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       className: 'hyperlink-open-link',
       title: intl.formatMessage(linkMessages.openLink),
       onClick: visitCardLink(editorAnalyticsApi)
+    }, {
+      type: 'separator'
     });
   }
   toolbarItems.push({
-    type: 'separator'
-  }, {
     type: 'copy-button',
     items: [{
       state: state,

package/dist/esm/utils.js

@@ -1,6 +1,7 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getResolvedAttributes } from '@atlaskit/link-analytics/resolved-attributes';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { pluginKey } from './pm-plugins/plugin-key';
 export var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
@@ -69,4 +70,8 @@ export var getResolvedAttributesFromStore = function getResolvedAttributesFromSt
     url: url,
     displayCategory: displayCategory
   }, urlState === null || urlState === void 0 ? void 0 : urlState.details);
+};
+export var isDatasourceConfigEditable = function isDatasourceConfigEditable(datasourceId) {
+  var datasourcesWithConfigModal = [JIRA_LIST_OF_LINKS_DATASOURCE_ID, ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
+  return datasourcesWithConfigModal.includes(datasourceId);
 };

package/dist/types/utils.d.ts

@@ -21,3 +21,4 @@ export declare const findCardInfo: (state: EditorState) => CardInfo | undefined;
 export declare const isEmbedSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const isBlockSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const getResolvedAttributesFromStore: (url: string, display: string | null, store?: CardContext['store']) => {};
+export declare const isDatasourceConfigEditable: (datasourceId: string) => boolean;

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

@@ -21,3 +21,4 @@ export declare const findCardInfo: (state: EditorState) => CardInfo | undefined;
 export declare const isEmbedSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const isBlockSupportedAtPosition: (currentNodePosition: number, editorState: EditorState, currentAppearance?: CardAppearance) => boolean;
 export declare const getResolvedAttributesFromStore: (url: string, display: string | null, store?: CardContext['store']) => {};
+export declare const isDatasourceConfigEditable: (datasourceId: string) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "0.16.2",
+  "version": "0.16.3",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "@atlaskit/adf-schema": "^35.3.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/custom-steps": "^0.0.11",
-    "@atlaskit/editor-common": "^76.39.0",
+    "@atlaskit/editor-common": "^76.41.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-decorations": "^0.2.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
@@ -53,10 +53,10 @@
     "@atlaskit/linking-common": "^5.3.0",
     "@atlaskit/linking-types": "^8.5.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^1.17.0",
+    "@atlaskit/primitives": "^1.18.0",
     "@atlaskit/smart-card": "^26.44.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.33.0",
+    "@atlaskit/tokens": "^1.34.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "lodash": "^4.17.21",