Refactor of components (#5499)

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")
   })
 })

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 }
+    })
+  })
+})

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()
+  })
+})

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
+  }
+}

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

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
+  }
+}