@atlaskit/editor-plugin-synced-block 3.3.6 → 3.4.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 3.4.0
+
+### Minor Changes
+
+- [`218e1d54178bb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/218e1d54178bb) -
+  Pre-fetch URL to source blocks
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.3.6
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-cc/tsconfig.json"
 		},

package/afm-dev-agents/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-dev-agents/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-dev-agents/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-dev-agents/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-jira/tsconfig.json"
 		},

package/afm-passionfruit/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-passionfruit/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-passionfruit/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-passionfruit/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-post-office/tsconfig.json"
 		},

package/afm-rovo-extension/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-rovo-extension/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-rovo-extension/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-rovo-extension/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -28,6 +28,9 @@
 		{
 			"path": "../../editor-json-transformer/afm-townsquare/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-menu/afm-townsquare/tsconfig.json"
 		},

package/dist/cjs/nodeviews/syncedBlock.js

@@ -50,6 +50,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     _this = _callSuper(this, SyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
     _this.options = props.options;
     _this.syncBlockStore = props.syncBlockStore;
+    _this.syncBlockStore.updateSyncBlockNode(_this.node);
     return _this;
   }
   (0, _inherits2.default)(SyncBlock, _ReactNodeView);

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

@@ -8,7 +8,6 @@ exports.removeSyncedBlock = exports.editSyncedBlockSource = exports.createSynced
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _utils2 = require("./utils/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -73,17 +72,31 @@ var copySyncedBlockReferenceToClipboard = exports.copySyncedBlockReferenceToClip
     return true;
   };
 };
-var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedBlockSource(_api) {
-  return function (state, _dispatch, _view) {
+var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {
+  return function (state, dispatch, _view) {
+    var _syncBlock$node;
     var syncBlock = (0, _utils2.findSyncBlock)(state);
-    if (!syncBlock) {
+    var resourceId = syncBlock === null || syncBlock === void 0 || (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 || (_syncBlock$node = _syncBlock$node.attrs) === null || _syncBlock$node === void 0 ? void 0 : _syncBlock$node.resourceId;
+    if (!resourceId) {
       return false;
     }
-    var url = (0, _editorSyncedBlockProvider.generateSyncBlockSourceUrl)(syncBlock.node);
-    if (!url) {
-      return false;
+    var syncBlockURL = syncBlockStore.getSyncBlockURL(resourceId);
+    if (syncBlockURL) {
+      window.open(syncBlockURL, '_blank');
+    } else {
+      var _api$analytics;
+      var tr = state.tr;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
+        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        action: _analytics.ACTION.ERROR,
+        actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_SOURCE_URL,
+        attributes: {
+          error: 'No URL resolved for synced block'
+        }
+      })(tr);
+      dispatch === null || dispatch === void 0 || dispatch(tr);
     }
-    window.open(url, '_blank');
     return true;
   };
 };

package/dist/cjs/ui/floating-toolbar.js

@@ -56,12 +56,13 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(stat
     var editSourceButton = _objectSpread({
       id: 'editor.syncedBlock.editSource',
       type: 'button',
+      disabled: !syncBlockStore.getSyncBlockURL(syncBlockObject.node.attrs.resourceId),
       appearance: 'subtle',
       icon: _linkExternal.default,
       title: formatMessage(_messages.syncBlockMessages.editSourceLabel),
       showTitle: true,
       tooltipContent: formatMessage(_messages.syncBlockMessages.editSourceTooltip),
-      onClick: (0, _actions.editSyncedBlockSource)(api)
+      onClick: (0, _actions.editSyncedBlockSource)(syncBlockStore, api)
     }, hoverDecorationProps(nodeType, _consts.akEditorSelectedNodeClassName));
     items.push(editSourceButton);
   }

package/dist/es2019/nodeviews/syncedBlock.js

@@ -32,6 +32,7 @@ class SyncBlock extends ReactNodeView {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
     this.options = props.options;
     this.syncBlockStore = props.syncBlockStore;
+    this.syncBlockStore.updateSyncBlockNode(this.node);
   }
   createDomRef() {
     const domRef = document.createElement('div');

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

@@ -1,6 +1,5 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { generateSyncBlockSourceUrl } from '@atlaskit/editor-synced-block-provider';
 import { canBeConvertedToSyncBlock, findSyncBlock } from './utils/utils';
 export const createSyncedBlock = ({
   tr,
@@ -75,16 +74,30 @@ export const copySyncedBlockReferenceToClipboard = api => (state, dispatch, _vie
   dispatch(newTr);
   return true;
 };
-export const editSyncedBlockSource = _api => (state, _dispatch, _view) => {
+export const editSyncedBlockSource = (syncBlockStore, api) => (state, dispatch, _view) => {
+  var _syncBlock$node, _syncBlock$node$attrs;
   const syncBlock = findSyncBlock(state);
-  if (!syncBlock) {
+  const resourceId = syncBlock === null || syncBlock === void 0 ? void 0 : (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 ? void 0 : (_syncBlock$node$attrs = _syncBlock$node.attrs) === null || _syncBlock$node$attrs === void 0 ? void 0 : _syncBlock$node$attrs.resourceId;
+  if (!resourceId) {
     return false;
   }
-  const url = generateSyncBlockSourceUrl(syncBlock.node);
-  if (!url) {
-    return false;
+  const syncBlockURL = syncBlockStore.getSyncBlockURL(resourceId);
+  if (syncBlockURL) {
+    window.open(syncBlockURL, '_blank');
+  } else {
+    var _api$analytics, _api$analytics$action;
+    const tr = state.tr;
+    api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.attachAnalyticsEvent({
+      eventType: EVENT_TYPE.OPERATIONAL,
+      action: ACTION.ERROR,
+      actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_SOURCE_URL,
+      attributes: {
+        error: 'No URL resolved for synced block'
+      }
+    })(tr);
+    dispatch === null || dispatch === void 0 ? void 0 : dispatch(tr);
   }
-  window.open(url, '_blank');
   return true;
 };
 export const removeSyncedBlock = api => (state, dispatch, _view) => {

package/dist/es2019/ui/floating-toolbar.js

@@ -41,12 +41,13 @@ export const getToolbarConfig = (state, intl, _options = {}, _providerFactory, a
     const editSourceButton = {
       id: 'editor.syncedBlock.editSource',
       type: 'button',
+      disabled: !syncBlockStore.getSyncBlockURL(syncBlockObject.node.attrs.resourceId),
       appearance: 'subtle',
       icon: LinkExternalIcon,
       title: formatMessage(messages.editSourceLabel),
       showTitle: true,
       tooltipContent: formatMessage(messages.editSourceTooltip),
-      onClick: editSyncedBlockSource(api),
+      onClick: editSyncedBlockSource(syncBlockStore, api),
       ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
     };
     items.push(editSourceButton);

package/dist/esm/nodeviews/syncedBlock.js

@@ -43,6 +43,7 @@ var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
     _this = _callSuper(this, SyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
     _this.options = props.options;
     _this.syncBlockStore = props.syncBlockStore;
+    _this.syncBlockStore.updateSyncBlockNode(_this.node);
     return _this;
   }
   _inherits(SyncBlock, _ReactNodeView);

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

@@ -1,9 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { generateSyncBlockSourceUrl } from '@atlaskit/editor-synced-block-provider';
 import { canBeConvertedToSyncBlock, findSyncBlock } from './utils/utils';
 export var createSyncedBlock = function createSyncedBlock(_ref) {
   var tr = _ref.tr,
@@ -66,17 +65,31 @@ export var copySyncedBlockReferenceToClipboard = function copySyncedBlockReferen
     return true;
   };
 };
-export var editSyncedBlockSource = function editSyncedBlockSource(_api) {
-  return function (state, _dispatch, _view) {
+export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {
+  return function (state, dispatch, _view) {
+    var _syncBlock$node;
     var syncBlock = findSyncBlock(state);
-    if (!syncBlock) {
+    var resourceId = syncBlock === null || syncBlock === void 0 || (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 || (_syncBlock$node = _syncBlock$node.attrs) === null || _syncBlock$node === void 0 ? void 0 : _syncBlock$node.resourceId;
+    if (!resourceId) {
       return false;
     }
-    var url = generateSyncBlockSourceUrl(syncBlock.node);
-    if (!url) {
-      return false;
+    var syncBlockURL = syncBlockStore.getSyncBlockURL(resourceId);
+    if (syncBlockURL) {
+      window.open(syncBlockURL, '_blank');
+    } else {
+      var _api$analytics;
+      var tr = state.tr;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
+        eventType: EVENT_TYPE.OPERATIONAL,
+        action: ACTION.ERROR,
+        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_SOURCE_URL,
+        attributes: {
+          error: 'No URL resolved for synced block'
+        }
+      })(tr);
+      dispatch === null || dispatch === void 0 || dispatch(tr);
     }
-    window.open(url, '_blank');
     return true;
   };
 };

package/dist/esm/ui/floating-toolbar.js

@@ -47,12 +47,13 @@ export var getToolbarConfig = function getToolbarConfig(state, intl) {
     var editSourceButton = _objectSpread({
       id: 'editor.syncedBlock.editSource',
       type: 'button',
+      disabled: !syncBlockStore.getSyncBlockURL(syncBlockObject.node.attrs.resourceId),
       appearance: 'subtle',
       icon: LinkExternalIcon,
       title: formatMessage(messages.editSourceLabel),
       showTitle: true,
       tooltipContent: formatMessage(messages.editSourceTooltip),
-      onClick: editSyncedBlockSource(api)
+      onClick: editSyncedBlockSource(syncBlockStore, api)
     }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName));
     items.push(editSourceButton);
   }

package/dist/types/pm-plugins/actions.d.ts

@@ -10,6 +10,6 @@ type createSyncedBlockProps = {
 };
 export declare const createSyncedBlock: ({ tr, syncBlockStore, typeAheadInsert, }: createSyncedBlockProps) => false | Transaction;
 export declare const copySyncedBlockReferenceToClipboard: (api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
-export declare const editSyncedBlockSource: (_api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
+export declare const editSyncedBlockSource: (syncBlockStore: SyncBlockStoreManager, api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
 export declare const removeSyncedBlock: (api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
 export {};

package/dist/types/syncedBlockPluginType.d.ts

@@ -2,6 +2,7 @@ import type { DocNode } from '@atlaskit/adf-schema';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
@@ -46,7 +47,8 @@ export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {
         SelectionPlugin,
         FloatingToolbarPlugin,
         DecorationsPlugin,
-        OptionalPlugin<BlockMenuPlugin>
+        OptionalPlugin<BlockMenuPlugin>,
+        OptionalPlugin<AnalyticsPlugin>
     ];
     pluginConfiguration: SyncedBlockPluginOptions | undefined;
 }>;

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

@@ -10,6 +10,6 @@ type createSyncedBlockProps = {
 };
 export declare const createSyncedBlock: ({ tr, syncBlockStore, typeAheadInsert, }: createSyncedBlockProps) => false | Transaction;
 export declare const copySyncedBlockReferenceToClipboard: (api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
-export declare const editSyncedBlockSource: (_api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
+export declare const editSyncedBlockSource: (syncBlockStore: SyncBlockStoreManager, api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
 export declare const removeSyncedBlock: (api?: ExtractInjectionAPI<SyncedBlockPlugin>) => Command;
 export {};

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

@@ -2,6 +2,7 @@ import type { DocNode } from '@atlaskit/adf-schema';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
@@ -46,7 +47,8 @@ export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {
         SelectionPlugin,
         FloatingToolbarPlugin,
         DecorationsPlugin,
-        OptionalPlugin<BlockMenuPlugin>
+        OptionalPlugin<BlockMenuPlugin>,
+        OptionalPlugin<AnalyticsPlugin>
     ];
     pluginConfiguration: SyncedBlockPluginOptions | undefined;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "3.3.6",
+	"version": "3.4.0",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,13 +31,14 @@
 		"@atlaskit/adf-schema": "^51.2.0",
 		"@atlaskit/button": "23.5.1",
 		"@atlaskit/editor-json-transformer": "^8.30.0",
+		"@atlaskit/editor-plugin-analytics": "^6.1.0",
 		"@atlaskit/editor-plugin-block-menu": "^4.0.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^8.2.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.7.0",
-		"@atlaskit/editor-synced-block-provider": "^0.5.0",
+		"@atlaskit/editor-synced-block-provider": "^0.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.15.0",
 		"@atlaskit/icon": "28.5.1",
@@ -46,7 +47,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.12.0",
+		"@atlaskit/editor-common": "^110.13.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {