-
Notifications
You must be signed in to change notification settings - Fork 936
feat: unify organization and deployment management settings #13602
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e3da0a4
something
aslilac 0d55592
yes
aslilac fe275f6
Merge branch 'main' into management-settings
aslilac 6443abc
🧹
aslilac d532a2b
yay
aslilac 73773bf
🧹
aslilac 32cbc68
🧹
aslilac e768bcd
use the old sidebar outside of the experiment
aslilac bda6d75
🧹
aslilac aadff9a
delete notification
aslilac 09dae97
Merge branch 'main' into management-settings
aslilac bb49eb6
🧼
aslilac 94a8338
🧹
aslilac 4246349
e2e test
aslilac f86b129
🧼
aslilac 6d7dea9
Merge branch 'main' into management-settings
aslilac 04d9cc8
typo
aslilac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
🧹
- Loading branch information
commit 73773bf266f1b4ea5112ae8f3bbb603d94eceb5a
There are no files selected for viewing
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
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
13 changes: 11 additions & 2 deletions
13
site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.stories.tsx
aslilac marked this conversation as resolved.
Show resolved
Hide resolved
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,25 @@ | ||
import type { Meta, StoryObj } from "@storybook/react"; | ||
import { | ||
MockDefaultOrganization, | ||
MockOrganization, | ||
} from "testHelpers/entities"; | ||
import { OrganizationSettingsPageView } from "./OrganizationSettingsPageView"; | ||
import { MockOrganization } from "testHelpers/entities"; | ||
|
||
const meta: Meta<typeof OrganizationSettingsPageView> = { | ||
title: "pages/OrganizationSettingsPageView", | ||
component: OrganizationSettingsPageView, | ||
args: { | ||
org: MockOrganization, | ||
organization: MockOrganization, | ||
}, | ||
}; | ||
|
||
export default meta; | ||
type Story = StoryObj<typeof OrganizationSettingsPageView>; | ||
|
||
export const Example: Story = {}; | ||
|
||
export const DefaultOrg: Story = { | ||
args: { | ||
organization: MockDefaultOrganization, | ||
}, | ||
}; |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.