- Notifications
You must be signed in to change notification settings - Fork928
chore: consolidateManageSettingsLayout code#14885
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
| <header> | ||
| <h2 css={styles.sidebarHeader}>Deployment</h2> | ||
| </header> | ||
| {showOrganizations && ( |
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.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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.
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.
I think this looks good. Just want to get confirmation on the redirect logic before I approve, to make sure it is working as intended
Uh oh!
There was an error while loading.Please reload this page.
site/src/pages/DeploymentSettingsPage/NotificationsPage/NotificationsPage.stories.tsx OutdatedShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
| @@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Could I get more context on this change? Mainly wondering why we went from!== to===
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.
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 OutdatedShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
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.
Overall, looks good, I think it would be useful to add to description of the PR more details about, why deploySettings and organizationSettings were combined into ManagementSettings.
8b6a06d intomainUh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.
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!