fix success alert not shown after object is uploaded (#6500)

browser/app/js/alert/actions.js

@@ -22,7 +22,7 @@ export let alertId = 0
 export const set = alert => {
   const id = alertId++
   return (dispatch, getState) => {
-    if (alert.type !== "danger") {
+    if (alert.type !== "danger" || alert.autoClear) {
       setTimeout(() => {
         dispatch({
           type: CLEAR,

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

@@ -123,9 +123,6 @@ describe("Objects actions", () => {
       objects: { currentPrefix: "" }
     })
     const expectedActions = [
-      {
-        type: "alert/CLEAR"
-      },
       {
         type: "objects/SET_LIST",
         objects: [{ name: "test1" }, { name: "test2" }],
@@ -157,9 +154,6 @@ describe("Objects actions", () => {
       objects: { currentPrefix: "" }
     })
     const expectedActions = [
-      {
-        type: "alert/CLEAR"
-      },
       {
         type: "objects/APPEND_LIST",
         objects: [{ name: "test1" }, { name: "test2" }],
@@ -183,15 +177,13 @@ describe("Objects actions", () => {
       objects: { currentPrefix: "" }
     })
     const expectedActions = [
-      {
-        type: "alert/CLEAR"
-      },
       {
         type: "alert/SET",
         alert: {
           type: "danger",
           message: "listobjects is denied",
-          id: alertActions.alertId
+          id: alertActions.alertId,
+          autoClear: true
         }
       },
       {
@@ -252,7 +244,6 @@ describe("Objects actions", () => {
     })
     const expectedActions = [
       { type: "objects/SET_CURRENT_PREFIX", prefix: "abc/" },
-      { type: "alert/CLEAR" },
       { type: "objects/CHECKED_LIST_RESET" }
     ]
     store.dispatch(actionsObjects.selectPrefix("abc/"))

browser/app/js/objects/actions.js

@@ -64,43 +64,47 @@ export const fetchObjects = append => {
       buckets: { currentBucket },
       objects: { currentPrefix, marker }
     } = getState()
-    dispatch(alertActions.clear())
     if (currentBucket) {
       return web
-      .ListObjects({
+        .ListObjects({
-        bucketName: currentBucket,
+          bucketName: currentBucket,
-        prefix: currentPrefix,
+          prefix: currentPrefix,
-        marker: append ? marker : ""
+          marker: append ? marker : ""
-      })
+        })
-      .then(res => {
+        .then(res => {
-        let objects = []
+          let objects = []
-        if (res.objects) {
+          if (res.objects) {
-          objects = res.objects.map(object => {
+            objects = res.objects.map(object => {
-            return {
+              return {
-              ...object,
+                ...object,
-              name: object.name.replace(currentPrefix, "")
+                name: object.name.replace(currentPrefix, "")
-            }
+              }
-          })
+            })
-        }
+          }
-        if (append) {
+          if (append) {
-          dispatch(appendList(objects, res.nextmarker, res.istruncated))
+            dispatch(appendList(objects, res.nextmarker, res.istruncated))
-        } else {
+          } else {
-          dispatch(setList(objects, res.nextmarker, res.istruncated))
+            dispatch(setList(objects, res.nextmarker, res.istruncated))
-          dispatch(setSortBy(""))
+            dispatch(setSortBy(""))
-          dispatch(setSortOrder(false))
+            dispatch(setSortOrder(false))
-        }
+          }
-        dispatch(setPrefixWritable(res.writable))
+          dispatch(setPrefixWritable(res.writable))
-      })
+        })
-      .catch(err => {
+        .catch(err => {
-        if (web.LoggedIn()) {
+          if (web.LoggedIn()) {
-          dispatch(alertActions.set({ type: "danger", message: err.message }))
+            dispatch(
-          dispatch(resetList())
+              alertActions.set({
-        }
+                type: "danger",
-        else {
+                message: err.message,
-          history.push("/login")
+                autoClear: true
-        }
+              })
-      })
+            )
-    } 
+            dispatch(resetList())
+          } else {
+            history.push("/login")
+          }
+        })
+    }
   }
 }