diff --git a/browser/app/js/objects/actions.js b/browser/app/js/objects/actions.js
index 9bb73d04c..c1ea37def 100644
--- a/browser/app/js/objects/actions.js
+++ b/browser/app/js/objects/actions.js
@@ -77,25 +77,32 @@ export const fetchObjects = () => {
prefix: currentPrefix
})
.then(res => {
- let objects = []
- if (res.objects) {
- objects = res.objects.map(object => {
- return {
- ...object,
- name: object.name.replace(currentPrefix, "")
- }
- })
+ // we need to check if the bucket name and prefix are the same as
+ // when the request was made before updating the displayed objects
+ if (
+ currentBucket === getCurrentBucket(getState()) &&
+ currentPrefix === getCurrentPrefix(getState())
+ ) {
+ let objects = []
+ if (res.objects) {
+ objects = res.objects.map(object => {
+ return {
+ ...object,
+ name: object.name.replace(currentPrefix, "")
+ }
+ })
+ }
+
+ const sortBy = SORT_BY_LAST_MODIFIED
+ const sortOrder = SORT_ORDER_DESC
+ dispatch(setSortBy(sortBy))
+ dispatch(setSortOrder(sortOrder))
+ const sortedList = sortObjectsList(objects, sortBy, sortOrder)
+ dispatch(setList(sortedList))
+
+ dispatch(setPrefixWritable(res.writable))
+ dispatch(setListLoading(false))
}
-
- const sortBy = SORT_BY_LAST_MODIFIED
- const sortOrder = SORT_ORDER_DESC
- dispatch(setSortBy(sortBy))
- dispatch(setSortOrder(sortOrder))
- const sortedList = sortObjectsList(objects, sortBy, sortOrder)
- dispatch(setList(sortedList))
-
- dispatch(setPrefixWritable(res.writable))
- dispatch(setListLoading(false))
})
.catch(err => {
if (web.LoggedIn()) {
diff --git a/browser/ui-assets.go b/browser/ui-assets.go
index 3061e2c76..b7385afae 100644
--- a/browser/ui-assets.go
+++ b/browser/ui-assets.go
@@ -6,7 +6,7 @@
// production/favicon-96x96.png
// production/firefox.png
// production/index.html
-// production/index_bundle-2019-06-19T09-39-21Z.js
+// production/index_bundle-2019-06-26T21-01-22Z.js
// production/loader.css
// production/logo.svg
// production/safari.png
@@ -16,7 +16,6 @@ package browser
import (
"fmt"
- "github.com/elazarl/go-bindata-assetfs"
"io/ioutil"
"os"
"path/filepath"
@@ -67,7 +66,7 @@ func productionChromePng() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/chrome.png", size: 3726, mode: os.FileMode(420), modTime: time.Unix(1560937181, 0)}
+ info := bindataFileInfo{name: "production/chrome.png", size: 3726, mode: os.FileMode(420), modTime: time.Unix(1561582910, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -84,7 +83,7 @@ func productionFavicon16x16Png() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/favicon-16x16.png", size: 14906, mode: os.FileMode(420), modTime: time.Unix(1560937181, 0)}
+ info := bindataFileInfo{name: "production/favicon-16x16.png", size: 14906, mode: os.FileMode(420), modTime: time.Unix(1561582910, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -101,7 +100,7 @@ func productionFavicon32x32Png() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/favicon-32x32.png", size: 16066, mode: os.FileMode(420), modTime: time.Unix(1560937181, 0)}
+ info := bindataFileInfo{name: "production/favicon-32x32.png", size: 16066, mode: os.FileMode(420), modTime: time.Unix(1561582910, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -118,7 +117,7 @@ func productionFavicon96x96Png() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/favicon-96x96.png", size: 17029, mode: os.FileMode(420), modTime: time.Unix(1560937181, 0)}
+ info := bindataFileInfo{name: "production/favicon-96x96.png", size: 17029, mode: os.FileMode(420), modTime: time.Unix(1561582910, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -135,7 +134,7 @@ func productionFirefoxPng() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/firefox.png", size: 4795, mode: os.FileMode(420), modTime: time.Unix(1560937181, 0)}
+ info := bindataFileInfo{name: "production/firefox.png", size: 4795, mode: os.FileMode(420), modTime: time.Unix(1561582910, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -195,8 +194,8 @@ var _productionIndexHTML = []byte(`
-
-
+
+