-
Notifications
You must be signed in to change notification settings - Fork 36
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
Introduce Container ADRs in Decision Tab #149
Introduce Container ADRs in Decision Tab #149
Conversation
Hi @galuszkak, thanks for your PR! Could you add one or more screenshots, so we can easily see that this is going to look like in the generated site? |
Hi @dirkgroot , |
Thanks! I think this is a good change. I think the UX could use some improvement, though. Instead of the "Container Decisions" table, I'd prefer to see a tab bar, for easier navigation. Here's a mockup: In this mockup, the first tab would contain Software System ADR's. Subsequent tabs would be added for container-level ADR's. Ideally, the tab bar is only shown if container-level ADR's are present. What do you think? |
@dirkgroot I really like this idea. I can try to do something for this over the weekend to do this implementation. Any tips or suggestions on how to implement those tabs? Should I go to some inheritance for models like with SoftwareSystemPageViewModel for implementing those main tabs? |
@galuszkak My apologies for the delay, I've been really busy the last two weeks. I think that an approach similar to Does this sufficiently answer your question? If not, I'm happy to help! |
…tr into feature/add-container-adrs
Hi @dirkgroot @jp7677 , I already had some implementation at the time of your comment, but didn't have time to finish tests so it's my first approach. Let me know if this works or I need to refactor it. |
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.
Hi @galuszkak, thanks! I think your approach with this is fine. I've added some suggestions to make the code cleaner/clearer.
src/main/kotlin/nl/avisi/structurizr/site/generatr/StructurizrUtilities.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/ContainersTableViewModel.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/DecisionTabViewModel.kt
Outdated
Show resolved
Hide resolved
.../avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerDecisionsPageViewModel.kt
Outdated
Show resolved
Hide resolved
.../avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerDecisionsPageViewModel.kt
Outdated
Show resolved
Hide resolved
...kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemDecisionsPageViewModel.kt
Outdated
Show resolved
Hide resolved
...kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemDecisionsPageViewModel.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemDecisionsPage.kt
Outdated
Show resolved
Hide resolved
.../kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemContainerDecisionPage.kt
Outdated
Show resolved
Hide resolved
src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/DecisionTabViewModelTest.kt
Outdated
Show resolved
Hide resolved
Co-authored-by: Dirk Groot <dirkgroot77@gmail.com>
Co-authored-by: Dirk Groot <dirkgroot77@gmail.com>
Hi @dirkgroot , Thanks for time of reviewing my PR and your insights! I've applied all of your suggestions. |
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.
@galuszkak Cool, thanks! I've added 2 more suggestions. If those are fixed, then I think this PR is ready to be merged.
src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/DecisionTabViewModel.kt
Show resolved
Hide resolved
...ain/kotlin/nl/avisi/structurizr/site/generatr/site/model/ContainerDecisionsTableViewModel.kt
Outdated
Show resolved
Hide resolved
Co-authored-by: Dirk Groot <dirkgroot77@gmail.com>
@dirkgroot added! I've also added regression test for that bug with filtering that you spotted. |
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.
@galuszkak Approved. Thanks again for this nice contribution!
Hi @dirkgroot @jp7677 ,
Thanks for help in previous PRs.
I'm unfamiliar with Kotlin, so I would appreciate any code review feedback.
Thanks!