@crystaldesign/diva-backoffice 26.1.0-rc.0 → 26.1.0-rc.2

package/build/esm/index.js

@@ -33494,51 +33494,67 @@ function PublishCustomCell (_ref) {
   var unpublishedChanges = hasUnpublishedChanges(publishedData === null || publishedData === void 0 ? void 0 : publishedData.publishDate, data === null || data === void 0 ? void 0 : data.lastUpdatedDate);
   var disabled = isPublishing || !(data !== null && data !== void 0 && data.basedCatalogId) && !(data !== null && data !== void 0 && data.basedPackageId) || !(data !== null && data !== void 0 && data.name);
   var fetchOrganizationsWithAutomaticPublishing = React.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var fields, url, response, result, allowedOrgIds, filtered, allOrgIds;
+    var url, response, result, allowedOrgIds, currentOrg, currentOrgParentIds, filtered, allOrgIds;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setLoadingOrganizations(true);
           _context.prev = 1;
           // Request organizations with automaticPublishing field from their settings
-          fields = encodeURIComponent('{_id,displayName,automaticPublishing}');
-          url = apiConfig.authService + "/organizations/".concat(organizationId, "/related?fields=").concat(fields);
-          _context.next = 6;
+          url = apiConfig.authService + "/organizations/".concat(organizationId, "/related");
+          _context.next = 5;
           return fetch(url, {
             headers: {
               Authorization: "Bearer ".concat(root.dataStore.jwt),
               'Content-Type': 'application/json'
             }
           });
-        case 6:
+        case 5:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 9;
+            _context.next = 8;
             break;
           }
           throw new Error("Failed to fetch organizations: ".concat(response.status));
-        case 9:
-          _context.next = 11;
+        case 8:
+          _context.next = 10;
           return response.json();
-        case 11:
+        case 10:
           result = _context.sent;
           // Get allowed organization IDs from the package
-          allowedOrgIds = data.allowedOrganizationIds || []; // Show organizations that are:
+          allowedOrgIds = data.allowedOrganizationIds || []; // Find current organization to get its parents
+          currentOrg = (result.data || []).find(function (o) {
+            return o._id === organizationId;
+          });
+          currentOrgParentIds = (currentOrg === null || currentOrg === void 0 ? void 0 : currentOrg.parentOrganizations) || []; // Show organizations that are:
           // 1. In package settings with AutomaticPublishing === true, OR
-          // 2. In allowedOrganizationIds AND have automaticPublishing === true in their own organization settings
+          // 2. Has access to the package AND have automaticPublishing === true in their own organization settings
           filtered = (result.data || []).filter(function (org) {
             var _data$settings;
             // EXCLUDE the current organization
             if (org._id === organizationId) {
               return false;
             }
-
-            // Check if organization is in package settings with AutomaticPublishing === true
-            var isInPackageSettingsWithAutomaticPublishing = ((_data$settings = data.settings) === null || _data$settings === void 0 || (_data$settings = _data$settings[org._id]) === null || _data$settings === void 0 ? void 0 : _data$settings.automaticPublishing) === true;
-
-            // Check if organization is in allowedOrganizationIds AND has automaticPublishing === true in their own settings
-            var isInAllowedAndHasAutomaticPublishing = allowedOrgIds.includes(org._id) && org.automaticPublishing === true;
-            return isInPackageSettingsWithAutomaticPublishing || isInAllowedAndHasAutomaticPublishing;
+            // EXCLUDE parents of the current organization
+            if (currentOrgParentIds.includes(org._id)) {
+              return false;
+            }
+            // EXCLUDE siblings and their children
+            var orgParentIds = org.parentOrganizations || [];
+            var isChild = orgParentIds.includes(organizationId);
+            var isOfSiblingBranch = !isChild && currentOrgParentIds.some(function (parentId) {
+              return orgParentIds.includes(parentId);
+            });
+            if (isOfSiblingBranch) {
+              return false;
+            }
+            var hasAutomaticPublishingForPackage = ((_data$settings = data.settings) === null || _data$settings === void 0 || (_data$settings = _data$settings[org._id]) === null || _data$settings === void 0 ? void 0 : _data$settings.automaticPublishing) === true;
+            var hasAccessToPackage = orgParentIds.includes(data.organizationId) || allowedOrgIds.includes(org._id) || allowedOrgIds.some(function (id) {
+              return orgParentIds.includes(id);
+            });
+            var hasAutomaticPublishing = org.automaticPublishing === true;
+            var hasAccessToPackageAndAutomaticPublishing = hasAccessToPackage && hasAutomaticPublishing;
+            return hasAutomaticPublishingForPackage || hasAccessToPackageAndAutomaticPublishing;
           });
           setAvailableOrganizations(filtered);
           // Set all organizations as selected by default
@@ -33547,21 +33563,21 @@ function PublishCustomCell (_ref) {
           });
           setSelectedOrganizationIds(allOrgIds);
           return _context.abrupt("return", filtered);
-        case 20:
-          _context.prev = 20;
+        case 21:
+          _context.prev = 21;
           _context.t0 = _context["catch"](1);
           modalState.showErrorModal("Error fetching organizations: ".concat(_context.t0 instanceof Error ? _context.t0.message : String(_context.t0)));
           setAvailableOrganizations([]);
           return _context.abrupt("return", []);
-        case 25:
-          _context.prev = 25;
+        case 26:
+          _context.prev = 26;
           setLoadingOrganizations(false);
-          return _context.finish(25);
-        case 28:
+          return _context.finish(26);
+        case 29:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 20, 25, 28]]);
+    }, _callee, null, [[1, 21, 26, 29]]);
   })), [apiConfig.authService, organizationId, root.dataStore.jwt, modalState, data.allowedOrganizationIds, data.settings]);
   var performPublish = React.useCallback(/*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(publish) {
@@ -34337,6 +34353,59 @@ var TablePackages = observer(function () {
     };
   }, [apiConfig.enricherService, organizationId]);
   var configuration = useMemo(function () {
+    var automaticPublishingCheck = function automaticPublishingCheck(data) {
+      var _root$dataStore$curre2, _dependingPackages, _data$settings;
+      var createdInCurrentOrganization = (data === null || data === void 0 ? void 0 : data.organizationId) == organizationId;
+      var automaticPublishingEnabled = (_root$dataStore$curre2 = root.dataStore.currentOrganization) === null || _root$dataStore$curre2 === void 0 || (_root$dataStore$curre2 = _root$dataStore$curre2.settings) === null || _root$dataStore$curre2 === void 0 ? void 0 : _root$dataStore$curre2.automaticPublishing;
+
+      // Collect dependingPackages in this org and all parent orgs
+      var dependingPackages = [];
+      if (Array.isArray(data === null || data === void 0 ? void 0 : data.dependingPackages)) {
+        var _root$dataStore$curre3;
+        // Current organization
+        dependingPackages = data.dependingPackages.filter(function (p) {
+          return p.organizationId == organizationId;
+        });
+
+        // Parent organizations (if field available; fallback to currentOrganization.parentOrganizations)
+        var parentOrgs = ((_root$dataStore$curre3 = root.dataStore.currentOrganization) === null || _root$dataStore$curre3 === void 0 ? void 0 : _root$dataStore$curre3.parentOrganizations) || [];
+        parentOrgs.forEach(function (parentOrg) {
+          var parentDepending = data.dependingPackages.filter(function (p) {
+            return p.organizationId == parentOrg._id;
+          });
+          dependingPackages = dependingPackages.concat(parentDepending);
+        });
+      }
+      if (createdInCurrentOrganization && !(data !== null && data !== void 0 && data.basedPackageId)) return {
+        editable: false,
+        value: false,
+        tooltip: t('backoffice.idmEnricher.packages.tooltips.automaticPublishing.currentOrganization', {
+          defaultValue: 'Das Paket wurde in dieser Organisation erstellt und basiered nicht auf einem anderen Paket. Bitte direkt veröffentlichen.'
+        })
+      };
+      if (automaticPublishingEnabled && dependingPackages.length > 0) return {
+        editable: false,
+        value: false,
+        tooltip: t('backoffice.idmEnricher.packages.tooltips.automaticPublishing.dependingPackage', {
+          defaultValue: 'Es gibt ein oder mehrere Pakete, die auf diesem Paket basieren. Automatisches Veröffentlichen ist nur im letzten Package einer Organisation erlaubt. Die Pakete sind: {{packages}}',
+          packages: (_dependingPackages = dependingPackages) === null || _dependingPackages === void 0 ? void 0 : _dependingPackages.map(function (p) {
+            return p.packageName;
+          }).join(', ')
+        })
+      };
+      if (automaticPublishingEnabled && dependingPackages.length === 0) return {
+        editable: false,
+        value: true,
+        tooltip: t('backoffice.idmEnricher.packages.tooltips.automaticPublishing.automaticPublishingEnabled', {
+          defaultValue: 'Das automatisierte Veröffentlichen ist auf Organisationsebene aktiviert. Das Paket kann nicht deaktiviert werden.'
+        })
+      };
+      return {
+        editable: true,
+        value: (_data$settings = data.settings) === null || _data$settings === void 0 || (_data$settings = _data$settings[organizationId]) === null || _data$settings === void 0 ? void 0 : _data$settings.automaticPublishing,
+        tooltip: null
+      };
+    };
     return {
       type: 'dotnetSSM',
       apiInterface: apiInterface,
@@ -34496,10 +34565,19 @@ var TablePackages = observer(function () {
         cellDataType: 'boolean',
         editable: function editable(_ref8) {
           var data = _ref8.data;
-          return data.organizationId != organizationId || data.basedPackageId;
+          return automaticPublishingCheck(data).editable;
+        },
+        valueGetter: function valueGetter(_ref9) {
+          var data = _ref9.data;
+          return automaticPublishingCheck(data).value;
+        },
+        tooltipValueGetter: function tooltipValueGetter(_ref10) {
+          var data = _ref10.data;
+          return automaticPublishingCheck(data).tooltip;
         },
         isDictionary: true,
-        defaultValue: false
+        defaultValue: false,
+        additionalFields: ['dependingPackages']
       }, {
         headerName: 'backoffice.idmEnricher.packages.label.isApi2',
         field: 'isApi',

package/build/types/backoffice/src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PublishCustomCell.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAOzE,OAAO,EAAE,SAAS,EAAkB,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAK9E,MAAM,CAAC,OAAO,WAAW,EACvB,IAAI,EACJ,SAAS,EACT,OAAO,EACP,GAAG,EACH,UAAU,EACV,cAAc,GACf,EAAE,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,0BAsNxH"}
+{"version":3,"file":"PublishCustomCell.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/PublishCustomCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAOzE,OAAO,EAAE,SAAS,EAAkB,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAK9E,MAAM,CAAC,OAAO,WAAW,EACvB,IAAI,EACJ,SAAS,EACT,OAAO,EACP,GAAG,EACH,UAAU,EACV,cAAc,GACf,EAAE,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC,0BAsOxH"}

package/build/types/backoffice/src/ui/IDMEnricherEditor/modules/TablePackages/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AA4BpD,eAAO,MAAM,aAAa;;CA4WxB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/IDMEnricherEditor/modules/TablePackages/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AA4BpD,eAAO,MAAM,aAAa;;CAiaxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "26.1.0-rc.0",
+  "version": "26.1.0-rc.2",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "6.1.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "26.1.0-rc.0",
-    "@crystaldesign/content-item": "26.1.0-rc.0",
-    "@crystaldesign/diva-core": "26.1.0-rc.0",
-    "@crystaldesign/diva-utils": "26.1.0-rc.0",
-    "@crystaldesign/media-upload": "26.1.0-rc.0",
-    "@crystaldesign/rtf-editor": "26.1.0-rc.0",
-    "@crystaldesign/spreadsheet": "26.1.0-rc.0",
+    "@crystaldesign/content-box": "26.1.0-rc.2",
+    "@crystaldesign/content-item": "26.1.0-rc.2",
+    "@crystaldesign/diva-core": "26.1.0-rc.2",
+    "@crystaldesign/diva-utils": "26.1.0-rc.2",
+    "@crystaldesign/media-upload": "26.1.0-rc.2",
+    "@crystaldesign/rtf-editor": "26.1.0-rc.2",
+    "@crystaldesign/spreadsheet": "26.1.0-rc.2",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
     "ag-charts-react": "^10.1.0",
@@ -51,5 +51,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "55a187dfabbbfe8808d49715d7a95ce4ba079d18"
+  "gitHead": "c82c77201d6abad4d4a48a67f9b40a1fe3662b7c"
 }