diff --git a/src/entities/activity/lib/hooks/useQueueProcessing.ts b/src/entities/activity/lib/hooks/useQueueProcessing.ts index b12e55e77..5ff2b8ca7 100644 --- a/src/entities/activity/lib/hooks/useQueueProcessing.ts +++ b/src/entities/activity/lib/hooks/useQueueProcessing.ts @@ -4,6 +4,7 @@ import { useForceUpdate } from '@app/shared/lib/hooks/useForceUpdate'; import { getDefaultChangeQueueObservable } from '@app/shared/lib/observables/changeQueueObservableInstance'; import { getDefaultUploadObservable } from '@app/shared/lib/observables/uploadObservableInstance'; import { getDefaultLogger } from '@app/shared/lib/services/loggerInstance'; +import { useRefreshMutation } from '@entities/applet/model/hooks/useRefreshMutation.ts'; import { getDefaultAnswersQueueService } from '../services/answersQueueServiceInstance'; import { getDefaultQueueProcessingService } from '../services/queueProcessingServiceInstance'; @@ -21,6 +22,7 @@ type Result = { export const useQueueProcessing = (): Result => { const update = useForceUpdate(); + const { mutateAsync: refreshApplets } = useRefreshMutation(); useEffect(() => { const onChangeUploadState = () => { @@ -46,7 +48,8 @@ export const useQueueProcessing = (): Result => { const processQueueWithSendingLogs = async (): Promise => { const result = await queueProcessingService.process(); - getDefaultLogger().send(); + await refreshApplets(); + getDefaultLogger().send().catch(console.error); return result; }; diff --git a/src/widgets/survey/model/hooks/useAutoCompletion.ts b/src/widgets/survey/model/hooks/useAutoCompletion.ts index 42cf1e716..14151fbed 100644 --- a/src/widgets/survey/model/hooks/useAutoCompletion.ts +++ b/src/widgets/survey/model/hooks/useAutoCompletion.ts @@ -22,6 +22,7 @@ import { ReduxPersistor } from '@app/shared/lib/redux-state/store'; import { Emitter } from '@app/shared/lib/services/Emitter'; import { getDefaultLogger } from '@app/shared/lib/services/loggerInstance'; import { getMutexDefaultInstanceManager } from '@app/shared/lib/utils/mutexDefaultInstanceManagerInstance'; +import { useRefreshMutation } from '@entities/applet/model/hooks/useRefreshMutation.ts'; import { CollectCompletionOutput } from '@widgets/survey/model/services/ICollectCompletionsService'; import { CollectCompletionsService } from '../services/CollectCompletionsService'; @@ -48,6 +49,8 @@ export const useAutoCompletion = (): Result => { const queryClient = useQueryClient(); + const { mutateAsync: refreshApplets } = useRefreshMutation(); + const hasItemsInQueue = useCallback(() => { return getDefaultAnswersQueueService().getLength() > 0; }, []); @@ -180,6 +183,7 @@ export const useAutoCompletion = (): Result => { if (hasItemsInQueue()) { result = await getDefaultQueueProcessingService().process(); + await refreshApplets(); } if (forceRefreshNotifications || completionsCollected) { @@ -188,7 +192,13 @@ export const useAutoCompletion = (): Result => { return result; }, - [mutex, incompletedEntities, createConstructService, hasItemsInQueue], + [ + mutex, + incompletedEntities, + createConstructService, + hasItemsInQueue, + refreshApplets, + ], ); const hasExpiredEntity = useCallback((): boolean => {