#RI-6313 - change refresh instances on success import, refresh import form after close

Author: rsergeenko

redisinsight/ui/src/pages/home/HomePage.tsx

@@ -20,6 +20,7 @@ import {
   fetchEditedInstanceAction,
   fetchInstancesAction,
   instancesSelector,
+  resetImportInstances,
   setEditedInstance
 } from 'uiSrc/slices/instances/instances'
 import { localStorageService } from 'uiSrc/services'
@@ -158,6 +159,7 @@ const HomePage = () => {
   const handleClose = () => {
     dispatch(resetDataRedisCluster())
     dispatch(resetDataSentinel())
+    dispatch(resetImportInstances())
 
     setOpenDialog(null)
     dispatch(setEditedInstance(null))

redisinsight/ui/src/pages/home/components/import-database/ImportDatabase.tsx

@@ -44,10 +44,6 @@ const ImportDatabase = (props: Props) => {
 
   useEffect(() => {
     setDomReady(true)
-
-    return () => {
-      dispatch(resetImportInstances())
-    }
   }, [])
 
   const onFileChange = (files: FileList | null) => {
@@ -57,9 +53,6 @@ const ImportDatabase = (props: Props) => {
   }
 
   const handleOnClose = () => {
-    if (data?.success?.length || data?.partial?.length) {
-      dispatch(fetchInstancesAction())
-    }
     onClose()
     dispatch(resetImportInstances())
 
@@ -80,7 +73,14 @@ const ImportDatabase = (props: Props) => {
       const formData = new FormData()
       formData.append('file', files[0])
 
-      dispatch(uploadInstancesFile(formData))
+      dispatch(uploadInstancesFile(
+        formData,
+        (data) => {
+          if (data?.success?.length || data?.partial?.length) {
+            dispatch(fetchInstancesAction())
+          }
+        }
+      ))
 
       sendEventTelemetry({
         event: TelemetryEvent.CONFIG_DATABASES_REDIS_IMPORT_SUBMITTED

redisinsight/ui/src/slices/instances/instances.ts

@@ -798,7 +798,7 @@ export function resetInstanceUpdateAction() {
 // Asynchronous thunk action
 export function uploadInstancesFile(
   file: FormData,
-  onSuccessAction?: () => void,
+  onSuccessAction?: (data: any) => void,
   onFailAction?: () => void
 ) {
   return async (dispatch: AppDispatch) => {
@@ -818,7 +818,7 @@ export function uploadInstancesFile(
 
       if (isStatusSuccessful(status)) {
         dispatch(importInstancesFromFileSuccess(data))
-        onSuccessAction?.()
+        onSuccessAction?.(data)
       }
     } catch (_err) {
       const error = _err as AxiosError