farmcontrol/farmcontrol-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: farmcontrol:2a18f3d697a7b5ca32ee0e5d6982e214b727351a
Branches Tags
farmcontrol:main
..
compare: farmcontrol:eb7f285eefc815721639c236981290139d0ab882
Branches Tags
farmcontrol:main

No commits in common. "2a18f3d697a7b5ca32ee0e5d6982e214b727351a" and "eb7f285eefc815721639c236981290139d0ab882" have entirely different histories.
2a18f3d697 ... eb7f285eef

19 changed files with 168 additions and 194 deletions
Show Stats Expand all files Collapse all files

9
src/App.css
View File

@ -36,15 +36,6 @@
.ant-typography .id-text {
font-family: 'DM Mono';
font-size: 11.9px;
vertical-align: top !important;
}
.ant-typography-ellipsis-single-line {
vertical-align: middle !important;
}
.ant-typography-ellipsis-single-line >code {
vertical-align: top !important;
}
.flag {

13
src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
View File

@ -113,7 +113,7 @@ const FilamentStockInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -130,7 +130,7 @@ const FilamentStockInfo = () => {
onToggle={(expanded) =>
updateCollapseState('events', expanded)
}
collapseKey='events'
key='events'
>
{loading ? (
<InfoCollapsePlaceholder />
@ -150,13 +150,10 @@ const FilamentStockInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel
_id={filamentStockId}
type='filamentStock'
/>
<NotesPanel _id={filamentStockId} />
</Card>
</InfoCollapse>
@ -167,7 +164,7 @@ const FilamentStockInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

10
src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
View File

@ -133,7 +133,7 @@ const FilamentInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -151,7 +151,7 @@ const FilamentInfo = () => {
onToggle={(expanded) =>
updateCollapseState('stocks', expanded)
}
collapseKey='stocks'
key='stocks'
>
{loading ? (
<InfoCollapsePlaceholder />
@ -175,10 +175,10 @@ const FilamentInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={filamentId} type='filament' />
<NotesPanel _id={filamentId} />
</Card>
</InfoCollapse>
@ -189,7 +189,7 @@ const FilamentInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

6
src/components/Dashboard/Management/NoteTypes.jsx
View File

@ -1,5 +1,6 @@
import React, { useState, useRef } from 'react'
import React, { useState, useContext, useRef } from 'react'
import { Button, Flex, Space, Modal, Dropdown, message } from 'antd'
import { AuthContext } from '../context/AuthContext'
import NewNoteType from './NoteTypes/NewNoteType'
import ObjectTable from '../common/ObjectTable'
import PlusIcon from '../../Icons/PlusIcon'
@ -14,7 +15,7 @@ const NoteTypes = () => {
const [messageApi, contextHolder] = message.useMessage()
const [newNoteTypeOpen, setNewNoteTypeOpen] = useState(false)
const tableRef = useRef()
const { authenticated } = useContext(AuthContext)
const [viewMode, setViewMode] = useViewMode('noteType')
const [columnVisibility, setColumnVisibility] =
@ -72,6 +73,7 @@ const NoteTypes = () => {
ref={tableRef}
visibleColumns={columnVisibility}
type='noteType'
authenticated={authenticated}
cards={viewMode === 'cards'}
/>
</Flex>

4
src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
View File

@ -122,7 +122,7 @@ const NoteTypeInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -140,7 +140,7 @@ const NoteTypeInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

8
src/components/Dashboard/Management/Parts/PartInfo.jsx
View File

@ -131,7 +131,7 @@ const PartInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -148,10 +148,10 @@ const PartInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={partId} type='part' />
<NotesPanel _id={partId} />
</Card>
</InfoCollapse>
@ -162,7 +162,7 @@ const PartInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

7
src/components/Dashboard/Management/Products.jsx
View File

@ -1,6 +1,6 @@
// src/gcodefiles.js
import React, { useState, useRef } from 'react'
import React, { useState, useContext, useRef } from 'react'
import { useNavigate } from 'react-router-dom'
import {
Button,
@ -15,6 +15,8 @@ import {
Input
} from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import { AuthContext } from '../context/AuthContext'
import IdDisplay from '../common/IdDisplay'
import TimeDisplay from '../common/TimeDisplay'
import ObjectTable from '../common/ObjectTable'
@ -35,7 +37,7 @@ const Products = () => {
const navigate = useNavigate()
const [newProductOpen, setNewProductOpen] = useState(false)
const tableRef = useRef()
const { authenticated } = useContext(AuthContext)
const [viewMode, setViewMode] = useViewMode('Products')
const getProductActionItems = (id) => {
@ -348,6 +350,7 @@ const Products = () => {
<ObjectTable
ref={tableRef}
type={'product'}
authenticated={authenticated}
cards={viewMode === 'cards'}
/>
</Flex>

10
src/components/Dashboard/Management/Products/ProductInfo.jsx
View File

@ -123,7 +123,7 @@ const ProductInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -140,7 +140,7 @@ const ProductInfo = () => {
onToggle={(expanded) =>
updateCollapseState('parts', expanded)
}
collapseKey='parts'
key='parts'
>
<ObjectTable
type='part'
@ -159,10 +159,10 @@ const ProductInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={productId} type='product' />
<NotesPanel _id={productId} />
</Card>
</InfoCollapse>
@ -173,7 +173,7 @@ const ProductInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

6
src/components/Dashboard/Management/Users.jsx
View File

@ -1,5 +1,6 @@
import React, { useRef } from 'react'
import React, { useContext, useRef } from 'react'
import { Button, Flex, Space, Dropdown } from 'antd'
import { AuthContext } from '../context/AuthContext'
import ObjectTable from '../common/ObjectTable'
import ReloadIcon from '../../Icons/ReloadIcon'
import useColumnVisibility from '../hooks/useColumnVisibility'
@ -10,7 +11,7 @@ import ColumnViewButton from '../common/ColumnViewButton'
const Users = () => {
const tableRef = useRef()
const { authenticated } = useContext(AuthContext)
const [viewMode, setViewMode] = useViewMode('user')
const [columnVisibility, setColumnVisibility] = useColumnVisibility('user')
@ -55,6 +56,7 @@ const Users = () => {
ref={tableRef}
type={'user'}
visibleColumns={columnVisibility}
authenticated={authenticated}
cards={viewMode === 'cards'}
/>
</Flex>

8
src/components/Dashboard/Management/Users/UserInfo.jsx
View File

@ -123,7 +123,7 @@ const UserInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -141,10 +141,10 @@ const UserInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={userId} type='user' />
<NotesPanel _id={userId} />
</Card>
</InfoCollapse>
@ -155,7 +155,7 @@ const UserInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

6
src/components/Dashboard/Management/Vendors.jsx
View File

@ -1,5 +1,6 @@
import React, { useState, useRef } from 'react'
import React, { useState, useContext, useRef } from 'react'
import { Button, Flex, Space, Modal, Dropdown, message } from 'antd'
import { AuthContext } from '../context/AuthContext'
import NewVendor from './Vendors/NewVendor'
import ObjectTable from '../common/ObjectTable'
import PlusIcon from '../../Icons/PlusIcon'
@ -14,7 +15,7 @@ const Vendors = () => {
const [messageApi, contextHolder] = message.useMessage()
const [newVendorOpen, setNewVendorOpen] = useState(false)
const tableRef = useRef()
const { authenticated } = useContext(AuthContext)
const [viewMode, setViewMode] = useViewMode('vendor')
const [columnVisibility, setColumnVisibility] = useColumnVisibility('vendor')
@ -71,6 +72,7 @@ const Vendors = () => {
ref={tableRef}
visibleColumns={columnVisibility}
type='vendor'
authenticated={authenticated}
cards={viewMode === 'cards'}
/>
</Flex>

19
src/components/Dashboard/Management/Vendors/VendorInfo.jsx
View File

@ -42,18 +42,17 @@ const VendorInfo = () => {
isEditing,
startEditing,
cancelEditing,
handleFetchObject,
handleUpdate,
handleDelete,
formValid,
objectData,
editLoading,
lock
lock,
fetchObject
}) => {
// Define actions for ActionHandler
const actions = {
reload: () => {
handleFetchObject()
fetchObject()
return true
},
edit: () => {
@ -67,10 +66,6 @@ const VendorInfo = () => {
finishEdit: () => {
handleUpdate()
return true
},
delete: () => {
handleDelete()
return true
}
}
@ -132,7 +127,7 @@ const VendorInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -149,10 +144,10 @@ const VendorInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={vendorId} type='vendor' />
<NotesPanel _id={vendorId} />
</Card>
</InfoCollapse>
@ -163,7 +158,7 @@ const VendorInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

10
src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
View File

@ -144,7 +144,7 @@ const GCodeFileInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -162,7 +162,7 @@ const GCodeFileInfo = () => {
onToggle={(expanded) =>
updateCollapseState('preview', expanded)
}
collapseKey='preview'
key='preview'
>
<Card>
{objectData?.gcodeFileInfo?.thumbnail ? (
@ -184,10 +184,10 @@ const GCodeFileInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={gcodeFileId} type='gcodeFile' />
<NotesPanel _id={gcodeFileId} />
</Card>
</InfoCollapse>
@ -198,7 +198,7 @@ const GCodeFileInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

6
src/components/Dashboard/Production/Jobs.jsx
View File

@ -1,7 +1,9 @@
// src/Jobs.js
import React, { useState, useRef } from 'react'
import React, { useState, useContext, useRef } from 'react'
import { Button, Flex, Space, Modal, Dropdown, message } from 'antd'
import { AuthContext } from '../context/AuthContext.js'
import NewJob from './Jobs/NewJob.jsx'
import useColumnVisibility from '../hooks/useColumnVisibility.js'
import PlusIcon from '../../Icons/PlusIcon.jsx'
@ -17,6 +19,7 @@ const Jobs = () => {
const [newJobOpen, setNewJobOpen] = useState(false)
const tableRef = useRef()
const [viewMode, setViewMode] = useViewMode('job')
const { authenticated } = useContext(AuthContext)
const [columnVisibility, setColumnVisibility] = useColumnVisibility('job')
@ -78,6 +81,7 @@ const Jobs = () => {
ref={tableRef}
type={'job'}
visibleColumns={columnVisibility}
authenticated={authenticated}
cards={viewMode === 'cards'}
/>
</Flex>

39
src/components/Dashboard/Production/Jobs/JobInfo.jsx
View File

@ -1,4 +1,4 @@
import React from 'react'
import React, { useContext } from 'react'
import { useLocation } from 'react-router-dom'
import { Space, Flex, Card } from 'antd'
import { LoadingOutlined } from '@ant-design/icons'
@ -17,12 +17,14 @@ import JobIcon from '../../../Icons/JobIcon'
import AuditLogIcon from '../../../Icons/AuditLogIcon'
import NoteIcon from '../../../Icons/NoteIcon'
import ObjectActions from '../../common/ObjectActions.jsx'
import { ApiServerContext } from '../../context/ApiServerContext'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
const JobInfo = () => {
const location = useLocation()
const jobId = new URLSearchParams(location.search).get('jobId')
const { fetchObjectContent } = useContext(ApiServerContext)
const [collapseState, updateCollapseState] = useCollapseState('JobInfo', {
info: true,
subJobs: true,
@ -39,6 +41,9 @@ const JobInfo = () => {
{({
loading,
isEditing,
startEditing,
cancelEditing,
handleUpdate,
formValid,
objectData,
editLoading,
@ -50,6 +55,28 @@ const JobInfo = () => {
reload: () => {
fetchObject()
return true
},
edit: () => {
startEditing()
return false
},
cancelEdit: () => {
cancelEditing()
return true
},
finishEdit: () => {
handleUpdate()
return true
},
download: () => {
if (jobId) {
fetchObjectContent(
jobId,
'job',
`${objectData.name || 'job'}.json`
)
return true
}
}
}
@ -108,7 +135,7 @@ const JobInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -126,7 +153,7 @@ const JobInfo = () => {
onToggle={(expanded) =>
updateCollapseState('subJobs', expanded)
}
collapseKey='subJobs'
key='subJobs'
>
<SubJobsTree jobData={objectData} loading={loading} />
</InfoCollapse>
@ -138,10 +165,10 @@ const JobInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={jobId} type='job' />
<NotesPanel _id={jobId} />
</Card>
</InfoCollapse>
@ -152,7 +179,7 @@ const JobInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogs', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

12
src/components/Dashboard/Production/Printers/PrinterInfo.jsx
View File

@ -135,7 +135,7 @@ const PrinterInfo = () => {
onToggle={(expanded) =>
updateCollapseState('info', expanded)
}
collapseKey='info'
key='info'
>
<ObjectInfo
loading={loading}
@ -153,7 +153,7 @@ const PrinterInfo = () => {
onToggle={(expanded) =>
updateCollapseState('jobs', expanded)
}
collapseKey='jobs'
key='jobs'
>
<PrinterJobsTree
subJobs={objectData?.subJobs}
@ -168,10 +168,10 @@ const PrinterInfo = () => {
onToggle={(expanded) =>
updateCollapseState('notes', expanded)
}
collapseKey='notes'
key='notes'
>
<Card>
<NotesPanel _id={printerId} type='printer' />
<NotesPanel _id={printerId} />
</Card>
</InfoCollapse>
@ -182,7 +182,7 @@ const PrinterInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogsParent', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />
@ -201,7 +201,7 @@ const PrinterInfo = () => {
onToggle={(expanded) =>
updateCollapseState('auditLogsOwner', expanded)
}
collapseKey='auditLogs'
key='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />

6
src/components/Dashboard/Production/SubJobs.jsx
View File

@ -1,7 +1,9 @@
// src/SubJobs.js
import React, { useRef } from 'react'
import React, { useContext, useRef } from 'react'
import { Button, Flex, Space, Dropdown } from 'antd'
import { AuthContext } from '../context/AuthContext.js'
import useColumnVisibility from '../hooks/useColumnVisibility.js'
import ReloadIcon from '../../Icons/ReloadIcon.jsx'
import ObjectTable from '../common/ObjectTable.jsx'
@ -13,6 +15,7 @@ import ColumnViewButton from '../common/ColumnViewButton.jsx'
const SubJobs = () => {
const tableRef = useRef()
const [viewMode, setViewMode] = useViewMode('subJob')
const { authenticated } = useContext(AuthContext)
const [columnVisibility, setColumnVisibility] = useColumnVisibility('subJob')
@ -61,6 +64,7 @@ const SubJobs = () => {
ref={tableRef}
type={'subJob'}
visibleColumns={columnVisibility}
authenticated={authenticated}
cards={viewMode === 'cards'}
/>
</Flex>

173
src/components/Dashboard/common/EditObjectForm.jsx
View File

@ -1,9 +1,7 @@
import React, { useState, useEffect, useContext, useCallback } from 'react'
import { Form, message } from 'antd'
import { ApiServerContext } from '../context/ApiServerContext'
import { AuthContext } from '../context/AuthContext'
import PropTypes from 'prop-types'
import DeleteObjectModal from './DeleteObjectModal'
/**
* EditObjectForm is a reusable form component for editing any object type.
@ -29,21 +27,17 @@ const EditObjectForm = ({ id, type, style, children }) => {
const [form] = Form.useForm()
const formUpdateValues = Form.useWatch([], form)
const [messageApi, contextHolder] = message.useMessage()
const [deleteModalOpen, setDeleteModalOpen] = useState(false)
const [deleteLoading, setDeleteLoading] = useState(false)
const {
fetchObject,
updateObject,
deleteObject,
fetchObjectInfo,
updateObjectInfo,
lockObject,
unlockObject,
onLockEvent,
onUpdateEvent,
fetchObjectLock,
showError,
connected,
subscribeToObject,
subscribeToLock
showError
} = useContext(ApiServerContext)
const { authenticated } = useContext(AuthContext)
// Validate form on change
useEffect(() => {
form
@ -52,6 +46,11 @@ const EditObjectForm = ({ id, type, style, children }) => {
.catch(() => setFormValid(false))
}, [form, formUpdateValues])
// Lock event handler
const lockEventHandler = useCallback((lockEvent) => {
setLock(lockEvent)
}, [])
// Cleanup on unmount
useEffect(() => {
return () => {
@ -61,10 +60,10 @@ const EditObjectForm = ({ id, type, style, children }) => {
}
}, [id, type, unlockObject])
const handleFetchObject = useCallback(async () => {
const fetchObject = useCallback(async () => {
try {
setFetchLoading(true)
const data = await fetchObject(id, type)
const data = await fetchObjectInfo(id, type)
const lockEvent = await fetchObjectLock(id, type)
setLock(lockEvent)
setObjectData(data)
@ -78,47 +77,38 @@ const EditObjectForm = ({ id, type, style, children }) => {
fetchObject
)
}
}, [fetchObject, fetchObjectLock, id, type, form, messageApi, showError])
}, [fetchObjectInfo, fetchObjectLock, id, type, form, messageApi, showError])
const updateObject = async () => {
const values = form.getFieldsValue()
await updateObjectInfo(id, type, values)
}
// Update event handler
const updateObjectEventHandler = useCallback((value) => {
setObjectData((prev) => ({ ...prev, ...value }))
}, [])
// Update event handler
const updateLockEventHandler = useCallback((value) => {
setLock((prev) => ({ ...prev, ...value }))
}, [])
const updateEventHandler = useCallback(() => {
fetchObject()
}, [fetchObject])
useEffect(() => {
if (!initialized && id && authenticated == true) {
if (!initialized && id) {
setInitialized(true)
handleFetchObject()
fetchObject()
}
}, [id, initialized, handleFetchObject, authenticated])
}, [id, initialized, fetchObject])
useEffect(() => {
if (id && connected) {
const objectUnsubscribe = subscribeToObject(
id,
type,
updateObjectEventHandler
)
const lockUnsubscribe = subscribeToLock(id, type, updateLockEventHandler)
return () => {
if (objectUnsubscribe) objectUnsubscribe()
if (lockUnsubscribe) lockUnsubscribe()
}
if (id) {
const cleanup = onLockEvent(id, lockEventHandler)
return cleanup
}
}, [
id,
type,
subscribeToObject,
subscribeToLock,
updateObjectEventHandler,
connected,
updateLockEventHandler
])
}, [id, onLockEvent, lockEventHandler])
useEffect(() => {
if (id) {
const cleanup = onUpdateEvent(id, updateEventHandler)
return cleanup
}
}, [id, onUpdateEvent, updateEventHandler])
const startEditing = () => {
setIsEditing(true)
@ -136,10 +126,10 @@ const EditObjectForm = ({ id, type, style, children }) => {
const handleUpdate = async () => {
try {
const value = await form.validateFields()
const values = await form.validateFields()
setEditLoading(true)
await updateObject(id, type, value)
setObjectData({ ...objectData, ...value })
await updateObject()
setObjectData({ ...objectData, ...values })
setIsEditing(false)
messageApi.success('Information updated successfully')
} catch (err) {
@ -152,70 +142,37 @@ const EditObjectForm = ({ id, type, style, children }) => {
() => handleUpdate()
)
} finally {
handleFetchObject()
fetchObject()
setEditLoading(false)
}
}
const handleDelete = () => {
setDeleteModalOpen(true)
}
const confirmDelete = async () => {
setDeleteLoading(true)
try {
await deleteObject(id, type)
setDeleteModalOpen(false)
messageApi.success('Deleted successfully')
// Optionally: trigger a callback to parent to remove this object from view
} catch (err) {
messageApi.error('Failed to delete')
showError(
`Failed to delete. Message: ${err.message}. Code: ${err.code}`,
confirmDelete
)
} finally {
setDeleteLoading(false)
}
}
return (
<>
<DeleteObjectModal
open={deleteModalOpen}
onOk={confirmDelete}
onCancel={() => setDeleteModalOpen(false)}
loading={deleteLoading}
objectType={type}
objectName={objectData?.name || objectData?.label || ''}
/>
<Form
form={form}
layout='vertical'
style={style}
onValuesChange={(values) => {
setObjectData((prev) => ({ ...prev, ...values }))
}}
>
{contextHolder}
{children({
loading: fetchLoading,
isEditing,
startEditing,
cancelEditing,
handleUpdate,
form,
formValid,
objectData,
setIsEditing,
setObjectData,
editLoading,
lock,
handleFetchObject,
handleDelete
})}
</Form>
</>
<Form
form={form}
layout='vertical'
style={style}
onValuesChange={(values) => {
setObjectData((prev) => ({ ...prev, ...values }))
}}
>
{contextHolder}
{children({
loading: fetchLoading,
isEditing,
startEditing,
cancelEditing,
handleUpdate,
form,
formValid,
objectData,
setIsEditing,
setObjectData,
editLoading,
lock,
fetchObject
})}
</Form>
)
}

10
src/database/models/Vendor.js
View File

@ -2,7 +2,6 @@ import VendorIcon from '../../components/Icons/VendorIcon'
import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
import EditIcon from '../../components/Icons/EditIcon'
import ReloadIcon from '../../components/Icons/ReloadIcon'
import BinIcon from '../../components/Icons/BinIcon'
export const Vendor = {
name: 'vendor',
@ -32,15 +31,6 @@ export const Vendor = {
icon: EditIcon,
url: (_id) =>
`/dashboard/management/vendors/info?vendorId=${_id}&action=edit`
},
{ type: 'divider' },
{
name: 'delete',
label: 'Delete',
icon: BinIcon,
danger: true,
url: (_id) =>
`/dashboard/management/vendors/info?vendorId=${_id}&action=delete`
}
],
url: (id) => `/dashboard/management/vendors/info?vendorId=${id}`,