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

Commit22de907

Browse files
committed
Merge remote-tracking branch 'origin/main' into asher/generated-types
2 parents04cc479 +e8e6d3c commit22de907

File tree

45 files changed

+64
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+64
-57
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 1 deletion

‎.github/ISSUE_TEMPLATE/doc.md

Lines changed: 1 addition & 1 deletion

‎.github/ISSUE_TEMPLATE/feature.md

Lines changed: 1 addition & 1 deletion

‎cli/templateedit.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎cli/templates.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ func templates() *cobra.Command {
2525
}
2626
cmd.AddCommand(
2727
templateCreate(),
28-
templateEdit(),
2928
templateInit(),
3029
templateList(),
3130
templatePlan(),

‎site/src/api/index.test.tsrenamed to‎site/src/api/api.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importaxiosfrom"axios"
2-
import{getApiKey,login,logout}from"."
2+
import{getApiKey,login,logout}from"./api"
33
import*asTypesGenfrom"./typesGenerated"
44

55
// Mock the axios module so that no real network requests are made, but rather
File renamed without changes.

‎site/src/components/AdminDropdown/AdminDropdown.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{history,render}from"../../testHelpers"
3+
import{history,render}from"../../testHelpers/renderHelpers"
44
import{AdminDropdown,Language}from"./AdminDropdown"
55

66
constrenderAndClick=async()=>{

‎site/src/components/CliAuthToken/CliAuthToken.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
3+
import{render}from"../../testHelpers/renderHelpers"
44
import{CliAuthToken}from"./CliAuthToken"
55

66
describe("CliAuthToken",()=>{

‎site/src/components/CodeBlock/CodeBlock.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
3+
import{render}from"../../testHelpers/renderHelpers"
44
import{CodeBlock}from"./CodeBlock"
55

66
describe("CodeBlock",()=>{

‎site/src/components/CodeExample/CodeExample.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
3+
import{render}from"../../testHelpers/renderHelpers"
44
import{CodeExample}from"./CodeExample"
55

66
describe("CodeExample",()=>{

‎site/src/components/EmptyState/EmptyState.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
3+
import{render}from"../../testHelpers/renderHelpers"
44
import{EmptyState}from"./EmptyState"
55

66
describe("EmptyState",()=>{

‎site/src/components/Footer/Footer.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{MockBuildInfo,render}from"../../testHelpers"
3+
import{MockBuildInfo,render}from"../../testHelpers/renderHelpers"
44
import{Footer,Language}from"./Footer"
55

66
describe("Footer",()=>{

‎site/src/components/Header/Header.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
3+
import{render}from"../../testHelpers/renderHelpers"
44
import{Header}from"./Header"
55

66
describe("Header",()=>{

‎site/src/components/NavbarView/NavbarView.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
43
import{MockUser}from"../../testHelpers/entities"
4+
import{render}from"../../testHelpers/renderHelpers"
55
import{NavbarView}from"./NavbarView"
66

77
describe("NavbarView",()=>{

‎site/src/components/ResetPasswordDialog/ResetPasswordDialog.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockUser}from"../../testHelpers"
3+
import{MockUser}from"../../testHelpers/renderHelpers"
44
import{ResetPasswordDialog,ResetPasswordDialogProps}from"./ResetPasswordDialog"
55

66
exportdefault{

‎site/src/components/RoleSelect/RoleSelect.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{ComponentMeta,Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockAdminRole,MockMemberRole,MockSiteRoles}from"../../testHelpers"
3+
import{MockAdminRole,MockMemberRole,MockSiteRoles}from"../../testHelpers/renderHelpers"
44
import{RoleSelect,RoleSelectProps}from"./RoleSelect"
55

66
exportdefault{

‎site/src/components/Table/Table.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
3+
import{render}from"../../testHelpers/renderHelpers"
44
import{Column,Table}from"./Table"
55

66
interfaceTestData{

‎site/src/components/UserCell/UserCell.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{ComponentMeta,Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockUser,MockUserAgent}from"../../testHelpers"
3+
import{MockUser,MockUserAgent}from"../../testHelpers/renderHelpers"
44
import{UserCell,UserCellProps}from"./UserCell"
55

66
exportdefault{

‎site/src/components/UserCell/UserCell.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{fireEvent,render,screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{MockUser,MockUserAgent,WrapperComponent}from"../../testHelpers"
3+
import{MockUser,MockUserAgent,WrapperComponent}from"../../testHelpers/renderHelpers"
44
import{UserCell,UserCellProps}from"./UserCell"
55

66
namespaceHelpers{

‎site/src/components/UserDropdown/UserDropdown.test.tsx

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{render}from"../../testHelpers"
43
import{MockUser}from"../../testHelpers/entities"
4+
import{render}from"../../testHelpers/renderHelpers"
55
import{Language,UserDropdown,UserDropdownProps}from"./UsersDropdown"
66

77
constrenderAndClick=async(props:Partial<UserDropdownProps>={})=>{
@@ -11,6 +11,18 @@ const renderAndClick = async (props: Partial<UserDropdownProps> = {}) => {
1111
}
1212

1313
describe("UserDropdown",()=>{
14+
constenv=process.env
15+
16+
// REMARK: copying process.env so we don't mutate that object or encounter conflicts between tests
17+
beforeEach(()=>{
18+
process.env={ ...env}
19+
})
20+
21+
// REMARK: restoring process.env
22+
afterEach(()=>{
23+
process.env=env
24+
})
25+
1426
describe("when the trigger is clicked",()=>{
1527
it("opens the menu",async()=>{
1628
awaitrenderAndClick()
@@ -32,14 +44,15 @@ describe("UserDropdown", () => {
3244
})
3345

3446
it("has the correct link for the documentation item",async()=>{
47+
process.env.CODER_VERSION="v0.5.4"
3548
awaitrenderAndClick()
3649

3750
constlink=screen.getByText(Language.docsLabel).closest("a")
3851
if(!link){
3952
thrownewError("Anchor tag not found for the documentation menu item")
4053
}
4154

42-
expect(link.getAttribute("href")).toBe("https://coder.com/docs")
55+
expect(link.getAttribute("href")).toBe(`https://github.com/coder/coder/tree/${process.env.CODER_VERSION}/docs`)
4356
})
4457

4558
it("has the correct link for the account item",async()=>{

‎site/src/components/UserDropdown/UsersDropdown.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@ export const UserDropdown: React.FC<UserDropdownProps> = ({ user, onSignOut }: U
7777
</MenuItem>
7878
</Link>
7979

80-
<ahref="https://coder.com/docs"target="_blank"rel="noreferrer"className={styles.link}>
80+
<a
81+
href={`https://github.com/coder/coder/tree/${process.env.CODER_VERSION}/docs`}
82+
target="_blank"
83+
rel="noreferrer"
84+
className={styles.link}
85+
>
8186
<MenuItemclassName={styles.menuItem}onClick={onPopoverClose}>
8287
<ListItemIconclassName={styles.icon}>
8388
<DocsIcon/>

‎site/src/components/UsersTable/UsersTable.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{ComponentMeta,Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockSiteRoles,MockUser,MockUser2}from"../../testHelpers"
3+
import{MockSiteRoles,MockUser,MockUser2}from"../../testHelpers/renderHelpers"
44
import{UsersTable,UsersTableProps}from"./UsersTable"
55

66
exportdefault{

‎site/src/components/Workspace/Workspace.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockOrganization,MockTemplate,MockWorkspace}from"../../testHelpers"
3+
import{MockOrganization,MockTemplate,MockWorkspace}from"../../testHelpers/renderHelpers"
44
import{Workspace,WorkspaceProps}from"./Workspace"
55

66
exportdefault{

‎site/src/components/Workspace/Workspace.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{MockOrganization,MockTemplate,MockWorkspace,render}from"../../testHelpers"
3+
import{MockOrganization,MockTemplate,MockWorkspace,render}from"../../testHelpers/renderHelpers"
44
import{Workspace}from"./Workspace"
55

66
describe("Workspace",()=>{

‎site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockWorkspaceAutostartEnabled}from"../../testHelpers"
3+
import{MockWorkspaceAutostartEnabled}from"../../testHelpers/renderHelpers"
44
import{WorkspaceSchedule,WorkspaceScheduleProps}from"./WorkspaceSchedule"
55

66
exportdefault{

‎site/src/forms/CreateTemplateForm.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{render,screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{MockOrganization,MockProvisioner,MockTemplate}from"../testHelpers"
3+
import{MockOrganization,MockProvisioner,MockTemplate}from"../testHelpers/renderHelpers"
44
import{CreateTemplateForm}from"./CreateTemplateForm"
55

66
describe("CreateTemplateForm",()=>{

‎site/src/forms/CreateWorkspaceForm.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{render,screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{MockOrganization,MockTemplate,MockWorkspace}from"../testHelpers"
3+
import{MockOrganization,MockTemplate,MockWorkspace}from"../testHelpers/renderHelpers"
44
import{CreateWorkspaceForm}from"./CreateWorkspaceForm"
55

66
describe("CreateWorkspaceForm",()=>{

‎site/src/pages/CliAuthPage/CliAuthPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{makeStyles}from"@material-ui/core/styles"
22
import{useActor}from"@xstate/react"
33
importReact,{useContext,useEffect,useState}from"react"
4-
import{getApiKey}from"../../api"
4+
import{getApiKey}from"../../api/api"
55
import{CliAuthToken}from"../../components/CliAuthToken/CliAuthToken"
66
import{FullScreenLoader}from"../../components/Loader/FullScreenLoader"
77
import{XServiceContext}from"../../xServices/StateContext"

‎site/src/pages/LoginPage/LoginPage.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event"
33
import{rest}from"msw"
44
importReactfrom"react"
55
import{Language}from"../../components/SignInForm/SignInForm"
6-
import{history,render}from"../../testHelpers"
6+
import{history,render}from"../../testHelpers/renderHelpers"
77
import{server}from"../../testHelpers/server"
88
import{LoginPage}from"./LoginPage"
99

‎site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import{fireEvent,screen,waitFor}from"@testing-library/react"
22
importReactfrom"react"
3-
import*asAPIfrom"../../../api"
3+
import*asAPIfrom"../../../api/api"
44
import{GlobalSnackbar}from"../../../components/GlobalSnackbar/GlobalSnackbar"
55
import*asAccountFormfrom"../../../components/PreferencesAccountForm/PreferencesAccountForm"
6-
import{renderWithAuth}from"../../../testHelpers"
6+
import{renderWithAuth}from"../../../testHelpers/renderHelpers"
77
import*asAuthXServicefrom"../../../xServices/auth/authXService"
88
import{AccountPage,Language}from"./AccountPage"
99

‎site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/CreateWorkspacePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useSelector } from "@xstate/react"
33
importReact,{useCallback,useContext}from"react"
44
import{useNavigate,useParams}from"react-router-dom"
55
importuseSWRfrom"swr"
6-
import*asAPIfrom"../../../../api"
6+
import*asAPIfrom"../../../../api/api"
77
import*asTypesGenfrom"../../../../api/typesGenerated"
88
import{ErrorSummary}from"../../../../components/ErrorSummary/ErrorSummary"
99
import{FullScreenLoader}from"../../../../components/Loader/FullScreenLoader"

‎site/src/pages/TerminalPage/TerminalPage.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import React from "react"
66
import{Route,Routes}from"react-router-dom"
77
import{TextDecoder,TextEncoder}from"util"
88
import{ReconnectingPTYRequest}from"../../api/types"
9-
import{history,MockWorkspaceAgent,render}from"../../testHelpers"
9+
import{history,MockWorkspaceAgent,render}from"../../testHelpers/renderHelpers"
1010
import{server}from"../../testHelpers/server"
1111
importTerminalPage,{Language}from"./TerminalPage"
1212

‎site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { screen } from "@testing-library/react"
22
importuserEventfrom"@testing-library/user-event"
33
import{rest}from"msw"
44
importReactfrom"react"
5-
import*asAPIfrom"../../../api"
5+
import*asAPIfrom"../../../api/api"
66
import{LanguageasFormLanguage}from"../../../components/CreateUserForm/CreateUserForm"
77
import{LanguageasFooterLanguage}from"../../../components/FormFooter/FormFooter"
8-
import{history,render}from"../../../testHelpers"
8+
import{history,render}from"../../../testHelpers/renderHelpers"
99
import{server}from"../../../testHelpers/server"
1010
import{LanguageasUserLanguage}from"../../../xServices/users/usersXService"
1111
import{CreateUserPage,Language}from"./CreateUserPage"

‎site/src/pages/UsersPage/UsersPage.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import{fireEvent,screen,waitFor,within}from"@testing-library/react"
22
importReactfrom"react"
3-
import*asAPIfrom"../../api"
3+
import*asAPIfrom"../../api/api"
44
import{Role}from"../../api/typesGenerated"
55
import{GlobalSnackbar}from"../../components/GlobalSnackbar/GlobalSnackbar"
66
import{LanguageasResetPasswordDialogLanguage}from"../../components/ResetPasswordDialog/ResetPasswordDialog"
77
import{LanguageasRoleSelectLanguage}from"../../components/RoleSelect/RoleSelect"
88
import{LanguageasUsersTableLanguage}from"../../components/UsersTable/UsersTable"
9-
import{MockAuditorRole,MockUser,MockUser2,render}from"../../testHelpers"
9+
import{MockAuditorRole,MockUser,MockUser2,render}from"../../testHelpers/renderHelpers"
1010
import{LanguageasusersXServiceLanguage}from"../../xServices/users/usersXService"
1111
import{LanguageasUsersPageLanguage,UsersPage}from"./UsersPage"
1212

‎site/src/pages/UsersPage/UsersPageView.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{ComponentMeta,Story}from"@storybook/react"
22
importReactfrom"react"
3-
import{MockSiteRoles,MockUser,MockUser2}from"../../testHelpers"
3+
import{MockSiteRoles,MockUser,MockUser2}from"../../testHelpers/renderHelpers"
44
import{UsersPageView,UsersPageViewProps}from"./UsersPageView"
55

66
exportdefault{

‎site/src/pages/WorkspacePage/WorkspacePage.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{screen}from"@testing-library/react"
22
importReactfrom"react"
3-
import{MockTemplate,MockWorkspace,renderWithAuth}from"../../testHelpers"
3+
import{MockTemplate,MockWorkspace,renderWithAuth}from"../../testHelpers/renderHelpers"
44
import{WorkspacePage}from"./WorkspacePage"
55

66
describe("Workspace Page",()=>{
File renamed without changes.

‎site/src/xServices/auth/authXService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{assign,createMachine}from"xstate"
2-
import*asAPIfrom"../../api"
2+
import*asAPIfrom"../../api/api"
33
import*asTypesGenfrom"../../api/typesGenerated"
44
import{displaySuccess}from"../../components/GlobalSnackbar/utils"
55

‎site/src/xServices/buildInfo/buildInfoXService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{assign,createMachine}from"xstate"
2-
import*asAPIfrom"../../api"
2+
import*asAPIfrom"../../api/api"
33
import*asTypesGenfrom"../../api/typesGenerated"
44

55
exportinterfaceBuildInfoContext{

‎site/src/xServices/roles/siteRolesXService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{assign,createMachine}from"xstate"
2-
import*asAPIfrom"../../api"
2+
import*asAPIfrom"../../api/api"
33
import*asTypesGenfrom"../../api/typesGenerated"
44
import{displayError}from"../../components/GlobalSnackbar/utils"
55

‎site/src/xServices/terminal/terminalXService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{assign,createMachine}from"xstate"
2-
import*asAPIfrom"../../api"
2+
import*asAPIfrom"../../api/api"
33
import*asTypesfrom"../../api/types"
44
import*asTypesGenfrom"../../api/typesGenerated"
55

‎site/src/xServices/users/usersXService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{assign,createMachine}from"xstate"
2-
import*asAPIfrom"../../api"
2+
import*asAPIfrom"../../api/api"
33
import{ApiError,FieldErrors,isApiError,mapApiErrorToFieldErrors}from"../../api/errors"
44
import*asTypesGenfrom"../../api/typesGenerated"
55
import{displayError,displaySuccess}from"../../components/GlobalSnackbar/utils"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp