From 6857a6352cae9f8008490750ded0b54953d8c101 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sat, 23 Mar 2024 15:26:27 +0100 Subject: [PATCH] small bugfix --- .../Profile/LinkedItemsHeaderView.tsx | 17 +++++++++++------ src/Components/Profile/OverlayItemProfile.tsx | 12 ++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/Components/Profile/LinkedItemsHeaderView.tsx b/src/Components/Profile/LinkedItemsHeaderView.tsx index 0bb3116f..44bef0b6 100644 --- a/src/Components/Profile/LinkedItemsHeaderView.tsx +++ b/src/Components/Profile/LinkedItemsHeaderView.tsx @@ -1,18 +1,18 @@ -import * as React from "react" +import { useEffect } from "react"; import { getValue } from "../../Utils/GetValue"; -import { Item, ItemsApi } from "../../types"; +import { Item } from "../../types"; import { useAssetApi } from "../AppShell/hooks/useAssets"; -import { useHasUserPermission } from "../Map/hooks/usePermissions"; -export function LinkedItemsHeaderView({ item, unlinkCallback, itemNameField, itemAvatarField, loading }: { +export function LinkedItemsHeaderView({ item, unlinkCallback, itemNameField, itemAvatarField, loading, unlinkPermission }: { item: Item, unlinkCallback?: any, itemNameField?: string, itemAvatarField?: string, loading?: boolean, + unlinkPermission: boolean }) { const assetsApi = useAssetApi(); @@ -22,7 +22,11 @@ export function LinkedItemsHeaderView({ item, unlinkCallback, itemNameField, ite const title = itemNameField ? getValue(item, itemNameField) : item.layer?.itemNameField && item && getValue(item, item.layer?.itemNameField); - + + useEffect(() => { + + }, [item]) + return ( <> @@ -41,6 +45,7 @@ export function LinkedItemsHeaderView({ item, unlinkCallback, itemNameField, ite
e.stopPropagation()}> + { unlinkPermission &&
+
} diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx index b3020345..de6c0692 100644 --- a/src/Components/Profile/OverlayItemProfile.tsx +++ b/src/Components/Profile/OverlayItemProfile.tsx @@ -30,7 +30,7 @@ export function OverlayItemProfile() { const map = useMap(); const windowDimension = useWindowDimensions(); - const [addButton, setAddButton] = useState(false); + const [updatePermission, setUpdatePermission] = useState(false); const layers = useLayers(); @@ -115,7 +115,7 @@ export function OverlayItemProfile() { }, [item, items]) useEffect(() => { - item && item.user_created && hasUserPermission("items", "update", item) && setAddButton(true); + item && item.user_created && hasUserPermission("items", "update", item) && setUpdatePermission(true); }, [item]) @@ -246,7 +246,7 @@ export function OverlayItemProfile() { if (i.type == 'project') return (
navigate('/item/' + i.id)}> - +
@@ -272,7 +272,7 @@ export function OverlayItemProfile() {
: <> } - {addButton && { setAddItemPopupType("project"); scroll() }} color={item.color}>} + {updatePermission && { setAddItemPopupType("project"); scroll() }} color={item.color}>}
@@ -286,7 +286,7 @@ export function OverlayItemProfile() { if (i.type == 'event') return (
navigate('/item/' + i.id)}> - +
@@ -313,7 +313,7 @@ export function OverlayItemProfile() {
: <> } - {addButton && { setAddItemPopupType("event"); scroll() }} color={item.color}>} + {updatePermission && { setAddItemPopupType("event"); scroll() }} color={item.color}>}