@atlaskit/editor-plugin-card 0.7.3 → 0.8.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-card
 
+## 0.8.1
+
+### Patch Changes
+
+- [`ae7c1132c88`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ae7c1132c88) - Added analytics fix for undo/redo scenarious of link upgrade to a datasource
+- [`553b34b5fd4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/553b34b5fd4) - Small analytics bug fixes relating to auto-linking on enter, legacy link picker, and unresolvable links.
+
+## 0.8.0
+
+### Minor Changes
+
+- [`e4721cc5a3f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e4721cc5a3f) - Make issue count clickable
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.7.3
 
 ### Patch Changes

package/dist/cjs/analytics/events-from-tr.js

@@ -143,7 +143,7 @@ var findChanged = function findChanged(tr, state) {
 
     /**
      * If there is no identifiable input method, and the links inserted and removed appear to be the same,
-     * then this transaction likely is not intended to be consided to be the insertion and removal of links
+     * then this transaction likely is not intended to be considered to be the insertion and removal of links
      */
     if (!inputMethod && (0, _utils2.areSameNodes)(removed, inserted)) {
       return {
@@ -158,6 +158,8 @@ var findChanged = function findChanged(tr, state) {
       updated: updated
     };
   }
+  var updateInserted = [];
+  var updateRemoved = [];
   for (var _i = 0; _i < inserted.length; _i++) {
     if (isResolveReplace) {
       var newLink = inserted[_i];
@@ -174,15 +176,22 @@ var findChanged = function findChanged(tr, state) {
       continue;
     }
     if (inserted.length === removed.length) {
-      updated.push({
-        removed: removed[_i],
-        inserted: inserted[_i]
-      });
+      var previousSubject = (0, _utils2.getNodeSubject)(removed[_i].node);
+      var currentSubject = (0, _utils2.getNodeSubject)(inserted[_i].node);
+      if (isDatasourceUpgrade(previousSubject, currentSubject) || isDatasourceDowngrade(previousSubject, currentSubject)) {
+        updateInserted.push(inserted[_i]);
+        updateRemoved.push(removed[_i]);
+      } else {
+        updated.push({
+          removed: removed[_i],
+          inserted: inserted[_i]
+        });
+      }
     }
   }
   return {
-    inserted: [],
-    removed: [],
+    inserted: updateInserted,
+    removed: updateRemoved,
     updated: updated
   };
 };
@@ -274,6 +283,12 @@ var getResolveLinkPrevDisplay = function getResolveLinkPrevDisplay(state, pos) {
     return request.pos === pos;
   })) === null || _cardState$requests$f === void 0 ? void 0 : _cardState$requests$f.previousAppearance;
 };
+var isDatasourceDowngrade = function isDatasourceDowngrade(previousSubject, currentSubject) {
+  return previousSubject === _types.EVENT_SUBJECT.DATASOURCE && currentSubject === _types.EVENT_SUBJECT.LINK;
+};
+var isDatasourceUpgrade = function isDatasourceUpgrade(previousSubject, currentSubject) {
+  return previousSubject === _types.EVENT_SUBJECT.LINK && currentSubject === _types.EVENT_SUBJECT.DATASOURCE;
+};
 function eventsFromTransaction(tr, state) {
   var events = [];
   try {

package/dist/cjs/nodeviews/datasource.js

@@ -97,6 +97,7 @@ var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
     value: function render() {
       var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
       var datasource = this.getDatasource();
+      var attrs = this.props.node.attrs;
       var tableView = this.getTableView();
       if (tableView) {
         var _tableView$properties;
@@ -115,7 +116,8 @@ var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
             datasourceId: datasource.id,
             parameters: datasource.parameters,
             visibleColumnKeys: visibleColumnKeys,
-            onVisibleColumnKeysChange: this.handleColumnChange
+            onVisibleColumnKeysChange: this.handleColumnChange,
+            url: attrs === null || attrs === void 0 ? void 0 : attrs.url
           })));
         }
       }

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

@@ -140,7 +140,8 @@ var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(request,
     }
     (0, _card.addLinkMetadata)(state.selection, tr, {
       action: request.analyticsAction,
-      inputMethod: request.source
+      inputMethod: request.source,
+      sourceEvent: request.sourceEvent
     });
     if (dispatch) {
       dispatch((0, _actions.resolveCard)(request.url)(tr));

package/dist/cjs/ui/EditorLinkingPlatformAnalytics/DatasourceEvents.js

@@ -45,9 +45,7 @@ function getAnalyticAttributesFromNode(datasourceAttrs, metadata) {
   var actions = [];
   if (metadata.inputMethod) {
     var _getMethod;
-    inputMethod = (_getMethod = (0, _common.getMethod)({
-      inputMethod: metadata.inputMethod
-    })) !== null && _getMethod !== void 0 ? _getMethod : '';
+    inputMethod = (_getMethod = (0, _common.getMethod)(metadata)) !== null && _getMethod !== void 0 ? _getMethod : '';
   } else if (metadata.sourceEvent instanceof _analyticsNext.UIAnalyticsEvent) {
     var _metadata$sourceEvent, _metadata$sourceEvent2;
     inputMethod = (_metadata$sourceEvent = metadata.sourceEvent.payload.attributes) === null || _metadata$sourceEvent === void 0 ? void 0 : _metadata$sourceEvent.inputMethod;

package/dist/cjs/ui/EditorLinkingPlatformAnalytics/common.js

@@ -34,6 +34,10 @@ var getMethod = withHistoryMethod(function (_ref) {
     case _analytics.INPUT_METHOD.AUTO_DETECT:
     case _analytics.INPUT_METHOD.FORMATTING:
       return 'editor_type';
+    case _analytics.INPUT_METHOD.TYPEAHEAD:
+      return 'linkpicker_searchResult';
+    case _analytics.INPUT_METHOD.MANUAL:
+      return 'linkpicker_manual';
     default:
       return 'unknown';
   }

package/dist/es2019/analytics/events-from-tr.js

@@ -5,7 +5,7 @@ import { isLinkMark, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { getPluginState } from '../pm-plugins/util/state';
-import { EVENT } from './types';
+import { EVENT, EVENT_SUBJECT } from './types';
 import { appearanceForLink, areSameNodes, findAtPositions, findInNodeRange, getNodeContext, getNodeSubject } from './utils';
 
 /**
@@ -126,7 +126,7 @@ export const findChanged = (tr, state) => {
 
     /**
      * If there is no identifiable input method, and the links inserted and removed appear to be the same,
-     * then this transaction likely is not intended to be consided to be the insertion and removal of links
+     * then this transaction likely is not intended to be considered to be the insertion and removal of links
      */
     if (!inputMethod && areSameNodes(removed, inserted)) {
       return {
@@ -141,6 +141,8 @@ export const findChanged = (tr, state) => {
       updated
     };
   }
+  const updateInserted = [];
+  const updateRemoved = [];
   for (let i = 0; i < inserted.length; i++) {
     if (isResolveReplace) {
       const newLink = inserted[i];
@@ -157,15 +159,22 @@ export const findChanged = (tr, state) => {
       continue;
     }
     if (inserted.length === removed.length) {
-      updated.push({
-        removed: removed[i],
-        inserted: inserted[i]
-      });
+      const previousSubject = getNodeSubject(removed[i].node);
+      const currentSubject = getNodeSubject(inserted[i].node);
+      if (isDatasourceUpgrade(previousSubject, currentSubject) || isDatasourceDowngrade(previousSubject, currentSubject)) {
+        updateInserted.push(inserted[i]);
+        updateRemoved.push(removed[i]);
+      } else {
+        updated.push({
+          removed: removed[i],
+          inserted: inserted[i]
+        });
+      }
     }
   }
   return {
-    inserted: [],
-    removed: [],
+    inserted: updateInserted,
+    removed: updateRemoved,
     updated
   };
 };
@@ -250,6 +259,8 @@ const getResolveLinkPrevDisplay = (state, pos) => {
   }
   return (_cardState$requests$f = cardState.requests.find(request => request.pos === pos)) === null || _cardState$requests$f === void 0 ? void 0 : _cardState$requests$f.previousAppearance;
 };
+const isDatasourceDowngrade = (previousSubject, currentSubject) => previousSubject === EVENT_SUBJECT.DATASOURCE && currentSubject === EVENT_SUBJECT.LINK;
+const isDatasourceUpgrade = (previousSubject, currentSubject) => previousSubject === EVENT_SUBJECT.LINK && currentSubject === EVENT_SUBJECT.DATASOURCE;
 export function eventsFromTransaction(tr, state) {
   const events = [];
   try {

package/dist/es2019/nodeviews/datasource.js

@@ -72,6 +72,7 @@ export class DatasourceComponent extends React.PureComponent {
   render() {
     const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
     const datasource = this.getDatasource();
+    const attrs = this.props.node.attrs;
     const tableView = this.getTableView();
     if (tableView) {
       var _tableView$properties;
@@ -89,7 +90,8 @@ export class DatasourceComponent extends React.PureComponent {
           datasourceId: datasource.id,
           parameters: datasource.parameters,
           visibleColumnKeys: visibleColumnKeys,
-          onVisibleColumnKeysChange: this.handleColumnChange
+          onVisibleColumnKeysChange: this.handleColumnChange,
+          url: attrs === null || attrs === void 0 ? void 0 : attrs.url
         })));
       }
     }

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

@@ -119,7 +119,8 @@ export const handleFallbackWithAnalytics = (request, editorAnalyticsApi) => (sta
   }
   addLinkMetadata(state.selection, tr, {
     action: request.analyticsAction,
-    inputMethod: request.source
+    inputMethod: request.source,
+    sourceEvent: request.sourceEvent
   });
   if (dispatch) {
     dispatch(resolveCard(request.url)(tr));

package/dist/es2019/ui/EditorLinkingPlatformAnalytics/DatasourceEvents.js

@@ -38,9 +38,7 @@ function getAnalyticAttributesFromNode(datasourceAttrs, metadata) {
   let actions = [];
   if (metadata.inputMethod) {
     var _getMethod;
-    inputMethod = (_getMethod = getMethod({
-      inputMethod: metadata.inputMethod
-    })) !== null && _getMethod !== void 0 ? _getMethod : '';
+    inputMethod = (_getMethod = getMethod(metadata)) !== null && _getMethod !== void 0 ? _getMethod : '';
   } else if (metadata.sourceEvent instanceof UIAnalyticsEvent) {
     var _metadata$sourceEvent, _metadata$sourceEvent2;
     inputMethod = (_metadata$sourceEvent = metadata.sourceEvent.payload.attributes) === null || _metadata$sourceEvent === void 0 ? void 0 : _metadata$sourceEvent.inputMethod;

package/dist/es2019/ui/EditorLinkingPlatformAnalytics/common.js

@@ -31,6 +31,10 @@ export const getMethod = withHistoryMethod(({
     case INPUT_METHOD.AUTO_DETECT:
     case INPUT_METHOD.FORMATTING:
       return 'editor_type';
+    case INPUT_METHOD.TYPEAHEAD:
+      return 'linkpicker_searchResult';
+    case INPUT_METHOD.MANUAL:
+      return 'linkpicker_manual';
     default:
       return 'unknown';
   }

package/dist/esm/analytics/events-from-tr.js

@@ -7,7 +7,7 @@ import { isLinkMark, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { getPluginState } from '../pm-plugins/util/state';
-import { EVENT } from './types';
+import { EVENT, EVENT_SUBJECT } from './types';
 import { appearanceForLink, areSameNodes, findAtPositions, findInNodeRange, getNodeContext, getNodeSubject } from './utils';
 
 /**
@@ -136,7 +136,7 @@ export var findChanged = function findChanged(tr, state) {
 
     /**
      * If there is no identifiable input method, and the links inserted and removed appear to be the same,
-     * then this transaction likely is not intended to be consided to be the insertion and removal of links
+     * then this transaction likely is not intended to be considered to be the insertion and removal of links
      */
     if (!inputMethod && areSameNodes(removed, inserted)) {
       return {
@@ -151,6 +151,8 @@ export var findChanged = function findChanged(tr, state) {
       updated: updated
     };
   }
+  var updateInserted = [];
+  var updateRemoved = [];
   for (var _i = 0; _i < inserted.length; _i++) {
     if (isResolveReplace) {
       var newLink = inserted[_i];
@@ -167,15 +169,22 @@ export var findChanged = function findChanged(tr, state) {
       continue;
     }
     if (inserted.length === removed.length) {
-      updated.push({
-        removed: removed[_i],
-        inserted: inserted[_i]
-      });
+      var previousSubject = getNodeSubject(removed[_i].node);
+      var currentSubject = getNodeSubject(inserted[_i].node);
+      if (isDatasourceUpgrade(previousSubject, currentSubject) || isDatasourceDowngrade(previousSubject, currentSubject)) {
+        updateInserted.push(inserted[_i]);
+        updateRemoved.push(removed[_i]);
+      } else {
+        updated.push({
+          removed: removed[_i],
+          inserted: inserted[_i]
+        });
+      }
     }
   }
   return {
-    inserted: [],
-    removed: [],
+    inserted: updateInserted,
+    removed: updateRemoved,
     updated: updated
   };
 };
@@ -266,6 +275,12 @@ var getResolveLinkPrevDisplay = function getResolveLinkPrevDisplay(state, pos) {
     return request.pos === pos;
   })) === null || _cardState$requests$f === void 0 ? void 0 : _cardState$requests$f.previousAppearance;
 };
+var isDatasourceDowngrade = function isDatasourceDowngrade(previousSubject, currentSubject) {
+  return previousSubject === EVENT_SUBJECT.DATASOURCE && currentSubject === EVENT_SUBJECT.LINK;
+};
+var isDatasourceUpgrade = function isDatasourceUpgrade(previousSubject, currentSubject) {
+  return previousSubject === EVENT_SUBJECT.LINK && currentSubject === EVENT_SUBJECT.DATASOURCE;
+};
 export function eventsFromTransaction(tr, state) {
   var events = [];
   try {

package/dist/esm/nodeviews/datasource.js

@@ -91,6 +91,7 @@ export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
     value: function render() {
       var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
       var datasource = this.getDatasource();
+      var attrs = this.props.node.attrs;
       var tableView = this.getTableView();
       if (tableView) {
         var _tableView$properties;
@@ -109,7 +110,8 @@ export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
             datasourceId: datasource.id,
             parameters: datasource.parameters,
             visibleColumnKeys: visibleColumnKeys,
-            onVisibleColumnKeysChange: this.handleColumnChange
+            onVisibleColumnKeysChange: this.handleColumnChange,
+            url: attrs === null || attrs === void 0 ? void 0 : attrs.url
           })));
         }
       }

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

@@ -132,7 +132,8 @@ export var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(re
     }
     addLinkMetadata(state.selection, tr, {
       action: request.analyticsAction,
-      inputMethod: request.source
+      inputMethod: request.source,
+      sourceEvent: request.sourceEvent
     });
     if (dispatch) {
       dispatch(resolveCard(request.url)(tr));

package/dist/esm/ui/EditorLinkingPlatformAnalytics/DatasourceEvents.js

@@ -38,9 +38,7 @@ function getAnalyticAttributesFromNode(datasourceAttrs, metadata) {
   var actions = [];
   if (metadata.inputMethod) {
     var _getMethod;
-    inputMethod = (_getMethod = getMethod({
-      inputMethod: metadata.inputMethod
-    })) !== null && _getMethod !== void 0 ? _getMethod : '';
+    inputMethod = (_getMethod = getMethod(metadata)) !== null && _getMethod !== void 0 ? _getMethod : '';
   } else if (metadata.sourceEvent instanceof UIAnalyticsEvent) {
     var _metadata$sourceEvent, _metadata$sourceEvent2;
     inputMethod = (_metadata$sourceEvent = metadata.sourceEvent.payload.attributes) === null || _metadata$sourceEvent === void 0 ? void 0 : _metadata$sourceEvent.inputMethod;

package/dist/esm/ui/EditorLinkingPlatformAnalytics/common.js

@@ -28,6 +28,10 @@ export var getMethod = withHistoryMethod(function (_ref) {
     case INPUT_METHOD.AUTO_DETECT:
     case INPUT_METHOD.FORMATTING:
       return 'editor_type';
+    case INPUT_METHOD.TYPEAHEAD:
+      return 'linkpicker_searchResult';
+    case INPUT_METHOD.MANUAL:
+      return 'linkpicker_manual';
     default:
       return 'unknown';
   }

package/dist/types/ui/EditorLinkingPlatformAnalytics/common.d.ts

@@ -1,7 +1,7 @@
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { EditorCardPluginEvents } from '../../analytics/create-events-queue';
-import { CardPluginEvent } from '../../analytics/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorCardPluginEvents } from '../../analytics/create-events-queue';
+import type { CardPluginEvent } from '../../analytics/types';
 export type AnalyticsBindingsProps = {
     editorView: EditorView;
     cardPluginEvents: EditorCardPluginEvents<CardPluginEvent>;

package/dist/types-ts4.5/ui/EditorLinkingPlatformAnalytics/common.d.ts

@@ -1,7 +1,7 @@
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { EditorCardPluginEvents } from '../../analytics/create-events-queue';
-import { CardPluginEvent } from '../../analytics/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorCardPluginEvents } from '../../analytics/create-events-queue';
+import type { CardPluginEvent } from '../../analytics/types';
 export type AnalyticsBindingsProps = {
     editorView: EditorView;
     cardPluginEvents: EditorCardPluginEvents<CardPluginEvent>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^29.1.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^75.2.0",
+    "@atlaskit/editor-common": "^75.6.0",
     "@atlaskit/editor-plugin-analytics": "^0.2.0",
     "@atlaskit/editor-plugin-decorations": "^0.2.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
@@ -45,9 +45,9 @@
     "@atlaskit/editor-shared-styles": "^2.7.0",
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/link-analytics": "^8.3.0",
-    "@atlaskit/link-datasource": "^1.2.0",
+    "@atlaskit/link-datasource": "^1.3.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/smart-card": "^26.27.0",
+    "@atlaskit/smart-card": "^26.28.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/tokens": "^1.25.0",
     "@babel/runtime": "^7.0.0",