Revert "deprecate embedded browser (#12163)"

This reverts commit 736d8cbac4.

Bring contrib files for older contributions

browser/app/js/uploads/__tests__/AbortConfirmModal.test.js

@@ -0,0 +1,49 @@
+/*
+ * MinIO Object Storage (c) 2021 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 { AbortConfirmModal } from "../AbortConfirmModal"
+
+describe("AbortConfirmModal", () => {
+  it("should render without crashing", () => {
+    shallow(<AbortConfirmModal />)
+  })
+
+  it("should call abort for every upload when Abort is clicked", () => {
+    const abort = jest.fn()
+    const wrapper = shallow(
+      <AbortConfirmModal
+        uploads={{
+          "a-b/-test1": { size: 100, loaded: 50, name: "test1" },
+          "a-b/-test2": { size: 100, loaded: 50, name: "test2" }
+        }}
+        abort={abort}
+      />
+    )
+    wrapper.instance().abortUploads()
+    expect(abort.mock.calls.length).toBe(2)
+    expect(abort.mock.calls[0][0]).toBe("a-b/-test1")
+    expect(abort.mock.calls[1][0]).toBe("a-b/-test2")
+  })
+
+  it("should call hideAbort when cancel is clicked", () => {
+    const hideAbort = jest.fn()
+    const wrapper = shallow(<AbortConfirmModal hideAbort={hideAbort} />)
+    wrapper.find("ConfirmModal").prop("cancelHandler")()
+    expect(hideAbort).toHaveBeenCalled()
+  })
+})

browser/app/js/uploads/__tests__/Dropzone.test.js

@@ -0,0 +1,34 @@
+/*
+ * MinIO Object Storage (c) 2021 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 { Dropzone } from "../Dropzone"
+
+describe("Dropzone", () => {
+  it("should render without crashing", () => {
+    shallow(<Dropzone />)
+  })
+
+  it("should call uploadFile with files", () => {
+    const uploadFile = jest.fn()
+    const wrapper = shallow(<Dropzone uploadFile={uploadFile} />)
+    const file1 = new Blob(["file content1"], { type: "text/plain" })
+    const file2 = new Blob(["file content2"], { type: "text/plain" })
+    wrapper.first().prop("onDrop")([file1, file2])
+    expect(uploadFile.mock.calls).toEqual([[file1], [file2]])
+  })
+})

browser/app/js/uploads/__tests__/UploadModal.test.js

@@ -0,0 +1,56 @@
+/*
+ * MinIO Object Storage (c) 2021 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 { UploadModal } from "../UploadModal"
+
+describe("UploadModal", () => {
+  it("should render without crashing", () => {
+    shallow(<UploadModal uploads={{}} />)
+  })
+
+  it("should render AbortConfirmModal when showAbort is true", () => {
+    const wrapper = shallow(<UploadModal uploads={{}} showAbort={true} />)
+    expect(wrapper.find("Connect(AbortConfirmModal)").length).toBe(1)
+  })
+
+  it("should render nothing when there are no files being uploaded", () => {
+    const wrapper = shallow(<UploadModal uploads={{}} />)
+    expect(wrapper.find("noscript").length).toBe(1)
+  })
+
+  it("should show upload progress when one or more files are being uploaded", () => {
+    const wrapper = shallow(
+      <UploadModal
+        uploads={{ "a-b/-test": { size: 100, loaded: 50, name: "test" } }}
+      />
+    )
+    expect(wrapper.find("ProgressBar").length).toBe(1)
+  })
+
+  it("should call showAbortModal when close button is clicked", () => {
+    const showAbortModal = jest.fn()
+    const wrapper = shallow(
+      <UploadModal
+        uploads={{ "a-b/-test": { size: 100, loaded: 50, name: "test" } }}
+        showAbortModal={showAbortModal}
+      />
+    )
+    wrapper.find("button").simulate("click")
+    expect(showAbortModal).toHaveBeenCalled()
+  })
+})

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

@@ -0,0 +1,167 @@
+/*
+ * MinIO Object Storage (c) 2021 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 configureStore from "redux-mock-store"
+import thunk from "redux-thunk"
+import * as uploadsActions from "../actions"
+
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares)
+
+describe("Uploads actions", () => {
+  it("creates uploads/ADD action", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "uploads/ADD",
+        slug: "a-b-c",
+        size: 100,
+        name: "test"
+      }
+    ]
+    store.dispatch(uploadsActions.add("a-b-c", 100, "test"))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates uploads/UPDATE_PROGRESS action", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "uploads/UPDATE_PROGRESS",
+        slug: "a-b-c",
+        loaded: 50
+      }
+    ]
+    store.dispatch(uploadsActions.updateProgress("a-b-c", 50))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates uploads/STOP action", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "uploads/STOP",
+        slug: "a-b-c"
+      }
+    ]
+    store.dispatch(uploadsActions.stop("a-b-c"))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates uploads/SHOW_ABORT_MODAL action", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "uploads/SHOW_ABORT_MODAL",
+        show: true
+      }
+    ]
+    store.dispatch(uploadsActions.showAbortModal())
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  describe("uploadFile", () => {
+    const file = new Blob(["file content"], {
+      type: "text/plain"
+    })
+    file.name = "file1"
+
+    it("creates alerts/SET action when currentBucket is not present", () => {
+      const store = mockStore({
+        buckets: { currentBucket: "" }
+      })
+      const expectedActions = [
+        {
+          type: "alert/SET",
+          alert: {
+            id: 0,
+            type: "danger",
+            message: "Please choose a bucket before trying to upload files."
+          }
+        }
+      ]
+      const file = new Blob(["file content"], { type: "text/plain" })
+      store.dispatch(uploadsActions.uploadFile(file))
+      const actions = store.getActions()
+      expect(actions).toEqual(expectedActions)
+    })
+
+    it("creates uploads/ADD action before uploading the file", () => {
+      const store = mockStore({
+        buckets: { currentBucket: "test1" },
+        objects: { currentPrefix: "pre1/" }
+      })
+      const expectedActions = [
+        {
+          type: "uploads/ADD",
+          slug: "test1-pre1/-file1",
+          size: file.size,
+          name: file.name
+        }
+      ]
+      store.dispatch(uploadsActions.uploadFile(file))
+      const actions = store.getActions()
+      expect(actions).toEqual(expectedActions)
+    })
+
+    it("should open and send XMLHttpRequest", () => {
+      const open = jest.fn()
+      const send = jest.fn()
+      const xhrMockClass = () => ({
+        open: open,
+        send: send,
+        setRequestHeader: jest.fn(),
+        upload: {
+          addEventListener: jest.fn()
+        }
+      })
+      window.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass)
+      const store = mockStore({
+        buckets: { currentBucket: "test1" },
+        objects: { currentPrefix: "pre1/" }
+      })
+      store.dispatch(uploadsActions.uploadFile(file))
+      const objectPath = encodeURIComponent("pre1/file1")
+      expect(open).toHaveBeenCalledWith(
+        "PUT",
+        "https://localhost:8080/upload/test1/" + objectPath,
+        true
+      )
+      expect(send).toHaveBeenCalledWith(file)
+    })
+  })
+
+  it("creates uploads/STOP and uploads/SHOW_ABORT_MODAL after abortUpload", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "uploads/STOP",
+        slug: "a-b/-c"
+      },
+      {
+        type: "uploads/SHOW_ABORT_MODAL",
+        show: false
+      }
+    ]
+    store.dispatch(uploadsActions.abortUpload("a-b/-c"))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+})

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

@@ -0,0 +1,87 @@
+/*
+ * MinIO Object Storage (c) 2021 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 "../reducer"
+import * as actions from "../actions"
+
+describe("uploads reducer", () => {
+  it("should return the initial state", () => {
+    const initialState = reducer(undefined, {})
+    expect(initialState).toEqual({
+      files: {},
+      showAbortModal: false
+    })
+  })
+
+  it("should handle ADD", () => {
+    const newState = reducer(undefined, {
+      type: actions.ADD,
+      slug: "a-b-c",
+      size: 100,
+      name: "test"
+    })
+    expect(newState.files).toEqual({
+      "a-b-c": { loaded: 0, size: 100, name: "test" }
+    })
+  })
+
+  it("should handle UPDATE_PROGRESS", () => {
+    const newState = reducer(
+      {
+        files: { "a-b-c": { loaded: 0, size: 100, name: "test" } }
+      },
+      {
+        type: actions.UPDATE_PROGRESS,
+        slug: "a-b-c",
+        loaded: 50
+      }
+    )
+    expect(newState.files).toEqual({
+      "a-b-c": { loaded: 50, size: 100, name: "test" }
+    })
+  })
+
+  it("should handle STOP", () => {
+    const newState = reducer(
+      {
+        files: {
+          "a-b-c": { loaded: 70, size: 100, name: "test1" },
+          "x-y-z": { loaded: 50, size: 100, name: "test2" }
+        }
+      },
+      {
+        type: actions.STOP,
+        slug: "a-b-c"
+      }
+    )
+    expect(newState.files).toEqual({
+      "x-y-z": { loaded: 50, size: 100, name: "test2" }
+    })
+  })
+
+  it("should handle SHOW_ABORT_MODAL", () => {
+    const newState = reducer(
+      {
+        showAbortModal: false
+      },
+      {
+        type: actions.SHOW_ABORT_MODAL,
+        show: true
+      }
+    )
+    expect(newState.showAbortModal).toBeTruthy()
+  })
+})