Skip to content

feat(site): Read users into basic UsersTable #981

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 26 commits into from
Apr 14, 2022
Merged

feat(site): Read users into basic UsersTable #981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fa600a5
Start users
presleyp Apr 11, 2022
aa75ca0
Merge branch 'main' into users-table/presleyp/592
presleyp Apr 11, 2022
665e217
Set up fake response
presleyp Apr 11, 2022
934e060
Update handler
presleyp Apr 11, 2022
a2a1a04
Update types
presleyp Apr 11, 2022
201b34a
Set up page
presleyp Apr 11, 2022
b45ddaf
Start adding table
presleyp Apr 12, 2022
0c341ed
Add header
presleyp Apr 12, 2022
aac1aee
Add Header
presleyp Apr 12, 2022
40c61db
Remove roles
presleyp Apr 12, 2022
ca729e9
Add UsersPageView
presleyp Apr 12, 2022
3fce4f0
Add test
presleyp Apr 12, 2022
96d3a72
Lint
presleyp Apr 12, 2022
6757380
Storybook error summary
presleyp Apr 12, 2022
b5fd9c8
Strip Pager to just what's currently needed
presleyp Apr 13, 2022
30ced2f
Clean up ErrorSummary while I'm here
presleyp Apr 13, 2022
272633b
Storybook tweaks
presleyp Apr 13, 2022
1dda810
Extract language
presleyp Apr 13, 2022
be60aa8
Lint
presleyp Apr 13, 2022
8d22584
Add missing $
presleyp Apr 14, 2022
91ac0d5
Merge branch 'main' into users-table/presleyp/592
presleyp Apr 14, 2022
a50ea8a
Lint
presleyp Apr 14, 2022
bf06e92
Merge branch 'users-table/presleyp/592' of github.com:coder/coder int…
presleyp Apr 14, 2022
34eb66b
Lint
presleyp Apr 14, 2022
8c03bbc
Fix syntax error
presleyp Apr 14, 2022
1cbc885
Lint
presleyp Apr 14, 2022
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
Lint
  • Loading branch information
@presleyp
presleyp committed Apr 13, 2022
commit be60aa8634b84d829a9eb52104a630c6c5521a09
2 changes: 1 addition & 1 deletion site/src/components/ErrorSummary/ErrorSummary.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Template: Story<ErrorSummaryProps> = (args) => <ErrorSummary {...args} />

export const WithError = Template.bind({})
WithError.args = {
error: new Error("Something went wrong!")
error: new Error("Something went wrong!"),
}

export const WithUndefined = Template.bind({})
2 changes: 1 addition & 1 deletion site/src/components/ErrorSummary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react"

const Language = {
unknownErrorMessage: "Unknown error"
unknownErrorMessage: "Unknown error",
}

export interface ErrorSummaryProps {
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/UsersPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Template: Story<UsersPageViewProps> = (args) => <UsersPageView {...args} /
export const Ready = Template.bind({})
Ready.args = {
users: [MockUser, MockUser2],
pager: MockPager
pager: MockPager,
}
export const Empty = Template.bind({})
Empty.args = {
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/UsersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { UsersTable } from "../../components/UsersTable/UsersTable"

export const Language = {
pageTitle: "Users",
pageSubtitle: (pager: Pager | undefined) => (pager ? `{pager.total} total` : ""),
pageSubtitle: (pager: Pager | undefined): string => (pager ? `{pager.total} total` : ""),
}

export interface UsersPageViewProps {
Expand Down
1 change: 0 additions & 1 deletion site/src/test_helpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { v4 as uuidv4 } from "uuid"
import {
BuildInfoResponse,
Organization,
Expand Down