From 056bd27f2f4f604b984542a6b72fc8d3288c5b26 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Fri, 22 Mar 2024 02:05:40 +0100 Subject: [PATCH] small stuff --- src/Components/Profile/OverlayItemProfile.tsx | 21 ++++++++++++------- src/Components/Templates/ItemsIndexPage.tsx | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx index f05701f9..1034d86b 100644 --- a/src/Components/Profile/OverlayItemProfile.tsx +++ b/src/Components/Profile/OverlayItemProfile.tsx @@ -3,7 +3,7 @@ import { MapOverlayPage, TitleCard } from '../Templates' import { useAddItem, useItems, useRemoveItem, useUpdateItem } from '../Map/hooks/useItems' import { useLocation, useNavigate } from 'react-router-dom' import { useEffect, useRef, useState } from 'react'; -import { Item, Tag, UserItem } from '../../types'; +import { Item} from '../../types'; import { getValue } from '../../Utils/GetValue'; import { useMap } from 'react-leaflet'; import { LatLng } from 'leaflet'; @@ -19,6 +19,7 @@ import { hashTagRegex } from '../../Utils/HashTagRegex'; import { randomColor } from '../../Utils/RandomColor'; import { toast } from 'react-toastify'; import { useAuth } from '../Auth'; +import { useLayers } from '../Map/hooks/useLayers'; export function OverlayItemProfile() { @@ -31,6 +32,8 @@ export function OverlayItemProfile() { const [addButton, setAddButton] = useState(false); + const layers = useLayers(); + const tags = useTags(); @@ -105,16 +108,18 @@ export function OverlayItemProfile() { } }); const uuid = crypto.randomUUID(); + const layer = layers.find(l => l.name = addItemPopupType) + let success = false; try { - await item?.layer?.api?.createItem!({ ...formItem, id: uuid, type: type }); + await layer?.api?.createItem!({ ...formItem, id: uuid, type: type }); await linkItem(uuid); success = true; } catch (error) { toast.error(error.toString()); } if (success) { - addItem({ ...formItem, id: uuid, type: type, layer: item?.layer, user_created: user }); + addItem({ ...formItem, id: uuid, type: type, layer: layer, user_created: user }); toast.success("New item created"); resetFilterTags(); } @@ -157,12 +162,12 @@ export function OverlayItemProfile() {
setActiveTab(1)} /> -
+
setActiveTab(2)} /> -
+
{relations && relations.map(i => { @@ -201,7 +206,7 @@ export function OverlayItemProfile() {
setActiveTab(3)} /> -
+
{relations && relations.map(i => { @@ -235,13 +240,13 @@ export function OverlayItemProfile() {
: <> } - { setAddItemPopupType("event"); scroll() }} color={item.color}> + { addButton && { setAddItemPopupType("event"); scroll() }} color={item.color}>}
setActiveTab(4)} /> -
+
diff --git a/src/Components/Templates/ItemsIndexPage.tsx b/src/Components/Templates/ItemsIndexPage.tsx index ae5aae8c..cd532954 100644 --- a/src/Components/Templates/ItemsIndexPage.tsx +++ b/src/Components/Templates/ItemsIndexPage.tsx @@ -117,7 +117,7 @@ export const ItemsIndexPage = ({ api, url, parameterField, breadcrumbs, itemName -
+
{ items?.map((i, k) => { return (