Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

refactor: Load users from the API#1218

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

Merged
BrunoQuaresma merged 2 commits intomainfrombq/1216/load-users-from-the-api
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
11 changes: 3 additions & 8 deletionssite/src/api/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import axios, { AxiosRequestHeaders } from "axios"
import { mutate } from "swr"
import { MockPager, MockUser, MockUser2 } from "../testHelpers/entities"
import * as Types from "./types"
import * as TypesGen from "./typesGenerated"

Expand DownExpand Up@@ -76,13 +75,9 @@ export const getApiKey = async (): Promise<Types.APIKeyResponse> => {
return response.data
}

export const getUsers = async (): Promise<Types.PagedUsers> => {
// const response = await axios.get<Types.UserResponse[]>("/api/v2/users")
// return response.data
return Promise.resolve({
page: [MockUser, MockUser2],
pager: MockPager,
})
export const getUsers = async (): Promise<TypesGen.User[]> => {
const response = await axios.get<TypesGen.User[]>("/api/v2/users?offset=0&limit=1000")
return response.data
}

export const createUser = async (user: Types.CreateUserRequest): Promise<TypesGen.User> => {
Expand Down
9 changes: 0 additions & 9 deletionssite/src/api/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ export interface UserAgent {
readonly os: string
}

export interface Pager {
total: number
}

export interface PagedUsers {
page: UserResponse[]
pager: Pager
}

export interface WorkspaceAutostartRequest {
schedule: string
}
Expand Down
8 changes: 1 addition & 7 deletionssite/src/pages/UsersPage/UsersPage.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
import { screen } from "@testing-library/react"
import React from "react"
import {MockPager,render } from "../../testHelpers"
import { render } from "../../testHelpers"
import { UsersPage } from "./UsersPage"
import { Language } from "./UsersPageView"

describe("Users Page", () => {
it("has a header with the total number of users", async () => {
render(<UsersPage />)
const total = await screen.findByText(/\d+ total/)
expect(total.innerHTML).toEqual(Language.pageSubtitle(MockPager))
})
it("shows users", async () => {
render(<UsersPage />)
const users = await screen.findAllByText(/.*@coder.com/)
Expand Down
8 changes: 6 additions & 2 deletionssite/src/pages/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,14 @@ import { useActor } from "@xstate/react"
import React, { useContext, useEffect } from "react"
import { useNavigate } from "react-router"
import { ErrorSummary } from "../../components/ErrorSummary/ErrorSummary"
import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
import { XServiceContext } from "../../xServices/StateContext"
import { UsersPageView } from "./UsersPageView"

export const UsersPage: React.FC = () => {
const xServices = useContext(XServiceContext)
const [usersState, usersSend] = useActor(xServices.usersXService)
const { users,pager,getUsersError } = usersState.context
const { users, getUsersError } = usersState.context
const navigate = useNavigate()

/**
Expand All@@ -20,11 +21,14 @@ export const UsersPage: React.FC = () => {

if (usersState.matches("error")) {
return <ErrorSummary error={getUsersError} />
}

if (!users) {
return <FullScreenLoader />
} else {
return (
<UsersPageView
users={users}
pager={pager}
openUserCreationDialog={() => {
navigate("/users/create")
}}
Expand Down
3 changes: 1 addition & 2 deletionssite/src/pages/UsersPage/UsersPageView.stories.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { ComponentMeta, Story } from "@storybook/react"
import React from "react"
import {MockPager,MockUser, MockUser2 } from "../../testHelpers"
import { MockUser, MockUser2 } from "../../testHelpers"
import { UsersPageView, UsersPageViewProps } from "./UsersPageView"

export default {
Expand All@@ -13,7 +13,6 @@ const Template: Story<UsersPageViewProps> = (args) => <UsersPageView {...args} /
export const Ready = Template.bind({})
Ready.args = {
users: [MockUser, MockUser2],
pager: MockPager,
}
export const Empty = Template.bind({})
Empty.args = {
Expand Down
17 changes: 7 additions & 10 deletionssite/src/pages/UsersPage/UsersPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
import Paper from "@material-ui/core/Paper"
import { makeStyles } from "@material-ui/core/styles"
import React from "react"
import {Pager,UserResponse } from "../../api/types"
import { UserResponse } from "../../api/types"
import { Header } from "../../components/Header/Header"
import { UsersTable } from "../../components/UsersTable/UsersTable"

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

export interface UsersPageViewProps {
users: UserResponse[]
pager?: Pager
openUserCreationDialog: () => void
}

export const UsersPageView: React.FC<UsersPageViewProps> = ({ users,pager,openUserCreationDialog }) => {
export const UsersPageView: React.FC<UsersPageViewProps> = ({ users, openUserCreationDialog }) => {
const styles = useStyles()

return (
<div className={styles.flexColumn}>
<Header
title={Language.pageTitle}
subTitle={Language.pageSubtitle(pager)}
action={{ text: Language.newUserButton, onClick: openUserCreationDialog }}
/>
<UsersTable users={users} />
<Header title={Language.pageTitle} action={{ text: Language.newUserButton, onClick: openUserCreationDialog }} />
<Paper style={{ maxWidth: "1380px", margin: "1em auto", width: "100%" }}>
<UsersTable users={users} />
</Paper>
</div>
)
}
Expand Down
5 changes: 0 additions & 5 deletionssite/src/testHelpers/entities.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import {
BuildInfoResponse,
Organization,
Pager,
Provisioner,
Template,
UserAgent,
Expand DownExpand Up@@ -38,10 +37,6 @@ export const MockUser2: UserResponse = {
organization_ids: ["fc0774ce-cc9e-48d4-80ae-88f7a4d4a8b0"],
}

export const MockPager: Pager = {
total: 2,
}

export const MockOrganization: Organization = {
id: "test-org",
name: "Test Organization",
Expand Down
2 changes: 1 addition & 1 deletionsite/src/testHelpers/handlers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ export const handlers = [

// users
rest.get("/api/v2/users", async (req, res, ctx) => {
return res(ctx.status(200), ctx.json({ page:[M.MockUser, M.MockUser2], pager: M.MockPager }))
return res(ctx.status(200), ctx.json([M.MockUser, M.MockUser2]))
}),
rest.post("/api/v2/users", async (req, res, ctx) => {
return res(ctx.status(200), ctx.json(M.MockUser))
Expand Down
8 changes: 3 additions & 5 deletionssite/src/xServices/users/usersXService.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,7 @@ export const Language = {
}

export interface UsersContext {
users: Types.UserResponse[]
pager?: Types.Pager
users?: TypesGen.User[]
getUsersError?: Error | unknown
createUserError?: Error | unknown
createUserFormErrors?: FieldErrors
Expand All@@ -27,7 +26,7 @@ export const usersMachine = createMachine(
events: {} as UsersEvent,
services: {} as {
getUsers: {
data:Types.PagedUsers
data:TypesGen.User[]
}
createUser: {
data: TypesGen.User
Expand DownExpand Up@@ -104,8 +103,7 @@ export const usersMachine = createMachine(
},
actions: {
assignUsers: assign({
users: (_, event) => event.data.page,
pager: (_, event) => event.data.pager,
users: (_, event) => event.data,
}),
assignGetUsersError: assign({
getUsersError: (_, event) => event.data,
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp