From fbf48b7dedaadd0690bba6bdd8363607f84255b4 Mon Sep 17 00:00:00 2001
From: ilan7empest <therecanbeonly1.1984@gmail.com>
Date: Thu, 23 Nov 2023 11:36:37 +0700
Subject: [PATCH] Fix [Batch run] remove the 'No data to show'

---
 .../JobWizardFunctionSelection.js                  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
index 5d0100b5a0..1ee0161ecd 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
@@ -95,7 +95,7 @@ const JobWizardFunctionSelection = ({
       store.filtersStore[FILTER_MENU_MODAL][JOB_WIZARD_FILTERS]?.values?.[HUB_CATEGORIES_FILTER]
   )
 
-  const { hubFunctions, hubFunctionsCatalog } = useSelector(store => store.functionsStore)
+  const { hubFunctions, hubFunctionsCatalog, loading } = useSelector(store => store.functionsStore)
 
   const dispatch = useDispatch()
 
@@ -389,9 +389,10 @@ const JobWizardFunctionSelection = ({
               <FormSelect name={`${FUNCTION_SELECTION_STEP}.projectName`} options={projects} />
             </div>
           </div>
-          {(filterByName.length > 0 &&
-            (filterMatches.length === 0 || filteredFunctions.length === 0)) ||
-          functions.length === 0 ? (
+          {!loading &&
+          ((filterByName.length > 0 &&
+            (filterMatches.length === 0 || isEmpty(filteredFunctions))) ||
+            isEmpty(functions)) ? (
             <NoData />
           ) : (
             <div className="functions-list">
@@ -438,9 +439,10 @@ const JobWizardFunctionSelection = ({
               </FilterMenuModal>
             )}
           </div>
-          {(filterByName.length > 0 &&
+          {!loading &&
+          ((filterByName.length > 0 &&
             (filterMatches.length === 0 || isEmpty(filteredTemplates))) ||
-          isEmpty(templates) ? (
+            isEmpty(templates)) ? (
             <NoData />
           ) : (
             <div className="functions-list">