Fix [Function] Revert and fix for empty Batch run on function run (#2991

)

src/components/FunctionsPage/functions.util.js

@@ -50,6 +50,7 @@ import { setNotification } from '../../reducers/notificationReducer'
 import { showErrorNotification } from '../../utils/notifications.util'
 import { getFunctionLogs, getFunctionNuclioLogs } from '../../utils/getFunctionLogs'
 import { parseIdentifier } from '../../utils'
+import { setJobFunction } from '../../reducers/jobReducer'
 
 import { ReactComponent as Delete } from 'igz-controls/images/delete.svg'
 import { ReactComponent as Run } from 'igz-controls/images/run.svg'
@@ -312,6 +313,7 @@ export const generateActionsMenu = (
         onClick: funcMin => {
           getFullFunction(funcMin).then(func => {
             if (func?.project && func?.name && func?.hash && func?.ui?.originalContent) {
+              dispatch(setJobFunction(func.ui.originalContent))
               setJobWizardMode(PANEL_FUNCTION_CREATE_MODE)
             } else {
               showErrorNotification(dispatch, {}, '', 'Failed to retrieve function data')

src/components/JobWizard/JobWizard.js

@@ -128,10 +128,9 @@ const JobWizard = ({
     }
     dispatch(resetModalFilter({ name: JOB_WIZARD_FILTERS }))
     dispatch(removeJobFunction())
-    functionsStore.func && dispatch(functionsActions.removeFunction())
     onResolve()
     onWizardClose && onWizardClose()
-  }, [dispatch, functionsStore.func, onResolve, onWizardClose, showSchedule])
+  }, [dispatch, onResolve, onWizardClose, showSchedule])
 
   const { handleCloseModal, resolveModal } = useModalBlockHistory(closeModal, formRef.current)
 
@@ -175,15 +174,13 @@ const JobWizard = ({
   }, [fetchFunctionTemplate, fetchHubFunction, isBatchInference, isTrain, resolveModal])
 
   useEffect(() => {
-    if (!isEmpty(jobsStore.jobFunc) || !isEmpty(functionsStore.func)) {
+    if (!isEmpty(jobsStore.jobFunc)) {
       setSelectedFunctionData({
-        name: !isEmpty(functionsStore.func)
-          ? functionsStore.func.metadata.name
-          : jobsStore.jobFunc.metadata.name,
-        functions: !isEmpty(functionsStore.func) ? [functionsStore.func] : [jobsStore.jobFunc]
+        name: jobsStore.jobFunc.metadata.name,
+        functions: [jobsStore.jobFunc]
       })
     }
-  }, [functionsStore.func, isEditMode, isRunMode, jobsStore.jobFunc])
+  }, [isEditMode, isRunMode, jobsStore.jobFunc])
 
   const setJobData = useCallback(
     (formState, jobFormData, jobAdditionalData) => {

src/reducers/jobReducer.js

@@ -288,6 +288,9 @@ const jobsSlice = createSlice({
     },
     setJobsData(state, action) {
       state.jobsData = action.payload
+    },
+    setJobFunction(state, action) {
+      state.jobFunc = action.payload
     }
   },
   extraReducers: builder => {
@@ -380,6 +383,6 @@ const jobsSlice = createSlice({
   }
 })
 
-export const { removeJobFunction, setJobsData } = jobsSlice.actions
+export const { removeJobFunction, setJobsData, setJobFunction } = jobsSlice.actions
 
 export default jobsSlice.reducer