Skip to content
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

No longer showing "Scramble Set A" if there is only one scramble set/group #578

Conversation

mihlefeld
Copy link
Contributor

closes Issue #433

Copy link
Member

@gregorbg gregorbg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review details have been discussed via remote video call.

TL;DR: Don't change the WCIF model.

@mihlefeld
Copy link
Contributor Author

@suushiemaniac should be fixed now.

@mihlefeld mihlefeld requested a review from gregorbg June 8, 2020 08:42
Copy link
Member

@gregorbg gregorbg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the prompt fixes! Minor remarks concerning Kotlin left...

@@ -5,7 +5,8 @@ import org.worldcubeassociation.tnoodle.server.webscrambles.wcif.model.extension
import org.worldcubeassociation.tnoodle.server.webscrambles.wcif.provider.IndexingIdProvider

@Serializable
data class ScrambleSet(override val id: Int, val scrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, val extraScrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, override val extensions: List<Extension> = emptyList()) : ExtensionProvider(), IndexingIdProvider {
data class ScrambleSet(override val id: Int, val scrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, val extraScrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, override val extensions: List<Extension> = emptyList()
) : ExtensionProvider(), IndexingIdProvider {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, please try to figure out why IntelliJ doesn't do the automated line breaking like outlined above (or alternatively discard this change from this particular commit, adding only one weeny line break seems silly given the length of the line)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems there's an option for that in editorconfig https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties but it's under "limited support"

@mihlefeld mihlefeld requested a review from gregorbg June 8, 2020 09:16
Copy link
Member

@gregorbg gregorbg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rigorous implementation :)

@gregorbg
Copy link
Member

gregorbg commented Jun 9, 2020

I had to make some changes in order to accomodate for broken schedules. Please rebase on top of master at your earliest convenience (we try to avoid merge in this project)

@gregorbg gregorbg force-pushed the do_not_show_scramble_set_a_if_ther_is_only_one_group branch from e70ba9e to 56569cf Compare June 9, 2020 13:47
@gregorbg
Copy link
Member

gregorbg commented Jun 9, 2020

Nevermind, figured out I can do the rebase by myself :)

@gregorbg gregorbg merged commit 34bf72f into thewca:master Jun 9, 2020
@mihlefeld mihlefeld deleted the do_not_show_scramble_set_a_if_ther_is_only_one_group branch June 9, 2020 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants