Refactor delete object and share object components (#5537)

browser/app/js/objects/__tests__/DeleteObjectConfirmModal.test.js

@@ -0,0 +1,45 @@
+/*
+ * 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 { DeleteObjectConfirmModal } from "../DeleteObjectConfirmModal"
+
+describe("DeleteObjectConfirmModal", () => {
+  it("should render without crashing", () => {
+    shallow(<DeleteObjectConfirmModal />)
+  })
+
+  it("should call deleteObject when Delete is clicked", () => {
+    const deleteObject = jest.fn()
+    const wrapper = shallow(
+      <DeleteObjectConfirmModal deleteObject={deleteObject} />
+    )
+    wrapper.find("ConfirmModal").prop("okHandler")()
+    expect(deleteObject).toHaveBeenCalled()
+  })
+
+  it("should call hideDeleteConfirmModal when Cancel is clicked", () => {
+    const hideDeleteConfirmModal = jest.fn()
+    const wrapper = shallow(
+      <DeleteObjectConfirmModal
+        hideDeleteConfirmModal={hideDeleteConfirmModal}
+      />
+    )
+    wrapper.find("ConfirmModal").prop("cancelHandler")()
+    expect(hideDeleteConfirmModal).toHaveBeenCalled()
+  })
+})

browser/app/js/objects/__tests__/ObjectActions.test.js

@@ -0,0 +1,95 @@
+/*
+ * 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 { ObjectActions } from "../ObjectActions"
+
+describe("ObjectActions", () => {
+  it("should render without crashing", () => {
+    shallow(<ObjectActions object={{ name: "obj1" }} currentPrefix={"pre1/"} />)
+  })
+
+  it("should show DeleteObjectConfirmModal when delete action is clicked", () => {
+    const wrapper = shallow(
+      <ObjectActions object={{ name: "obj1" }} currentPrefix={"pre1/"} />
+    )
+    wrapper
+      .find("a")
+      .last()
+      .simulate("click", { preventDefault: jest.fn() })
+    expect(wrapper.state("showDeleteConfirmation")).toBeTruthy()
+    expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(1)
+  })
+
+  it("should hide DeleteObjectConfirmModal when Cancel button is clicked", () => {
+    const wrapper = shallow(
+      <ObjectActions object={{ name: "obj1" }} currentPrefix={"pre1/"} />
+    )
+    wrapper
+      .find("a")
+      .last()
+      .simulate("click", { preventDefault: jest.fn() })
+    wrapper.find("DeleteObjectConfirmModal").prop("hideDeleteConfirmModal")()
+    wrapper.update()
+    expect(wrapper.state("showDeleteConfirmation")).toBeFalsy()
+    expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(0)
+  })
+
+  it("should call deleteObject with object name", () => {
+    const deleteObject = jest.fn()
+    const wrapper = shallow(
+      <ObjectActions
+        object={{ name: "obj1" }}
+        currentPrefix={"pre1/"}
+        deleteObject={deleteObject}
+      />
+    )
+    wrapper
+      .find("a")
+      .last()
+      .simulate("click", { preventDefault: jest.fn() })
+    wrapper.find("DeleteObjectConfirmModal").prop("deleteObject")()
+    expect(deleteObject).toHaveBeenCalledWith("obj1")
+  })
+
+  it("should call shareObject with object and expiry", () => {
+    const shareObject = jest.fn()
+    const wrapper = shallow(
+      <ObjectActions
+        object={{ name: "obj1" }}
+        currentPrefix={"pre1/"}
+        shareObject={shareObject}
+      />
+    )
+    wrapper
+      .find("a")
+      .first()
+      .simulate("click", { preventDefault: jest.fn() })
+    expect(shareObject).toHaveBeenCalledWith("obj1", 5, 0, 0)
+  })
+
+  it("should render ShareObjectModal when an object is shared", () => {
+    const wrapper = shallow(
+      <ObjectActions
+        object={{ name: "obj1" }}
+        currentPrefix={"pre1/"}
+        showShareObjectModal={true}
+      />
+    )
+    expect(wrapper.find("Connect(ShareObjectModal)").length).toBe(1)
+  })
+})

browser/app/js/objects/__tests__/ShareObjectModal.test.js

@@ -0,0 +1,204 @@
+/*
+ * 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, mount } from "enzyme"
+import { ShareObjectModal } from "../ShareObjectModal"
+import {
+  SHARE_OBJECT_EXPIRY_DAYS,
+  SHARE_OBJECT_EXPIRY_HOURS,
+  SHARE_OBJECT_EXPIRY_MINUTES
+} from "../../constants"
+
+jest.mock("../../web", () => ({
+  LoggedIn: jest.fn(() => {
+    return true
+  })
+}))
+
+describe("ShareObjectModal", () => {
+  it("should render without crashing", () => {
+    shallow(
+      <ShareObjectModal
+        object={{ name: "obj1" }}
+        shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
+      />
+    )
+  })
+
+  it("shoud call hideShareObject when Cancel is clicked", () => {
+    const hideShareObject = jest.fn()
+    const wrapper = shallow(
+      <ShareObjectModal
+        object={{ name: "obj1" }}
+        shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
+        hideShareObject={hideShareObject}
+      />
+    )
+    wrapper
+      .find("button")
+      .last()
+      .simulate("click")
+    expect(hideShareObject).toHaveBeenCalled()
+  })
+
+  it("should show the shareable link", () => {
+    const wrapper = shallow(
+      <ShareObjectModal
+        object={{ name: "obj1" }}
+        shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
+      />
+    )
+    expect(
+      wrapper
+        .find("input")
+        .first()
+        .prop("value")
+    ).toBe(`${window.location.protocol}//test`)
+  })
+
+  it("should call showCopyAlert and hideShareObject when Copy button is clicked", () => {
+    const hideShareObject = jest.fn()
+    const showCopyAlert = jest.fn()
+    const wrapper = shallow(
+      <ShareObjectModal
+        object={{ name: "obj1" }}
+        shareObjectDetails={{ show: true, object: "obj1", url: "test" }}
+        hideShareObject={hideShareObject}
+        showCopyAlert={showCopyAlert}
+      />
+    )
+    wrapper.find("CopyToClipboard").prop("onCopy")()
+    expect(showCopyAlert).toHaveBeenCalledWith("Link copied to clipboard!")
+    expect(hideShareObject).toHaveBeenCalled()
+  })
+
+  describe("Update expiry values", () => {
+    const props = {
+      object: { name: "obj1" },
+      shareObjectDetails: { show: true, object: "obj1", url: "test" }
+    }
+    it("should have default expiry values", () => {
+      const wrapper = shallow(<ShareObjectModal {...props} />)
+      expect(wrapper.state("expiry")).toEqual({
+        days: SHARE_OBJECT_EXPIRY_DAYS,
+        hours: SHARE_OBJECT_EXPIRY_HOURS,
+        minutes: SHARE_OBJECT_EXPIRY_MINUTES
+      })
+    })
+
+    it("should not allow any increments when days is already max", () => {
+      const shareObject = jest.fn()
+      const wrapper = shallow(
+        <ShareObjectModal {...props} shareObject={shareObject} />
+      )
+      wrapper.setState({
+        expiry: {
+          days: 7,
+          hours: 0,
+          minutes: 0
+        }
+      })
+      wrapper.find("#increase-hours").simulate("click")
+      expect(wrapper.state("expiry")).toEqual({
+        days: 7,
+        hours: 0,
+        minutes: 0
+      })
+      expect(shareObject).not.toHaveBeenCalled()
+    })
+
+    it("should not allow expiry values less than minimum value", () => {
+      const shareObject = jest.fn()
+      const wrapper = shallow(
+        <ShareObjectModal {...props} shareObject={shareObject} />
+      )
+      wrapper.setState({
+        expiry: {
+          days: 5,
+          hours: 0,
+          minutes: 0
+        }
+      })
+      wrapper.find("#decrease-hours").simulate("click")
+      expect(wrapper.state("expiry").hours).toBe(0)
+      wrapper.find("#decrease-minutes").simulate("click")
+      expect(wrapper.state("expiry").minutes).toBe(0)
+      expect(shareObject).not.toHaveBeenCalled()
+    })
+
+    it("should not allow expiry values more than maximum value", () => {
+      const shareObject = jest.fn()
+      const wrapper = shallow(
+        <ShareObjectModal {...props} shareObject={shareObject} />
+      )
+      wrapper.setState({
+        expiry: {
+          days: 1,
+          hours: 23,
+          minutes: 59
+        }
+      })
+      wrapper.find("#increase-hours").simulate("click")
+      expect(wrapper.state("expiry").hours).toBe(23)
+      wrapper.find("#increase-minutes").simulate("click")
+      expect(wrapper.state("expiry").minutes).toBe(59)
+      expect(shareObject).not.toHaveBeenCalled()
+    })
+
+    it("should set hours and minutes to 0 when days reaches max", () => {
+      const shareObject = jest.fn()
+      const wrapper = shallow(
+        <ShareObjectModal {...props} shareObject={shareObject} />
+      )
+      wrapper.setState({
+        expiry: {
+          days: 6,
+          hours: 5,
+          minutes: 30
+        }
+      })
+      wrapper.find("#increase-days").simulate("click")
+      expect(wrapper.state("expiry")).toEqual({
+        days: 7,
+        hours: 0,
+        minutes: 0
+      })
+      expect(shareObject).toHaveBeenCalled()
+    })
+
+    it("should set days to MAX when all of them becomes 0", () => {
+      const shareObject = jest.fn()
+      const wrapper = shallow(
+        <ShareObjectModal {...props} shareObject={shareObject} />
+      )
+      wrapper.setState({
+        expiry: {
+          days: 0,
+          hours: 1,
+          minutes: 0
+        }
+      })
+      wrapper.find("#decrease-hours").simulate("click")
+      expect(wrapper.state("expiry")).toEqual({
+        days: 7,
+        hours: 0,
+        minutes: 0
+      })
+      expect(shareObject).toHaveBeenCalledWith("obj1", 7, 0, 0)
+    })
+  })
+})

browser/app/js/objects/__tests__/actions.test.js

@@ -17,6 +17,7 @@
 import configureStore from "redux-mock-store"
 import thunk from "redux-thunk"
 import * as actionsObjects from "../actions"
+import * as alertActions from "../../alert/actions"
 
 jest.mock("../../web", () => ({
   ListObjects: jest.fn(() => {
@@ -25,6 +26,18 @@ jest.mock("../../web", () => ({
       istruncated: false,
       nextmarker: "test2"
     })
+  }),
+  RemoveObject: jest.fn(({ bucketName, objects }) => {
+    if (!bucketName) {
+      return Promise.reject({ message: "Invalid bucket" })
+    }
+    return Promise.resolve({})
+  }),
+  PresignedGet: jest.fn(({ bucket, object }) => {
+    if (!bucket) {
+      return Promise.reject({ message: "Invalid bucket" })
+    }
+    return Promise.resolve({ url: "https://test.com/bk1/pre1/b.txt" })
   })
 }))
 
@@ -169,4 +182,123 @@ describe("Objects actions", () => {
     expect(actions).toEqual(expectedActions)
     expect(window.location.pathname.endsWith("/test/abc/")).toBeTruthy()
   })
+
+  it("creates objects/REMOVE action", () => {
+    const store = mockStore()
+    const expectedActions = [{ type: "objects/REMOVE", object: "obj1" }]
+    store.dispatch(actionsObjects.removeObject("obj1"))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates objects/REMOVE action when object is deleted", () => {
+    const store = mockStore({
+      buckets: { currentBucket: "test" },
+      objects: { currentPrefix: "pre1/" }
+    })
+    const expectedActions = [{ type: "objects/REMOVE", object: "obj1" }]
+    store.dispatch(actionsObjects.deleteObject("obj1")).then(() => {
+      const actions = store.getActions()
+      expect(actions).toEqual(expectedActions)
+    })
+  })
+
+  it("creates alert/SET action when invalid bucket is provided", () => {
+    const store = mockStore({
+      buckets: { currentBucket: "" },
+      objects: { currentPrefix: "pre1/" }
+    })
+    const expectedActions = [
+      {
+        type: "alert/SET",
+        alert: { type: "danger", message: "Invalid bucket", id: 0 }
+      }
+    ]
+    return store.dispatch(actionsObjects.deleteObject("obj1")).then(() => {
+      const actions = store.getActions()
+      expect(actions).toEqual(expectedActions)
+    })
+  })
+
+  it("creates objects/SET_SHARE_OBJECT action for showShareObject", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "objects/SET_SHARE_OBJECT",
+        show: true,
+        object: "b.txt",
+        url: "test"
+      }
+    ]
+    store.dispatch(actionsObjects.showShareObject("b.txt", "test"))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates objects/SET_SHARE_OBJECT action for hideShareObject", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "objects/SET_SHARE_OBJECT",
+        show: false,
+        object: "",
+        url: ""
+      }
+    ]
+    store.dispatch(actionsObjects.hideShareObject())
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates objects/SET_SHARE_OBJECT when object is shared", () => {
+    const store = mockStore({
+      buckets: { currentBucket: "bk1" },
+      objects: { currentPrefix: "pre1/" }
+    })
+    const expectedActions = [
+      {
+        type: "objects/SET_SHARE_OBJECT",
+        show: true,
+        object: "a.txt",
+        url: "https://test.com/bk1/pre1/b.txt"
+      },
+      {
+        type: "alert/SET",
+        alert: {
+          type: "success",
+          message: "Object shared. Expires in 1 days 0 hours 0 minutes",
+          id: alertActions.alertId
+        }
+      }
+    ]
+    return store
+      .dispatch(actionsObjects.shareObject("a.txt", 1, 0, 0))
+      .then(() => {
+        const actions = store.getActions()
+        expect(actions).toEqual(expectedActions)
+      })
+  })
+
+  it("creates alert/SET when shareObject is failed", () => {
+    const store = mockStore({
+      buckets: { currentBucket: "" },
+      objects: { currentPrefix: "pre1/" }
+    })
+    const expectedActions = [
+      {
+        type: "alert/SET",
+        alert: {
+          type: "danger",
+          message: "Invalid bucket",
+          id: alertActions.alertId
+        }
+      }
+    ]
+    return store
+      .dispatch(actionsObjects.shareObject("a.txt", 1, 0, 0))
+      .then(() => {
+        const actions = store.getActions()
+        expect(actions).toEqual(expectedActions)
+      })
+  })
 })

browser/app/js/objects/__tests__/reducer.test.js

@@ -26,7 +26,12 @@ describe("objects reducer", () => {
       sortOrder: false,
       currentPrefix: "",
       marker: "",
-      isTruncated: false
+      isTruncated: false,
+      shareObject: {
+        show: false,
+        object: "",
+        url: ""
+      }
     })
   })
 
@@ -66,6 +71,28 @@ describe("objects reducer", () => {
     expect(newState.isTruncated).toBeFalsy()
   })
 
+  it("should handle REMOVE", () => {
+    const newState = reducer(
+      { list: [{ name: "obj1" }, { name: "obj2" }] },
+      {
+        type: actions.REMOVE,
+        object: "obj1"
+      }
+    )
+    expect(newState.list).toEqual([{ name: "obj2" }])
+  })
+
+  it("should handle REMOVE with non-existent object", () => {
+    const newState = reducer(
+      { list: [{ name: "obj1" }, { name: "obj2" }] },
+      {
+        type: actions.REMOVE,
+        object: "obj3"
+      }
+    )
+    expect(newState.list).toEqual([{ name: "obj1" }, { name: "obj2" }])
+  })
+
   it("should handle SET_SORT_BY", () => {
     const newState = reducer(undefined, {
       type: actions.SET_SORT_BY,
@@ -94,4 +121,18 @@ describe("objects reducer", () => {
     expect(newState.marker).toEqual("")
     expect(newState.isTruncated).toBeFalsy()
   })
+
+  it("should handle SET_SHARE_OBJECT", () => {
+    const newState = reducer(undefined, {
+      type: actions.SET_SHARE_OBJECT,
+      show: true,
+      object: "a.txt",
+      url: "test"
+    })
+    expect(newState.shareObject).toEqual({
+      show: true,
+      object: "a.txt",
+      url: "test"
+    })
+  })
 })