itizawa 5 лет назад
Родитель
Сommit
6f5d8c1a1f
2 измененных файлов с 5 добавлено и 7 удалено
  1. 1 6
      src/client/js/components/PageHistory.jsx
  2. 4 1
      src/client/js/services/PageHistoryContainer.js

+ 1 - 6
src/client/js/components/PageHistory.jsx

@@ -12,13 +12,11 @@ import PageHistroyContainer from '../services/PageHistoryContainer';
 
 
 const logger = loggerFactory('growi:PageHistory');
 const logger = loggerFactory('growi:PageHistory');
 
 
-// for using suspense
-let isLoaded = false;
 
 
 function PageHistory(props) {
 function PageHistory(props) {
   const { pageHistoryContainer } = props;
   const { pageHistoryContainer } = props;
 
 
-  if (!isLoaded) {
+  if (pageHistoryContainer.state.revisions === pageHistoryContainer.dummyRevisions) {
     throw new Promise(async() => {
     throw new Promise(async() => {
       try {
       try {
         await props.pageHistoryContainer.retrieveRevisions();
         await props.pageHistoryContainer.retrieveRevisions();
@@ -28,9 +26,6 @@ function PageHistory(props) {
         pageHistoryContainer.setState({ retrieveError: err.message });
         pageHistoryContainer.setState({ retrieveError: err.message });
         logger.error(err);
         logger.error(err);
       }
       }
-      finally {
-        isLoaded = true;
-      }
     });
     });
   }
   }
 
 

+ 4 - 1
src/client/js/services/PageHistoryContainer.js

@@ -12,10 +12,13 @@ export default class PageHistoryContainer extends Container {
     this.appContainer = appContainer;
     this.appContainer = appContainer;
     this.pageContainer = pageContainer;
     this.pageContainer = pageContainer;
 
 
+    this.dummyRevisions = 0;
+
     this.state = {
     this.state = {
       retrieveError: null,
       retrieveError: null,
 
 
-      revisions: [],
+      // set dummy rivisions for using suspense
+      revisions: this.dummyRevisions,
       diffOpened: null,
       diffOpened: null,
     };
     };