Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor: Improve roles UI #5576

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.

Sign up for GitHub

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 11 commits into from
Jan 4, 2023
Merged

refactor: Improve roles UI #5576

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d2ab1b9
Update FE with the new roles popover
BrunoQuaresma Jan 4, 2023
f5b1b23
Predicatable sorting
BrunoQuaresma Jan 4, 2023
513de24
Add predicatble sorting
BrunoQuaresma Jan 4, 2023
a23b818
Update language
BrunoQuaresma Jan 4, 2023
676d806
Add storybooks
BrunoQuaresma Jan 4, 2023
9b666f0
Add delay
BrunoQuaresma Jan 4, 2023
2fe9e51
Update site/src/i18n/en/usersPage.json
BrunoQuaresma Jan 4, 2023
48cfb1d
Fix test
BrunoQuaresma Jan 4, 2023
e21898e
Merge branch 'bq/improve-roles-ui' of github.com:coder/coder into bq/…
BrunoQuaresma Jan 4, 2023
5724c6c
Improve var name
BrunoQuaresma Jan 4, 2023
d7081f3
Improve var name
BrunoQuaresma Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add storybooks
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jan 4, 2023
commit 676d806ca364ee9e38de296dbdaa3bd597710064
31 changes: 31 additions & 0 deletions site/src/components/EditRolesButton/EditRolesButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { ComponentMeta, Story } from "@storybook/react"
import {
MockOwnerRole,
MockSiteRoles,
MockUserAdminRole,
} from "testHelpers/entities"
import { EditRolesButtonProps, EditRolesButton } from "./EditRolesButton"

export default {
title: "components/EditRolesButton",
component: EditRolesButton,
} as ComponentMeta<typeof EditRolesButton>

const Template: Story<EditRolesButtonProps> = (args) => (
<EditRolesButton {...args} />
)

export const Open = Template.bind({})
Open.args = {
defaultIsOpen: true,
roles: MockSiteRoles,
selectedRoles: [MockUserAdminRole, MockOwnerRole],
}

export const Loading = Template.bind({})
Loading.args = {
defaultIsOpen: true,
roles: MockSiteRoles,
isLoading: true,
selectedRoles: [MockUserAdminRole, MockOwnerRole],
}
15 changes: 12 additions & 3 deletions site/src/components/EditRolesButton/EditRolesButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,25 @@ const Option: React.FC<{
)
}

export const EditRolesButton: FC<{
export interface EditRolesButtonProps {
isLoading: boolean
roles: Role[]
selectedRoles: Role[]
onChange: (roles: Role["name"][]) => void
}> = ({ roles, selectedRoles, onChange, isLoading }) => {
defaultIsOpen?: boolean
}

export const EditRolesButton: FC<EditRolesButtonProps> = ({
roles,
selectedRoles,
onChange,
isLoading,
defaultIsOpen = false,
}) => {
const styles = useStyles()
const { t } = useTranslation("usersPage")
const anchorRef = useRef<HTMLButtonElement>(null)
const [isOpen, setIsOpen] = useState(false)
const [isOpen, setIsOpen] = useState(defaultIsOpen)
const id = isOpen ? "edit-roles-popover" : undefined
const selectedRoleNames = selectedRoles.map((role) => role.name)

Expand Down
8 changes: 8 additions & 0 deletions site/src/theme/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { getOverrides } from "./overrides"
import { darkPalette } from "./palettes"
import { props } from "./props"
import { typography } from "./typography"
import isChromatic from "chromatic/isChromatic"

const makeTheme = (palette: PaletteOptions) => {
const theme = createTheme({
Expand All @@ -16,6 +17,13 @@ const makeTheme = (palette: PaletteOptions) => {
props,
})

// We want to disable transitions during chromatic snapshots
// https://www.chromatic.com/docs/animations#javascript-animations
// https://github.com/mui/material-ui/issues/10560#issuecomment-439147374
if (isChromatic()) {
theme.transitions.create = () => "none"
}

theme.overrides = getOverrides(theme)

return theme
Expand Down