-
Notifications
You must be signed in to change notification settings - Fork 266
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
Improve search of authorized and unauthorized studies #4521
Closed
jagnathan
wants to merge
17
commits into
cBioPortal:master
from
jagnathan:fix-9915-improved-finability
Closed
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
a88c674
fix 9915 improve search of authorized studies
jagnathan dcc0c0d
fix 9915 improve search of authorized studies
jagnathan 450fa29
Merge branch 'fix-9915-improved-finability' of https://github.com/jag…
jagnathan 5847a79
Use _.toString in matchPhraseFull, and specify type
d7895ea
Unnest fieldName check in Phrase.match
8162310
Introduce FilterFieldOption type that includes a displayValue
54bd4a9
Merge pull request #1 from BasLee/fix-9915-improved-finability
jagnathan ccdd9c5
Update QueryParser.ts
jagnathan 6a76f28
Update CheckboxFilterField.tsx
jagnathan fc24858
Modify the Select all checkbox to select only authorized studies
jagnathan c06b4f9
Update checkbox label text
jagnathan fff8f44
fix all Authorized or Unauthorized studies scenario
jagnathan 90e7b03
Updated logic and refactoring
jagnathan 2361d73
fix 9915 improve search of authorized studies
jagnathan a4e8aa6
Updated logic and refactoring
jagnathan f352643
Update Phrase.tsx
jagnathan 222e1f4
Merge branch 'fix-9915-improved-finability' of https://github.com/jag…
jagnathan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/shared/components/query/filteredSearch/field/FilterFieldOption.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
export type FilterFieldOption = { | ||
value: string; | ||
displayValue: string; | ||
}; | ||
|
||
export function toFilterFieldOption(option: string) { | ||
return { value: option, displayValue: option }; | ||
} | ||
|
||
export function toFilterFieldValue(option: FilterFieldOption) { | ||
return option.value; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filter can now still be matched to the wrong checkbox, when their
displayValues
are the same. Maybe better to get rid of the ID by wrapping the checkbox by its label?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
now, the id will consist of displayvalue and optionvalue combined to ensure that they are unique. Enwrapped with label.