mirror of
https://github.com/minio/minio.git
synced 2025-01-26 06:03:17 -05:00
Refactor login page to get rid of warning on test (#6083)
This commit is contained in:
parent
25de775560
commit
8bd7a19d50
@ -25,14 +25,35 @@ import web from "../web"
|
|||||||
import { Redirect } from "react-router-dom"
|
import { Redirect } from "react-router-dom"
|
||||||
|
|
||||||
export class Login extends React.Component {
|
export class Login extends React.Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props)
|
||||||
|
this.state = {
|
||||||
|
accessKey: "",
|
||||||
|
secretKey: ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle field changes
|
||||||
|
accessKeyChange(e) {
|
||||||
|
this.setState({
|
||||||
|
accessKey: e.target.value
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
secretKeyChange(e) {
|
||||||
|
this.setState({
|
||||||
|
secretKey: e.target.value
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
handleSubmit(event) {
|
handleSubmit(event) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
const { showAlert, history } = this.props
|
const { showAlert, history } = this.props
|
||||||
let message = ""
|
let message = ""
|
||||||
if (!document.getElementById("accessKey").value) {
|
if (this.state.accessKey === "") {
|
||||||
message = "Access Key cannot be empty"
|
message = "Access Key cannot be empty"
|
||||||
}
|
}
|
||||||
if (!document.getElementById("secretKey").value) {
|
if (this.state.secretKey === "") {
|
||||||
message = "Secret Key cannot be empty"
|
message = "Secret Key cannot be empty"
|
||||||
}
|
}
|
||||||
if (message) {
|
if (message) {
|
||||||
@ -41,8 +62,8 @@ export class Login extends React.Component {
|
|||||||
}
|
}
|
||||||
web
|
web
|
||||||
.Login({
|
.Login({
|
||||||
username: document.getElementById("accessKey").value,
|
username: this.state.accessKey,
|
||||||
password: document.getElementById("secretKey").value
|
password: this.state.secretKey
|
||||||
})
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
history.push("/")
|
history.push("/")
|
||||||
@ -77,6 +98,8 @@ export class Login extends React.Component {
|
|||||||
<div className="l-wrap">
|
<div className="l-wrap">
|
||||||
<form onSubmit={this.handleSubmit.bind(this)}>
|
<form onSubmit={this.handleSubmit.bind(this)}>
|
||||||
<InputGroup
|
<InputGroup
|
||||||
|
value={this.state.accessKey}
|
||||||
|
onChange={this.accessKeyChange.bind(this)}
|
||||||
className="ig-dark"
|
className="ig-dark"
|
||||||
label="Access Key"
|
label="Access Key"
|
||||||
id="accessKey"
|
id="accessKey"
|
||||||
@ -87,6 +110,8 @@ export class Login extends React.Component {
|
|||||||
autoComplete="username"
|
autoComplete="username"
|
||||||
/>
|
/>
|
||||||
<InputGroup
|
<InputGroup
|
||||||
|
value={this.state.secretKey}
|
||||||
|
onChange={this.secretKeyChange.bind(this)}
|
||||||
className="ig-dark"
|
className="ig-dark"
|
||||||
label="Secret Key"
|
label="Secret Key"
|
||||||
id="secretKey"
|
id="secretKey"
|
||||||
|
@ -60,20 +60,25 @@ describe("Login", () => {
|
|||||||
alert={{ show: false, type: "danger"}}
|
alert={{ show: false, type: "danger"}}
|
||||||
showAlert={showAlertMock}
|
showAlert={showAlertMock}
|
||||||
clearAlert={clearAlertMock}
|
clearAlert={clearAlertMock}
|
||||||
/>,
|
/>
|
||||||
{ attachTo: document.body }
|
|
||||||
)
|
)
|
||||||
// case where both keys are empty - displays the second warning
|
// case where both keys are empty - displays the second warning
|
||||||
wrapper.find("form").simulate("submit")
|
wrapper.find("form").simulate("submit")
|
||||||
expect(showAlertMock).toHaveBeenCalledWith("danger", "Secret Key cannot be empty")
|
expect(showAlertMock).toHaveBeenCalledWith("danger", "Secret Key cannot be empty")
|
||||||
|
|
||||||
// case where access key is empty
|
// case where access key is empty
|
||||||
document.getElementById("secretKey").value = "secretKey"
|
wrapper.setState({
|
||||||
|
accessKey: "",
|
||||||
|
secretKey: "secretKey"
|
||||||
|
})
|
||||||
wrapper.find("form").simulate("submit")
|
wrapper.find("form").simulate("submit")
|
||||||
expect(showAlertMock).toHaveBeenCalledWith("danger", "Access Key cannot be empty")
|
expect(showAlertMock).toHaveBeenCalledWith("danger", "Access Key cannot be empty")
|
||||||
|
|
||||||
// case where secret key is empty
|
// case where secret key is empty
|
||||||
document.getElementById("accessKey").value = "accessKey"
|
wrapper.setState({
|
||||||
|
accessKey: "accessKey",
|
||||||
|
secretKey: ""
|
||||||
|
})
|
||||||
wrapper.find("form").simulate("submit")
|
wrapper.find("form").simulate("submit")
|
||||||
expect(showAlertMock).toHaveBeenCalledWith("danger", "Secret Key cannot be empty")
|
expect(showAlertMock).toHaveBeenCalledWith("danger", "Secret Key cannot be empty")
|
||||||
})
|
})
|
||||||
@ -85,11 +90,12 @@ describe("Login", () => {
|
|||||||
alert={{ show: false, type: "danger"}}
|
alert={{ show: false, type: "danger"}}
|
||||||
showAlert={showAlertMock}
|
showAlert={showAlertMock}
|
||||||
clearAlert={clearAlertMock}
|
clearAlert={clearAlertMock}
|
||||||
/>,
|
/>
|
||||||
{ attachTo: document.body }
|
|
||||||
)
|
)
|
||||||
document.getElementById("accessKey").value = "accessKey"
|
wrapper.setState({
|
||||||
document.getElementById("secretKey").value = "secretKey"
|
accessKey: "accessKey",
|
||||||
|
secretKey: "secretKey"
|
||||||
|
})
|
||||||
wrapper.find("form").simulate("submit")
|
wrapper.find("form").simulate("submit")
|
||||||
expect(web.Login).toHaveBeenCalledWith({
|
expect(web.Login).toHaveBeenCalledWith({
|
||||||
"username": "accessKey",
|
"username": "accessKey",
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user