Projects: Minecraft Aquatic in the project widget #25691
Merged
Conversation
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
| const { showFullList } = this.state; | ||
| const GAMES_AND_EVENTS = includeDanceParty ? | ||
| ['spritelab', 'dance','flappy', 'starwarsblocks', 'starwars', 'bounce', 'sports', 'basketball'] : | ||
| ['spritelab','flappy', 'starwarsblocks', 'starwars', 'bounce', 'sports', 'basketball']; | ||
|
|
||
| const MINECRAFT = includeMCAquatic ? |
There was a problem hiding this comment.
nit: you can use the unshift method to prepend to an array and avoid repetition:
let minecraft_buttons = ['minecraft_hero', 'minecraft_designer', 'minecraft_adventurer'];
if (includeMCAquatic) {
minecraft_buttons.unshift('minecraft_aquatic');
}
| @@ -8,6 +8,8 @@ | |||
| - homepage_data[:topCourse] = @top_course | |||
| - homepage_data[:isEnglish] = @is_english | |||
| - homepage_data[:includeDanceParty] = DCDO.get("dance_projects", false) | |||
| - hoc_launch = DCDO.get("hoc_launch", nil) | |||
| - homepage_data[:includeMCAquatic] = !hoc_launch.nil? | |||
There was a problem hiding this comment.
just to be safe, i think we should check the the value of hoc_launch matches an acceptable value ('mc' or 'dance':
- homepage_data[:includeMCAquatic] = ['mc', 'dance'].include? hoc_launch
There was a problem hiding this comment.
Suggested change
| - homepage_data[:includeMCAquatic] = !hoc_launch.nil? | |
| - homepage_data[:includeMCAquatic] = ['mc', 'dance'].include? hoc_launch |
| @@ -7,6 +7,8 @@ | |||
| - projects_data[:canViewAdvancedTools] = !(current_user.under_13? && current_user.terms_version.nil?) | |||
| - projects_data[:canShare] = !current_user.sharing_disabled? | |||
| - projects_data[:includeDanceParty] = DCDO.get("dance_projects", false) | |||
| - hoc_launch = DCDO.get("hoc_launch", nil) | |||
| - projects_data[:includeMCAquatic] = !hoc_launch.nil? | |||
There was a problem hiding this comment.
Suggested change
| - projects_data[:includeMCAquatic] = !hoc_launch.nil? | |
| - projects_data[:includeMCAquatic] = ['mc', 'dance'].include? hoc_launch |
| @@ -2,6 +2,8 @@ | |||
| - projects_data = {} | |||
| - projects_data[:limitedGallery] = limited_gallery | |||
| - projects_data[:includeDanceParty] = DCDO.get("dance_projects", false) | |||
| - hoc_launch = DCDO.get("hoc_launch", nil) | |||
| - projects_data[:includeMCAquatic] = !hoc_launch.nil? | |||
There was a problem hiding this comment.
Suggested change
| - projects_data[:includeMCAquatic] = !hoc_launch.nil? | |
| - projects_data[:includeMCAquatic] = ['mc', 'dance'].include? hoc_launch |
maddiedierker
approved these changes
Oct 30, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Very similar to #25498.
If the DCDO
hoc_launchflag is set, a button to make new Minecraft Aquatic projects will show as the first Minecraft option in the expanded project type list of the project widget. This button will show on the public project gallery widget, the signed in projects gallery widget and the projects widget on the signed in homepage.The DCDO check and prop
includeMCAquaticwill be removed post-launch.