- { alert.message }
-
-
-
- }
-
-
- }
-
- let createButton = ''
- if (web.LoggedIn()) {
- createButton =
-
-
- -
-
- - Used: - { humanize.filesize(total - free) } - -
- - Free: - { humanize.filesize(total - used) } - -
-
- )
- }
-}
diff --git a/browser/app/js/components/Browser.js b/browser/app/js/components/Browser.js
new file mode 100644
index 000000000..948eefa6e
--- /dev/null
+++ b/browser/app/js/components/Browser.js
@@ -0,0 +1,36 @@
+/*
+ * Minio Cloud Storage (C) 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react"
+import classNames from "classnames"
+import { connect } from "react-redux"
+import SideBar from "./SideBar"
+
+class Browser extends React.Component {
+ render() {
+ return (
+
-
- { alertBox }
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Bucket Policy (
- { currentBucket })
-
-
-
-
-
-
-
- Share Object
-
-
-
-
- { settingsModal }
-
-
- 0
- })) }>
- { checkedObjects.length } Objects selected
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- Name
-
-
-
- Size
-
-
-
- Last Modified
-
-
-
-
-
-
-
-
- Loading...
-
-
-
-
-
-
-
-
- -
-
-
- - Version -- { version } -
-
-
- - Memory -- { memory } -
-
-
- - Platform -- { platform } -
-
-
- - Runtime -- { runtime } -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Days
-
-
-
-
-
-
-
-
-
- Hours
-
-
-
-
-
-
-
-
-
- Minutes
-
-
-
-
-
-
-
-
-
-
-
-
+
+ )
+ }
+}
+
+export default connect(state => state)(Browser)
diff --git a/browser/app/js/components/Bucket.js b/browser/app/js/components/Bucket.js
new file mode 100644
index 000000000..bd05209b1
--- /dev/null
+++ b/browser/app/js/components/Bucket.js
@@ -0,0 +1,43 @@
+/*
+ * Minio Cloud Storage (C) 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react"
+import classNames from "classnames"
+
+export const Bucket = ({ bucket, isActive, selectBucket }) => {
+ return (
+
+ }
+ >
+
+
+ )
+ }
+}
+
+const mapStateToProps = state => {
+ return {
+ visibleBuckets: getVisibleBuckets(state)
+ }
+}
+
+const mapDispatchToProps = dispatch => {
+ return {
+ fetchBuckets: () => dispatch(actionsBuckets.fetchBuckets())
+ }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(BucketList)
diff --git a/browser/app/js/components/BucketSearch.js b/browser/app/js/components/BucketSearch.js
new file mode 100644
index 000000000..2f13320bb
--- /dev/null
+++ b/browser/app/js/components/BucketSearch.js
@@ -0,0 +1,44 @@
+/*
+ * Minio Cloud Storage (C) 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react"
+import { connect } from "react-redux"
+import * as actionsBuckets from "../actions/buckets"
+
+export const BucketSearch = ({ onChange }) => (
+ -
+ {visibleBuckets.map(bucket => (
+
+ onChange(e.target.value)}
+ placeholder="Search Buckets..."
+ />
+
+
+)
+
+const mapDispatchToProps = dispatch => {
+ return {
+ onChange: filter => {
+ dispatch(actionsBuckets.setFilter(filter))
+ }
+ }
+}
+
+export default connect(undefined, mapDispatchToProps)(BucketSearch)
diff --git a/browser/app/js/components/Host.js b/browser/app/js/components/Host.js
new file mode 100644
index 000000000..233167332
--- /dev/null
+++ b/browser/app/js/components/Host.js
@@ -0,0 +1,26 @@
+/*
+ * Minio Cloud Storage (C) 2016, 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react"
+
+export const Host = () => (
+
+
+ {window.location.host}
+
+)
+
+export default Host
diff --git a/browser/app/js/components/Login.js b/browser/app/js/components/Login.js
index 914df95f9..e74375942 100644
--- a/browser/app/js/components/Login.js
+++ b/browser/app/js/components/Login.js
@@ -1,5 +1,5 @@
/*
- * Minio Cloud Storage (C) 2016 Minio, Inc.
+ * Minio Cloud Storage (C) 2016, 2018 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,115 +14,118 @@
* limitations under the License.
*/
-import React from 'react'
-import classNames from 'classnames'
-import logo from '../../img/logo.svg'
-import Alert from 'react-bootstrap/lib/Alert'
-import * as actions from '../actions'
-import InputGroup from '../components/InputGroup'
+import React from "react"
+import { connect } from "react-redux"
+import classNames from "classnames"
+import logo from "../../img/logo.svg"
+import Alert from "./Alert"
+import * as actionsAlert from "../actions/alert"
+import InputGroup from "../components/InputGroup"
+import { minioBrowserPrefix } from "../constants"
+import web from "../web"
+import { Redirect } from "react-router-dom"
-export default class Login extends React.Component {
+export class Login extends React.Component {
handleSubmit(event) {
event.preventDefault()
- const {web, dispatch, loginRedirectPath} = this.props
- let message = ''
- if (!document.getElementById('accessKey').value) {
- message = 'Secret Key cannot be empty'
+ const { dispatch, history } = this.props
+ let message = ""
+ if (!document.getElementById("accessKey").value) {
+ message = "Secret Key cannot be empty"
}
- if (!document.getElementById('secretKey').value) {
- message = 'Access Key cannot be empty'
+ if (!document.getElementById("secretKey").value) {
+ message = "Access Key cannot be empty"
}
if (message) {
- dispatch(actions.showAlert({
- type: 'danger',
- message
- }))
+ dispatch(
+ actionsAlert.set({
+ type: "danger",
+ message
+ })
+ )
return
}
- web.Login({
- username: document.getElementById('accessKey').value,
- password: document.getElementById('secretKey').value
- })
- .then((res) => {
- this.context.router.push(loginRedirectPath)
+ web
+ .Login({
+ username: document.getElementById("accessKey").value,
+ password: document.getElementById("secretKey").value
+ })
+ .then(res => {
+ history.push(minioBrowserPrefix)
})
.catch(e => {
- dispatch(actions.setLoginError())
- dispatch(actions.showAlert({
- type: 'danger',
- message: e.message
- }))
+ dispatch(
+ actionsAlert.set({
+ type: "danger",
+ message: e.message
+ })
+ )
})
}
componentWillMount() {
- const {dispatch} = this.props
+ const { dispatch } = this.props
// Clear out any stale message in the alert of previous page
- dispatch(actions.showAlert({
- type: 'danger',
- message: ''
- }))
- document.body.classList.add('is-guest')
+ dispatch(actionsAlert.clear())
+ document.body.classList.add("is-guest")
}
componentWillUnmount() {
- document.body.classList.remove('is-guest')
+ document.body.classList.remove("is-guest")
}
- hideAlert() {
- const {dispatch} = this.props
- dispatch(actions.hideAlert())
+ clearAlert() {
+ const { dispatch } = this.props
+ dispatch(actionsAlert.clear())
}
render() {
- const {alert} = this.props
- let alertBox =
- { alert.message }
-
-
- { alertBox }
+ {alertBox}
)
}
}
-Login.contextTypes = {
- router: React.PropTypes.object.isRequired
-}
+export default connect(state => state)(Login)
diff --git a/browser/app/js/components/SideBar.js b/browser/app/js/components/SideBar.js
index 40d3c07f4..bb1607ef1 100644
--- a/browser/app/js/components/SideBar.js
+++ b/browser/app/js/components/SideBar.js
@@ -1,5 +1,5 @@
/*
- * Minio Cloud Storage (C) 2016 Minio, Inc.
+ * Minio Cloud Storage (C) 2016, 2018 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,86 +14,37 @@
* limitations under the License.
*/
-import React from 'react'
-import classNames from 'classnames'
-import ClickOutHandler from 'react-onclickout'
-import Scrollbars from 'react-custom-scrollbars/lib/Scrollbars'
-import connect from 'react-redux/lib/components/connect'
+import React from "react"
+import classNames from "classnames"
+import ClickOutHandler from "react-onclickout"
+import { connect } from "react-redux"
-import logo from '../../img/logo.svg'
-import Dropdown from 'react-bootstrap/lib/Dropdown'
-
-let SideBar = ({visibleBuckets, loadBucket, currentBucket, selectBucket, searchBuckets, sidebarStatus, clickOutside, showPolicy, deleteBucket, toggleBucketDropdown, showBucketDropdown}) => {
-
- const list = visibleBuckets.map((bucket, i) => {
- return
-
+
+
)
}
-// Subscribe it to state changes that affect only the sidebar.
-export default connect(state => {
- return {
- visibleBuckets: state.visibleBuckets,
- loadBucket: state.loadBucket,
- currentBucket: state.currentBucket,
- showBucketDropdown: state.showBucketDropdown,
- sidebarStatus: state.sidebarStatus
- }
-})(SideBar)
+export default connect(state => state)(SideBar)
diff --git a/browser/app/js/components/__tests__/Bucket.test.js b/browser/app/js/components/__tests__/Bucket.test.js
new file mode 100644
index 000000000..b25fb90e0
--- /dev/null
+++ b/browser/app/js/components/__tests__/Bucket.test.js
@@ -0,0 +1,39 @@
+/*
+ * Minio Cloud Storage (C) 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react"
+import { shallow } from "enzyme"
+import { Bucket } from "../Bucket"
+
+describe("Bucket", () => {
+ it("should render without crashing", () => {
+ shallow(