From 63441f7df2f8e7090176602c73a01b38e4db81e3 Mon Sep 17 00:00:00 2001 From: biz123 Date: Wed, 27 May 2020 14:16:01 -0700 Subject: [PATCH 1/9] adds basic logic to move sort filter based on configuration --- .../federated-solr-faceted-search.js | 20 +++++++++---- src/components/search-field-container.js | 29 +++++++++++++++++-- src/components/sort-menu/index.js | 2 +- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/components/federated-solr-faceted-search.js b/src/components/federated-solr-faceted-search.js index c3dd389..390efbb 100644 --- a/src/components/federated-solr-faceted-search.js +++ b/src/components/federated-solr-faceted-search.js @@ -79,6 +79,7 @@ class FederatedSolrFacetedSearch extends React.Component { const CurrentQueryComponent = customComponents.searchFields.currentQuery; const SortComponent = customComponents.sortFields.menu; const FederatedTextSearch = FederatedSolrComponentPack.searchFields.text; + console.log(customComponents); const resultPending = results.pending ? () @@ -106,6 +107,7 @@ class FederatedSolrFacetedSearch extends React.Component { gridTemplateColumns = '', reverseDesktopColumns = false, reverseMobileOrder = false, + sortFilterInAccordion = false, } = this.props.options.layoutAndClasses || {}; return ( @@ -117,6 +119,9 @@ class FederatedSolrFacetedSearch extends React.Component { onNewSearch={this.resetFilters} resultsCount={this.props.results.numFound} options={this.props.options} + onSortFieldChange={onSortFieldChange} + sortFields={sortFields} + customComponents={customComponents} > {/* Only render the visible facets / filters. Note: their values may still be used in the query, if they were pre-set. */} @@ -142,6 +147,8 @@ class FederatedSolrFacetedSearch extends React.Component { facets={facets} truncateFacetListsAt={truncateFacetListsAt} onChange={onSearchFieldChange} + onSortFieldChange={onSortFieldChange} + sortFields={sortFields} /> ); }) @@ -164,11 +171,14 @@ class FederatedSolrFacetedSearch extends React.Component { {...this.props} onChange={onSearchFieldChange} /> - + {sortFilterInAccordion + ? '' + : + }

sf.field === 'tm_rendered_item').value || this.props.options.showEmptySearchResults) ? 'solr-search-results-container__prompt fs-element-invisible' : 'solr-search-results-container__prompt'}>{this.props.options.searchPrompt || 'Please enter a search term.'}

sf.field === 'tm_rendered_item').value || this.props.options.showEmptySearchResults) ? 'solr-search-results-container__wrapper' : 'solr-search-results-container__wrapper fs-element-invisible'}> diff --git a/src/components/search-field-container.js b/src/components/search-field-container.js index 46f6496..21978b4 100644 --- a/src/components/search-field-container.js +++ b/src/components/search-field-container.js @@ -3,7 +3,6 @@ import React from 'react'; import cx from 'classnames'; import AnimateHeight from 'react-animate-height'; - class FederatedSearchFieldContainer extends React.Component { constructor(props) { super(props); @@ -41,8 +40,15 @@ class FederatedSearchFieldContainer extends React.Component { } render() { - const { onNewSearch } = this.props; + const { onNewSearch, customComponents, bootstrapCss, onSortFieldChange, sortFields, options } = this.props; + // Grab env vars. + const { + sortFilterInAccordion = false, + } = this.props.options.layoutAndClasses || {}; + const height = this.state.expanded ? 'auto' : 0; + const SortComponent = customComponents.sortFields.menu; + console.log(customComponents); return (
@@ -64,7 +70,19 @@ class FederatedSearchFieldContainer extends React.Component {

Filter Results

{ this.props.resultsCount > 0 - ? (
    {this.props.children}
) + ? (
    {this.props.children} + + {sortFilterInAccordion + ?
  • + +
    • + : '' + } +
) :
There are no results to filter.
} @@ -78,10 +96,15 @@ class FederatedSearchFieldContainer extends React.Component { } } + FederatedSearchFieldContainer.propTypes = { children: PropTypes.array, + customComponents: PropTypes.object, onNewSearch: PropTypes.func, + onSortFieldChange: PropTypes.func, options: PropTypes.object, + bootstrapCss: PropTypes.bool, + sortFields: PropTypes.array, }; export default FederatedSearchFieldContainer; diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index 7f60ace..b255d63 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -45,7 +45,7 @@ class FederatedSortMenu extends React.Component { FederatedSortMenu.propTypes = { bootstrapCss: PropTypes.bool, onChange: PropTypes.func, - sortFields: PropTypes.array + sortFields: PropTypes.array, }; export default FederatedSortMenu; From ecd7e3f43e8a4d51e79833b8f81fec0c759a6a2f Mon Sep 17 00:00:00 2001 From: biz123 Date: Thu, 28 May 2020 08:05:09 -0700 Subject: [PATCH 2/9] WIP still needs accordion collapse states --- .../federated-solr-faceted-search.js | 24 ++-- src/components/search-field-container.js | 28 ++--- src/components/sort-menu/index.js | 117 ++++++++++++------ 3 files changed, 96 insertions(+), 73 deletions(-) diff --git a/src/components/federated-solr-faceted-search.js b/src/components/federated-solr-faceted-search.js index 390efbb..3c3f828 100644 --- a/src/components/federated-solr-faceted-search.js +++ b/src/components/federated-solr-faceted-search.js @@ -79,7 +79,6 @@ class FederatedSolrFacetedSearch extends React.Component { const CurrentQueryComponent = customComponents.searchFields.currentQuery; const SortComponent = customComponents.sortFields.menu; const FederatedTextSearch = FederatedSolrComponentPack.searchFields.text; - console.log(customComponents); const resultPending = results.pending ? () @@ -109,6 +108,14 @@ class FederatedSolrFacetedSearch extends React.Component { reverseMobileOrder = false, sortFilterInAccordion = false, } = this.props.options.layoutAndClasses || {}; + const sortFilterComponent = ( + + ); return ( @@ -119,9 +126,7 @@ class FederatedSolrFacetedSearch extends React.Component { onNewSearch={this.resetFilters} resultsCount={this.props.results.numFound} options={this.props.options} - onSortFieldChange={onSortFieldChange} - sortFields={sortFields} - customComponents={customComponents} + sortFilterComponent={sortFilterComponent} > {/* Only render the visible facets / filters. Note: their values may still be used in the query, if they were pre-set. */} @@ -147,8 +152,6 @@ class FederatedSolrFacetedSearch extends React.Component { facets={facets} truncateFacetListsAt={truncateFacetListsAt} onChange={onSearchFieldChange} - onSortFieldChange={onSortFieldChange} - sortFields={sortFields} /> ); }) @@ -171,14 +174,7 @@ class FederatedSolrFacetedSearch extends React.Component { {...this.props} onChange={onSearchFieldChange} /> - {sortFilterInAccordion - ? '' - : - } + {sortFilterInAccordion ? '' : sortFilterComponent}

sf.field === 'tm_rendered_item').value || this.props.options.showEmptySearchResults) ? 'solr-search-results-container__prompt fs-element-invisible' : 'solr-search-results-container__prompt'}>{this.props.options.searchPrompt || 'Please enter a search term.'}

sf.field === 'tm_rendered_item').value || this.props.options.showEmptySearchResults) ? 'solr-search-results-container__wrapper' : 'solr-search-results-container__wrapper fs-element-invisible'}> diff --git a/src/components/search-field-container.js b/src/components/search-field-container.js index 21978b4..59c3f15 100644 --- a/src/components/search-field-container.js +++ b/src/components/search-field-container.js @@ -40,15 +40,13 @@ class FederatedSearchFieldContainer extends React.Component { } render() { - const { onNewSearch, customComponents, bootstrapCss, onSortFieldChange, sortFields, options } = this.props; + const { onNewSearch, sortFilterComponent } = this.props; // Grab env vars. const { sortFilterInAccordion = false, } = this.props.options.layoutAndClasses || {}; const height = this.state.expanded ? 'auto' : 0; - const SortComponent = customComponents.sortFields.menu; - console.log(customComponents); return (
@@ -70,19 +68,12 @@ class FederatedSearchFieldContainer extends React.Component {

Filter Results

{ this.props.resultsCount > 0 - ? (
    {this.props.children} - - {sortFilterInAccordion - ?
  • - -
    • - : '' - } -
) + ? ( +
    + {this.props.children} + {sortFilterInAccordion ? sortFilterComponent : ''} +
+ ) :
There are no results to filter.
} @@ -99,12 +90,9 @@ class FederatedSearchFieldContainer extends React.Component { FederatedSearchFieldContainer.propTypes = { children: PropTypes.array, - customComponents: PropTypes.object, onNewSearch: PropTypes.func, - onSortFieldChange: PropTypes.func, options: PropTypes.object, - bootstrapCss: PropTypes.bool, - sortFields: PropTypes.array, + sortFilterComponent: PropTypes.object, }; export default FederatedSearchFieldContainer; diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index b255d63..c327113 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -1,51 +1,90 @@ +import cx from "classnames"; import PropTypes from 'prop-types'; import React from "react"; +import AnimateHeight from 'react-animate-height'; class FederatedSortMenu extends React.Component { - constructor(props) { - super(props); + constructor(props) { + super(props); - this.state = { - sort: 'score' - }; + this.state = { + sort: 'score', + }; this.onSelect = this.onSelect.bind(this); - } - - onSelect(event) { - this.setState({sort: event.target.value}); - - const sortField = event.target.value; - const foundIdx = this.props.sortFields.indexOf(sortField); - if (foundIdx < 0) { - this.props.onChange(sortField, "desc"); - } else { - this.props.onChange(sortField, null); - } - } - - render() { - const { sortFields } = this.props; - if (sortFields.length === 0) { return null; } - - return ( -
-
- - -
-
- ); - } + } + toggleExpand() { + this.props.onSetCollapse(this.props.field, !(this.props.collapse || false)); + } + + onSelect(event) { + this.setState({sort: event.target.value}); + + const sortField = event.target.value; + const foundIdx = this.props.sortFields.indexOf(sortField); + if (foundIdx < 0) { + this.props.onChange(sortField, "desc"); + } else { + this.props.onChange(sortField, null); + } + } + + render() { + const { sortFields, sortFilterInAccordion, collapse } = this.props; + const expanded = !(collapse || false); + const height = expanded ? 'auto' : 0; + if (sortFields.length === 0) { return null; } + + return ( + sortFilterInAccordion + ? ( +
  • +
    {if (event.keyCode === 13) {this.toggleExpand()}}} + >Sort by
    + +
    +
    + + +
    +
    +     +
    • + ) + : ( +
    +
    + + +
    +
    + ) + ); + } } FederatedSortMenu.propTypes = { - bootstrapCss: PropTypes.bool, - onChange: PropTypes.func, - sortFields: PropTypes.array, + bootstrapCss: PropTypes.bool, + onChange: PropTypes.func, + onSetCollapse: PropTypes.func, + sortFields: PropTypes.array, + sortFilterInAccordion: PropTypes.bool, + collapse: PropTypes.bool, }; export default FederatedSortMenu; From 8c33cb94f6154d82c2d161693ddb581951c60b97 Mon Sep 17 00:00:00 2001 From: nstriedinger Date: Thu, 28 May 2020 16:54:09 -0400 Subject: [PATCH 3/9] testing --- src/components/_fs-search-accordion.scss | 132 ++++++++++++++++++ .../federated-solr-faceted-search.js | 1 + src/components/list-facet/index.js | 52 ++++++- src/components/sort-menu/index.js | 19 +-- 4 files changed, 194 insertions(+), 10 deletions(-) create mode 100644 src/components/_fs-search-accordion.scss diff --git a/src/components/_fs-search-accordion.scss b/src/components/_fs-search-accordion.scss new file mode 100644 index 0000000..6cd5fbe --- /dev/null +++ b/src/components/_fs-search-accordion.scss @@ -0,0 +1,132 @@ +/** + * search-accordion.scss + * Define search accordion styles. + * + * @copyright Copyright (c) 2017-2020 Palantir.net + */ + +.fs-search-accordion { + margin-bottom: rhythm(1); + color: $gray-dark; + padding: 0; +} + +.fs-search-accordion__title { + @include adjust-font-size-to($sm-heading, 1); + display: block; + padding-right: 1.25rem; + padding-left: 1.25rem; + + &:hover, + &:focus, + &:active { + text-decoration: none; + } + + // Display plus symbol at initial state + &:after { + content: "+"; + float: right; + } +} + +.fs-search-accordion__checkbox-input { + @extend %input; +} + +.fs-search-accordion__checkbox-label { + cursor: pointer; + display: block; + padding: rhythm(.5) 0; + + @include breakpoint($bp2) { + @include adjust-font-size-to($label, .8); + padding: rhythm(.35) 0; + } +} + +.fs-search-accordion__content { + @extend %list; + margin: 0; + padding: rhythm(.5) 1.25rem; + + @media only screen and (min-width: 1025px) { + // Center date-picker which we can't set to display:block. + #solr-list-facet-ds_federated_date & { + text-align: center; + } + } + + @media only screen and (max-width: 425px) { + // Center date-picker which we can't set to display:block. + #solr-list-facet-ds_federated_date & { + text-align: center; + } + } + + @media only screen and (max-width: 1350px) and (min-width: 768px) { + #solr-list-facet-ds_federated_date & { + padding: rhythm(.5) .5rem; + } + } +} + +.fs-search-accordion__group, +.fs-search-accordion__subgroup { + list-style: none; + padding: 0; +} + +.fs-search-accordion__group-item, +.fs-search-accordion__content-item { + display: block; + margin: 0; + overflow: hidden; + + // Date widget overflow fix. + &#solr-list-facet-ds_federated_date { + overflow: visible; + + .fs-search-accordion__content-item { + overflow: visible; + } + } +} + +.fs-search-accordion__group { + @extend %list; + margin: 0; +} + +.fs-search-accordion__subgroup { + margin: 0 0 0 rhythm(.5); +} + +.fs-search-accordion__title { + @extend %h2; + border-bottom: solid 1px $gray-light; + padding-top: rhythm(.75); + padding-bottom: rhythm(.75); + + @include breakpoint($bp2) { + @include adjust-font-size-to($label, .8); + padding-top: rhythm(.3); + padding-bottom: rhythm(.3); + } + + &:active, + &:hover, + &:focus { + border-bottom: solid 1px darken($gray-light, 10); + outline: 0; + } + + &:hover { + cursor: pointer; + } + + // Replace plus symbol with en dash when search-accordion is open + &.js-fs-search-accordion-open:after { + content: "–"; + } +} diff --git a/src/components/federated-solr-faceted-search.js b/src/components/federated-solr-faceted-search.js index 3c3f828..99cbb6b 100644 --- a/src/components/federated-solr-faceted-search.js +++ b/src/components/federated-solr-faceted-search.js @@ -150,6 +150,7 @@ class FederatedSolrFacetedSearch extends React.Component { {...searchField} bootstrapCss={bootstrapCss} facets={facets} + sortFields={sortFields} truncateFacetListsAt={truncateFacetListsAt} onChange={onSearchFieldChange} /> diff --git a/src/components/list-facet/index.js b/src/components/list-facet/index.js index 28155c0..b2be66d 100644 --- a/src/components/list-facet/index.js +++ b/src/components/list-facet/index.js @@ -12,7 +12,23 @@ class FederatedListFacet extends React.Component { this.state = { filter: '', truncateFacetListsAt: props.truncateFacetListsAt, + sort: 'score', }; + this.onSelect = this.onSelect.bind(this); + } + + onSelect(sortField) { + console.log(sortField); + this.setState({sort: sortField}); + + const foundIdx = this.props.sortFields.indexOf(sortField); + + console.log(foundIdx); + if (foundIdx < 0) { + this.props.onChange(sortField, "desc"); + } else { + this.props.onChange(sortField, null); + } } handleClick(value) { @@ -99,9 +115,10 @@ class FederatedListFacet extends React.Component { collapse, hierarchy, options, + sortFields, + sortFilterInAccordion, } = this.props; const { truncateFacetListsAt } = this.state; - const siteList = options.siteList; const facetCounts = facets.filter((facet, i) => i % 2 === 1); const facetValues = facets.filter((facet, i) => i % 2 === 0); @@ -224,7 +241,38 @@ class FederatedListFacet extends React.Component { ); + }); + listFacetHierarchyLis.push( +
  • +
    {if (event.keyCode === 13) {this.toggleExpand()}}} + >Sort
    + +
      + {sortFields.map((sortField, i) => ( +
    • + +
      • + ))} +
    +     +
    • ); // Render the group of accordion lis with their facet value checkbox lists. return listFacetHierarchyLis; } @@ -300,6 +348,8 @@ FederatedListFacet.propTypes = { onChange: PropTypes.func, onFacetSortChange: PropTypes.func, onSetCollapse: PropTypes.func, + sortFields: PropTypes.array, + sortFilterInAccordion: PropTypes.bool, query: PropTypes.object, truncateFacetListsAt: PropTypes.number, value: PropTypes.array, diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index c327113..8b03c6b 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -11,16 +11,20 @@ class FederatedSortMenu extends React.Component { sort: 'score', }; this.onSelect = this.onSelect.bind(this); + this.toggleExpand = this.toggleExpand.bind(this); } toggleExpand() { this.props.onSetCollapse(this.props.field, !(this.props.collapse || false)); } onSelect(event) { + console.log(event.target.value); this.setState({sort: event.target.value}); const sortField = event.target.value; const foundIdx = this.props.sortFields.indexOf(sortField); + + console.log(foundIdx); if (foundIdx < 0) { this.props.onChange(sortField, "desc"); } else { @@ -37,7 +41,7 @@ class FederatedSortMenu extends React.Component { return ( sortFilterInAccordion ? ( -
  • +
  • -
    +
      +
    • -
      -
    +
    • + ) @@ -66,11 +71,7 @@ class FederatedSortMenu extends React.Component {
    - +
    ) From 5526fbf2e90f656ee393f575bd369d580d8965d7 Mon Sep 17 00:00:00 2001 From: biz123 Date: Thu, 28 May 2020 14:58:27 -0700 Subject: [PATCH 4/9] adds fixes to onselect method and switches to select box input --- .../federated-solr-faceted-search.js | 1 + src/components/list-facet/index.js | 35 ++++++++----------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/components/federated-solr-faceted-search.js b/src/components/federated-solr-faceted-search.js index 99cbb6b..b6facb5 100644 --- a/src/components/federated-solr-faceted-search.js +++ b/src/components/federated-solr-faceted-search.js @@ -153,6 +153,7 @@ class FederatedSolrFacetedSearch extends React.Component { sortFields={sortFields} truncateFacetListsAt={truncateFacetListsAt} onChange={onSearchFieldChange} + onSortFieldChange={onSortFieldChange} /> ); }) diff --git a/src/components/list-facet/index.js b/src/components/list-facet/index.js index b2be66d..97fc493 100644 --- a/src/components/list-facet/index.js +++ b/src/components/list-facet/index.js @@ -17,17 +17,16 @@ class FederatedListFacet extends React.Component { this.onSelect = this.onSelect.bind(this); } - onSelect(sortField) { - console.log(sortField); - this.setState({sort: sortField}); + onSelect(event) { + this.setState({sort: event.target.value}); + const sortField = event.target.value; const foundIdx = this.props.sortFields.indexOf(sortField); - console.log(foundIdx); if (foundIdx < 0) { - this.props.onChange(sortField, "desc"); + this.props.onSortFieldChange(sortField, "desc"); } else { - this.props.onChange(sortField, null); + this.props.onSortFieldChange(sortField, null); } } @@ -255,21 +254,15 @@ class FederatedListFacet extends React.Component { -
      - {sortFields.map((sortField, i) => ( -
    • - -
      • - ))} + >{ console.log(sortFields) } +
        +
      • + +
      ); From 1d9f095f431d4535c56af1fdb727768b868d5fe3 Mon Sep 17 00:00:00 2001 From: biz123 Date: Thu, 28 May 2020 15:14:07 -0700 Subject: [PATCH 5/9] adds in config logic and removes extra stuff --- .../federated-solr-faceted-search.js | 2 +- src/components/list-facet/index.js | 9 +++-- src/components/sort-menu/index.js | 35 +------------------ 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/src/components/federated-solr-faceted-search.js b/src/components/federated-solr-faceted-search.js index b6facb5..78982eb 100644 --- a/src/components/federated-solr-faceted-search.js +++ b/src/components/federated-solr-faceted-search.js @@ -126,7 +126,6 @@ class FederatedSolrFacetedSearch extends React.Component { onNewSearch={this.resetFilters} resultsCount={this.props.results.numFound} options={this.props.options} - sortFilterComponent={sortFilterComponent} > {/* Only render the visible facets / filters. Note: their values may still be used in the query, if they were pre-set. */} @@ -154,6 +153,7 @@ class FederatedSolrFacetedSearch extends React.Component { truncateFacetListsAt={truncateFacetListsAt} onChange={onSearchFieldChange} onSortFieldChange={onSortFieldChange} + sortFilterInAccordion={sortFilterInAccordion} /> ); }) diff --git a/src/components/list-facet/index.js b/src/components/list-facet/index.js index 97fc493..3f6061e 100644 --- a/src/components/list-facet/index.js +++ b/src/components/list-facet/index.js @@ -243,7 +243,9 @@ class FederatedListFacet extends React.Component { }); listFacetHierarchyLis.push( -
    • + sortFilterInAccordion + ? ( +
    - ); + + ) + : '', + ); // Render the group of accordion lis with their facet value checkbox lists. return listFacetHierarchyLis; } diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index 8b03c6b..450fe5c 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -18,13 +18,11 @@ class FederatedSortMenu extends React.Component { } onSelect(event) { - console.log(event.target.value); this.setState({sort: event.target.value}); const sortField = event.target.value; const foundIdx = this.props.sortFields.indexOf(sortField); - console.log(foundIdx); if (foundIdx < 0) { this.props.onChange(sortField, "desc"); } else { @@ -33,48 +31,18 @@ class FederatedSortMenu extends React.Component { } render() { - const { sortFields, sortFilterInAccordion, collapse } = this.props; + const { sortFields, collapse } = this.props; const expanded = !(collapse || false); const height = expanded ? 'auto' : 0; if (sortFields.length === 0) { return null; } return ( - sortFilterInAccordion - ? ( -
  • -
    {if (event.keyCode === 13) {this.toggleExpand()}}} - >Sort by
    - -
      -
    • -
      - -
      -
      • -
    -     -
    • - ) - : (
    - ) ); } } @@ -84,7 +52,6 @@ FederatedSortMenu.propTypes = { onChange: PropTypes.func, onSetCollapse: PropTypes.func, sortFields: PropTypes.array, - sortFilterInAccordion: PropTypes.bool, collapse: PropTypes.bool, }; From ab05acfcaba3a4301edb777458c6eba7346e2f66 Mon Sep 17 00:00:00 2001 From: biz123 Date: Thu, 28 May 2020 15:20:17 -0700 Subject: [PATCH 6/9] clean up --- src/components/sort-menu/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index 450fe5c..7dbbc59 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -1,7 +1,5 @@ -import cx from "classnames"; import PropTypes from 'prop-types'; import React from "react"; -import AnimateHeight from 'react-animate-height'; class FederatedSortMenu extends React.Component { constructor(props) { @@ -50,9 +48,7 @@ class FederatedSortMenu extends React.Component { FederatedSortMenu.propTypes = { bootstrapCss: PropTypes.bool, onChange: PropTypes.func, - onSetCollapse: PropTypes.func, sortFields: PropTypes.array, - collapse: PropTypes.bool, }; export default FederatedSortMenu; From e8e1f282d451636249327f392690292e24707bfb Mon Sep 17 00:00:00 2001 From: biz123 Date: Thu, 28 May 2020 15:23:02 -0700 Subject: [PATCH 7/9] more cleanup --- src/components/sort-menu/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index 7dbbc59..a53d3d7 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -29,9 +29,7 @@ class FederatedSortMenu extends React.Component { } render() { - const { sortFields, collapse } = this.props; - const expanded = !(collapse || false); - const height = expanded ? 'auto' : 0; + const { sortFields} = this.props; if (sortFields.length === 0) { return null; } return ( From c5d0f3571e63118dc955ac8feba855132698e0b9 Mon Sep 17 00:00:00 2001 From: biz123 Date: Thu, 28 May 2020 15:26:38 -0700 Subject: [PATCH 8/9] reverts original sort menu --- src/components/sort-menu/index.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/components/sort-menu/index.js b/src/components/sort-menu/index.js index a53d3d7..34f2aab 100644 --- a/src/components/sort-menu/index.js +++ b/src/components/sort-menu/index.js @@ -29,16 +29,20 @@ class FederatedSortMenu extends React.Component { } render() { - const { sortFields} = this.props; + const { sortFields } = this.props; if (sortFields.length === 0) { return null; } return ( -
    -
    - - -
    -
    +
    +
    + + +
    +
    ); } } From 6500ae7b6c256941e133481a04a331a1384f31f0 Mon Sep 17 00:00:00 2001 From: nstriedinger Date: Fri, 29 May 2020 09:36:34 -0400 Subject: [PATCH 9/9] code cleanup --- src/components/list-facet/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/list-facet/index.js b/src/components/list-facet/index.js index 3f6061e..9a46422 100644 --- a/src/components/list-facet/index.js +++ b/src/components/list-facet/index.js @@ -256,7 +256,7 @@ class FederatedListFacet extends React.Component { { console.log(sortFields) } + >