Skip to content

refactor(site): improve the overall user table design #9342

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 6 commits into from
Aug 25, 2023
Merged

refactor(site): improve the overall user table design #9342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55dd4b0
Refactor last seen table value
BrunoQuaresma Aug 25, 2023
0cfc7ee
Improve auth methods display
BrunoQuaresma Aug 25, 2023
d1d2d48
Improve roles menu
BrunoQuaresma Aug 25, 2023
60f12e6
Fix chromatic errors
BrunoQuaresma Aug 25, 2023
5885fd9
Fix storybook
BrunoQuaresma Aug 25, 2023
02641df
Merge branch 'main' of https://github.com/coder/coder into bq/improve…
BrunoQuaresma Aug 25, 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
Fix chromatic errors
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Aug 25, 2023
commit 60f12e69be7f119df3abc5df92c0de117b1bec24
113 changes: 60 additions & 53 deletions site/src/components/UsersTable/UsersTable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,80 @@
import { ComponentMeta, Story } from "@storybook/react"
import {
MockUser,
MockUser2,
MockAssignableSiteRoles,
MockAuthMethods,
} from "testHelpers/entities"
import { UsersTable, UsersTableProps } from "./UsersTable"
import { UsersTable } from "./UsersTable"
import type { Meta, StoryObj } from "@storybook/react"

export default {
const meta: Meta<typeof UsersTable> = {
title: "components/UsersTable",
component: UsersTable,
args: {
isNonInitialPage: false,
authMethods: MockAuthMethods,
},
} as ComponentMeta<typeof UsersTable>
}

const Template: Story<UsersTableProps> = (args) => <UsersTable {...args} />
export default meta
type Story = StoryObj<typeof UsersTable>

export const Example = Template.bind({})
Example.args = {
users: [MockUser, MockUser2],
roles: MockAssignableSiteRoles,
canEditUsers: false,
export const Example: Story = {
args: {
users: [MockUser, MockUser2],
roles: MockAssignableSiteRoles,
canEditUsers: false,
},
}

export const Editable = Template.bind({})
Editable.args = {
users: [
MockUser,
MockUser2,
{
...MockUser,
username: "John Doe",
email: "john.doe@coder.com",
roles: [],
status: "dormant",
},
{
...MockUser,
username: "Roger Moore",
email: "roger.moore@coder.com",
roles: [],
status: "suspended",
},
{
...MockUser,
username: "OIDC User",
email: "oidc.user@coder.com",
roles: [],
status: "active",
login_type: "oidc",
},
],
roles: MockAssignableSiteRoles,
canEditUsers: true,
canViewActivity: true,
export const Editable: Story = {
args: {
users: [
MockUser,
MockUser2,
{
...MockUser,
username: "John Doe",
email: "john.doe@coder.com",
roles: [],
status: "dormant",
},
{
...MockUser,
username: "Roger Moore",
email: "roger.moore@coder.com",
roles: [],
status: "suspended",
},
{
...MockUser,
username: "OIDC User",
email: "oidc.user@coder.com",
roles: [],
status: "active",
login_type: "oidc",
},
],
roles: MockAssignableSiteRoles,
canEditUsers: true,
canViewActivity: true,
},
}

export const Empty = Template.bind({})
Empty.args = {
users: [],
roles: MockAssignableSiteRoles,
export const Empty: Story = {
args: {
users: [],
roles: MockAssignableSiteRoles,
},
}

export const Loading = Template.bind({})
Loading.args = {
users: [],
roles: MockAssignableSiteRoles,
isLoading: true,
}
Loading.parameters = {
chromatic: { pauseAnimationAtEnd: true },
export const Loading: Story = {
args: {
users: [],
roles: MockAssignableSiteRoles,
isLoading: true,
},
parameters: {
chromatic: { pauseAnimationAtEnd: true },
},
}
30 changes: 19 additions & 11 deletions site/src/components/UsersTable/UsersTableBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import HideSourceOutlined from "@mui/icons-material/HideSourceOutlined"
import KeyOutlined from "@mui/icons-material/KeyOutlined"
import GitHub from "@mui/icons-material/GitHub"
import PasswordOutlined from "@mui/icons-material/PasswordOutlined"
import relativeTime from "dayjs/plugin/relativeTime"
import ShieldOutlined from "@mui/icons-material/ShieldOutlined"

dayjs.extend(relativeTime)

const isOwnerRole = (role: TypesGen.Role): boolean => {
return role.name === "owner"
Expand Down Expand Up @@ -87,7 +91,7 @@ export const UsersTableBody: FC<
return (
<ChooseOne>
<Cond condition={Boolean(isLoading)}>
<TableLoaderSkeleton columns={5} useAvatarData />
<TableLoaderSkeleton columns={canEditUsers ? 5 : 4} useAvatarData />
</Cond>
<Cond condition={!users || users.length === 0}>
<ChooseOne>
Expand Down Expand Up @@ -267,17 +271,21 @@ const LoginType = ({
icon = <GitHub sx={iconStyles} />
} else if (value === "token") {
displayName = "Token"
icon = <KeyOutlined />
icon = <KeyOutlined sx={iconStyles} />
} else if (value === "oidc") {
displayName = authMethods.oidc.signInText
icon = (
<Box
component="img"
alt="Open ID Connect icon"
src={authMethods.oidc.iconUrl}
sx={iconStyles}
/>
)
displayName =
authMethods.oidc.signInText === "" ? "OIDC" : authMethods.oidc.signInText
icon =
authMethods.oidc.iconUrl === "" ? (
<ShieldOutlined sx={iconStyles} />
) : (
<Box
component="img"
alt="Open ID Connect icon"
src={authMethods.oidc.iconUrl}
sx={iconStyles}
/>
)
}

return (
Expand Down