NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commita2eaba1

committed

feat(setup): organization is not longer needed

1 parent4b7c710 commita2eaba1Copy full SHA for a2eaba1

File tree

2 files changed

-18

lines changed

site/src/pages/SetupPage
- SetupPage.test.tsx
- SetupPageView.tsx

2 files changed

-18

lines changed

`‎site/src/pages/SetupPage/SetupPage.test.tsx`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,14 @@ const fillForm = async ({`
`12`	`12`	`username="someuser",`
`13`	`13`	`email="someone@coder.com",`
`14`	`14`	`password="password",`
`15`		`- organization="Coder",`
`16`	`15`	`}:{`
`17`	`16`	`username?:string`
`18`	`17`	`email?:string`
`19`	`18`	`password?:string`
`20`		`-organization?:string`
`21`	`19`	`}={})=>{`
`22`	`20`	`constusernameField=screen.getByLabelText(PageViewLanguage.usernameLabel)`
`23`	`21`	`constemailField=screen.getByLabelText(PageViewLanguage.emailLabel)`
`24`	`22`	`constpasswordField=screen.getByLabelText(PageViewLanguage.passwordLabel)`
`25`		`-constorganizationField=screen.getByLabelText(`
`26`		`-PageViewLanguage.organizationLabel,`
`27`		`-)`
`28`		`-awaituserEvent.type(organizationField,organization)`
`29`	`23`	`awaituserEvent.type(usernameField,username)`
`30`	`24`	`awaituserEvent.type(emailField,email)`
`31`	`25`	`awaituserEvent.type(passwordField,password)`

`‎site/src/pages/SetupPage/SetupPageView.tsx`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,9 @@ export const Language = {`
`13`	`13`	`emailLabel:"Email",`
`14`	`14`	`passwordLabel:"Password",`
`15`	`15`	`usernameLabel:"Username",`
`16`		`-organizationLabel:"Organization name",`
`17`	`16`	`emailInvalid:"Please enter a valid email address.",`
`18`	`17`	`emailRequired:"Please enter an email address.",`
`19`	`18`	`passwordRequired:"Please enter a password.",`
`20`		`-organizationRequired:"Please enter an organization name.",`
`21`	`19`	`create:"Setup account",`
`22`	`20`	`welcomeMessage:(`
`23`	`21`	`<>`
`@@ -32,7 +30,6 @@ const validationSchema = Yup.object({`
`32`	`30`	`.email(Language.emailInvalid)`
`33`	`31`	`.required(Language.emailRequired),`
`34`	`32`	`password:Yup.string().required(Language.passwordRequired),`
`35`		`-organization:Yup.string().required(Language.organizationRequired),`
`36`	`33`	`username:nameValidator(Language.usernameLabel),`
`37`	`34`	`})`
`38`	`35`
`@@ -55,7 +52,6 @@ export const SetupPageView: React.FC<SetupPageViewProps> = ({`
`55`	`52`	`email:"",`
`56`	`53`	`password:"",`
`57`	`54`	`username:"",`
`58`		`-organization:"",`
`59`	`55`	`},`
`60`	`56`	`validationSchema,`
`61`	`57`	`onSubmit,`
`@@ -70,14 +66,6 @@ export const SetupPageView: React.FC<SetupPageViewProps> = ({`
`70`	`66`	`<Welcomemessage={Language.welcomeMessage}/>`
`71`	`67`	`<formonSubmit={form.handleSubmit}>`
`72`	`68`	`<Stack>`
`73`		`-<TextField`
`74`		`-{...getFieldHelpers("organization")}`
`75`		`-onChange={onChangeTrimmed(form)}`
`76`		`-autoFocus`
`77`		`-fullWidth`
`78`		`-label={Language.organizationLabel}`
`79`		`-variant="outlined"`
`80`		`-/>`
`81`	`69`	`<TextField`
`82`	`70`	`{...getFieldHelpers("username")}`
`83`	`71`	`onChange={onChangeTrimmed(form)}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita2eaba1

File tree

2 files changed

2 files changed

`‎site/src/pages/SetupPage/SetupPage.test.tsx`

`‎site/src/pages/SetupPage/SetupPageView.tsx`

0 commit comments