Compare commits

...

2 Commits

Author SHA1 Message Date
caa50709dd Fixed warnings 2025-08-23 11:21:59 +01:00
fbb0dd7b32 Bugfix: Fixed object update and creation ws. 2025-08-23 11:21:37 +01:00
3 changed files with 70 additions and 38 deletions

View File

@ -82,10 +82,14 @@ const ObjectTable = forwardRef(
// Table state // Table state
const [pages, setPages] = useState([]) const [pages, setPages] = useState([])
const pagesRef = useRef(pages)
const [hasMore, setHasMore] = useState(true) const [hasMore, setHasMore] = useState(true)
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
const [lazyLoading, setLazyLoading] = useState(false) const [lazyLoading, setLazyLoading] = useState(false)
const [subscribedIds, setSubscribedIds] = useState([])
const [typeSubscribed, setTypeSubscribed] = useState(false)
const rowActions = const rowActions =
model.actions?.filter((action) => action.row == true) || [] model.actions?.filter((action) => action.row == true) || []
@ -140,6 +144,7 @@ const ObjectTable = forwardRef(
order: sorter.order order: sorter.order
}) })
} }
console.log('Fetching data...')
try { try {
const result = await fetchObjects(type, { const result = await fetchObjects(type, {
page: pageNum, page: pageNum,
@ -273,25 +278,27 @@ const ObjectTable = forwardRef(
const reload = useCallback(async () => { const reload = useCallback(async () => {
setLazyLoading(true) setLazyLoading(true)
for (let i = 0; i < pages.length; i++) { console.log('Pages during reload', pagesRef.current)
const page = pages[i] for (let i = 0; i < pagesRef.current.length; i++) {
const page = pagesRef.current[i]
await fetchData(page.pageNum) await fetchData(page.pageNum)
} }
}, [fetchData, pages]) }, [fetchData])
// Update event handler for real-time updates // Update event handler for real-time updates
const updateEventHandler = useCallback((updatedData) => { const updateEventHandler = useCallback((id, updatedData) => {
setPages((prevPages) => setPages((prevPages) =>
prevPages.map((page) => ({ prevPages.map((page) => ({
...page, ...page,
items: page.items.map((item) => items: page.items.map((item) => {
item._id === updatedData._id ? merge({}, item, updatedData) : item return item._id === id ? merge({}, item, updatedData) : item
) })
})) }))
) )
}, []) }, [])
const newEventHandler = useCallback(() => { const newEventHandler = useCallback(() => {
console.log('GOT NEW EVENT')
reload() reload()
}, [reload]) }, [reload])
@ -299,17 +306,19 @@ const ObjectTable = forwardRef(
useEffect(() => { useEffect(() => {
if (pages.length > 0 && connected) { if (pages.length > 0 && connected) {
const unsubscribes = [] const unsubscribes = []
// Subscribe to each item in all pages // Subscribe to each item in all pages
pages.forEach((page) => { pages.forEach((page) => {
if (page?.items && page?.items?.length > 0) { if (page?.items && page?.items?.length > 0) {
page.items.forEach((item) => { page.items.forEach((item) => {
if (!item.isSkeleton) { if (!item.isSkeleton && !subscribedIds.includes(item?._id)) {
const unsubscribe = subscribeToObjectUpdates( const unsubscribe = subscribeToObjectUpdates(
item._id, item._id,
type, type,
updateEventHandler (updateData) => {
updateEventHandler(item._id, updateData)
}
) )
setSubscribedIds((prev) => [...prev, item._id])
if (unsubscribe) { if (unsubscribe) {
unsubscribes.push(unsubscribe) unsubscribes.push(unsubscribe)
} }
@ -325,18 +334,32 @@ const ObjectTable = forwardRef(
}) })
} }
} }
}, [pages, type, subscribeToObjectUpdates, updateEventHandler, connected]) }, [
pages,
type,
subscribeToObjectUpdates,
updateEventHandler,
connected,
subscribedIds
])
useEffect(() => { useEffect(() => {
if (connected == true) { if (connected == true && typeSubscribed == false) {
const unsubscribe = subscribeToObjectTypeUpdates(type, newEventHandler) const unsubscribe = subscribeToObjectTypeUpdates(type, newEventHandler)
setTypeSubscribed(true)
return () => { return () => {
if (unsubscribe) { if (unsubscribe && typeSubscribed == true) {
unsubscribe() unsubscribe()
} }
} }
} }
}, [type, subscribeToObjectTypeUpdates, connected, newEventHandler]) }, [
type,
subscribeToObjectTypeUpdates,
connected,
newEventHandler,
typeSubscribed
])
const updateData = useCallback( const updateData = useCallback(
(_id, updatedData) => { (_id, updatedData) => {
@ -451,6 +474,10 @@ const ObjectTable = forwardRef(
} }
] ]
useEffect(() => {
console.log('Pages', pages)
pagesRef.current = pages
}, [pages])
// Add columns in the order specified by model.columns // Add columns in the order specified by model.columns
model.columns.forEach((colName) => { model.columns.forEach((colName) => {
const prop = modelProperties.find((p) => p.name === colName) const prop = modelProperties.find((p) => p.name === colName)

View File

@ -1,4 +1,4 @@
import { useState, useContext, useEffect, useRef } from 'react' import { useState, useContext, useEffect, useRef, useCallback } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { Flex, Alert, Card, Spin, Splitter, Button, Modal, Input } from 'antd' import { Flex, Alert, Card, Spin, Splitter, Button, Modal, Input } from 'antd'
import { LoadingOutlined } from '@ant-design/icons' import { LoadingOutlined } from '@ant-design/icons'
@ -44,25 +44,28 @@ const TemplateEditor = ({
} }
} }
function reloadPreview(content, testObject = {}, scale = 1) { const reloadPreview = useCallback(
fetchTemplatePreview( (content, testObject = {}, scale = 1) => {
objectData._id, fetchTemplatePreview(
content, objectData._id,
testObject, content,
scale, testObject,
(result) => { scale,
setReloadLoading(false) (result) => {
if (result?.error) { setReloadLoading(false)
setPreviewError(true) if (result?.error) {
setPreviewMessage(result.error) setPreviewError(true)
} else { setPreviewMessage(result.error)
setPreviewError(false) } else {
updatePreviewContent(result.html) setPreviewError(false)
setPreviewMessage('No issues found.') updatePreviewContent(result.html)
setPreviewMessage('No issues found.')
}
} }
} )
) },
} [fetchTemplatePreview, objectData?._id]
)
// Move useEffect to component level and use state to track objectData changes // Move useEffect to component level and use state to track objectData changes
useEffect(() => { useEffect(() => {
@ -70,7 +73,7 @@ const TemplateEditor = ({
console.log('PreviewScale', previewScale) console.log('PreviewScale', previewScale)
reloadPreview(objectData.content, objectData.testObject, previewScale) reloadPreview(objectData.content, objectData.testObject, previewScale)
} }
}, [objectData, previewScale]) }, [objectData, previewScale, reloadPreview])
return ( return (
<> <>

View File

@ -243,16 +243,17 @@ const ApiServerProvider = ({ children }) => {
const offObjectUpdatesEvent = useCallback((id, objectType, callback) => { const offObjectUpdatesEvent = useCallback((id, objectType, callback) => {
if (socketRef.current && socketRef.current.connected == true) { if (socketRef.current && socketRef.current.connected == true) {
const callbacksRefKey = `${objectType}:${id}`
// Remove callback from the subscribed callbacks map // Remove callback from the subscribed callbacks map
if (subscribedCallbacksRef.current.has(id)) { if (subscribedCallbacksRef.current.has(callbacksRefKey)) {
const callbacks = subscribedCallbacksRef.current const callbacks = subscribedCallbacksRef.current
.get(id) .get(callbacksRefKey)
.filter((cb) => cb !== callback) .filter((cb) => cb !== callback)
if (callbacks.length === 0) { if (callbacks.length === 0) {
subscribedCallbacksRef.current.delete(id) subscribedCallbacksRef.current.delete(callbacksRefKey)
socketRef.current.emit('unsubscribe', { id: id, type: objectType }) socketRef.current.emit('unsubscribe', { id: id, type: objectType })
} else { } else {
subscribedCallbacksRef.current.set(id, callbacks) subscribedCallbacksRef.current.set(callbacksRefKey, callbacks)
} }
} }
} }
@ -261,6 +262,7 @@ const ApiServerProvider = ({ children }) => {
const offObjectTypeUpdatesEvent = useCallback((objectType, callback) => { const offObjectTypeUpdatesEvent = useCallback((objectType, callback) => {
if (socketRef.current && socketRef.current.connected == true) { if (socketRef.current && socketRef.current.connected == true) {
// Remove callback from the subscribed callbacks map // Remove callback from the subscribed callbacks map
console.log('Unsubscribing from type')
if (subscribedCallbacksRef.current.has(objectType)) { if (subscribedCallbacksRef.current.has(objectType)) {
const callbacks = subscribedCallbacksRef.current const callbacks = subscribedCallbacksRef.current
.get(objectType) .get(objectType)