@atlaskit/editor-plugin-card 0.5.1 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-card
 
+## 0.5.3
+
+### Patch Changes
+
+- [`882e4e88358`](https://bitbucket.org/atlassian/atlassian-frontend/commits/882e4e88358) - Add playwright tests and add test ids to find elements
+
+## 0.5.2
+
+### Patch Changes
+
+- [`386b8378aeb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/386b8378aeb) - Datasource ADF no longer included when feature flag call from canRenderDatasource returns false
+
 ## 0.5.1
 
 ### Patch Changes

package/dist/cjs/pm-plugins/util/resolve.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveWithProvider = exports.handleProvider = void 0;
+var _utils = require("@atlaskit/editor-common/utils");
 var _actions = require("../actions");
 var _doc = require("../doc");
 // ============================================================================ //
@@ -23,14 +24,19 @@ var resolveWithProvider = function resolveWithProvider(view, provider, request,
 };
 exports.resolveWithProvider = resolveWithProvider;
 var updateCardType = function updateCardType(resolvedCard, options) {
-  var isDatasource = resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs;
-  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds || isDatasource && !options.allowDatasource) {
+  if (resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs) {
+    var datasourceId = resolvedCard.attrs.datasource.id;
+    if (!options.allowDatasource || !(0, _utils.canRenderDatasource)(datasourceId)) {
+      delete resolvedCard.attrs.datasource;
+      resolvedCard.type = 'inlineCard';
+      return;
+    }
+  }
+  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds) {
     // clean out the 'layout' attr from an embedCard type that should be transformed into the inlineCard type.
     if (resolvedCard.type === 'embedCard') {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       delete resolvedCard.attrs.layout;
-    } else if (isDatasource) {
-      delete resolvedCard.attrs.datasource;
     }
     resolvedCard.type = 'inlineCard';
   }

package/dist/cjs/toolbar.js

@@ -352,7 +352,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     metadata: metadata,
     className: 'datasource-edit',
     title: intl.formatMessage(_messages.linkToolbarMessages.editDatasource),
-    onClick: (0, _EditLinkToolbar.editDatasource)(node, editorAnalyticsApi)
+    onClick: (0, _EditLinkToolbar.editDatasource)(node, editorAnalyticsApi),
+    testId: 'datasource-edit-button'
   }];
   if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({

package/dist/es2019/pm-plugins/util/resolve.js

@@ -1,3 +1,4 @@
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { setProvider } from '../actions';
 import { handleFallbackWithAnalytics, replaceQueuedUrlWithCard } from '../doc';
 
@@ -17,14 +18,19 @@ export const resolveWithProvider = (view, provider, request, options, editorAnal
   return handleResolve;
 };
 const updateCardType = (resolvedCard, options) => {
-  const isDatasource = resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs;
-  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds || isDatasource && !options.allowDatasource) {
+  if (resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs) {
+    const datasourceId = resolvedCard.attrs.datasource.id;
+    if (!options.allowDatasource || !canRenderDatasource(datasourceId)) {
+      delete resolvedCard.attrs.datasource;
+      resolvedCard.type = 'inlineCard';
+      return;
+    }
+  }
+  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds) {
     // clean out the 'layout' attr from an embedCard type that should be transformed into the inlineCard type.
     if (resolvedCard.type === 'embedCard') {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       delete resolvedCard.attrs.layout;
-    } else if (isDatasource) {
-      delete resolvedCard.attrs.datasource;
     }
     resolvedCard.type = 'inlineCard';
   }

package/dist/es2019/toolbar.js

@@ -345,7 +345,8 @@ const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, nod
     metadata: metadata,
     className: 'datasource-edit',
     title: intl.formatMessage(linkToolbarMessages.editDatasource),
-    onClick: editDatasource(node, editorAnalyticsApi)
+    onClick: editDatasource(node, editorAnalyticsApi),
+    testId: 'datasource-edit-button'
   }];
   if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({

package/dist/esm/pm-plugins/util/resolve.js

@@ -1,3 +1,4 @@
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { setProvider } from '../actions';
 import { handleFallbackWithAnalytics, replaceQueuedUrlWithCard } from '../doc';
 
@@ -17,14 +18,19 @@ export var resolveWithProvider = function resolveWithProvider(view, provider, re
   return handleResolve;
 };
 var updateCardType = function updateCardType(resolvedCard, options) {
-  var isDatasource = resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs;
-  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds || isDatasource && !options.allowDatasource) {
+  if (resolvedCard.type === 'blockCard' && 'datasource' in resolvedCard.attrs) {
+    var datasourceId = resolvedCard.attrs.datasource.id;
+    if (!options.allowDatasource || !canRenderDatasource(datasourceId)) {
+      delete resolvedCard.attrs.datasource;
+      resolvedCard.type = 'inlineCard';
+      return;
+    }
+  }
+  if ((resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'blockCard' && !options.allowBlockCards || (resolvedCard === null || resolvedCard === void 0 ? void 0 : resolvedCard.type) === 'embedCard' && !options.allowEmbeds) {
     // clean out the 'layout' attr from an embedCard type that should be transformed into the inlineCard type.
     if (resolvedCard.type === 'embedCard') {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       delete resolvedCard.attrs.layout;
-    } else if (isDatasource) {
-      delete resolvedCard.attrs.datasource;
     }
     resolvedCard.type = 'inlineCard';
   }

package/dist/esm/toolbar.js

@@ -338,7 +338,8 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     metadata: metadata,
     className: 'datasource-edit',
     title: intl.formatMessage(linkToolbarMessages.editDatasource),
-    onClick: editDatasource(node, editorAnalyticsApi)
+    onClick: editDatasource(node, editorAnalyticsApi),
+    testId: 'datasource-edit-button'
   }];
   if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({

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

@@ -1,8 +1,8 @@
-import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import { CardOptions } from '@atlaskit/editor-common/card';
-import { CardProvider, DatasourceAdf } from '@atlaskit/editor-common/provider-factory';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { Request } from '../../types';
+import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { CardOptions } from '@atlaskit/editor-common/card';
+import type { CardProvider, DatasourceAdf } from '@atlaskit/editor-common/provider-factory';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Request } from '../../types';
 export declare const resolveWithProvider: (view: EditorView, provider: CardProvider, request: Request, options: CardOptions, editorAnalyticsApi: EditorAnalyticsAPI | undefined, createAnalyticsEvent: CreateUIAnalyticsEvent | undefined) => Promise<void | import("@atlaskit/linking-common").InlineCardAdf | import("@atlaskit/linking-common").BlockCardAdf | import("@atlaskit/linking-common").EmbedCardAdf | DatasourceAdf>;
 export declare const handleProvider: (_: 'cardProvider', provider: Promise<CardProvider> | undefined, view: EditorView) => void;

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

@@ -1,8 +1,8 @@
-import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import { CardOptions } from '@atlaskit/editor-common/card';
-import { CardProvider, DatasourceAdf } from '@atlaskit/editor-common/provider-factory';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { Request } from '../../types';
+import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { CardOptions } from '@atlaskit/editor-common/card';
+import type { CardProvider, DatasourceAdf } from '@atlaskit/editor-common/provider-factory';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Request } from '../../types';
 export declare const resolveWithProvider: (view: EditorView, provider: CardProvider, request: Request, options: CardOptions, editorAnalyticsApi: EditorAnalyticsAPI | undefined, createAnalyticsEvent: CreateUIAnalyticsEvent | undefined) => Promise<void | import("@atlaskit/linking-common").InlineCardAdf | import("@atlaskit/linking-common").BlockCardAdf | import("@atlaskit/linking-common").EmbedCardAdf | DatasourceAdf>;
 export declare const handleProvider: (_: 'cardProvider', provider: Promise<CardProvider> | undefined, view: EditorView) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -47,9 +47,9 @@
     "@atlaskit/link-analytics": "^8.2.0",
     "@atlaskit/link-datasource": "^1.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/smart-card": "^26.19.0",
-    "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.18.0",
+    "@atlaskit/smart-card": "^26.20.0",
+    "@atlaskit/theme": "^12.6.0",
+    "@atlaskit/tokens": "^1.20.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "lodash": "^4.17.21",