Skip to content

Commit 3a6e5a2

Browse files
BENTO-1284: bento local search minor bugs and improvements
1 parent 7ccb0f7 commit 3a6e5a2

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ module.exports = {
3232
"jsx-a11y/click-events-have-key-events":"off",
3333
"react/jsx-props-no-spreading":"off",
3434
"linebreak-style":"off",
35+
"react/jsx-no-bind":"off",
3536
},
3637
};

src/components/SideBar/SideBarComponents/clearFilters.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const clearFilters = ({
1616
disabled={disable}
1717
className={classes.customButton}
1818
classes={{ root: classes.clearAllButtonRoot }}
19-
onClick={() => onClick()}
2019
disableRipple
20+
onClick={() => onClick()}
2121
>
2222
<img
2323
src={resetIcon.src}
@@ -26,7 +26,7 @@ const clearFilters = ({
2626
alt={resetIcon.alt}
2727
/>
2828
</Button>
29-
<span className={classes.resetText}>{resetText}</span>
29+
<span className={disable ? classes.resetTextDisabled : classes.resetText}>{resetText}</span>
3030

3131
</div>
3232
);
@@ -58,7 +58,13 @@ const styles = (theme) => ({
5858
resetText: {
5959
marginTop: '0px',
6060
marginLeft: '8px',
61-
color: '#638FB5',
61+
color: '#4b82b2',
62+
fontSize: 14,
63+
},
64+
resetTextDisabled: {
65+
marginTop: '0px',
66+
marginLeft: '8px',
67+
color: '#a9b2b9',
6268
fontSize: 14,
6369
},
6470
});

src/components/SideBar/SideBarComponents/searchComponet.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function localSearchCOmponent({ classes }) {
7272
why clear filter on click not working */}
7373
<a onClick={() => resetFilter()}>
7474
<ClearFilters
75-
disable={options.length === 0}
75+
disable={value.length === 0}
7676
onClick={() => {}}
7777
resetText="Clear all search selections"
7878
/>

src/components/SideBar/SideBarView.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ const SideBarContent = ({ classes }) => {
2323
const [value, setValue] = React.useState('1');
2424

2525
const handleChange = (event, newValue) => {
26-
setValue(newValue);
27-
clearAllFilters();
26+
if (value !== newValue) {
27+
setValue(newValue);
28+
clearAllFilters();
29+
}
2830
};
2931
const activeFilters = useSelector((state) => (
3032
state.dashboardTab
@@ -76,6 +78,7 @@ const SideBarContent = ({ classes }) => {
7678
<ClearFilters
7779
disable={activeFiltersCount === 0}
7880
onClick={() => clearAllFilters()}
81+
resetText="Clear all filtered selections"
7982
/>
8083
</div>
8184
<List component="nav" aria-label="filter cases" classes={{ root: classes.listRoot, divider: classes.dividerRoot }}>

src/pages/dashboardTab/store/dashboardReducer.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable react/destructuring-assignment */
12
import _ from 'lodash';
23
import {
34
customCheckBox,

src/pages/fileCentricCart/components/body/cartBody.js

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const CartHeader = ({
2828
isLoading,
2929
}) => {
3030
function onRowSelectionChange(curr, allRowsSelected) {
31+
// eslint-disable-next-line no-sequences
3132
return (curr, allRowsSelected);
3233
}
3334
const columns = getColumns(table, classes).concat(deleteColumn);

0 commit comments

Comments
 (0)