Skip to content
This repository was archived by the owner on Aug 4, 2025. It is now read-only.

Commit 15d77e1

Browse files
scaredcatscaredcat
authored
Hide permanent filters from SelectFilters (#78)
1 parent 11fbb34 commit 15d77e1

2 files changed

Lines changed: 4 additions & 97 deletions

File tree

‎src/__snapshots__/ObjectList.stories.storyshot‎

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ exports[`Storyshots object-list all selected 1`] = `
1818
openMenuOnClick={true}
1919
options={
2020
Array [
21-
Object {
22-
"Renderer": [Function],
23-
"active": false,
24-
"filterKey": "search",
25-
"name": "",
26-
},
2721
Object {
2822
"Renderer": [Function],
2923
"active": false,
@@ -48,12 +42,6 @@ exports[`Storyshots object-list all selected 1`] = `
4842
"filterKey": "DateFilter",
4943
"name": "DateFilter",
5044
},
51-
Object {
52-
"Renderer": [Function],
53-
"active": false,
54-
"filterKey": "DayFilter",
55-
"name": "DayFilter",
56-
},
5745
Object {
5846
"Renderer": [Function],
5947
"active": false,
@@ -666,12 +654,6 @@ exports[`Storyshots object-list can select all 1`] = `
666654
openMenuOnClick={true}
667655
options={
668656
Array [
669-
Object {
670-
"Renderer": [Function],
671-
"active": false,
672-
"filterKey": "search",
673-
"name": "",
674-
},
675657
Object {
676658
"Renderer": [Function],
677659
"active": false,
@@ -696,12 +678,6 @@ exports[`Storyshots object-list can select all 1`] = `
696678
"filterKey": "DateFilter",
697679
"name": "DateFilter",
698680
},
699-
Object {
700-
"Renderer": [Function],
701-
"active": false,
702-
"filterKey": "DayFilter",
703-
"name": "DayFilter",
704-
},
705681
Object {
706682
"Renderer": [Function],
707683
"active": false,
@@ -1324,12 +1300,6 @@ exports[`Storyshots object-list can select items 1`] = `
13241300
openMenuOnClick={true}
13251301
options={
13261302
Array [
1327-
Object {
1328-
"Renderer": [Function],
1329-
"active": false,
1330-
"filterKey": "search",
1331-
"name": "",
1332-
},
13331303
Object {
13341304
"Renderer": [Function],
13351305
"active": false,
@@ -1354,12 +1324,6 @@ exports[`Storyshots object-list can select items 1`] = `
13541324
"filterKey": "DateFilter",
13551325
"name": "DateFilter",
13561326
},
1357-
Object {
1358-
"Renderer": [Function],
1359-
"active": false,
1360-
"filterKey": "DayFilter",
1361-
"name": "DayFilter",
1362-
},
13631327
Object {
13641328
"Renderer": [Function],
13651329
"active": false,
@@ -1961,12 +1925,6 @@ exports[`Storyshots object-list has active filters 1`] = `
19611925
openMenuOnClick={true}
19621926
options={
19631927
Array [
1964-
Object {
1965-
"Renderer": [Function],
1966-
"active": false,
1967-
"filterKey": "search",
1968-
"name": "",
1969-
},
19701928
Object {
19711929
"Renderer": [Function],
19721930
"active": false,
@@ -4711,12 +4669,6 @@ exports[`Storyshots object-list has multiple pages 1`] = `
47114669
openMenuOnClick={true}
47124670
options={
47134671
Array [
4714-
Object {
4715-
"Renderer": [Function],
4716-
"active": false,
4717-
"filterKey": "search",
4718-
"name": "",
4719-
},
47204672
Object {
47214673
"Renderer": [Function],
47224674
"active": false,
@@ -4741,12 +4693,6 @@ exports[`Storyshots object-list has multiple pages 1`] = `
47414693
"filterKey": "DateFilter",
47424694
"name": "DateFilter",
47434695
},
4744-
Object {
4745-
"Renderer": [Function],
4746-
"active": false,
4747-
"filterKey": "DayFilter",
4748-
"name": "DayFilter",
4749-
},
47504696
Object {
47514697
"Renderer": [Function],
47524698
"active": false,
@@ -5217,12 +5163,6 @@ exports[`Storyshots object-list has optional fields 1`] = `
52175163
openMenuOnClick={true}
52185164
options={
52195165
Array [
5220-
Object {
5221-
"Renderer": [Function],
5222-
"active": false,
5223-
"filterKey": "search",
5224-
"name": "",
5225-
},
52265166
Object {
52275167
"Renderer": [Function],
52285168
"active": false,
@@ -5247,12 +5187,6 @@ exports[`Storyshots object-list has optional fields 1`] = `
52475187
"filterKey": "DateFilter",
52485188
"name": "DateFilter",
52495189
},
5250-
Object {
5251-
"Renderer": [Function],
5252-
"active": false,
5253-
"filterKey": "DayFilter",
5254-
"name": "DayFilter",
5255-
},
52565190
Object {
52575191
"Renderer": [Function],
52585192
"active": false,
@@ -5795,12 +5729,6 @@ exports[`Storyshots object-list has search key 1`] = `
57955729
"filterKey": "DateFilter",
57965730
"name": "DateFilter",
57975731
},
5798-
Object {
5799-
"Renderer": [Function],
5800-
"active": false,
5801-
"filterKey": "DayFilter",
5802-
"name": "DayFilter",
5803-
},
58045732
Object {
58055733
"Renderer": [Function],
58065734
"active": false,
@@ -6271,12 +6199,6 @@ exports[`Storyshots object-list loading 1`] = `
62716199
openMenuOnClick={true}
62726200
options={
62736201
Array [
6274-
Object {
6275-
"Renderer": [Function],
6276-
"active": false,
6277-
"filterKey": "search",
6278-
"name": "",
6279-
},
62806202
Object {
62816203
"Renderer": [Function],
62826204
"active": false,
@@ -6301,12 +6223,6 @@ exports[`Storyshots object-list loading 1`] = `
63016223
"filterKey": "DateFilter",
63026224
"name": "DateFilter",
63036225
},
6304-
Object {
6305-
"Renderer": [Function],
6306-
"active": false,
6307-
"filterKey": "DayFilter",
6308-
"name": "DayFilter",
6309-
},
63106226
Object {
63116227
"Renderer": [Function],
63126228
"active": false,
@@ -6783,12 +6699,6 @@ exports[`Storyshots object-list ready 1`] = `
67836699
openMenuOnClick={true}
67846700
options={
67856701
Array [
6786-
Object {
6787-
"Renderer": [Function],
6788-
"active": false,
6789-
"filterKey": "search",
6790-
"name": "",
6791-
},
67926702
Object {
67936703
"Renderer": [Function],
67946704
"active": false,
@@ -6813,12 +6723,6 @@ exports[`Storyshots object-list ready 1`] = `
68136723
"filterKey": "DateFilter",
68146724
"name": "DateFilter",
68156725
},
6816-
Object {
6817-
"Renderer": [Function],
6818-
"active": false,
6819-
"filterKey": "DayFilter",
6820-
"name": "DayFilter",
6821-
},
68226726
Object {
68236727
"Renderer": [Function],
68246728
"active": false,

‎src/actions-filters/ActionsFiltersContainer.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ class ActionsFilterContainer extends Component {
134134
)}
135135
<div className="objectlist-row">
136136
<SelectFilters
137-
filters={filters.filter(f => !search || f.filterKey !== searchKey)}
137+
filters={filters.filter(f =>
138+
(!search || f.filterKey !== searchKey) && // remove search filter
139+
((f.permanent !== undefined && !f.permanent) || (f.permanent === undefined && !f.Renderer.defaultProps.permanent)) // remove filters to display permanently
140+
)}
138141
addFilter={this.props.addFilter}
139142
/>
140143
{this.props.favouritesEnabled &&

0 commit comments

Comments
 (0)