Add user color configuration for oncoprint #4699
Conversation
gblaih
force-pushed
the
oncoprint-color-configuration
branch
from
47130cf
to
c3551be
Compare
| public setDefaultUserAlterationColors( | ||
| rule: IGeneticAlterationRuleSetParams | ||
| ) { | ||
| for (let alteration in rule.rule_params.conditional) { |
There was a problem hiding this comment.
avoid using for loops. use functional approach instead. _.forIn(()=>{})
better separates the control logic (loop) from the business logic (the callback)
| @@ -573,6 +574,17 @@ export class ResultsViewPageStore extends AnalysisStore | |||
|
|
|||
| @observable queryFormVisible: boolean = false; | |||
|
|
|||
| @observable userAlterationColors: { | |||
| [alteration: string]: { | |||
| @@ -573,6 +574,17 @@ export class ResultsViewPageStore extends AnalysisStore | |||
|
|
|||
| @observable queryFormVisible: boolean = false; | |||
|
|
|||
| @observable userAlterationColors: { | |||
There was a problem hiding this comment.
userSelectedAlterationColors
gblaih
force-pushed
the
oncoprint-color-configuration
branch
2 times, most recently
from
1df8dcb
to
abdb06e
Compare
| } | ||
|
|
||
| @action.bound | ||
| public setDefaultClinicalTrackColors( |
There was a problem hiding this comment.
we shouldn't ever need to set the defaults. when the consumer of the track colors (the oncoprint rendring logic) requests a color, we look to see if there is a custom color for that track, and if not, we use a default. since that default is not static, we may need to "cache" the colors so that they are only generated once during a load of the page.
| return colors; | ||
| } | ||
|
|
||
| buildColorChooserWidget = () => ( |
There was a problem hiding this comment.
@computed get colorChooserElement() {
}
| > | ||
| <span | ||
| style={{ | ||
| float: 'right', |
There was a problem hiding this comment.
we avoid using float css property. user flex box instead.
| attribute.displayName | ||
| ] | ||
| ) { | ||
| oncoprint.props.store.setDefaultClinicalTrackColors( |
There was a problem hiding this comment.
we should never set state from inside of an invoke (this is known as a side effect)
| // set new color of value in track's category_to_color | ||
| // if undefined color, set value's color in track's category_to_color back to its default | ||
| if (color) { | ||
| (track as any).category_to_color[value] = color; |
There was a problem hiding this comment.
look into whether we can avoid casting as any.
| } | ||
| } | ||
|
|
||
| export function getClinicalTrackColor( |
There was a problem hiding this comment.
this should be a method of the store
| @@ -183,6 +250,12 @@ export default class ResultsViewOncoprint extends React.Component< | |||
| ); | |||
| } | |||
|
|
|||
| @computed get enableWhiteBackgroundForGlyphs() { | |||
| @@ -253,6 +326,8 @@ export default class ResultsViewOncoprint extends React.Component< | |||
|
|
|||
| @observable renderingComplete = false; | |||
|
|
|||
| @observable changedTrackKey: string = ''; | |||
| value: string, | ||
| color: RGBAColor | undefined | ||
| ) { | ||
| setClinicalTrackColor( |
There was a problem hiding this comment.
we should not need to update two different things with essentially the same data. if we update
store, then the track should respond to the observable mutation. because of the particular nature of the oncopring library, this may be difficult.
| } | ||
|
|
||
| @computed get selectedClinicalTrack() { | ||
| let index = _.findIndex( |
There was a problem hiding this comment.
you should just use _.find and deal with typescrupt in another fashion.
There was a problem hiding this comment.
whoever is using this needs to be able to to handle an undefined case.
gblaih
force-pushed
the
oncoprint-color-configuration
branch
from
1abe082
to
48cd324
Compare
| }; | ||
| }; | ||
| } = JSON.parse( | ||
| localStorage.getItem('clinicalTracksColorConfig') || '{"global":{}}' |
There was a problem hiding this comment.
put localStorage get into constructor
gblaih
force-pushed
the
oncoprint-color-configuration
branch
3 times, most recently
from
9f682dc
to
2fa7e98
Compare
gblaih
force-pushed
the
oncoprint-color-configuration
branch
5 times, most recently
from
7c117ef
to
f7b7872
Compare
gblaih
force-pushed
the
oncoprint-color-configuration
branch
from
f7b7872
to
049fb6d
Compare
Implements cBioPortal/cbioportal#10291