Merge pull request #2064 from HubSpot/run-now-modal-focus

Prevent request action modals from closing upon regaining focus
HubSpot · Jan 31, 2020 · bb4d68f · bb4d68f
2 parents 0efb9e1 + 34d0fbd
commit bb4d68f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/SingularityUI/app/actions/ui/requestDetail.es6 b/SingularityUI/app/actions/ui/requestDetail.es6
@@ -8,6 +8,21 @@ import { FetchTaskCleanups, FetchScheduledTasksForRequest } from '../api/tasks';
 import { FetchRequestUtilization } from '../api/utilization';
 
 export const refresh = (requestId) => (dispatch, getState) => {
+  const requiredPromises = Promise.all([
+    dispatch(FetchRequest.trigger(requestId)),
+    dispatch(FetchRequestHistory.trigger(requestId, 5, 1)),
+  ])
+
+  dispatch(FetchActiveTasksForRequest.trigger(requestId));
+  dispatch(FetchTaskCleanups.trigger());
+  dispatch(FetchDeploysForRequest.trigger(requestId, 5, 1));
+  dispatch(FetchScheduledTasksForRequest.trigger(requestId));
+  dispatch(FetchRequestUtilization.trigger(requestId, [404]))
+
+  return requiredPromises;
+}
+
+export const initialize = (requestId) => (dispatch, getState) => {
   const requiredPromises = Promise.all([
     dispatch(FetchRequest.trigger(requestId)),
     dispatch(FetchRequestHistory.trigger(requestId, 5, 1)),

diff --git a/SingularityUI/app/components/requestDetail/RequestDetailPage.jsx b/SingularityUI/app/components/requestDetail/RequestDetailPage.jsx
@@ -27,8 +27,7 @@ import RequestUtilization from './RequestUtilization';
 
 import Utils from '../../utils';
 
-import { refresh } from '../../actions/ui/requestDetail';
-import { FetchRequestShuffleOptOut } from '../../actions/api/requests.es6';
+import { refresh, initialize } from '../../actions/ui/requestDetail';
 
 class RequestDetailPage extends Component {
   componentDidMount() {
@@ -124,4 +123,6 @@ export default withRouter(connect(
   RequestDetailPage,
   (props) => refresh(props.params.requestId),
   true,
+  true,
+  (props) => initialize(props.params.requestId),
 )));