@atlaskit/editor-plugin-card 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-card
 
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.2.4
+
+### Patch Changes
+
+- [`6255c2ad1c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6255c2ad1c9) - [ux] Adds ability to open Assets datasource dialog using the slash command in the editor, behind a feature flag
+
 ## 0.2.3
 
 ### Patch Changes

package/dist/cjs/messages.js

@@ -15,6 +15,16 @@ var messages = (0, _reactIntlNext.defineMessages)({
     id: 'fabric.editor.datasource.jiraIssue.description',
     defaultMessage: 'Insert issues from Jira Cloud with enhanced search, filtering, and configuration',
     description: 'Insert a jira datasource table'
+  },
+  datasourceAssetsObjects: {
+    id: 'fabric.editor.datasource.assetsObjects',
+    defaultMessage: 'Assets',
+    description: 'Text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects'
+  },
+  datasourceAssetsObjectsDescription: {
+    id: 'fabric.editor.datasource.assetsObjects.description',
+    defaultMessage: 'Insert objects from Assets in Jira Service Management with search and filtering',
+    description: 'Description text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects'
   }
 });
 exports.messages = messages;

package/dist/cjs/plugin.js

@@ -116,8 +116,12 @@ var cardPlugin = function cardPlugin(options, api) {
       floatingToolbar: (0, _toolbar.floatingToolbar)(options, featureFlags, options.platform, options.linkPicker, api),
       quickInsert: function quickInsert(_ref3) {
         var formatMessage = _ref3.formatMessage;
-        if (options.allowDatasource && (0, _utils.canRenderDatasource)(_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
-          return [{
+        var quickInsertArray = [];
+        if (!options.allowDatasource) {
+          return quickInsertArray;
+        }
+        if ((0, _utils.canRenderDatasource)(_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
+          quickInsertArray.push({
             id: 'datasource',
             title: formatMessage(_messages.messages.datasourceJiraIssue),
             description: formatMessage(_messages.messages.datasourceJiraIssueDescription),
@@ -130,9 +134,25 @@ var cardPlugin = function cardPlugin(options, api) {
               (0, _actions.showDatasourceModal)('jira')(tr);
               return tr;
             }
-          }];
+          });
+        }
+        if ((0, _utils.canRenderDatasource)(_linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
+          quickInsertArray.push({
+            id: 'datasource',
+            title: formatMessage(_messages.messages.datasourceAssetsObjects),
+            description: formatMessage(_messages.messages.datasourceAssetsObjectsDescription),
+            keywords: ['assets'],
+            icon: function icon() {
+              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconDatasourceAssetsObjects, null);
+            },
+            action: function action(insert) {
+              var tr = insert(undefined);
+              (0, _actions.showDatasourceModal)('assets')(tr);
+              return tr;
+            }
+          });
         }
-        return [];
+        return quickInsertArray;
       }
     }
   };

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

@@ -55,6 +55,30 @@ var DatasourceModal = function DatasourceModal(_ref) {
       onInsert: onInsert
     }));
   }
+  if (modalType === 'assets') {
+    var _existingNode$attrs2, _tableView$properties2;
+    var _ref5 = (existingNode === null || existingNode === void 0 ? void 0 : (_existingNode$attrs2 = existingNode.attrs) === null || _existingNode$attrs2 === void 0 ? void 0 : _existingNode$attrs2.datasource) || {},
+      _ref5$id = _ref5.id,
+      _datasourceId = _ref5$id === void 0 ? _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID : _ref5$id,
+      _parameters = _ref5.parameters,
+      _ref5$views = _ref5.views,
+      _views = _ref5$views === void 0 ? [] : _ref5$views;
+    var _ref6 = _views,
+      _ref7 = (0, _slicedToArray2.default)(_ref6, 1),
+      _tableView = _ref7[0];
+    var _visibleColumnKeys = _tableView === null || _tableView === void 0 ? void 0 : (_tableView$properties2 = _tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.map(function (column) {
+      return column.key;
+    });
+    return /*#__PURE__*/_react.default.createElement("div", {
+      "data-testid": "assets-config-modal"
+    }, /*#__PURE__*/_react.default.createElement(_linkDatasource.AssetsConfigModal, {
+      datasourceId: _datasourceId,
+      visibleColumnKeys: _visibleColumnKeys,
+      parameters: _parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
   return null; // null for now until we have modal component that handles other datasources
 };
 exports.DatasourceModal = DatasourceModal;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "0.2.3",
+	"version": "0.2.5",
 	"sideEffects": false
 }

package/dist/es2019/messages.js

@@ -9,5 +9,15 @@ export const messages = defineMessages({
     id: 'fabric.editor.datasource.jiraIssue.description',
     defaultMessage: 'Insert issues from Jira Cloud with enhanced search, filtering, and configuration',
     description: 'Insert a jira datasource table'
+  },
+  datasourceAssetsObjects: {
+    id: 'fabric.editor.datasource.assetsObjects',
+    defaultMessage: 'Assets',
+    description: 'Text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects'
+  },
+  datasourceAssetsObjectsDescription: {
+    id: 'fabric.editor.datasource.assetsObjects.description',
+    defaultMessage: 'Insert objects from Assets in Jira Service Management with search and filtering',
+    description: 'Description text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects'
   }
 });

package/dist/es2019/plugin.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { blockCard, embedCard, inlineCard } from '@atlaskit/adf-schema';
-import { IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
+import { IconDatasourceAssetsObjects, IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
-import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { messages } from './messages';
 import { hideLinkToolbar, showDatasourceModal } from './pm-plugins/actions';
 import { changeSelectedCardToLink, queueCardsFromChangedTr, setSelectedCardAppearance } from './pm-plugins/doc';
@@ -110,8 +110,12 @@ export const cardPlugin = (options, api) => {
       quickInsert: ({
         formatMessage
       }) => {
-        if (options.allowDatasource && canRenderDatasource(JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
-          return [{
+        const quickInsertArray = [];
+        if (!options.allowDatasource) {
+          return quickInsertArray;
+        }
+        if (canRenderDatasource(JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
+          quickInsertArray.push({
             id: 'datasource',
             title: formatMessage(messages.datasourceJiraIssue),
             description: formatMessage(messages.datasourceJiraIssueDescription),
@@ -122,9 +126,23 @@ export const cardPlugin = (options, api) => {
               showDatasourceModal('jira')(tr);
               return tr;
             }
-          }];
+          });
+        }
+        if (canRenderDatasource(ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
+          quickInsertArray.push({
+            id: 'datasource',
+            title: formatMessage(messages.datasourceAssetsObjects),
+            description: formatMessage(messages.datasourceAssetsObjectsDescription),
+            keywords: ['assets'],
+            icon: () => /*#__PURE__*/React.createElement(IconDatasourceAssetsObjects, null),
+            action(insert) {
+              const tr = insert(undefined);
+              showDatasourceModal('assets')(tr);
+              return tr;
+            }
+          });
         }
-        return [];
+        return quickInsertArray;
       }
     }
   };

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

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { NodeSelection } from 'prosemirror-state';
-import { JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
 import { hideDatasourceModal } from '../../pm-plugins/actions';
 import { insertDatasource, updateExistingDatasource } from '../../pm-plugins/doc';
 export const DatasourceModal = ({
@@ -44,5 +44,24 @@ export const DatasourceModal = ({
       onInsert: onInsert
     }));
   }
+  if (modalType === 'assets') {
+    var _existingNode$attrs2, _tableView$properties2;
+    const {
+      id: datasourceId = ASSETS_LIST_OF_LINKS_DATASOURCE_ID,
+      parameters,
+      views = []
+    } = (existingNode === null || existingNode === void 0 ? void 0 : (_existingNode$attrs2 = existingNode.attrs) === null || _existingNode$attrs2 === void 0 ? void 0 : _existingNode$attrs2.datasource) || {};
+    const [tableView] = views;
+    const visibleColumnKeys = tableView === null || tableView === void 0 ? void 0 : (_tableView$properties2 = tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.map(column => column.key);
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "assets-config-modal"
+    }, /*#__PURE__*/React.createElement(AssetsConfigModal, {
+      datasourceId: datasourceId,
+      visibleColumnKeys: visibleColumnKeys,
+      parameters: parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
   return null; // null for now until we have modal component that handles other datasources
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "0.2.3",
+	"version": "0.2.5",
 	"sideEffects": false
 }

package/dist/esm/messages.js

@@ -9,5 +9,15 @@ export var messages = defineMessages({
     id: 'fabric.editor.datasource.jiraIssue.description',
     defaultMessage: 'Insert issues from Jira Cloud with enhanced search, filtering, and configuration',
     description: 'Insert a jira datasource table'
+  },
+  datasourceAssetsObjects: {
+    id: 'fabric.editor.datasource.assetsObjects',
+    defaultMessage: 'Assets',
+    description: 'Text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects'
+  },
+  datasourceAssetsObjectsDescription: {
+    id: 'fabric.editor.datasource.assetsObjects.description',
+    defaultMessage: 'Insert objects from Assets in Jira Service Management with search and filtering',
+    description: 'Description text displayed when selecting the type of data to include onto the page, in this case: JSM Assets objects'
   }
 });

package/dist/esm/plugin.js

@@ -3,9 +3,9 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React from 'react';
 import { blockCard, embedCard, inlineCard } from '@atlaskit/adf-schema';
-import { IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
+import { IconDatasourceAssetsObjects, IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
-import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { messages } from './messages';
 import { hideLinkToolbar, showDatasourceModal } from './pm-plugins/actions';
 import { changeSelectedCardToLink, queueCardsFromChangedTr, setSelectedCardAppearance } from './pm-plugins/doc';
@@ -109,8 +109,12 @@ export var cardPlugin = function cardPlugin(options, api) {
       floatingToolbar: floatingToolbar(options, featureFlags, options.platform, options.linkPicker, api),
       quickInsert: function quickInsert(_ref3) {
         var formatMessage = _ref3.formatMessage;
-        if (options.allowDatasource && canRenderDatasource(JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
-          return [{
+        var quickInsertArray = [];
+        if (!options.allowDatasource) {
+          return quickInsertArray;
+        }
+        if (canRenderDatasource(JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
+          quickInsertArray.push({
             id: 'datasource',
             title: formatMessage(messages.datasourceJiraIssue),
             description: formatMessage(messages.datasourceJiraIssueDescription),
@@ -123,9 +127,25 @@ export var cardPlugin = function cardPlugin(options, api) {
               showDatasourceModal('jira')(tr);
               return tr;
             }
-          }];
+          });
+        }
+        if (canRenderDatasource(ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
+          quickInsertArray.push({
+            id: 'datasource',
+            title: formatMessage(messages.datasourceAssetsObjects),
+            description: formatMessage(messages.datasourceAssetsObjectsDescription),
+            keywords: ['assets'],
+            icon: function icon() {
+              return /*#__PURE__*/React.createElement(IconDatasourceAssetsObjects, null);
+            },
+            action: function action(insert) {
+              var tr = insert(undefined);
+              showDatasourceModal('assets')(tr);
+              return tr;
+            }
+          });
         }
-        return [];
+        return quickInsertArray;
       }
     }
   };

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

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback } from 'react';
 import { NodeSelection } from 'prosemirror-state';
-import { JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
 import { hideDatasourceModal } from '../../pm-plugins/actions';
 import { insertDatasource, updateExistingDatasource } from '../../pm-plugins/doc';
 export var DatasourceModal = function DatasourceModal(_ref) {
@@ -45,5 +45,29 @@ export var DatasourceModal = function DatasourceModal(_ref) {
       onInsert: onInsert
     }));
   }
+  if (modalType === 'assets') {
+    var _existingNode$attrs2, _tableView$properties2;
+    var _ref5 = (existingNode === null || existingNode === void 0 ? void 0 : (_existingNode$attrs2 = existingNode.attrs) === null || _existingNode$attrs2 === void 0 ? void 0 : _existingNode$attrs2.datasource) || {},
+      _ref5$id = _ref5.id,
+      _datasourceId = _ref5$id === void 0 ? ASSETS_LIST_OF_LINKS_DATASOURCE_ID : _ref5$id,
+      _parameters = _ref5.parameters,
+      _ref5$views = _ref5.views,
+      _views = _ref5$views === void 0 ? [] : _ref5$views;
+    var _ref6 = _views,
+      _ref7 = _slicedToArray(_ref6, 1),
+      _tableView = _ref7[0];
+    var _visibleColumnKeys = _tableView === null || _tableView === void 0 ? void 0 : (_tableView$properties2 = _tableView.properties) === null || _tableView$properties2 === void 0 ? void 0 : _tableView$properties2.columns.map(function (column) {
+      return column.key;
+    });
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "assets-config-modal"
+    }, /*#__PURE__*/React.createElement(AssetsConfigModal, {
+      datasourceId: _datasourceId,
+      visibleColumnKeys: _visibleColumnKeys,
+      parameters: _parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
   return null; // null for now until we have modal component that handles other datasources
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "0.2.3",
+	"version": "0.2.5",
 	"sideEffects": false
 }

package/dist/types/messages.d.ts

@@ -9,4 +9,14 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    datasourceAssetsObjects: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    datasourceAssetsObjectsDescription: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
 };

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

@@ -24,7 +24,7 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
     smartLinkEventsNext?: import("../../types").SmartLinkEventsNext | undefined;
     editorAppearance?: import("@atlaskit/editor-common/types").EditorAppearance | undefined;
     showDatasourceModal: boolean;
-    datasourceModalType?: "jira" | undefined;
+    datasourceModalType?: import("@atlaskit/editor-common/types").DatasourceModalType | undefined;
     datasourceTableRef?: HTMLElement | undefined;
     layout?: import("../../ui/LayoutButton/types").DatasourceTableLayout | undefined;
 };

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

@@ -9,4 +9,14 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    datasourceAssetsObjects: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    datasourceAssetsObjectsDescription: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
 };

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

@@ -24,7 +24,7 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
     smartLinkEventsNext?: import("../../types").SmartLinkEventsNext | undefined;
     editorAppearance?: import("@atlaskit/editor-common/types").EditorAppearance | undefined;
     showDatasourceModal: boolean;
-    datasourceModalType?: "jira" | undefined;
+    datasourceModalType?: import("@atlaskit/editor-common/types").DatasourceModalType | undefined;
     datasourceTableRef?: HTMLElement | undefined;
     layout?: import("../../ui/LayoutButton/types").DatasourceTableLayout | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -31,9 +31,9 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^26.1.0",
+    "@atlaskit/adf-schema": "^26.3.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^74.26.0",
+    "@atlaskit/editor-common": "^74.27.0",
     "@atlaskit/editor-plugin-analytics": "^0.1.0",
     "@atlaskit/editor-plugin-decorations": "^0.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^0.1.0",
@@ -41,11 +41,11 @@
     "@atlaskit/editor-plugin-grid": "^0.1.0",
     "@atlaskit/editor-plugin-hyperlink": "^0.2.0",
     "@atlaskit/editor-plugin-width": "^0.1.0",
-    "@atlaskit/editor-shared-styles": "^2.4.0",
+    "@atlaskit/editor-shared-styles": "^2.5.0",
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/link-analytics": "^8.2.0",
-    "@atlaskit/link-datasource": "^0.29.0",
-    "@atlaskit/smart-card": "^26.9.0",
+    "@atlaskit/link-datasource": "^0.30.0",
+    "@atlaskit/smart-card": "^26.11.0",
     "@atlaskit/theme": "^12.5.0",
     "@atlaskit/tokens": "^1.13.0",
     "@babel/runtime": "^7.0.0",
@@ -69,7 +69,7 @@
   "devDependencies": {
     "@atlaskit/activity-provider": "^2.4.0",
     "@atlaskit/editor-test-helpers": "^18.9.0",
-    "@atlaskit/link-test-helpers": "^4.2.0",
+    "@atlaskit/link-test-helpers": "^5.0.0",
     "@atlaskit/media-test-helpers": "^33.0.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/util-data-test": "^17.8.0",