@atlaskit/editor-plugin-media 9.4.17 → 9.5.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-media
 
+## 9.5.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.5.0
+
+### Minor Changes
+
+- [`c90ccf0c600ee`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c90ccf0c600ee) -
+  Enable cross product/cross client copy and paste of Media files by including clientId during Copy
+  operations.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.4.17
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaNodeUpdater.js

@@ -16,11 +16,12 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaClientReact = require("@atlaskit/media-client-react");
+var _mediaCommon = require("@atlaskit/media-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _helpers = require("../pm-plugins/commands/helpers");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _batchMediaNodeAttrs = require("../pm-plugins/utils/batchMediaNodeAttrs");
-var _mediaCommon = require("../pm-plugins/utils/media-common");
+var _mediaCommon2 = require("../pm-plugins/utils/media-common");
 var _excluded = ["authProvider"],
   _excluded2 = ["authProvider"]; // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 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; }
@@ -354,7 +355,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
             }
             return _context8.abrupt("return", false);
           case 10:
-            id = (0, _mediaCommon.getIdentifier)(attrs);
+            id = (0, _mediaCommon2.getIdentifier)(attrs);
             isIdentifierOutsideEditorScope = !_this.mediaPluginState.isIdentifierInEditorScope(id);
             return _context8.abrupt("return", isIdentifierOutsideEditorScope);
           case 13:
@@ -478,7 +479,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
     }());
     (0, _defineProperty2.default)(this, "copyNodeFromBlobUrl", /*#__PURE__*/function () {
       var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(getPos) {
-        var attrs, url, mediaAttrs, mediaProvider, currentCollectionName, contextId, id, collection, height, width, mimeType, name, size, uploadMediaClientConfig, mediaClient, getAuthFromContext, mediaFileId, pos;
+        var attrs, url, mediaAttrs, mediaProvider, currentCollectionName, contextId, clientId, id, collection, height, width, mimeType, name, size, uploadMediaClientConfig, mediaClient, getAuthFromContext, mediaFileId, pos;
         return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -508,7 +509,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
               return _context10.abrupt("return");
             case 12:
               currentCollectionName = mediaProvider.uploadParams.collection;
-              contextId = mediaAttrs.contextId, id = mediaAttrs.id, collection = mediaAttrs.collection, height = mediaAttrs.height, width = mediaAttrs.width, mimeType = mediaAttrs.mimeType, name = mediaAttrs.name, size = mediaAttrs.size;
+              contextId = mediaAttrs.contextId, clientId = mediaAttrs.clientId, id = mediaAttrs.id, collection = mediaAttrs.collection, height = mediaAttrs.height, width = mediaAttrs.width, mimeType = mediaAttrs.mimeType, name = mediaAttrs.name, size = mediaAttrs.size;
               uploadMediaClientConfig = mediaProvider.uploadMediaClientConfig;
               if (!(!uploadMediaClientConfig || !uploadMediaClientConfig.getAuthFromContext)) {
                 _context10.next = 17;
@@ -526,7 +527,8 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
                   collection: collection,
                   authProvider: function authProvider() {
                     return getAuthFromContext(contextId);
-                  }
+                  },
+                  clientId: (0, _platformFeatureFlags.fg)('platform_media_cross_client_copy_with_auth') ? clientId : undefined
                 },
                 destination: {
                   collection: currentCollectionName,
@@ -639,7 +641,7 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
     }());
     (0, _defineProperty2.default)(this, "copyFile", /*#__PURE__*/function () {
       var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(id, collection, traceContext) {
-        var mediaProvider, nodeContextId, uploadMediaClientConfig, mediaClient, currentCollectionName, objectId, getAuthFromContext, mediaFileId;
+        var mediaProvider, nodeContextId, uploadMediaClientConfig, mediaClient, clientId, currentCollectionName, objectId, getAuthFromContext, mediaFileId;
         return _regenerator.default.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -662,13 +664,14 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
               return _context13.abrupt("return");
             case 9:
               mediaClient = (0, _mediaClientReact.getMediaClient)(uploadMediaClientConfig);
+              clientId = (0, _platformFeatureFlags.fg)('platform_media_cross_client_copy_with_auth') ? (0, _mediaCommon.getClientIdForFile)(id) : undefined;
               currentCollectionName = mediaProvider.uploadParams.collection;
-              _context13.next = 13;
+              _context13.next = 14;
               return _this.getObjectId();
-            case 13:
+            case 14:
               objectId = _context13.sent;
               getAuthFromContext = uploadMediaClientConfig.getAuthFromContext;
-              _context13.next = 17;
+              _context13.next = 18;
               return _this.handleCopyFileSwitcher({
                 mediaClient: mediaClient,
                 source: {
@@ -676,7 +679,8 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
                   collection: collection,
                   authProvider: function authProvider() {
                     return getAuthFromContext(nodeContextId);
-                  }
+                  },
+                  clientId: clientId
                 },
                 destination: {
                   collection: currentCollectionName,
@@ -686,14 +690,14 @@ var MediaNodeUpdater = exports.MediaNodeUpdater = /*#__PURE__*/function () {
                 },
                 traceContext: traceContext
               });
-            case 17:
+            case 18:
               mediaFileId = _context13.sent;
               return _context13.abrupt("return", {
                 id: mediaFileId,
                 collection: currentCollectionName,
                 __contextId: objectId
               });
-            case 19:
+            case 20:
             case "end":
               return _context13.stop();
           }

package/dist/es2019/nodeviews/mediaNodeUpdater.js

@@ -5,6 +5,7 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { getAttrsFromUrl, isImageRepresentationReady, isMediaBlobUrl } from '@atlaskit/media-client';
 import { getMediaClient } from '@atlaskit/media-client-react';
+import { getClientIdForFile } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { replaceExternalMedia, updateCurrentMediaNodeAttrs, updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
@@ -71,7 +72,7 @@ export class MediaNodeUpdater {
         if (fileState.status === 'error') {
           return;
         }
-      } catch (err) {
+      } catch {
         return;
       }
       const contextId = this.getNodeContextId() || (await this.getObjectId());
@@ -158,7 +159,7 @@ export class MediaNodeUpdater {
             width: dimensions.width,
             occurrenceKey: uploadableFileUpfrontIds.occurrenceKey
           })(this.props.view.state, this.props.view.dispatch);
-        } catch (e) {
+        } catch {
           //keep it as external media
           if (this.props.dispatchAnalyticsEvent) {
             this.props.dispatchAnalyticsEvent({
@@ -281,6 +282,7 @@ export class MediaNodeUpdater {
       const currentCollectionName = mediaProvider.uploadParams.collection;
       const {
         contextId,
+        clientId,
         id,
         collection,
         height,
@@ -300,7 +302,8 @@ export class MediaNodeUpdater {
         source: {
           id,
           collection,
-          authProvider: () => getAuthFromContext(contextId)
+          authProvider: () => getAuthFromContext(contextId),
+          clientId: fg('platform_media_cross_client_copy_with_auth') ? clientId : undefined
         },
         destination: {
           collection: currentCollectionName,
@@ -364,6 +367,7 @@ export class MediaNodeUpdater {
         return;
       }
       const mediaClient = getMediaClient(uploadMediaClientConfig);
+      const clientId = fg('platform_media_cross_client_copy_with_auth') ? getClientIdForFile(id) : undefined;
       const currentCollectionName = mediaProvider.uploadParams.collection;
       const objectId = await this.getObjectId();
       const getAuthFromContext = uploadMediaClientConfig.getAuthFromContext;
@@ -372,7 +376,8 @@ export class MediaNodeUpdater {
         source: {
           id,
           collection,
-          authProvider: () => getAuthFromContext(nodeContextId)
+          authProvider: () => getAuthFromContext(nodeContextId),
+          clientId
         },
         destination: {
           collection: currentCollectionName,
@@ -457,7 +462,7 @@ export class MediaNodeUpdater {
     if (this.isMediaBlobUrl()) {
       try {
         await this.copyNodeFromBlobUrl(getPos);
-      } catch (e) {
+      } catch {
         await this.uploadExternalMedia(getPos);
       }
     } else {

package/dist/esm/nodeviews/mediaNodeUpdater.js

@@ -14,6 +14,7 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { getAttrsFromUrl, isImageRepresentationReady, isMediaBlobUrl as _isMediaBlobUrl } from '@atlaskit/media-client';
 import { getMediaClient } from '@atlaskit/media-client-react';
+import { getClientIdForFile } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { replaceExternalMedia, updateCurrentMediaNodeAttrs, updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
@@ -472,7 +473,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
     }());
     _defineProperty(this, "copyNodeFromBlobUrl", /*#__PURE__*/function () {
       var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(getPos) {
-        var attrs, url, mediaAttrs, mediaProvider, currentCollectionName, contextId, id, collection, height, width, mimeType, name, size, uploadMediaClientConfig, mediaClient, getAuthFromContext, mediaFileId, pos;
+        var attrs, url, mediaAttrs, mediaProvider, currentCollectionName, contextId, clientId, id, collection, height, width, mimeType, name, size, uploadMediaClientConfig, mediaClient, getAuthFromContext, mediaFileId, pos;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -502,7 +503,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
               return _context10.abrupt("return");
             case 12:
               currentCollectionName = mediaProvider.uploadParams.collection;
-              contextId = mediaAttrs.contextId, id = mediaAttrs.id, collection = mediaAttrs.collection, height = mediaAttrs.height, width = mediaAttrs.width, mimeType = mediaAttrs.mimeType, name = mediaAttrs.name, size = mediaAttrs.size;
+              contextId = mediaAttrs.contextId, clientId = mediaAttrs.clientId, id = mediaAttrs.id, collection = mediaAttrs.collection, height = mediaAttrs.height, width = mediaAttrs.width, mimeType = mediaAttrs.mimeType, name = mediaAttrs.name, size = mediaAttrs.size;
               uploadMediaClientConfig = mediaProvider.uploadMediaClientConfig;
               if (!(!uploadMediaClientConfig || !uploadMediaClientConfig.getAuthFromContext)) {
                 _context10.next = 17;
@@ -520,7 +521,8 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
                   collection: collection,
                   authProvider: function authProvider() {
                     return getAuthFromContext(contextId);
-                  }
+                  },
+                  clientId: fg('platform_media_cross_client_copy_with_auth') ? clientId : undefined
                 },
                 destination: {
                   collection: currentCollectionName,
@@ -633,7 +635,7 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
     }());
     _defineProperty(this, "copyFile", /*#__PURE__*/function () {
       var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(id, collection, traceContext) {
-        var mediaProvider, nodeContextId, uploadMediaClientConfig, mediaClient, currentCollectionName, objectId, getAuthFromContext, mediaFileId;
+        var mediaProvider, nodeContextId, uploadMediaClientConfig, mediaClient, clientId, currentCollectionName, objectId, getAuthFromContext, mediaFileId;
         return _regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -656,13 +658,14 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
               return _context13.abrupt("return");
             case 9:
               mediaClient = getMediaClient(uploadMediaClientConfig);
+              clientId = fg('platform_media_cross_client_copy_with_auth') ? getClientIdForFile(id) : undefined;
               currentCollectionName = mediaProvider.uploadParams.collection;
-              _context13.next = 13;
+              _context13.next = 14;
               return _this.getObjectId();
-            case 13:
+            case 14:
               objectId = _context13.sent;
               getAuthFromContext = uploadMediaClientConfig.getAuthFromContext;
-              _context13.next = 17;
+              _context13.next = 18;
               return _this.handleCopyFileSwitcher({
                 mediaClient: mediaClient,
                 source: {
@@ -670,7 +673,8 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
                   collection: collection,
                   authProvider: function authProvider() {
                     return getAuthFromContext(nodeContextId);
-                  }
+                  },
+                  clientId: clientId
                 },
                 destination: {
                   collection: currentCollectionName,
@@ -680,14 +684,14 @@ export var MediaNodeUpdater = /*#__PURE__*/function () {
                 },
                 traceContext: traceContext
               });
-            case 17:
+            case 18:
               mediaFileId = _context13.sent;
               return _context13.abrupt("return", {
                 id: mediaFileId,
                 collection: currentCollectionName,
                 __contextId: objectId
               });
-            case 19:
+            case 20:
             case "end":
               return _context13.stop();
           }

package/dist/types/nodeviews/mediaNodeUpdater.d.ts

@@ -2,7 +2,7 @@ import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { MediaTraceContext } from '@atlaskit/media-common';
+import { type MediaTraceContext } from '@atlaskit/media-common';
 import type { MediaOptions, MediaPluginState, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
 type RemoteDimensions = {
     height: number;

package/dist/types-ts4.5/nodeviews/mediaNodeUpdater.d.ts

@@ -2,7 +2,7 @@ import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { MediaTraceContext } from '@atlaskit/media-common';
+import { type MediaTraceContext } from '@atlaskit/media-common';
 import type { MediaOptions, MediaPluginState, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
 type RemoteDimensions = {
     height: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "9.4.17",
+	"version": "9.5.1",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,18 +55,18 @@
 		"@atlaskit/icon": "^31.0.0",
 		"@atlaskit/icon-lab": "^5.16.0",
 		"@atlaskit/media-card": "^79.15.0",
-		"@atlaskit/media-client": "^35.7.0",
-		"@atlaskit/media-client-react": "^4.1.0",
-		"@atlaskit/media-common": "^12.3.0",
+		"@atlaskit/media-client": "^35.8.0",
+		"@atlaskit/media-client-react": "^4.2.0",
+		"@atlaskit/media-common": "^12.4.0",
 		"@atlaskit/media-filmstrip": "^51.1.0",
 		"@atlaskit/media-picker": "^70.1.0",
 		"@atlaskit/media-ui": "^28.7.0",
-		"@atlaskit/media-viewer": "^52.7.0",
+		"@atlaskit/media-viewer": "^52.8.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^25.0.0",
+		"@atlaskit/tmp-editor-statsig": "^26.0.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@babel/runtime": "^7.0.0",
@@ -78,7 +78,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.12.0",
+		"@atlaskit/editor-common": "^111.16.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -124,6 +124,9 @@
 		"platform_media_cross_client_copy": {
 			"type": "boolean"
 		},
+		"platform_media_cross_client_copy_with_auth": {
+			"type": "boolean"
+		},
 		"platform_editor_typography_ugc": {
 			"type": "boolean"
 		},