mirror of
https://github.com/Qortal/qapp-core.git
synced 2025-06-15 09:51:21 +00:00
added search interval
This commit is contained in:
parent
78a0110f11
commit
27641f2cfc
@ -1,5 +1,6 @@
|
|||||||
import React, {
|
import React, {
|
||||||
CSSProperties,
|
CSSProperties,
|
||||||
|
Ref,
|
||||||
useCallback,
|
useCallback,
|
||||||
useEffect,
|
useEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
@ -75,6 +76,12 @@ interface BaseProps {
|
|||||||
retryAttempts: number
|
retryAttempts: number
|
||||||
returnType: 'JSON' | 'BASE64'
|
returnType: 'JSON' | 'BASE64'
|
||||||
onResults?: (results: Results)=> void
|
onResults?: (results: Results)=> void
|
||||||
|
searchNewData?: {
|
||||||
|
interval: number
|
||||||
|
intervalSearch: QortalSearchParams
|
||||||
|
}
|
||||||
|
onNewData?: (hasNewData: boolean) => void;
|
||||||
|
ref?: any
|
||||||
}
|
}
|
||||||
|
|
||||||
// ✅ Restrict `direction` only when `disableVirtualization = false`
|
// ✅ Restrict `direction` only when `disableVirtualization = false`
|
||||||
@ -111,10 +118,19 @@ export const MemorizedComponent = ({
|
|||||||
entityParams,
|
entityParams,
|
||||||
returnType = 'JSON',
|
returnType = 'JSON',
|
||||||
retryAttempts = 2,
|
retryAttempts = 2,
|
||||||
onResults
|
onResults,
|
||||||
|
searchNewData,
|
||||||
|
onNewData,
|
||||||
|
ref
|
||||||
}: PropsResourceListDisplay) => {
|
}: PropsResourceListDisplay) => {
|
||||||
const {identifierOperations, lists} = useGlobal()
|
const {identifierOperations, lists} = useGlobal()
|
||||||
const memoizedParams = useMemo(() => JSON.stringify(search), [search]);
|
const memoizedParams = useMemo(() => JSON.stringify(search), [search]);
|
||||||
|
const memoizedParamsSearchNewData = useMemo(() => {
|
||||||
|
if(searchNewData?.intervalSearch){
|
||||||
|
return JSON.stringify(searchNewData?.intervalSearch)
|
||||||
|
}
|
||||||
|
return undefined
|
||||||
|
}, [searchNewData?.intervalSearch]);
|
||||||
const temporaryResources = useCacheStore().getTemporaryResources(listName)
|
const temporaryResources = useCacheStore().getTemporaryResources(listName)
|
||||||
const list = useListStore((state) => state.lists[listName]?.items) || [];
|
const list = useListStore((state) => state.lists[listName]?.items) || [];
|
||||||
|
|
||||||
@ -134,12 +150,52 @@ const addItems = useListStore((s) => s.addItems);
|
|||||||
const initialized = useRef(false)
|
const initialized = useRef(false)
|
||||||
const [generatedIdentifier, setGeneratedIdentifier] = useState("")
|
const [generatedIdentifier, setGeneratedIdentifier] = useState("")
|
||||||
const prevGeneratedIdentifierRef = useRef('')
|
const prevGeneratedIdentifierRef = useRef('')
|
||||||
|
const searchIntervalRef = useRef<null | number>(null)
|
||||||
|
const lastItemTimestampRef = useRef<null | number>(null)
|
||||||
const stringifiedEntityParams = useMemo(()=> {
|
const stringifiedEntityParams = useMemo(()=> {
|
||||||
return JSON .stringify(entityParams)
|
return JSON .stringify(entityParams)
|
||||||
}, [entityParams])
|
}, [entityParams])
|
||||||
|
|
||||||
|
useEffect(()=> {
|
||||||
|
if(list?.length > 0){
|
||||||
|
lastItemTimestampRef.current = list[0]?.created || null
|
||||||
|
}
|
||||||
|
}, [list])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
useEffect(()=> {
|
||||||
|
if(!searchNewData?.interval || !memoizedParamsSearchNewData || !generatedIdentifier) return
|
||||||
|
let isCalling = false
|
||||||
|
searchIntervalRef.current = setInterval(async () => {
|
||||||
|
|
||||||
|
try {
|
||||||
|
if(!lastItemTimestampRef.current) return
|
||||||
|
if(isCalling) return
|
||||||
|
isCalling = true
|
||||||
|
const parsedParams = {...(JSON.parse(memoizedParamsSearchNewData))};
|
||||||
|
parsedParams.identifier = generatedIdentifier
|
||||||
|
parsedParams.after = lastItemTimestampRef.current
|
||||||
|
const responseData = await lists.fetchResourcesResultsOnly(parsedParams, listName, returnType); // Awaiting the async function
|
||||||
|
if(onNewData && responseData?.length > 0){
|
||||||
|
onNewData(true)
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
} finally {
|
||||||
|
isCalling = false
|
||||||
|
}
|
||||||
|
}, searchNewData?.interval);
|
||||||
|
|
||||||
|
return ()=> {
|
||||||
|
if(searchIntervalRef.current){
|
||||||
|
|
||||||
|
clearInterval(searchIntervalRef.current)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [searchNewData?.interval, memoizedParamsSearchNewData, generatedIdentifier])
|
||||||
|
|
||||||
|
|
||||||
useEffect(()=> {
|
useEffect(()=> {
|
||||||
try {
|
try {
|
||||||
@ -168,25 +224,38 @@ const addItems = useListStore((s) => s.addItems);
|
|||||||
const getResourceList = useCallback(async () => {
|
const getResourceList = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
if(!generatedIdentifier) return
|
if(!generatedIdentifier) return
|
||||||
|
setIsLoading(true);
|
||||||
await new Promise((res)=> {
|
await new Promise((res)=> {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
res(null)
|
res(null)
|
||||||
}, 500);
|
}, 500);
|
||||||
})
|
})
|
||||||
setIsLoading(true);
|
lastItemTimestampRef.current = null
|
||||||
const parsedParams = {...(JSON.parse(memoizedParams))};
|
const parsedParams = {...(JSON.parse(memoizedParams))};
|
||||||
parsedParams.identifier = generatedIdentifier
|
parsedParams.identifier = generatedIdentifier
|
||||||
const responseData = await lists.fetchResources(parsedParams, listName, returnType, true); // Awaiting the async function
|
const responseData = await lists.fetchResources(parsedParams, listName, returnType, true); // Awaiting the async function
|
||||||
|
|
||||||
addList(listName, responseData || []);
|
addList(listName, responseData || []);
|
||||||
|
if(onNewData){
|
||||||
|
onNewData(false)
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed to fetch resources:", error);
|
console.error("Failed to fetch resources:", error);
|
||||||
} finally {
|
} finally {
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
}
|
}
|
||||||
}, [memoizedParams, lists.fetchResources, generatedIdentifier]); // Added dependencies for re-fetching
|
}, [memoizedParams, lists.fetchResources, generatedIdentifier]); // Added dependencies for re-fetching
|
||||||
|
|
||||||
|
const resetSearch = useCallback(async ()=> {
|
||||||
|
lists.deleteList(listName);
|
||||||
|
getResourceList()
|
||||||
|
}, [listName, getResourceList])
|
||||||
|
|
||||||
|
useEffect(()=> {
|
||||||
|
if(ref){
|
||||||
|
ref.current = {resetSearch}
|
||||||
|
}
|
||||||
|
}, [resetSearch])
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if(!generatedIdentifier) return
|
if(!generatedIdentifier) return
|
||||||
|
|
||||||
@ -366,7 +435,8 @@ function arePropsEqual(
|
|||||||
JSON.stringify(prevProps.search) === JSON.stringify(nextProps.search) &&
|
JSON.stringify(prevProps.search) === JSON.stringify(nextProps.search) &&
|
||||||
JSON.stringify(prevProps.styles) === JSON.stringify(nextProps.styles) &&
|
JSON.stringify(prevProps.styles) === JSON.stringify(nextProps.styles) &&
|
||||||
prevProps.listItem === nextProps.listItem &&
|
prevProps.listItem === nextProps.listItem &&
|
||||||
JSON.stringify(prevProps.entityParams) === JSON.stringify(nextProps.entityParams)
|
JSON.stringify(prevProps.entityParams) === JSON.stringify(nextProps.entityParams) &&
|
||||||
|
JSON.stringify(prevProps.searchNewData) === JSON.stringify(nextProps.searchNewData)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -248,6 +248,48 @@ export const useResources = (retryAttempts: number = 2) => {
|
|||||||
[getSearchCache, setSearchCache, fetchDataFromResults]
|
[getSearchCache, setSearchCache, fetchDataFromResults]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const fetchResourcesResultsOnly = useCallback(
|
||||||
|
async (
|
||||||
|
params: QortalSearchParams,
|
||||||
|
listName: string,
|
||||||
|
returnType: ReturnType = 'JSON'
|
||||||
|
): Promise<QortalMetadata[]> => {
|
||||||
|
|
||||||
|
let responseData: QortalMetadata[] = [];
|
||||||
|
let filteredResults: QortalMetadata[] = [];
|
||||||
|
let lastCreated = params.before || null;
|
||||||
|
const targetLimit = params.limit ?? 20;
|
||||||
|
|
||||||
|
while (filteredResults.length < targetLimit) {
|
||||||
|
const response = await qortalRequest({
|
||||||
|
action: "SEARCH_QDN_RESOURCES",
|
||||||
|
mode: "ALL",
|
||||||
|
...params,
|
||||||
|
limit: targetLimit - filteredResults.length,
|
||||||
|
before: lastCreated,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response || response.length === 0) break;
|
||||||
|
|
||||||
|
responseData = response;
|
||||||
|
const validResults = responseData.filter((item) => item.size !== 32);
|
||||||
|
filteredResults = [...filteredResults, ...validResults];
|
||||||
|
|
||||||
|
if (filteredResults.length >= targetLimit) {
|
||||||
|
filteredResults = filteredResults.slice(0, targetLimit);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastCreated = responseData[responseData.length - 1]?.created;
|
||||||
|
if (!lastCreated) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return filteredResults;
|
||||||
|
},
|
||||||
|
[cancelAllRequests, fetchDataFromResults]
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
const addNewResources = useCallback(
|
const addNewResources = useCallback(
|
||||||
(listName: string, resources: Resource[]) => {
|
(listName: string, resources: Resource[]) => {
|
||||||
|
|
||||||
@ -306,7 +348,8 @@ export const useResources = (retryAttempts: number = 2) => {
|
|||||||
addNewResources,
|
addNewResources,
|
||||||
updateNewResources,
|
updateNewResources,
|
||||||
deleteResource,
|
deleteResource,
|
||||||
deleteList
|
deleteList,
|
||||||
|
fetchResourcesResultsOnly
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user