Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

📦 scxa-faceted-search-results 💬 Import package #67

Merged
merged 117 commits into from
Sep 10, 2020

Conversation

alfonsomunozpomer
Copy link
Member

I removed the packed FetchLoader component in favour of our Atlas React Fetch Loader and reimplemented the example pages using the latter. This new version will require some changes in our bundles.

…tchLoader fetches data from server and passes it to the component that does the heavy lifting
alfonsomunozpomer and others added 28 commits September 10, 2020 11:40
* Add a ResultsHeaderClass that is rendered on top of the results list

* Add headers to demo page

* Minor code clean-up

* 2.5.0-beta

* Clean code style
* Test real data

* Reformat FilterSidebar by pass cleaned facetGroups

* Clean up code style

* Clean checkbox facetGroups and clean up codes

* Reformat the FilterSidebar with tidy facet groups

* Reformat container and pass results to sidebar

* Clean up code style

* Add required props in test

* Remove unused commands

* Update snapshots

* Update testutils with markerGenes and species

* Add a test for hiding a facet shared by all result

* Clean up code

* Add a filter method remove facets shared by all

* Clean up codes, delete old methods

* Remove unused props

* Revert "Remove unused props"

This reverts commit f4f3042895711117220e3e164a9cf93685757597.

* Disable facets after intial search results

* Remove useless props and define propTypes

* Assign clearedFacets in constructor and clean code

* Reorganise demo pages and update experiments results/header components

* Fix linter warnings/errors

* Trim and update dependencies

* Fix typo on CheckboxOption.propTypes

* Fix test environment for fetch

* Remove facet markerGenes in TestUtils; move common facet to test data

* Remove closure for facet-trimming, we’re only running this once

* Add comment to see trimming of shared facets in action
* Add experiment card and title as test utils

* Amend container and list test with experiment card

* Update snapshots

* Add TableCard and TableHeader files as demo input

* Pass TableCard and TableHeader as props to loader

* Amend demo file to show a valid search result

* Add two packages and a updating snapshots script

* Reformat FilterList as a stateful component to …

make table title clickable for sorting the table content

* Add a sorting order state and arrow in header

* Add a pointer cursor css style in table header

* Add hover, transition, opacity CSS for headers

* Add a sortState to indicate user selected title…

and toggle up and down orders

* Clean up code and fix up a bug about sorting if no

same attributes in response as table header

* Clean up code, set a different id for selected ..

title

* Add attributes. corresponding to the titles in

 ExperimentTableHeader  Utils for testing user selections

* Add test for the user selection on table headers

* Update snapshots

* Clean up package by removing update snapshots

* Update package-lock

* Fix Eslint style issues

* Fix Eslint style in test files

* Amend EpisodesHeader to ExperimentTable structure

* Amend codes based on PR review

* Update snapshots and clean up codes

* Change sortState name, use lodash sort

* Update snapshots

* Update test props

* Generalize FilterList with new HeaderComponent

* Add a stylesheet for sorting icons

* Format TableHeader component comprehensively

* Adjust EpisodesHeader structure to the same as …

ExperimentTableHeader

* Update test utils and FilterList with new structured header

* Update snapshots

* Update webpack-dev-server package

* Change default sorting as markergenes

* Update test snapshots

* Fix bug on table sorting

* Rename click callback function and clean states

* Remove additional stylesheet

* Clean the onClick callback function and propTypes

* Add a test for sorting table by clicking header

* Update package-lock

* Update snapshots

* Resolved merge conflict by incorporate suggestions

commit be61714933a584b9a97aa5a09041cce7a23a9a10
Author: lingyun1010 <zhaolingyun1010@gmail.com>
Date:   Tue Mar 5 11:22:32 2019 +0000

    Resolved merge conflict by incorporating both suggestions.

commit ea29e4930c1e545d01e18aeb62b9c350f16eae09
Author: Lingyun Zhao <33519183+lingyun1010@users.noreply.github.com>
Date:   Mon Mar 4 14:57:24 2019 +0000

    Feature #162304903 remove facets shared by all results (#14)

    * Test real data

    * Reformat FilterSidebar by pass cleaned facetGroups

    * Clean up code style

    * Clean checkbox facetGroups and clean up codes

    * Reformat the FilterSidebar with tidy facet groups

    * Reformat container and pass results to sidebar

    * Clean up code style

    * Add required props in test

    * Remove unused commands

    * Update snapshots

    * Update testutils with markerGenes and species

    * Add a test for hiding a facet shared by all result

    * Clean up code

    * Add a filter method remove facets shared by all

    * Clean up codes, delete old methods

    * Remove unused props

    * Revert "Remove unused props"

    This reverts commit f4f3042895711117220e3e164a9cf93685757597.

    * Disable facets after intial search results

    * Remove useless props and define propTypes

    * Assign clearedFacets in constructor and clean code

    * Reorganise demo pages and update experiments results/header components

    * Fix linter warnings/errors

    * Trim and update dependencies

    * Fix typo on CheckboxOption.propTypes

    * Fix test environment for fetch

    * Remove facet markerGenes in TestUtils; move common facet to test data

    * Remove closure for facet-trimming, we’re only running this once

    * Add comment to see trimming of shared facets in action

* Remove conflict package-lock.json

* Create a new package-lock.json

* Revert "Create a new package-lock.json"

This reverts commit ca779a90c7c6f571ec0858b303ee20f3b13764c3.

* Update snapshot
* Assign selected facets as an empty array if null

* Update depdendencies and fix snapshot tests

Co-authored-by: amunozpomer <amunoz@ebi.ac.uk>
@alfonsomunozpomer alfonsomunozpomer merged commit dd7657d into master Sep 10, 2020
@alfonsomunozpomer alfonsomunozpomer deleted the scxa-faceted-search-results/import-package branch September 10, 2020 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants