MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tweak fetchBuckets to comply with the changes made to the routes (#5592)

Browse Source 
This commit removes the argument in the fetchBuckets function that was
introduced in #5580. Due to the adjustment made in #5584, we no longer
need to differentiate between where the function has been called from.
This commit is contained in:
Kaan Kabalak 2018-03-02 10:23:50 -08:00 committed by Harshavardhana
parent 6a15b89b9a
commit 384b4fdf28
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/app/js/buckets/BucketList.js
View File

@ -28,7 +28,7 @@ export class BucketList extends React.Component {
componentWillMount() {
const { fetchBuckets, setBucketList, selectBucket } = this.props
if (web.LoggedIn()) {
fetchBuckets("list")
fetchBuckets()
} else {
const { bucket, prefix } = pathSlice(history.location.pathname)
if (bucket) {
@ -65,7 +65,7 @@ const mapStateToProps = state => {
const mapDispatchToProps = dispatch => {
return {
fetchBuckets: action => dispatch(actionsBuckets.fetchBuckets(action)),
fetchBuckets: () => dispatch(actionsBuckets.fetchBuckets()),
setBucketList: buckets => dispatch(actionsBuckets.setList(buckets)),
selectBucket: bucket => dispatch(actionsBuckets.selectBucket(bucket))
}

6
browser/app/js/buckets/__tests__/actions.test.js
View File

@ -46,7 +46,7 @@ describe("Buckets actions", () => {
{ type: "buckets/SET_LIST", buckets: ["test1", "test2"] },
{ type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
]
return store.dispatch(actionsBuckets.fetchBuckets("list")).then(() => {
return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
const actions = store.getActions()
expect(actions).toEqual(expectedActions)
})
@ -60,7 +60,7 @@ describe("Buckets actions", () => {
{ type: "buckets/SET_CURRENT_BUCKET", bucket: "test2" }
]
window.location
return store.dispatch(actionsBuckets.fetchBuckets("list")).then(() => {
return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
const actions = store.getActions()
expect(actions).toEqual(expectedActions)
})
@ -74,7 +74,7 @@ describe("Buckets actions", () => {
{ type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
]
window.location
return store.dispatch(actionsBuckets.fetchBuckets("list")).then(() => {
return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
const actions = store.getActions()
expect(actions).toEqual(expectedActions)
})

6
browser/app/js/buckets/actions.js
View File

@ -29,7 +29,7 @@ export const SHOW_MAKE_BUCKET_MODAL = "buckets/SHOW_MAKE_BUCKET_MODAL"
export const SHOW_BUCKET_POLICY = "buckets/SHOW_BUCKET_POLICY"
export const SET_POLICIES = "buckets/SET_POLICIES"
export const fetchBuckets = action => {
export const fetchBuckets = () => {
return function(dispatch) {
return web.ListBuckets().then(res => {
const buckets = res.buckets ? res.buckets.map(bucket => bucket.name) : []
@ -41,7 +41,7 @@ export const fetchBuckets = action => {
} else {
dispatch(selectBucket(buckets[0]))
}
} else if (action === "delete") {
} else {
dispatch(selectBucket(""))
history.replace("/")
}
@ -112,7 +112,7 @@ export const deleteBucket = bucket => {
})
)
dispatch(removeBucket(bucket))
dispatch(fetchBuckets("delete"))
dispatch(fetchBuckets())
})
.catch(err => {
dispatch(