Merge "Don't overwrite builds when retrieving the buildset"

web/src/actions/build.js

@@ -376,18 +376,16 @@ const failedBuildset = error => ({
   error
 })
 
-const fetchBuildset = (tenant, buildset) => dispatch => {
+export function fetchBuildset(tenant, buildsetId) {
-  dispatch(requestBuildset())
+  return async function(dispatch) {
-  return API.fetchBuildset(tenant.apiPrefix, buildset)
+    dispatch(requestBuildset())
-    .then(response => {
+    try {
-      if (response.data.builds) {
+      const response = await API.fetchBuildset(tenant.apiPrefix, buildsetId)
-        response.data.builds.forEach(build => {
+      dispatch(receiveBuildset(buildsetId, response.data))
-          dispatch(receiveBuild(build.uuid, build))
+    } catch (error) {
-        })
+      dispatch(failedBuildset(error))
-      }
+    }
-      dispatch(receiveBuildset(buildset, response.data))
+  }
-    })
-    .catch(error => dispatch(failedBuildset(error)))
 }
 
 const shouldFetchBuildset = (buildsetId, state) => {

web/src/pages/Buildset.jsx

@@ -25,7 +25,7 @@ import {
 } from '@patternfly/react-core'
 import { BuildIcon } from '@patternfly/react-icons'
 
-import { fetchBuildsetIfNeeded } from '../actions/build'
+import { fetchBuildset } from '../actions/build'
 import { EmptyPage } from '../containers/Errors'
 import { Fetchable, Fetching } from '../containers/Fetching'
 import BuildList from '../containers/build/BuildList'
@@ -39,13 +39,9 @@ class BuildsetPage extends React.Component {
     dispatch: PropTypes.func,
   }
 
-  updateData = (force) => {
+  updateData = () => {
     this.props.dispatch(
-      fetchBuildsetIfNeeded(
+      fetchBuildset(this.props.tenant, this.props.match.params.buildsetId)
-        this.props.tenant,
-        this.props.match.params.buildsetId,
-        force
-      )
     )
   }