antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2025-12-13 07:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved permission detection in items index

Browse Source
This commit is contained in:
Anton Tranelis 2024-05-04 09:20:44 +02:00
parent 8c075e0823
commit 1c00e6abf1
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Components/Profile/PlusButton.tsx
View File

@ -1,9 +1,10 @@
import { LayerProps } from "../../types";
import { useHasUserPermission } from "../Map/hooks/usePermissions";
export function PlusButton({ triggerAction, color, collection="items" }: { triggerAction: any, color: string, collection?:string }) {
export function PlusButton({ layer, triggerAction, color, collection="items" }: { layer?: LayerProps ,triggerAction: any, color: string, collection?:string }) {
const hasUserPermission = useHasUserPermission();
return (
<>{hasUserPermission(collection, "create") &&
<>{hasUserPermission(collection, "create", undefined, layer) &&
<div className="tw-dropdown tw-dropdown-top tw-dropdown-end tw-dropdown-hover tw-z-3000 tw-absolute tw-right-4 tw-bottom-4" >
<button tabIndex={0} className="tw-z-500 tw-btn tw-btn-circle tw-shadow" onClick={() => { triggerAction() }} style={{ backgroundColor: color, color: "#fff"}}>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" className="tw-w-5 tw-h-5">

12
src/Components/Templates/OverlayItemsIndexPage.tsx
View File

@ -2,7 +2,7 @@ import { ReactNode, useEffect, useRef, useState } from 'react'
import { Link, useNavigate } from 'react-router-dom';
import { Item, ItemsApi, LayerProps } from '../../types';
import { getValue } from '../../Utils/GetValue';
import { StartEndView, TextView } from '../Map';
import { PopupStartEndInput, StartEndView, TextView } from '../Map';
import { PlusButton } from '../Profile/PlusButton';
import { TextInput, TextAreaInput } from '../Input';
import { useAddTag, useTags } from '../Map/hooks/useTags';
@ -14,7 +14,6 @@ import { useLayers } from '../Map/hooks/useLayers';
import { HeaderView } from '../Map/Subcomponents/ItemPopupComponents/HeaderView';
import { MapOverlayPage } from './MapOverlayPage';
import { useAddItem, useItems, useRemoveItem } from '../Map/hooks/useItems';
import { timeAgo } from '../../Utils/TimeAgo';
import { DateUserInfo } from './DateUserInfo';
@ -87,7 +86,7 @@ export const OverlayItemsIndexPage = ({ url, layerName, parameterField, breadcru
if (success) {
toast.success("New item created");
}
addItem({ ...formItem, user_created: user, id: uuid, layer: layer });
addItem({ ...formItem, user_created: user, id: uuid, layer: layer, public_edit: !user ? true : false });
setLoading(false);
setAddItemPopupType("");
}
@ -141,7 +140,7 @@ export const OverlayItemsIndexPage = ({ url, layerName, parameterField, breadcru
}
{i.layer?.itemType.show_text &&
<TextView truncate item={i} itemTextField={itemTextField} />
}
}
</div>
<DateUserInfo item={i}></DateUserInfo>
</div>
@ -160,6 +159,9 @@ export const OverlayItemsIndexPage = ({ url, layerName, parameterField, breadcru
}}>
<p className='tw-text-center '>✕</p></label>
<TextInput type="text" placeholder="Name" dataField="name" defaultValue={""} inputStyle='' />
{layer?.itemType.show_start_end_input &&
<PopupStartEndInput></PopupStartEndInput>
}
<TextAreaInput placeholder="Text" dataField="text" defaultValue={""} inputStyle='tw-h-40 tw-mt-5' />
<div className='tw-flex tw-justify-center'>
<button className={loading ? 'tw-btn tw-btn-disabled tw-mt-5 tw-place-self-center' : 'tw-btn tw-mt-5 tw-place-self-center'} type='submit'>{loading ? <span className="tw-loading tw-loading-spinner"></span> : 'Save'}</button>
@ -175,7 +177,7 @@ export const OverlayItemsIndexPage = ({ url, layerName, parameterField, breadcru
</MapOverlayPage>
{plusButton && <PlusButton triggerAction={() => { setAddItemPopupType("place"); scroll(); }} color={'#777'} collection='items' />}
{plusButton && <PlusButton layer={layer} triggerAction={() => { setAddItemPopupType("place"); scroll(); }} color={'#777'} collection='items' />}
</>