fix (TOBACCO-1585): clear default filters when changing select type. Fix encode URI for data-categories

Author: timothygachengo

plugins/wp-react-blocks-plugin/blocks/posts-filter/BlockEdit.jsx

@@ -84,7 +84,7 @@ class BlockEdit extends BlockEditWithFilters {
                             label={__('Filter Type')}
                             value={filterType}
                             onChange={(filterType) => {
-                                setAttributes({ filterType: filterType });
+                                setAttributes({ filterType: filterType, defaultValues: [] });
                             }}
                             options={[
                                 { label: "Single select", value: "single-select" },
@@ -99,7 +99,8 @@ class BlockEdit extends BlockEditWithFilters {
                             onChange={() => setAttributes({
                                 isCountryFilter: !isCountryFilter,
                                 isYearFilter: false,
-                                selectedYear: null
+                                selectedYear: null,
+                                defaultValues: []
                             })} />
 
                         <ToggleControl
@@ -109,7 +110,8 @@ class BlockEdit extends BlockEditWithFilters {
                             onChange={() => setAttributes({
                                 isYearFilter: !isYearFilter,
                                 isCountryFilter: false,
-                                selectedYear: null
+                                selectedYear: null,
+                                defaultValues: []
                             })} />
 
                     </PanelBody>

plugins/wp-react-blocks-plugin/blocks/posts-filter/BlockSave.jsx

@@ -49,7 +49,7 @@ const SaveComponent = (props) => {
             data-all-none-same-behaviour={allNoneSameBehaviour}
             data-auto-apply={autoApply}
             data-taxonomy={taxonomy}
-            data-categories={categories.toString()}
+            data-categories={encodeURIComponent(JSON.stringify(categories))}
             data-is-country-filter={isCountryFilter}
             data-is-year-filter={isYearFilter}
             data-selected-year={selectedYear}