chore: consolidate ManageSettingsLayout code
#14885
Merged
Conversation
This file contains hidden or 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
jaaydenh
reviewed
Oct 2, 2024
| <header> | ||
| <h2 css={styles.sidebarHeader}>Deployment</h2> | ||
| </header> | ||
| {showOrganizations && ( |
There was a problem hiding this comment.
Why would showOrganizations need to be true to show only the Deployment header? Is there some reason to show DeploymentSettingsNavigation without the Header text?
There was a problem hiding this comment.
it just looks weird for it to say deployment twice without the organizations section below. it's weird, but we'll get rid of this when we adopt the designs we went over with Christin.
Parkreiner
reviewed
Oct 2, 2024
site/src/pages/DeploymentSettingsPage/NotificationsPage/NotificationsPage.stories.tsx
Outdated
Show resolved
Hide resolved
| @@ -102,7 +102,7 @@ const UsersPage: FC = () => { | |||
| authMethodsQuery.isLoading || | |||
| groupsByUserIdQuery.isLoading; | |||
|
|
|||
| if (showOrganizations && location.pathname !== "/deployment/users") { | |||
| if (location.pathname === "/users") { | |||
There was a problem hiding this comment.
Could I get more context on this change? Mainly wondering why we went from !== to ===
There was a problem hiding this comment.
The goal is just to always redirect from /users to /deployment/users. I guess I could've left it the other way, this just feels clearer to me.
site/src/pages/DeploymentSettingsPage/NetworkSettingsPage/NetworkSettingsPageView.tsx
Outdated
Show resolved
Hide resolved
jaaydenh
approved these changes
Oct 2, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Clean up a bunch of tangles that only existed to service the
"multi-organization"experiment, which has now been removedNotably, the
DeploySettingsLayoutcomponent has been folded intoManagementSettingsLayoutsince they're both for controlling state in the "same part" of the app, one just needed to also exist outside of orgs. No longer needed!