Commit 3feccaa

AdrinlolNikolayS

authored and

committed

fix(ui): remove text and token field on edit page, remove verify_token from the request

1 parent 311eb32 commit 3feccaaCopy full SHA for 3feccaa

File tree

2 files changed

+56

-50

lines changed

ui/packages/platform/src
- api
  - api.js
- components/DbLabInstanceForm
  - DbLabInstanceForm.tsx

2 files changed

+56

-50

lines changed

`‎ui/packages/platform/src/api/api.js‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,6 @@ class Api {`
`524`	`524`	`project_label: instanceData.projectLabel,`
`525`	`525`	`use_tunnel: instanceData.useTunnel,`
`526`	`526`	`ssh_server_url: instanceData.sshServerUrl,`
`527`		`- verify_token: instanceData.instanceToken,`
`528`	`527`	`}`
`529`	`528`
`530`	`529`	return this.post(`${this.apiServer}/rpc/dblab_instance_edit`, params, {

`‎ui/packages/platform/src/components/DbLabInstanceForm/DbLabInstanceForm.tsx‎`

Lines changed: 56 additions & 49 deletions

Original file line number	Diff line number	Diff line change
`@@ -327,12 +327,15 @@ class DbLabInstanceForm extends Component<`
`327`	`327`	`</WarningWrapper>`
`328`	`328`	`)}`
`329`	`329`
`330`		`- <span>`
`331`		`- Database Lab provisioning is currently semi-automated.`
`332`		`- <br />`
`333`		`- First, you need to prepare a Database Lab instance on a separate `
`334`		`- machine. Once the instance is ready, register it here.`
`335`		`- </span>`
	`330`	`+ {!disabledOnEdit && (`
	`331`	`+ <span>`
	`332`	`+ Database Lab provisioning is currently semi-automated.`
	`333`	`+ <br />`
	`334`	`+ First, you need to prepare a Database Lab instance on a`
	`335`	`+ separate  machine. Once the instance is ready, register it`
	`336`	`+ here.`
	`337`	`+ </span>`
	`338`	`+ )}`
`336`	`339`
`337`	`340`	`<div className={classes.errorMessage}>`
`338`	`341`	`{data?.errorMessage ? data.errorMessage : null}`
`@@ -404,51 +407,55 @@ class DbLabInstanceForm extends Component<`
`404`	`407`	`/>`
`405`	`408`	`</div>`
`406`	`409`
`407`		`- <div className={classes.fieldBlock}>`
`408`		`- <TextField`
`409`		`- disabled={!permitted \|\| disabledOnEdit}`
`410`		`- type={disabledOnEdit ? 'password' : 'text'}`
`411`		`- variant="outlined"`
`412`		`- id="token"`
`413`		`- label="Verification token"`
`414`		`- value={this.state.token}`
`415`		`- required`
`416`		`- className={classes.textField}`
`417`		`- onChange={(e) => {`
`418`		`- this.setState({`
`419`		`- token: e.target.value,`
`420`		`- })`
`421`		`- Actions.resetNewDbLabInstance()`
`422`		`- }}`
`423`		`- margin="normal"`
`424`		`- error={this.state.errorFields.indexOf('token') !== -1}`
`425`		`- fullWidth`
`426`		`- inputProps={{`
`427`		`- name: 'token',`
`428`		`- id: 'token',`
`429`		`- shrink: true,`
`430`		`- }}`
`431`		`- InputLabelProps={{`
`432`		`- shrink: true,`
`433`		`- style: styles.inputFieldLabel,`
`434`		`- }}`
`435`		`- FormHelperTextProps={{`
`436`		`- style: styles.inputFieldHelper,`
`437`		`- }}`
`438`		`- />`
`439`		`- <div>`
`440`		`- <Button`
`441`		`- variant="contained"`
`442`		`- color="primary"`
`443`		`- disabled={isDataUpdating \|\| !permitted \|\| disabledOnEdit}`
`444`		`- onClick={this.generateTokenHandler}`
`445`		`- >`
`446`		`- Generate`
`447`		`- </Button>`
	`410`	`+ {!disabledOnEdit && (`
	`411`	`+ <div className={classes.fieldBlock}>`
	`412`	`+ <TextField`
	`413`	`+ disabled={!permitted}`
	`414`	`+ variant="outlined"`
	`415`	`+ id="token"`
	`416`	`+ label="Verification token"`
	`417`	`+ value={this.state.token}`
	`418`	`+ required`
	`419`	`+ className={classes.textField}`
	`420`	`+ onChange={(e) => {`
	`421`	`+ this.setState({`
	`422`	`+ token: e.target.value,`
	`423`	`+ })`
	`424`	`+ Actions.resetNewDbLabInstance()`
	`425`	`+ }}`
	`426`	`+ margin="normal"`
	`427`	`+ error={this.state.errorFields.indexOf('token') !== -1}`
	`428`	`+ fullWidth`
	`429`	`+ inputProps={{`
	`430`	`+ name: 'token',`
	`431`	`+ id: 'token',`
	`432`	`+ shrink: true,`
	`433`	`+ }}`
	`434`	`+ InputLabelProps={{`
	`435`	`+ shrink: true,`
	`436`	`+ style: styles.inputFieldLabel,`
	`437`	`+ }}`
	`438`	`+ FormHelperTextProps={{`
	`439`	`+ style: styles.inputFieldHelper,`
	`440`	`+ }}`
	`441`	`+ />`
	`442`	`+ <div>`
	`443`	`+ <Button`
	`444`	`+ variant="contained"`
	`445`	`+ color="primary"`
	`446`	`+ disabled={isDataUpdating \|\| !permitted \|\| disabledOnEdit}`
	`447`	`+ onClick={this.generateTokenHandler}`
	`448`	`+ >`
	`449`	`+ Generate`
	`450`	`+ </Button>`
	`451`	`+ </div>`
`448`	`452`	`</div>`
`449`		`- </div>`
	`453`	`+ )}`
`450`	`454`
`451`		`- <div className={classes.fieldBlock} style={{ marginTop: 10 }}>`
	`455`	`+ <div`
	`456`	`+ className={classes.fieldBlock}`
	`457`	`+ style={{ marginTop: !disabledOnEdit ? 10 : 0 }}`
	`458`	`+ >`
`452`	`459`	`<TextField`
`453`	`460`	`disabled={!permitted}`
`454`	`461`	`variant="outlined"`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3feccaa

File tree

2 files changed

2 files changed

`‎ui/packages/platform/src/api/api.js‎`

`‎ui/packages/platform/src/components/DbLabInstanceForm/DbLabInstanceForm.tsx‎`

0 commit comments