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

2.1 #156

Merged
merged 239 commits into from
Nov 17, 2023
Merged

2.1 #156

merged 239 commits into from
Nov 17, 2023

Conversation

machinehum
Copy link
Contributor

Merging in the past two years of updates. Some cleanup, some new tests, have attempted to generalize anything UMN-specific. I know this is a ton to look at, appreciate any input.

cdinger and others added 30 commits September 28, 2021 14:46
Changed the text for zero search results.
Adding boolean field to brief description.
…matching. This drops support for query_string operators (AND/OR/+/""/etc).

2. Make the default configuration take the synonyms from an array in lib/modules/trial_synonyms.rb, rather than a solr file on the ES server. This allows for managing the synonyms without dealing directly with the ES server in deployed environments.
3. Remove function_score clauses and date added sort. Use default ES relevancy sorting.
4. Add rake task to pre-process json file to array file.
5. Move synonym_path to config files, if user chooses to use ES server file instead of array.
6. Update docker-compose to scope ports to host.
7. Readme updates
ElasticSearch updates for synonyms and search strategy.
…. Hide 'caption' as it's not used in new format.

2. Home page: remove commented-out code. header spacing adjustment. Update bottom-left research text.
3. Change 'primary' buttons to 'secondary' to avoid blue that clashes with maroon. TODO: This should be made a theme option.
2. Title-casing on main page, and other small edits.
3. New researchmatch image.
4. Pull showcase code into a partial.
…arch and downcase 'q' param before searches.
- correct test config.
- add spec for new api endpoint.
- update schema for previous change (rare disease flag).
- Fix API controller to correctly handle incoming OpenStruct-based json for interventions.
- Fix method name in models/trial.rb.
- Fix attribute name in models/trial_intervention.rb.
EpicureanHeron and others added 26 commits July 21, 2023 10:17
- Normalized capitalization
- Fixed bug where respond_to? was being used in lieu of blank?, the former always returned true for min_age_unit and max_age_unit, causing issues with "18 years to old" and others appearing

[SF-215]
- Moved the "Healthy Volunteer" and "Gender" filters to be configured at the admin screen
- Added healthy_volunteers_filter to study_finder_systems_infos via migration  (Defaults to true aka 'opt out' because this was previously a standard option)
- Added gender_filter to study_finder_systems_infos via migration (Defaults to true aka 'opt out' because this was previously a standard option  )
- Added logic to the search partials to render filters configured based on system info
- Updated "placeholder" text in the refine_search partial
- Updated UI to make the absence of the optional filters less jarring

[SF-242]
[SF-241]
- Moved UI elements around via css per client's request
- Added new text

[SF-241]
- Removed drop down options for healthy volunteer
- Replaced with a Checkbox and updated text

[SF-241]
- Added Healthy Volunteers text and to be a checkbox
- Merged branches
- Updated Showcase CSS
[SF-241]
[SF-242]
Optional Filters for Search
Remove "protect simple description" option. Allow to override brief description whether one is imported or not. Use override when exists, imported if not. Since override is a separate field, import value won't override it.
Subcategory/subgroup needs to be a real entity, not lumped into keywords, for true filtering.
Elevate subgroup to first-class status
2. schema
3. remove extraneous double-extension on css
2. schema
3. remove extraneous double-extension on css
… double-extension on css

1. fix search bug re: approval setting 2. schema 3. remove extraneous double-extension on css
… will replace will_paginate

JS fix, cleanup.

Clean up vestiges of 'protect_simple_description', which was removed. Add tests and solidify models (add associations, etc.).

abstract 'Internet ID' to configurable string. Cleanup, readme.

Don't introduce Kaminari -- will_paginate is in maintenance mode, but elastic-search rails still uses it internally so stick with it for now. Change a couple uses of 'paginate()' on ES-backed models to 'page()' from the elasticsearch-rails interface.
@machinehum machinehum requested a review from cdinger October 31, 2023 19:09
Copy link
Member

@cdinger cdinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't read through everything here, but I did do a fresh checkout and stepped through the README. Everything appears to work correctly and specs pass.

I'm realizing that we should probably publish (and keep up-to-date) a public docker image so people can easily try the application without making then clone the repo, etc. But that's a separate task.

Thank you for tackling this monster merge!

@machinehum machinehum merged commit 89aeea5 into master Nov 17, 2023
1 check passed
@machinehum machinehum deleted the 2.1 branch November 17, 2023 17:49
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