-
Notifications
You must be signed in to change notification settings - Fork 308
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
Upgraded react-mutation-mapper version to 0.3.0 #2706
Upgraded react-mutation-mapper version to 0.3.0 #2706
Conversation
2056fe5
to
76bb3ab
Compare
@@ -130,43 +130,6 @@ export default class MutationMapperStore extends DefaultMutationMapperStore | |||
return mutation.gene.entrezGeneId; | |||
} | |||
|
|||
@autobind | |||
protected customFilterApplier(filter: DataFilter, |
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.
This logic has been moved as multiple separate methods into https://github.com/cBioPortal/react-mutation-mapper/blob/66648ae9b966f7a30069e397acfb0e6efc0a0c73/src/store/DefaultMutationMapperFilterApplier.ts#L24
@@ -188,18 +201,6 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa | |||
): null; | |||
} | |||
|
|||
protected get proteinImpactTypePanel(): JSX.Element | null |
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 we are using ProteinImpactTypeBadgeSelector
component to enable multiple filtering
{this.somaticMutationFrequency()} | ||
{this.germlineMutationFrequency()} | ||
</div> | ||
<MutationStatusSelector |
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.
This enables filtering by mutation status (somatic / germline)
76bb3ab
to
902f4d7
Compare
902f4d7
to
b19f410
Compare
@onursumer is this still draft? what's story? |
b19f410
to
a48621b
Compare
a48621b
to
59cafe1
Compare
@alisman we can merge this as soon as Niki approves the latest UI changes. I still need to update the screenshot tests though. |
59cafe1
to
41af9f9
Compare
41af9f9
to
10b09f3
Compare
10b09f3
to
043a5a3
Compare
043a5a3
to
56d8830
Compare
56d8830
to
ce6a5ac
Compare
cf5cdee
to
ee56378
Compare
ee56378
to
ddb5a42
Compare
ddb5a42
to
469bd76
Compare
469bd76
to
3e38a15
Compare
3e38a15
to
d9f58eb
Compare
d9f58eb
to
5a16964
Compare
@@ -171,6 +186,10 @@ export default class MutationMapper<P extends IMutationMapperProps> extends Defa | |||
trackDataStatus={this.trackDataStatus} | |||
onTrackVisibilityChange={this.onTrackVisibilityChange} | |||
getLollipopColor={getColorForProteinImpactType} | |||
filterResetPanel={ | |||
!this.props.store.dataStore.showingAllData && this.filterResetPanel ? |
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.
could you just pass filterResetPanel whether it's defined or not? just kind confusing
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.
The problem here is, for some reason, we initially defined filterResetPanel
as JSX.Element | null
instead of JSX.Element | undefined
. When I just pass it, TS complains that null
cannot be assigned to undefined
.
For now just updated the check to this.filterResetPanel !== null
, but we should probably revisit those function definitions (both here and in react-mutation-mapper
)
export const PROTEIN_IMPACT_TYPE_FILTER_ID = "_cBioPortalProteinImpactTypeFilter_"; | ||
export const MUTATION_STATUS_FILTER_ID = "_cBioPortalMutationStatusFilter_"; | ||
|
||
export function findMutationTypeFilter(dataFilters: DataFilter[]) |
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.
function name sees strange because code finds a particular type of filter, right? shouldn't function name suggest that?
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.
renamed to findProteinImpactTypeFilter
5a16964
to
6edcc41
Compare
6edcc41
to
d3d6979
Compare
d3d6979
to
a756189
Compare
a756189
to
b6dc4fd
Compare
Signed-off-by: Onur Sumer <s.onur.sumer@gmail.com> replaced ProteinImpactTypePanel with ProteinImpactTypeBadgeSelector Signed-off-by: Onur Sumer <s.onur.sumer@gmail.com> enabled filtering for MutationRateSummary Signed-off-by: Onur Sumer <s.onur.sumer@gmail.com> fixed mutation type filter counts Signed-off-by: Onur Sumer <s.onur.sumer@gmail.com>
Signed-off-by: Onur Sumer <s.onur.sumer@gmail.com>
b6dc4fd
to
21290e3
Compare
Before:
After:
Fix cBioPortal/cbioportal/issues/5338
Checks
can be automatically added by git if you run the
git-commit
command withthe
-s
option)