utopia-ui 3.0.4 → 3.0.6

package/dist/Components/Profile/Templates/TabsView.d.ts

@@ -1,5 +1,5 @@
 import { Item, Tag } from '../../../types';
-export declare const TabsView: ({ attestations, userType, item, offers, needs, relations, updatePermission, loading, linkItem, unlinkItem, setUrlParams }: {
+export declare const TabsView: ({ attestations, userType, item, offers, needs, relations, updatePermission, loading, linkItem, unlinkItem }: {
     attestations: Array<any>;
     userType: string;
     item: Item;
@@ -10,5 +10,4 @@ export declare const TabsView: ({ attestations, userType, item, offers, needs, r
     loading: boolean;
     linkItem: (id: string) => Promise<void>;
     unlinkItem: (id: string) => Promise<void>;
-    setUrlParams: any;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/index.js

@@ -3061,6 +3061,10 @@ function usePermissionsManager(initialPermissions) {
         });
     }, []);
     var hasUserPermission = useCallback(function (collectionName, action, item, layer) {
+        console.log(layer === null || layer === void 0 ? void 0 : layer.name);
+        console.log(user === null || user === void 0 ? void 0 : user.role.name);
+        console.log(action);
+        console.log(permissions.filter(function (p) { return p.policy.name === (user === null || user === void 0 ? void 0 : user.role.name) || (p.policy.name === "$t:public_label" && !user); }));
         var evaluateCondition = function (condition) {
             var _a, _b, _c;
             if (((_a = condition.user_created) === null || _a === void 0 ? void 0 : _a._eq) === "$CURRENT_USER") {
@@ -3081,8 +3085,10 @@ function usePermissionsManager(initialPermissions) {
                     : evaluateCondition(andCondition);
             });
         };
+        if (collectionName === "items" && action === "create" && (layer === null || layer === void 0 ? void 0 : layer.public_edit_items))
+            return true;
         // Bedingung für leere Berechtigungen nur, wenn NICHT item und create
-        if (permissions.length === 0 && !(collectionName === "item" && action === "create"))
+        if (permissions.length === 0)
             return true;
         else if (user && user.role.id === adminRole)
             return true;
@@ -3091,17 +3097,14 @@ function usePermissionsManager(initialPermissions) {
                 var _a;
                 return p.action === action &&
                     p.collection === collectionName &&
-                    (
-                    // Neue Bedingung für "item" und "create"
-                    (collectionName === "item" && action === "create" && (layer === null || layer === void 0 ? void 0 : layer.public_edit_items) === true) ||
-                        ((p.policy.name === (user === null || user === void 0 ? void 0 : user.role.name) &&
-                            (!item || evaluatePermissions(p.permissions))) ||
-                            (p.policy == null &&
-                                (((layer === null || layer === void 0 ? void 0 : layer.public_edit_items) || ((_a = item === null || item === void 0 ? void 0 : item.layer) === null || _a === void 0 ? void 0 : _a.public_edit_items)) &&
-                                    (!item || evaluatePermissions(p.permissions))))));
+                    ((p.policy.name === (user === null || user === void 0 ? void 0 : user.role.name) &&
+                        (!item || evaluatePermissions(p.permissions))) ||
+                        (p.policy === "$t:public_label" &&
+                            (((layer === null || layer === void 0 ? void 0 : layer.public_edit_items) || ((_a = item === null || item === void 0 ? void 0 : item.layer) === null || _a === void 0 ? void 0 : _a.public_edit_items)) &&
+                                (!item || evaluatePermissions(p.permissions)))));
             });
         }
-    }, [permissions, user]);
+    }, [permissions, user, adminRole]);
     return { permissions: permissions, setPermissionApi: setPermissionApi, setPermissionData: setPermissionData, setAdminRole: setAdminRole, hasUserPermission: hasUserPermission };
 }
 var PermissionsProvider = function (_a) {
@@ -4419,7 +4422,7 @@ function ActionButton(_a) {
 // eslint-disable-next-line no-unused-vars
 var TabsView = function (_a) {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    var attestations = _a.attestations, userType = _a.userType, item = _a.item, offers = _a.offers, needs = _a.needs, relations = _a.relations, updatePermission = _a.updatePermission, loading = _a.loading, linkItem = _a.linkItem, unlinkItem = _a.unlinkItem, setUrlParams = _a.setUrlParams;
+    var attestations = _a.attestations, userType = _a.userType, item = _a.item, offers = _a.offers, needs = _a.needs, relations = _a.relations, updatePermission = _a.updatePermission, loading = _a.loading, linkItem = _a.linkItem, unlinkItem = _a.unlinkItem;
     var addFilterTag = useAddFilterTag();
     var _l = useState(), activeTab = _l[0], setActiveTab = _l[1];
     var navigate = useNavigate();
@@ -4443,7 +4446,6 @@ var TabsView = function (_a) {
         params.set("tab", "".concat(id));
         var newUrl = location.pathname + "?" + params.toString();
         window.history.pushState({}, '', newUrl);
-        setUrlParams(params);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [location.pathname]);
     useEffect(function () {
@@ -4897,12 +4899,11 @@ function ProfileView(_a) {
         var _a;
         setTemplate(((_a = item === null || item === void 0 ? void 0 : item.layer) === null || _a === void 0 ? void 0 : _a.itemType.template) || userType);
     }, [userType, item]);
-    var /* urlParams, */ setUrlParams = useState(new URLSearchParams(location.search))[0];
     return (jsx(Fragment, { children: item &&
             jsx(MapOverlayPage, __assign({ className: "!tw-p-0 tw-mx-4 tw-mt-4 tw-mb-4 md:tw-w-[calc(50%-32px)] tw-w-[calc(100%-32px)] tw-min-w-80 tw-max-w-3xl !tw-left-0 sm:!tw-left-auto tw-top-0 tw-bottom-0 tw-transition-opacity tw-duration-500 ".concat(!selectPosition ? 'tw-opacity-100 tw-pointer-events-auto' : 'tw-opacity-0 tw-pointer-events-none') }, { children: jsxs(Fragment, { children: [jsx("div", __assign({ className: "tw-px-6 tw-pt-6" }, { children: jsx(HeaderView, { api: (_b = item.layer) === null || _b === void 0 ? void 0 : _b.api, item: item, deleteCallback: function (e) { return handleDelete(e, item, setLoading, removeItem, map, navigate); }, editCallback: function () { return navigate("/edit-item/" + item.id); }, setPositionCallback: function () { map.closePopup(); setSelectPosition(item); navigate("/"); }, big: true, truncateSubname: false }) })), template == "onepager" &&
                             jsx(OnepagerView, { item: item, userType: userType }), template == "simple" &&
                             jsx(SimpleView, { item: item }), template == "tabs" &&
-                            jsx(TabsView, { userType: userType, attestations: attestations, setUrlParams: setUrlParams, item: item, loading: loading, offers: offers, needs: needs, relations: relations, updatePermission: updatePermission, linkItem: function (id) { return linkItem(id, item, updateItem); }, unlinkItem: function (id) { return unlinkItem(id, item, updateItem); } })] }) }), item.id) }));
+                            jsx(TabsView, { userType: userType, attestations: attestations, item: item, loading: loading, offers: offers, needs: needs, relations: relations, updatePermission: updatePermission, linkItem: function (id) { return linkItem(id, item, updateItem); }, unlinkItem: function (id) { return unlinkItem(id, item, updateItem); } })] }) }), item.id) }));
 }
 
 var ComboBoxInput = function (_a) {