@comet/cms-admin 7.25.5 → 7.25.7

package/lib/form/file/FileField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileField.d.ts","sourceRoot":"","sources":["../../../src/form/file/FileField.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAoE,QAAQ,EAAc,MAAM,eAAe,CAAC;AACvH,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,SAAS,EAAY,MAAM,OAAO,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQpD,OAAO,EAAE,2BAA2B,EAA+D,MAAM,2BAA2B,CAAC;AAErI,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,UAAU,UAAW,SAAQ,cAAc,CAAC,OAAO,QAAQ,CAAC;IACxD,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,UAAU,cAAe,SAAQ,gBAAgB,CAAC,2BAA2B,GAAG,SAAS,EAAE,gBAAgB,CAAC;IACxG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACrE;AAED,QAAA,MAAM,SAAS,kEAAmE,cAAc,gBAkH/F,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"FileField.d.ts","sourceRoot":"","sources":["../../../src/form/file/FileField.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAoE,QAAQ,EAAc,MAAM,eAAe,CAAC;AACvH,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,SAAS,EAAY,MAAM,OAAO,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQpD,OAAO,EAAE,2BAA2B,EAA+D,MAAM,2BAA2B,CAAC;AAErI,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAExE,UAAU,UAAW,SAAQ,cAAc,CAAC,OAAO,QAAQ,CAAC;IACxD,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,UAAU,cAAe,SAAQ,gBAAgB,CAAC,2BAA2B,GAAG,SAAS,EAAE,gBAAgB,CAAC;IACxG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACrE;AAED,QAAA,MAAM,SAAS,kEAAmE,cAAc,gBAoH/F,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/lib/form/file/FileField.js

@@ -64,7 +64,7 @@ var FileField = exports.FileField = function FileField(_ref) {
   };
   var damFile = input.value;
   if (damFile) {
-    var showMenu = Boolean(dependencyMap["DamFile"]);
+    var showMenu = Boolean(dependencyMap["DamFile"]) || menuActions !== undefined && menuActions.length > 0;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_blocksAdmin.AdminComponentPaper, {
         disablePadding: true,
@@ -120,7 +120,7 @@ var FileField = exports.FileField = function FileField(_ref) {
         keepMounted: true,
         open: Boolean(anchorEl),
         onClose: handleMenuClose,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
+        children: [dependencyMap["DamFile"] && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
           onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
             var path, url;
             return _regeneratorRuntime().wrap(function _callee$(_context) {

package/lib/pages/pageTree/useCopyPastePages/sendPages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendPages.d.ts","sourceRoot":"","sources":["../../../../src/pages/pageTree/useCopyPastePages/sendPages.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAO,MAAM,gBAAgB,CAAC;AAInD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAiB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA4CrE,MAAM,WAAW,gBAAgB;IAC7B;;;SAGK;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;CACnE;AAED,UAAU,qBAAqB;IAC3B,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;IAChD,YAAY,EAAE,eAAe,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;IAcI;AACJ,wBAAsB,SAAS,CAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE,cAAc,EACpD,OAAO,EAAE,gBAAgB,EACzB,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,qBAAqB,EACpI,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,GAC/D,OAAO,CAAC,IAAI,CAAC,CA2Sf"}
+{"version":3,"file":"sendPages.d.ts","sourceRoot":"","sources":["../../../../src/pages/pageTree/useCopyPastePages/sendPages.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAO,MAAM,gBAAgB,CAAC;AAInD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAiB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA4CrE,MAAM,WAAW,gBAAgB;IAC7B;;;SAGK;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;CACnE;AAED,UAAU,qBAAqB;IAC3B,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;IAChD,YAAY,EAAE,eAAe,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;IAcI;AACJ,wBAAsB,SAAS,CAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE,cAAc,EACpD,OAAO,EAAE,gBAAgB,EACzB,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,qBAAqB,EACpI,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,GAC/D,OAAO,CAAC,IAAI,CAAC,CA4Sf"}

package/lib/pages/pageTree/useCopyPastePages/sendPages.js

@@ -573,7 +573,8 @@ function _sendPages() {
                   if (sourcePage.document && !(0, _lodash["default"])(sourceContentScope, targetContentScope)) {
                     unhandledDependencies = unhandledDependenciesFromDocument(documentType, sourcePage.document, {
                       existingReplacements: dependencyReplacements,
-                      hasDamScope: hasDamScope
+                      hasDamScope: hasDamScope,
+                      targetDamScope: targetDamScope
                     });
                     replacementsForUnhandledDependencies = createUndefinedReplacementsForDependencies(unhandledDependencies);
                     dependencyReplacements.push.apply(dependencyReplacements, _toConsumableArray(replacementsForUnhandledDependencies));
@@ -670,11 +671,18 @@ function createPageTreeNodeIdReplacements(nodes) {
 function unhandledDependenciesFromDocument(documentType, document, _ref3) {
   var existingReplacements = _ref3.existingReplacements,
     _ref3$hasDamScope = _ref3.hasDamScope,
-    hasDamScope = _ref3$hasDamScope === void 0 ? false : _ref3$hasDamScope;
+    hasDamScope = _ref3$hasDamScope === void 0 ? false : _ref3$hasDamScope,
+    targetDamScope = _ref3.targetDamScope;
   var unhandledDependencies = documentType.dependencies(document).filter(function (dependency) {
-    if (dependency.targetGraphqlObjectType === "DamFile" && !hasDamScope) {
-      // If there is no DAM scoping (DAM = global), the dependency is not unhandled. It's handled correctly by doing nothing
-      return false;
+    if (isDamFileDependency(dependency)) {
+      if (!hasDamScope) {
+        // If there is no DAM scoping (DAM = global), the dependency is not unhandled. It's handled correctly by doing nothing
+        return false;
+      }
+      if ((0, _lodash["default"])(dependency.data.damFile.scope, targetDamScope)) {
+        // Source and target DAM scope are the same, so no need to handle this dependency
+        return false;
+      }
     }
     return !existingReplacements.some(function (replacement) {
       return replacement.originalId === dependency.id && replacement.type === dependency.targetGraphqlObjectType;
@@ -708,12 +716,11 @@ function createUndefinedReplacementsForDependencies(dependencies) {
   return replacements;
 }
 function fileDependenciesFromDocument(documentType, document) {
-  return documentType.dependencies(document)
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  .filter(function (dependency) {
-    return dependency.targetGraphqlObjectType === "DamFile" && dependency.data && dependency.data.damFile;
-  }).map(function (dependency) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return documentType.dependencies(document).filter(isDamFileDependency).map(function (dependency) {
     return dependency.data.damFile;
   });
+}
+function isDamFileDependency(dependency) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return dependency.targetGraphqlObjectType === "DamFile" && dependency.data && dependency.data.damFile;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/cms-admin",
-  "version": "7.25.5",
+  "version": "7.25.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/vivid-planet/comet",
@@ -54,12 +54,12 @@
     "split.js": "^1.6.4",
     "use-debounce": "^6.0.0",
     "uuid": "^9.0.0",
-    "@comet/admin": "7.25.5",
-    "@comet/admin-date-time": "7.25.5",
-    "@comet/admin-icons": "7.25.5",
-    "@comet/admin-rte": "7.25.5",
-    "@comet/admin-theme": "7.25.5",
-    "@comet/blocks-admin": "7.25.5"
+    "@comet/admin": "7.25.7",
+    "@comet/admin-date-time": "7.25.7",
+    "@comet/admin-icons": "7.25.7",
+    "@comet/admin-rte": "7.25.7",
+    "@comet/admin-theme": "7.25.7",
+    "@comet/blocks-admin": "7.25.7"
   },
   "devDependencies": {
     "@apollo/client": "^3.7.0",
@@ -121,9 +121,9 @@
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "typescript": "^4.0.0",
-    "@comet/admin-babel-preset": "7.25.5",
-    "@comet/cli": "7.25.5",
-    "@comet/eslint-config": "7.25.5"
+    "@comet/admin-babel-preset": "7.25.7",
+    "@comet/cli": "7.25.7",
+    "@comet/eslint-config": "7.25.7"
   },
   "peerDependencies": {
     "@apollo/client": "^3.7.0",