@comet/cms-admin 7.25.6 → 7.25.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/pages/pageTree/useCopyPastePages/sendPages.d.ts.map +1 -1
  2. package/lib/pages/pageTree/useCopyPastePages/sendPages.js +18 -11
  3. package/package.json +10 -10
package/lib/pages/pageTree/useCopyPastePages/sendPages.d.ts.map CHANGED
@@ -1 +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"}
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,CA4Sf"}
package/lib/pages/pageTree/useCopyPastePages/sendPages.js CHANGED
@@ -573,7 +573,8 @@ function _sendPages() {
573
573
  if (sourcePage.document && !(0, _lodash["default"])(sourceContentScope, targetContentScope)) {
574
574
  unhandledDependencies = unhandledDependenciesFromDocument(documentType, sourcePage.document, {
575
575
  existingReplacements: dependencyReplacements,
576
- hasDamScope: hasDamScope
576
+ hasDamScope: hasDamScope,
577
+ targetDamScope: targetDamScope
577
578
  });
578
579
  replacementsForUnhandledDependencies = createUndefinedReplacementsForDependencies(unhandledDependencies);
579
580
  dependencyReplacements.push.apply(dependencyReplacements, _toConsumableArray(replacementsForUnhandledDependencies));
@@ -670,11 +671,18 @@ function createPageTreeNodeIdReplacements(nodes) {
670
671
  function unhandledDependenciesFromDocument(documentType, document, _ref3) {
671
672
  var existingReplacements = _ref3.existingReplacements,
672
673
  _ref3$hasDamScope = _ref3.hasDamScope,
673
- hasDamScope = _ref3$hasDamScope === void 0 ? false : _ref3$hasDamScope;
674
+ hasDamScope = _ref3$hasDamScope === void 0 ? false : _ref3$hasDamScope,
675
+ targetDamScope = _ref3.targetDamScope;
674
676
  var unhandledDependencies = documentType.dependencies(document).filter(function (dependency) {
675
- if (dependency.targetGraphqlObjectType === "DamFile" && !hasDamScope) {
676
- // If there is no DAM scoping (DAM = global), the dependency is not unhandled. It's handled correctly by doing nothing
677
- return false;
677
+ if (isDamFileDependency(dependency)) {
678
+ if (!hasDamScope) {
679
+ // If there is no DAM scoping (DAM = global), the dependency is not unhandled. It's handled correctly by doing nothing
680
+ return false;
681
+ }
682
+ if ((0, _lodash["default"])(dependency.data.damFile.scope, targetDamScope)) {
683
+ // Source and target DAM scope are the same, so no need to handle this dependency
684
+ return false;
685
+ }
678
686
  }
679
687
  return !existingReplacements.some(function (replacement) {
680
688
  return replacement.originalId === dependency.id && replacement.type === dependency.targetGraphqlObjectType;
@@ -708,12 +716,11 @@ function createUndefinedReplacementsForDependencies(dependencies) {
708
716
  return replacements;
709
717
  }
710
718
  function fileDependenciesFromDocument(documentType, document) {
711
- return documentType.dependencies(document)
712
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
713
- .filter(function (dependency) {
714
- return dependency.targetGraphqlObjectType === "DamFile" && dependency.data && dependency.data.damFile;
715
- }).map(function (dependency) {
716
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
719
+ return documentType.dependencies(document).filter(isDamFileDependency).map(function (dependency) {
717
720
  return dependency.data.damFile;
718
721
  });
722
+ }
723
+ function isDamFileDependency(dependency) {
724
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
725
+ return dependency.targetGraphqlObjectType === "DamFile" && dependency.data && dependency.data.damFile;
719
726
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@comet/cms-admin",
3
- "version": "7.25.6",
3
+ "version": "7.25.7",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/vivid-planet/comet",
@@ -54,12 +54,12 @@
54
54
  "split.js": "^1.6.4",
55
55
  "use-debounce": "^6.0.0",
56
56
  "uuid": "^9.0.0",
57
- "@comet/admin": "7.25.6",
58
- "@comet/admin-date-time": "7.25.6",
59
- "@comet/admin-icons": "7.25.6",
60
- "@comet/admin-rte": "7.25.6",
61
- "@comet/admin-theme": "7.25.6",
62
- "@comet/blocks-admin": "7.25.6"
57
+ "@comet/admin": "7.25.7",
58
+ "@comet/admin-date-time": "7.25.7",
59
+ "@comet/admin-icons": "7.25.7",
60
+ "@comet/admin-rte": "7.25.7",
61
+ "@comet/admin-theme": "7.25.7",
62
+ "@comet/blocks-admin": "7.25.7"
63
63
  },
64
64
  "devDependencies": {
65
65
  "@apollo/client": "^3.7.0",
@@ -121,9 +121,9 @@
121
121
  "ts-jest": "^29.0.5",
122
122
  "ts-node": "^10.9.1",
123
123
  "typescript": "^4.0.0",
124
- "@comet/admin-babel-preset": "7.25.6",
125
- "@comet/cli": "7.25.6",
126
- "@comet/eslint-config": "7.25.6"
124
+ "@comet/admin-babel-preset": "7.25.7",
125
+ "@comet/cli": "7.25.7",
126
+ "@comet/eslint-config": "7.25.7"
127
127
  },
128
128
  "peerDependencies": {
129
129
  "@apollo/client": "^3.7.0",