FIX Correctly reset file details after bulk publish

client/src/containers/AssetAdmin/AssetAdmin.js

@@ -230,8 +230,7 @@ class AssetAdmin extends Component {
     }
     // If the file is currently being edited, refresh that view
     if (this.props.fileId === file.id) {
-      this.handleCloseFile();
-      this.handleOpenFile(file.id);
+      this.props.resetFileDetails(this.getFolderId(), file.id, this.props.query);
     }
   }
 
@@ -481,8 +480,7 @@ class AssetAdmin extends Component {
       this.props.actions.files.readFiles()
         .then(() => {
           if (fileId && response.find(file => file.id === fileId)) {
-            this.handleCloseFile();
-            this.handleOpenFile(fileId);
+            this.props.resetFileDetails(this.getFolderId(), fileId, this.props.query);
           }
         });
     });
@@ -739,6 +737,7 @@ AssetAdmin.propTypes = {
   sectionConfig: configShape,
   fileId: PropTypes.number,
   folderId: PropTypes.number,
+  resetFileDetails: PropTypes.func,
   onBrowse: PropTypes.func,
   onReplaceUrl: PropTypes.func,
   onInsertMany: PropTypes.func,

client/src/containers/AssetAdmin/AssetAdminRouter.js

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { Navigate } from 'react-router-dom';
 import { connect } from 'react-redux';
 import withRouter, { routerPropTypes } from 'lib/withRouter';
 import AssetAdmin from 'containers/AssetAdmin/AssetAdmin';
@@ -53,6 +54,7 @@ class AssetAdminRouter extends Component {
 
     this.handleBrowse = this.handleBrowse.bind(this);
     this.handleReplaceUrl = this.handleReplaceUrl.bind(this);
+    this.handleResetDetails = this.handleResetDetails.bind(this);
     this.getUrl = this.getUrl.bind(this);
   }
 
@@ -128,6 +130,7 @@ class AssetAdminRouter extends Component {
       getUrl: this.getUrl,
       onBrowse: this.handleBrowse,
       onReplaceUrl: this.handleReplaceUrl,
+      resetFileDetails: this.handleResetDetails,
     };
   }
 
@@ -169,10 +172,40 @@ class AssetAdminRouter extends Component {
     this.props.router.navigate(pathname, { replace: true });
   }
 
+  /**
+   * Reset the details screen for a file.
+   * This requires replacing the current navigation to the folder without the details open,
+   * then replacing it again with it open again.
+   *
+   * @param {number} [folderId]
+   * @param {number} [fileId]
+   * @param {object} [query]
+   */
+  handleResetDetails(folderId, fileId, query) {
+    const currentPathname = this.getUrl(folderId, fileId, query);
+    const clearPathname = this.getUrl(folderId, null, query);
+    this.props.router.navigate(
+      clearPathname,
+      {
+        replace: true,
+        state: { reset: true, resetPath: currentPathname }
+      }
+    );
+  }
+
   render() {
+    // If rendering during a details reset, navigate back to the appropriate location
+    const locationState = this.props.router.location.state;
+    if (locationState && locationState && locationState.reset) {
+      return (
+        <Navigate to={locationState.resetPath} replace />
+      );
+    }
+    // If there's no section config we have nothing to render
     if (!this.props.sectionConfig) {
       return null;
     }
+    // Render the asset admin
     return (
       <AssetAdmin {...this.getSectionProps()} />
     );