From 406d61cbdb88d382fad7e23fe67ffd338e6f6a86 Mon Sep 17 00:00:00 2001
From: mariana-furyk <58301139+mariana-furyk@users.noreply.github.com>
Date: Fri, 6 Oct 2023 17:18:51 +0300
Subject: [PATCH] Fix [Filter] Add default "Apply" button `1.5.x` (#2010)

---
 .../ArtifactsActionBar/ArtifactsActionBar.js          |  2 --
 src/components/FilterMenuModal/FilterMenuModal.js     |  9 ++++++---
 .../HubCategoriesFilter/HubCategoriesFilter.js        | 11 ++---------
 .../JobWizardFunctionSelection.js                     |  1 -
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/components/ArtifactsActionBar/ArtifactsActionBar.js b/src/components/ArtifactsActionBar/ArtifactsActionBar.js
index fd9b2b3152..4953c98b2f 100644
--- a/src/components/ArtifactsActionBar/ArtifactsActionBar.js
+++ b/src/components/ArtifactsActionBar/ArtifactsActionBar.js
@@ -142,9 +142,7 @@ function ArtifactsActionBar({
           <div className="action-bar__filters">
             <NameFilter applyChanges={value => applyChanges(value, filterMenuModal.values)} />
             <FilterMenuModal
-              applyButton={{ label: 'Apply', variant: 'secondary' }}
               applyChanges={filterMenuModal => applyChanges(formState.values.name, filterMenuModal)}
-              cancelButton={{ label: 'Clear', variant: 'tertiary' }}
               filterMenuName={filterMenuName}
               initialValues={filtersInitialState}
               restartFormTrigger={tab ?? page}
diff --git a/src/components/FilterMenuModal/FilterMenuModal.js b/src/components/FilterMenuModal/FilterMenuModal.js
index 32f820d27b..780d2938e8 100644
--- a/src/components/FilterMenuModal/FilterMenuModal.js
+++ b/src/components/FilterMenuModal/FilterMenuModal.js
@@ -47,6 +47,7 @@ const FilterMenuModal = ({
   initialValues,
   restartFormTrigger,
   values,
+  withoutApplyButton,
   wizardClassName
 }) => {
   const [filtersWizardIsShown, setFiltersWizardIsShown] = useState(false)
@@ -186,7 +187,7 @@ const FilterMenuModal = ({
                           variant={cancelButton.variant}
                         />
                       )}
-                      {applyButton && (
+                      {applyButton && !withoutApplyButton && (
                         <Button
                           disabled={isEqual(filtersData.values, formState.values)}
                           variant={applyButton.variant}
@@ -208,10 +209,11 @@ const FilterMenuModal = ({
 
 FilterMenuModal.defaultProps = {
   applyChanges: null,
-  applyButton: null,
-  cancelButton: null,
+  applyButton: { label: 'Apply', variant: 'secondary' },
+  cancelButton: { label: 'Clear', variant: 'tertiary' },
   header: 'Filter by',
   restartFormTrigger: null,
+  withoutApplyButton: false,
   wizardClassName: ''
 }
 
@@ -230,6 +232,7 @@ FilterMenuModal.propTypes = {
   initialValues: PropTypes.shape({}).isRequired,
   restartFormTrigger: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
   values: PropTypes.shape({}).isRequired,
+  withoutApplyButton: PropTypes.bool,
   wizardClassName: PropTypes.string
 }
 
diff --git a/src/components/FilterMenuModal/HubCategoriesFilter/HubCategoriesFilter.js b/src/components/FilterMenuModal/HubCategoriesFilter/HubCategoriesFilter.js
index 7d9b934d39..e01346f52d 100644
--- a/src/components/FilterMenuModal/HubCategoriesFilter/HubCategoriesFilter.js
+++ b/src/components/FilterMenuModal/HubCategoriesFilter/HubCategoriesFilter.js
@@ -21,19 +21,17 @@ import React, { useContext, useEffect } from 'react'
 import PropTypes from 'prop-types'
 import { OnChange } from 'react-final-form-listeners'
 import { isEqual, pickBy } from 'lodash'
-import { useDispatch, useSelector } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { useForm } from 'react-final-form'
 
 import { FilterMenuWizardContext } from '../FilterMenuModal'
 import { FormCheckBox } from 'igz-controls/components'
 
 import { FILTER_MENU_MODAL, HUB_CATEGORIES_FILTER } from '../../../constants'
-import { setModalFiltersValues } from '../../../reducers/filtersReducer'
 
 import './hubCategoriesFilter.scss'
 
 const HubCategoriesFilter = ({ templates }) => {
-  const dispatch = useDispatch()
   const form = useForm()
   const filtersContext = useContext(FilterMenuWizardContext)
   const filtersStoreHubCategories = useSelector(
@@ -64,12 +62,7 @@ const HubCategoriesFilter = ({ templates }) => {
             const hubCategories = pickBy(next, value => value)
 
             if (!isEqual(hubCategories, filtersStoreHubCategories)) {
-              dispatch(
-                setModalFiltersValues({
-                  name: filtersContext.filterMenuName,
-                  value: { [HUB_CATEGORIES_FILTER]: hubCategories }
-                })
-              )
+              form.change(HUB_CATEGORIES_FILTER, hubCategories)
             }
           }
         }}
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
index bf95f210ed..63f42cf5c4 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
@@ -411,7 +411,6 @@ const JobWizardFunctionSelection = ({
               setMatches={setFilterMatches}
             />
             <FilterMenuModal
-              cancelButton={{ label: 'Clear', variant: 'tertiary' }}
               header="Filter by category"
               wizardClassName="hub-filter"
               filterMenuName={JOB_WIZARD_FILTERS}