Revert "deprecate embedded browser (#12163)"

This reverts commit 736d8cbac4.

Bring contrib files for older contributions

browser/app/js/alert/Alert.js

@@ -0,0 +1,30 @@
+/*
+ * 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 AlertComponent from "react-bootstrap/lib/Alert"
+
+const Alert = ({ show, type, message, onDismiss }) => (
+  <AlertComponent
+    className={"alert animated " + (show ? "fadeInDown" : "fadeOutUp")}
+    bsStyle={type}
+    onDismiss={onDismiss}
+  >
+    <div className="text-center">{message}</div>
+  </AlertComponent>
+)
+
+export default Alert

browser/app/js/alert/AlertContainer.js

@@ -0,0 +1,41 @@
+/*
+ * 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 { connect } from "react-redux"
+import Alert from "./Alert"
+import * as alertActions from "./actions"
+
+export const AlertContainer = ({ alert, clearAlert }) => {
+  if (!alert.message) {
+    return ""
+  }
+  return <Alert {...alert} onDismiss={clearAlert} />
+}
+
+const mapStateToProps = state => {
+  return {
+    alert: state.alert
+  }
+}
+
+const mapDispatchToProps = dispatch => {
+  return {
+    clearAlert: () => dispatch(alertActions.clear())
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(AlertContainer)

browser/app/js/alert/__tests___/Alert.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, mount } from "enzyme"
+import Alert from "../Alert"
+
+describe("Alert", () => {
+  it("should render without crashing", () => {
+    shallow(<Alert />)
+  })
+
+  it("should call onDismiss when close button is clicked", () => {
+    const onDismiss = jest.fn()
+    const wrapper = mount(
+      <Alert show={true} type="danger" message="test" onDismiss={onDismiss} />
+    )
+    wrapper.find("button").simulate("click", { preventDefault: jest.fn() })
+    expect(onDismiss).toHaveBeenCalled()
+  })
+})

browser/app/js/alert/__tests___/AlertContainer.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, mount } from "enzyme"
+import { AlertContainer } from "../AlertContainer"
+
+describe("Alert", () => {
+  it("should render without crashing", () => {
+    shallow(
+      <AlertContainer alert={{ show: true, type: "danger", message: "Test" }} />
+    )
+  })
+
+  it("should render nothing if message is empty", () => {
+    const wrapper = shallow(
+      <AlertContainer alert={{ show: true, type: "danger", message: "" }} />
+    )
+    expect(wrapper.find("Alert").length).toBe(0)
+  })
+})

browser/app/js/alert/__tests___/actions.test.js

@@ -0,0 +1,69 @@
+/*
+ * 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 actionsAlert from "../actions"
+
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares)
+
+jest.useFakeTimers()
+
+describe("Alert actions", () => {
+  it("creates alert/SET action", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "alert/SET",
+        alert: { id: 0, message: "Test alert", type: "danger" }
+      }
+    ]
+    store.dispatch(actionsAlert.set({ message: "Test alert", type: "danger" }))
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates alert/CLEAR action for non danger alerts", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "alert/SET",
+        alert: { id: 1, message: "Test alert" }
+      },
+      {
+        type: "alert/CLEAR",
+        alert: { id: 1 }
+      }
+    ]
+    store.dispatch(actionsAlert.set({ message: "Test alert" }))
+    jest.runAllTimers()
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+
+  it("creates alert/CLEAR action directly", () => {
+    const store = mockStore()
+    const expectedActions = [
+      {
+        type: "alert/CLEAR"
+      }
+    ]
+    store.dispatch(actionsAlert.clear())
+    const actions = store.getActions()
+    expect(actions).toEqual(expectedActions)
+  })
+})

browser/app/js/alert/__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 actionsAlert from "../actions"
+
+describe("alert reducer", () => {
+  it("should return the initial state", () => {
+    expect(reducer(undefined, {})).toEqual({
+      show: false,
+      type: "danger"
+    })
+  })
+
+  it("should handle SET_ALERT", () => {
+    expect(
+      reducer(undefined, {
+        type: actionsAlert.SET,
+        alert: { id: 1, type: "danger", message: "Test message" }
+      })
+    ).toEqual({
+      show: true,
+      id: 1,
+      type: "danger",
+      message: "Test message"
+    })
+  })
+
+  it("should clear alert if id not passed", () => {
+    expect(
+      reducer(
+        { show: true, type: "danger", message: "Test message" },
+        {
+          type: actionsAlert.CLEAR
+        }
+      )
+    ).toEqual({
+      show: false,
+      type: "danger"
+    })
+  })
+
+  it("should clear alert if id is matching", () => {
+    expect(
+      reducer(
+        { show: true, id: 1, type: "danger", message: "Test message" },
+        {
+          type: actionsAlert.CLEAR,
+          alert: { id: 1 }
+        }
+      )
+    ).toEqual({
+      show: false,
+      type: "danger"
+    })
+  })
+
+  it("should not clear alert if id is not matching", () => {
+    expect(
+      reducer(
+        { show: true, id: 1, type: "danger", message: "Test message" },
+        {
+          type: actionsAlert.CLEAR,
+          alert: { id: 2 }
+        }
+      )
+    ).toEqual({
+      show: true,
+      id: 1,
+      type: "danger",
+      message: "Test message"
+    })
+  })
+})

browser/app/js/alert/actions.js

@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+export const SET = "alert/SET"
+export const CLEAR = "alert/CLEAR"
+
+export let alertId = 0
+
+export const set = alert => {
+  const id = alertId++
+  return (dispatch, getState) => {
+    if (alert.type !== "danger" || alert.autoClear) {
+      setTimeout(() => {
+        dispatch({
+          type: CLEAR,
+          alert: {
+            id
+          }
+        })
+      }, 5000)
+    }
+    dispatch({
+      type: SET,
+      alert: Object.assign({}, alert, {
+        id
+      })
+    })
+  }
+}
+
+export const clear = () => {
+  return { type: CLEAR }
+}

browser/app/js/alert/reducer.js

@@ -0,0 +1,41 @@
+/*
+ * 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 * as actionsAlert from "./actions"
+
+const initialState = {
+  show: false,
+  type: "danger"
+}
+export default (state = initialState, action) => {
+  switch (action.type) {
+    case actionsAlert.SET:
+      return {
+        show: true,
+        id: action.alert.id,
+        type: action.alert.type,
+        message: action.alert.message
+      }
+    case actionsAlert.CLEAR:
+      if (action.alert && action.alert.id != state.id) {
+        return state
+      } else {
+        return initialState
+      }
+    default:
+      return state
+  }
+}