Re-add filtering to song display #25897
Conversation
| @@ -37,7 +37,9 @@ const SongSelector = Radium(class extends React.Component { | |||
| <label><b>{i18n.selectSong()}</b></label> | |||
| <select id="song_selector" style={styles.selectStyle} onChange={this.changeSong} value={this.props.selectedSong}> | |||
| {Object.keys(this.props.songData).map((option, i) => ( | |||
| <option key={i} value={option}>{this.props.songData[option].title}</option> | |||
| ((this.props.songData[option].pg13 && !this.props.filterOff) || !this.props.songData[option].pg13) && | |||
There was a problem hiding this comment.
Can this be simplified to
this.props.filterOff || this.props.songData[option].pg13
| let over13 = parseInt(value, 10) >= 13; | ||
| sessionStorage.setItem(sessionStorageKey, over13); | ||
| if (over13) { | ||
| reload(); |
There was a problem hiding this comment.
@Bjvanminnen When a logged out user goes to a dance level or project, this dialog is displayed over the dance level (so the level is already loaded behind the dialog), so we somehow need to trigger an update. My naive approach is to just refresh, but we probably don't want that to happen at a wide scale. Any ideas?
There was a problem hiding this comment.
I seem to remember running into some similar problems to this last year, where we did just go with a reload.
One option could be to just say that even if you're over 13, you won't see the songs the first time (but will when you advance to the next puzzle). This might be good enough (but may not be). We'd need to check with PM.
If not good enough, we need to figure out what all would need to happen to get the songs. I'm not super familiar with the loading/filtering pathway, but I could conceive of a scenario where we always load all the songs, and then just toggle which we show based on some state we have in redux. Then we wouldn't need to do anything, as everything would update appropriately as soon as we set our state.
|
@Bjvanminnen PTAL - thanks! I ended up finding and closing some other loopholes while editing the boolean as suggested. Could use input on the refresh case. |
Issue: code-dot-org/dance-party#169
Filtering code didn't make it through recent refactor of song display. Re-adding filter check.
Failure wasn't caught by age_filter tests as a known issue was causing the tests to fail and I didn't look beyond the known issue to discover this error. Age_filter tests should be fixed now, so any failures should indicate regression.