@@ -47,4 +49,16 @@ export const SideBar = () => {
)
}
-export default connect(state => state)(SideBar)
+const mapStateToProps = state => {
+ return {
+ sidebarOpen: state.common.sidebarOpen
+ }
+}
+
+const mapDispatchToProps = dispatch => {
+ return {
+ clickOutside: () => dispatch(actionsCommon.closeSidebar())
+ }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(SideBar)
diff --git a/browser/app/js/components/StorageInfo.js b/browser/app/js/components/StorageInfo.js
new file mode 100644
index 000000000..f0e5e0c02
--- /dev/null
+++ b/browser/app/js/components/StorageInfo.js
@@ -0,0 +1,64 @@
+/*
+ * 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 humanize from "humanize"
+import * as actionsCommon from "../actions/common"
+
+export class StorageInfo extends React.Component {
+ componentWillMount() {
+ const { fetchStorageInfo } = this.props
+ fetchStorageInfo()
+ }
+ render() {
+ const { total, free } = this.props.storageInfo
+ const used = total - free
+ const usedPercent = used / total * 100 + "%"
+ const freePercent = free * 100 / total
+ return (
+
+
+
+ -
+ Used:
+ {humanize.filesize(total - free)}
+
+ -
+ Free:
+ {humanize.filesize(total - used)}
+
+
+
+ )
+ }
+}
+
+const mapStateToProps = state => {
+ return {
+ storageInfo: state.common.storageInfo
+ }
+}
+
+const mapDispatchToProps = dispatch => {
+ return {
+ fetchStorageInfo: () => dispatch(actionsCommon.fetchStorageInfo())
+ }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(StorageInfo)
diff --git a/browser/app/js/components/__tests__/MobileHeader.test.js b/browser/app/js/components/__tests__/MobileHeader.test.js
new file mode 100644
index 000000000..d6dbd92e0
--- /dev/null
+++ b/browser/app/js/components/__tests__/MobileHeader.test.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 { shallow } from "enzyme"
+import { MobileHeader } from "../MobileHeader"
+
+describe("Bucket", () => {
+ it("should render without crashing", () => {
+ shallow(
)
+ })
+
+ it("should toggleSidebar when trigger is clicked", () => {
+ const toggleSidebar = jest.fn()
+ const wrapper = shallow(
+
+ )
+ wrapper
+ .find("#sidebar-toggle")
+ .simulate("click", { stopPropagation: jest.fn() })
+ expect(toggleSidebar).toHaveBeenCalled()
+ })
+})
diff --git a/browser/app/js/components/__tests__/ObjectsHeader.test.js b/browser/app/js/components/__tests__/ObjectsHeader.test.js
new file mode 100644
index 000000000..4bf6c8485
--- /dev/null
+++ b/browser/app/js/components/__tests__/ObjectsHeader.test.js
@@ -0,0 +1,61 @@
+/*
+ * 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 { ObjectsHeader } from "../ObjectsHeader"
+
+describe("ObjectsHeader", () => {
+ it("should render without crashing", () => {
+ const sortObjects = jest.fn()
+ shallow(
)
+ })
+
+ it("should render columns with asc classes by default", () => {
+ const sortObjects = jest.fn()
+ const wrapper = shallow(
)
+ expect(
+ wrapper.find("#sort-by-name i").hasClass("fa-sort-alpha-asc")
+ ).toBeTruthy()
+ expect(
+ wrapper.find("#sort-by-size i").hasClass("fa-sort-amount-asc")
+ ).toBeTruthy()
+ expect(
+ wrapper.find("#sort-by-last-modified i").hasClass("fa-sort-numeric-asc")
+ ).toBeTruthy()
+ })
+
+ it("should render name column with desc class when objects are sorted by name", () => {
+ const sortObjects = jest.fn()
+ const wrapper = shallow(
+
+ )
+ expect(
+ wrapper.find("#sort-by-name i").hasClass("fa-sort-alpha-desc")
+ ).toBeTruthy()
+ })
+
+ it("should call sortObjects when a column is clicked", () => {
+ const sortObjects = jest.fn()
+ const wrapper = shallow(
)
+ wrapper.find("#sort-by-name").simulate("click")
+ expect(sortObjects).toHaveBeenCalledWith("name")
+ wrapper.find("#sort-by-size").simulate("click")
+ expect(sortObjects).toHaveBeenCalledWith("size")
+ wrapper.find("#sort-by-last-modified").simulate("click")
+ expect(sortObjects).toHaveBeenCalledWith("last-modified")
+ })
+})
diff --git a/browser/app/js/components/__tests__/ObjectsList.test.js b/browser/app/js/components/__tests__/ObjectsList.test.js
new file mode 100644
index 000000000..5d6609271
--- /dev/null
+++ b/browser/app/js/components/__tests__/ObjectsList.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 { ObjectsList } from "../ObjectsList"
+
+describe("ObjectsList", () => {
+ it("should render without crashing", () => {
+ shallow(
)
+ })
+
+ it("should render ObjectContainer for every object", () => {
+ const wrapper = shallow(
+
+ )
+ expect(wrapper.find("ObjectContainer").length).toBe(2)
+ })
+
+ it("should render PrefixContainer for every prefix", () => {
+ const wrapper = shallow(
+
+ )
+ expect(wrapper.find("Connect(PrefixContainer)").length).toBe(2)
+ })
+})
diff --git a/browser/app/js/components/__tests__/ObjectsListContainer.test.js b/browser/app/js/components/__tests__/ObjectsListContainer.test.js
new file mode 100644
index 000000000..cea608c1c
--- /dev/null
+++ b/browser/app/js/components/__tests__/ObjectsListContainer.test.js
@@ -0,0 +1,57 @@
+/*
+ * 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 { ObjectsListContainer } from "../ObjectsListContainer"
+
+describe("ObjectsList", () => {
+ it("should render without crashing", () => {
+ shallow(
)
+ })
+
+ it("should render ObjectsList with objects", () => {
+ const wrapper = shallow(
+
+ )
+ expect(wrapper.find("ObjectsList").length).toBe(1)
+ expect(wrapper.find("ObjectsList").prop("objects")).toEqual([
+ { name: "test1.jpg" },
+ { name: "test2.jpg" }
+ ])
+ })
+
+ it("should call loadObjects when currentBucket is changed", () => {
+ const loadObjects = jest.fn()
+ const wrapper = shallow(
+
+ )
+ wrapper.setProps({ currentBucket: "test2" })
+ expect(loadObjects).toHaveBeenCalled()
+ })
+
+ it("should call loadObjects when currentPrefix is changed", () => {
+ const loadObjects = jest.fn()
+ const wrapper = shallow(
+
+ )
+ wrapper.setProps({ currentPrefix: "abc/xyz/" })
+ expect(loadObjects).toHaveBeenCalled()
+ })
+})
diff --git a/browser/app/js/components/__tests__/ObjetctItem.test.js b/browser/app/js/components/__tests__/ObjetctItem.test.js
new file mode 100644
index 000000000..507d52aa3
--- /dev/null
+++ b/browser/app/js/components/__tests__/ObjetctItem.test.js
@@ -0,0 +1,37 @@
+/*
+ * 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 { ObjectItem } from "../ObjectItem"
+
+describe("ObjectItem", () => {
+ it("should render without crashing", () => {
+ shallow(
)
+ })
+
+ it("should render with content type", () => {
+ const wrapper = shallow(
)
+ expect(wrapper.prop("data-type")).toBe("image")
+ })
+
+ it("should call onClick when the object isclicked", () => {
+ const onClick = jest.fn()
+ const wrapper = shallow(
)
+ wrapper.find("a").simulate("click", { preventDefault: jest.fn() })
+ expect(onClick).toHaveBeenCalled()
+ })
+})
diff --git a/browser/app/js/components/__tests__/Path.test.js b/browser/app/js/components/__tests__/Path.test.js
new file mode 100644
index 000000000..00952c14e
--- /dev/null
+++ b/browser/app/js/components/__tests__/Path.test.js
@@ -0,0 +1,72 @@
+/*
+ * 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 { Path } from "../Path"
+
+describe("Path", () => {
+ it("should render without crashing", () => {
+ shallow(
)
+ })
+
+ it("should render only bucket if there is no prefix", () => {
+ const wrapper = shallow(
)
+ expect(wrapper.find("span").length).toBe(1)
+ expect(wrapper.text()).toBe("test1")
+ })
+
+ it("should render bucket and prefix", () => {
+ const wrapper = shallow(
+
+ )
+ expect(wrapper.find("span").length).toBe(3)
+ expect(
+ wrapper
+ .find("span")
+ .at(0)
+ .text()
+ ).toBe("test1")
+ expect(
+ wrapper
+ .find("span")
+ .at(1)
+ .text()
+ ).toBe("a")
+ expect(
+ wrapper
+ .find("span")
+ .at(2)
+ .text()
+ ).toBe("b")
+ })
+
+ it("should call selectPrefix when a prefix part is clicked", () => {
+ const selectPrefix = jest.fn()
+ const wrapper = shallow(
+
+ )
+ wrapper
+ .find("a")
+ .at(2)
+ .simulate("click", { preventDefault: jest.fn() })
+ expect(selectPrefix).toHaveBeenCalledWith("a/b/")
+ })
+})
diff --git a/browser/app/js/components/__tests__/PrefixContainer.test.js b/browser/app/js/components/__tests__/PrefixContainer.test.js
new file mode 100644
index 000000000..87bc47ba3
--- /dev/null
+++ b/browser/app/js/components/__tests__/PrefixContainer.test.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 { shallow } from "enzyme"
+import { PrefixContainer } from "../PrefixContainer"
+
+describe("PrefixContainer", () => {
+ it("should render without crashing", () => {
+ shallow(
)
+ })
+
+ it("should render ObjectItem with props", () => {
+ const wrapper = shallow(
)
+ expect(wrapper.find("ObjectItem").length).toBe(1)
+ expect(wrapper.find("ObjectItem").prop("name")).toBe("abc/")
+ })
+
+ it("should call selectPrefix when the prefix is clicked", () => {
+ const selectPrefix = jest.fn()
+ const wrapper = shallow(
+
+ )
+ wrapper.find("ObjectItem").prop("onClick")()
+ expect(selectPrefix).toHaveBeenCalledWith("xyz/abc/")
+ })
+})
diff --git a/browser/app/js/components/__tests__/StorageInfo.test.js b/browser/app/js/components/__tests__/StorageInfo.test.js
new file mode 100644
index 000000000..6cf1ccbf4
--- /dev/null
+++ b/browser/app/js/components/__tests__/StorageInfo.test.js
@@ -0,0 +1,41 @@
+/*
+ * 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 { StorageInfo } from "../StorageInfo"
+
+describe("StorageInfo", () => {
+ it("should render without crashing", () => {
+ shallow(
+
+ )
+ })
+
+ it("should fetchStorageInfo before component is mounted", () => {
+ const fetchStorageInfo = jest.fn()
+ shallow(
+
+ )
+ expect(fetchStorageInfo).toHaveBeenCalled()
+ })
+})
diff --git a/browser/app/js/constants.js b/browser/app/js/constants.js
index 177000bbf..a2cf3097b 100644
--- a/browser/app/js/constants.js
+++ b/browser/app/js/constants.js
@@ -20,6 +20,6 @@
var p = window.location.pathname
export const minioBrowserPrefix = p.slice(0, p.indexOf("/", 1))
-export const READ_ONLY = 'readonly'
-export const WRITE_ONLY = 'writeonly'
-export const READ_WRITE = 'readwrite'
+export const READ_ONLY = "readonly"
+export const WRITE_ONLY = "writeonly"
+export const READ_WRITE = "readwrite"
diff --git a/browser/app/js/history.js b/browser/app/js/history.js
new file mode 100644
index 000000000..a88e3740c
--- /dev/null
+++ b/browser/app/js/history.js
@@ -0,0 +1,24 @@
+/*
+ * 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 createHistory from "history/createBrowserHistory"
+import { minioBrowserPrefix } from "./constants"
+
+const history = createHistory({
+ basename: minioBrowserPrefix
+})
+
+export default history
diff --git a/browser/app/js/reducers/__tests__/buckets.test.js b/browser/app/js/reducers/__tests__/buckets.test.js
index 84fec4f2e..e27e36cb3 100644
--- a/browser/app/js/reducers/__tests__/buckets.test.js
+++ b/browser/app/js/reducers/__tests__/buckets.test.js
@@ -19,7 +19,8 @@ import * as actions from "../../actions/buckets"
describe("buckets reducer", () => {
it("should return the initial state", () => {
- expect(reducer(undefined, {})).toEqual({
+ const initialState = reducer(undefined, {})
+ expect(initialState).toEqual({
list: [],
filter: "",
currentBucket: ""
@@ -27,38 +28,26 @@ describe("buckets reducer", () => {
})
it("should handle SET_BUCKETS", () => {
- expect(
- reducer(undefined, { type: actions.SET_LIST, buckets: ["bk1", "bk2"] })
- ).toEqual({
- list: ["bk1", "bk2"],
- filter: "",
- currentBucket: ""
+ const newState = reducer(undefined, {
+ type: actions.SET_LIST,
+ buckets: ["bk1", "bk2"]
})
+ expect(newState.list).toEqual(["bk1", "bk2"])
})
it("should handle SET_BUCKETS_FILTER", () => {
- expect(
- reducer(undefined, {
- type: actions.SET_FILTER,
- filter: "test"
- })
- ).toEqual({
- list: [],
- filter: "test",
- currentBucket: ""
+ const newState = reducer(undefined, {
+ type: actions.SET_FILTER,
+ filter: "test"
})
+ expect(newState.filter).toEqual("test")
})
it("should handle SELECT_BUCKET", () => {
- expect(
- reducer(undefined, {
- type: actions.SET_CURRENT_BUCKET,
- bucket: "test"
- })
- ).toEqual({
- list: [],
- filter: "",
- currentBucket: "test"
+ const newState = reducer(undefined, {
+ type: actions.SET_CURRENT_BUCKET,
+ bucket: "test"
})
+ expect(newState.currentBucket).toEqual("test")
})
})
diff --git a/browser/app/js/reducers/__tests__/common.test.js b/browser/app/js/reducers/__tests__/common.test.js
new file mode 100644
index 000000000..d49cc7757
--- /dev/null
+++ b/browser/app/js/reducers/__tests__/common.test.js
@@ -0,0 +1,70 @@
+/*
+ * 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 reducer from "../common"
+import * as actionsCommon from "../../actions/common"
+
+describe("common reducer", () => {
+ it("should return the initial state", () => {
+ expect(reducer(undefined, {})).toEqual({
+ sidebarOpen: false,
+ storageInfo: {
+ total: 0,
+ free: 0
+ }
+ })
+ })
+
+ it("should handle TOGGLE_SIDEBAR", () => {
+ expect(
+ reducer(
+ { sidebarOpen: false },
+ {
+ type: actionsCommon.TOGGLE_SIDEBAR
+ }
+ )
+ ).toEqual({
+ sidebarOpen: true
+ })
+ })
+
+ it("should handle CLOSE_SIDEBAR", () => {
+ expect(
+ reducer(
+ { sidebarOpen: true },
+ {
+ type: actionsCommon.CLOSE_SIDEBAR
+ }
+ )
+ ).toEqual({
+ sidebarOpen: false
+ })
+ })
+
+ it("should handle SET_STORAGE_INFO", () => {
+ expect(
+ reducer(
+ {},
+ {
+ type: actionsCommon.SET_STORAGE_INFO,
+ storageInfo: { total: 100, free: 40 }
+ }
+ )
+ ).toEqual({
+ storageInfo: { total: 100, free: 40 }
+ })
+ })
+})
diff --git a/browser/app/js/reducers/__tests__/objects.test.js b/browser/app/js/reducers/__tests__/objects.test.js
new file mode 100644
index 000000000..979bdc150
--- /dev/null
+++ b/browser/app/js/reducers/__tests__/objects.test.js
@@ -0,0 +1,97 @@
+/*
+ * 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 reducer from "../objects"
+import * as actions from "../../actions/objects"
+
+describe("objects reducer", () => {
+ it("should return the initial state", () => {
+ const initialState = reducer(undefined, {})
+ expect(initialState).toEqual({
+ list: [],
+ sortBy: "",
+ sortOrder: false,
+ currentPrefix: "",
+ marker: "",
+ isTruncated: false
+ })
+ })
+
+ it("should handle SET_LIST", () => {
+ const newState = reducer(undefined, {
+ type: actions.SET_LIST,
+ objects: [{ name: "obj1" }, { name: "obj2" }],
+ marker: "obj2",
+ isTruncated: false
+ })
+ expect(newState.list).toEqual([{ name: "obj1" }, { name: "obj2" }])
+ expect(newState.marker).toBe("obj2")
+ expect(newState.isTruncated).toBeFalsy()
+ })
+
+ it("should handle APPEND_LIST", () => {
+ const newState = reducer(
+ {
+ list: [{ name: "obj1" }, { name: "obj2" }],
+ marker: "obj2",
+ isTruncated: true
+ },
+ {
+ type: actions.APPEND_LIST,
+ objects: [{ name: "obj3" }, { name: "obj4" }],
+ marker: "obj4",
+ isTruncated: false
+ }
+ )
+ expect(newState.list).toEqual([
+ { name: "obj1" },
+ { name: "obj2" },
+ { name: "obj3" },
+ { name: "obj4" }
+ ])
+ expect(newState.marker).toBe("obj4")
+ expect(newState.isTruncated).toBeFalsy()
+ })
+
+ it("should handle SET_SORT_BY", () => {
+ const newState = reducer(undefined, {
+ type: actions.SET_SORT_BY,
+ sortBy: "name"
+ })
+ expect(newState.sortBy).toEqual("name")
+ })
+
+ it("should handle SET_SORT_ORDER", () => {
+ const newState = reducer(undefined, {
+ type: actions.SET_SORT_ORDER,
+ sortOrder: true
+ })
+ expect(newState.sortOrder).toEqual(true)
+ })
+
+ it("should handle SET_CURRENT_PREFIX", () => {
+ const newState = reducer(
+ { currentPrefix: "test1/", marker: "abc", isTruncated: true },
+ {
+ type: actions.SET_CURRENT_PREFIX,
+ prefix: "test2/"
+ }
+ )
+ expect(newState.currentPrefix).toEqual("test2/")
+ expect(newState.marker).toEqual("")
+ expect(newState.isTruncated).toBeFalsy()
+ })
+})
diff --git a/browser/app/js/reducers/common.js b/browser/app/js/reducers/common.js
new file mode 100644
index 000000000..33573aede
--- /dev/null
+++ b/browser/app/js/reducers/common.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 * as actionsCommon from "../actions/common"
+
+export default (
+ state = { sidebarOpen: false, storageInfo: { total: 0, free: 0 } },
+ action
+) => {
+ switch (action.type) {
+ case actionsCommon.TOGGLE_SIDEBAR:
+ return Object.assign({}, state, {
+ sidebarOpen: !state.sidebarOpen
+ })
+ case actionsCommon.CLOSE_SIDEBAR:
+ return Object.assign({}, state, {
+ sidebarOpen: false
+ })
+ case actionsCommon.SET_STORAGE_INFO:
+ return Object.assign({}, state, {
+ storageInfo: action.storageInfo
+ })
+ default:
+ return state
+ }
+}
diff --git a/browser/app/js/reducers/index.js b/browser/app/js/reducers/index.js
index 79145dcac..3b0d8bdb2 100644
--- a/browser/app/js/reducers/index.js
+++ b/browser/app/js/reducers/index.js
@@ -15,12 +15,16 @@
*/
import { combineReducers } from "redux"
+import common from "./common"
import alert from "./alert"
import buckets from "./buckets"
+import objects from "./objects"
const rootReducer = combineReducers({
+ common,
alert,
- buckets
+ buckets,
+ objects
})
export default rootReducer
diff --git a/browser/app/js/reducers/objects.js b/browser/app/js/reducers/objects.js
new file mode 100644
index 000000000..7b298c15d
--- /dev/null
+++ b/browser/app/js/reducers/objects.js
@@ -0,0 +1,65 @@
+/*
+ * 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 * as actionsObjects from "../actions/objects"
+
+export default (
+ state = {
+ list: [],
+ sortBy: "",
+ sortOrder: false,
+ currentPrefix: "",
+ marker: "",
+ isTruncated: false
+ },
+ action
+) => {
+ switch (action.type) {
+ case actionsObjects.SET_LIST:
+ return {
+ ...state,
+ list: action.objects,
+ marker: action.marker,
+ isTruncated: action.isTruncated
+ }
+ case actionsObjects.APPEND_LIST:
+ return {
+ ...state,
+ list: [...state.list, ...action.objects],
+ marker: action.marker,
+ isTruncated: action.isTruncated
+ }
+ case actionsObjects.SET_SORT_BY:
+ return {
+ ...state,
+ sortBy: action.sortBy
+ }
+ case actionsObjects.SET_SORT_ORDER:
+ return {
+ ...state,
+ sortOrder: action.sortOrder
+ }
+ case actionsObjects.SET_CURRENT_PREFIX:
+ return {
+ ...state,
+ currentPrefix: action.prefix,
+ marker: "",
+ isTruncated: false
+ }
+ default:
+ return state
+ }
+}
diff --git a/browser/app/less/inc/header.less b/browser/app/less/inc/header.less
index 50c619bc1..436fc4e41 100644
--- a/browser/app/less/inc/header.less
+++ b/browser/app/less/inc/header.less
@@ -27,6 +27,13 @@
color: @text-color;
}
}
+ &:last-child {
+ &:after {
+ content: '/';
+ margin: 0 4px;
+ color: @text-color;
+ }
+ }
}
}
diff --git a/browser/package.json b/browser/package.json
index eae83249b..3860e2d49 100644
--- a/browser/package.json
+++ b/browser/package.json
@@ -11,7 +11,10 @@
},
"jest": {
"setupTestFrameworkScriptFile": "./app/js/jest/setup.js",
- "testURL": "https://localhost:8080"
+ "testURL": "https://localhost:8080",
+ "moduleNameMapper": {
+ "\\.(css|scss|svg)$": "identity-obj-proxy"
+ }
},
"repository": {
"type": "git",
@@ -60,6 +63,7 @@
"font-awesome": "^4.7.0",
"history": "^4.7.2",
"humanize": "0.0.9",
+ "identity-obj-proxy": "^3.0.0",
"json-loader": "^0.5.4",
"local-storage-fallback": "^4.0.2",
"material-design-iconic-font": "^2.2.0",
diff --git a/browser/yarn.lock b/browser/yarn.lock
index b1e188fbd..69ea4b261 100644
--- a/browser/yarn.lock
+++ b/browser/yarn.lock
@@ -2992,6 +2992,10 @@ har-validator@~5.0.3:
ajv "^5.1.0"
har-schema "^2.0.0"
+harmony-reflect@^1.4.6:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.5.1.tgz#b54ca617b00cc8aef559bbb17b3d85431dc7e329"
+
has-ansi@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -3271,6 +3275,12 @@ icss-replace-symbols@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+identity-obj-proxy@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
+ dependencies:
+ harmony-reflect "^1.4.6"
+
ieee754@^1.1.4:
version "1.1.8"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"