fix: use multi-org settings layout even if not licensed #14215
Conversation
|
🤖 Meticulous spotted visual differences in 271 of 1324 screens tested: view and approve differences detected. Last updated for commit 46a28e0. This comment will update as new commits are pushed. |
5bcc2f6 to
fb933bd
Compare
fb933bd to
b06663b
Compare
| <PopoverPaywall | ||
| message="Organizations" | ||
| description="Organizations allow you to run a Coder deployment with multiple platform teams, all with unique use cases, templates, and even underlying infrastructure." | ||
| // TODO: No documentation link yet. |
| args: { | ||
| message: "Black Lotus", | ||
| description: | ||
| "Adds 3 mana of any single color of your choice to your mana pool, then is discarded. Tapping this artifact can be played as an interrupt.", |
There was a problem hiding this comment.
LOL, someone is playing too much Magic 😆
Sweet! |
Right now the workspace proxies page is the only one that is not bold, so it looks like the odd one out. Should we maybe change all of the pages to not be bold? |
|
@code-asher I think so but I will leave this up to you |
fdfe3ac to
39defe5
Compare
Sounds good to me! I will push up another PR soon for this. |
I added checks against the license but actually what we want is for these views to become the default even when not licensed (once the experimental flag is removed).
This will let us use it in the org settings pages, for a consistent look.
b06663b to
cde4095
Compare
cde4095 to
b31b68a
Compare
I am not sure if there is maybe a better place for this, but maybe this is good enough.
It says "change", but there is nothing to change yet since this is a new organization.
b31b68a to
dd3a470
Compare
Originally, I had it using the multi-org layout if the multi-org experiment was enabled AND the feature was entitled.
However, we actually want to use the new layout even for single-org deployments, so I changed it; we now use the new layout ONLY when the multi-org experiment is enabled, even if the license is not entitled to the feature. In the future, when the experiment is over, the multi-org layout will be the default and we can delete and permanently redirect the old views.
However, this means that you could see the create org page and not have the ability to use it, so I added our standard license badges to that page. So if you go there and do not have a license, you now see the disabled badge.
We did not have a badge for the premium license, which is what orgs requires, so I added it. I am not 100% sure if the wording is right.
Then, the badges looked a bit janky with
PageHeaderso I moved the header used on all the other settings pages to the components directory and used it instead ofPageHeader. Then I used it on the rest of the org pages as well for consistency (create org, edit org, members, and groups). It also brings some cohesiveness with the other settings pages, since they are all on the same sidebar and now these pages all use the same header style. Doing this also got rid of some extra padding.So in summary:
Stacked on: