itizawa 5 лет назад
Родитель
Сommit
dd9ffc0f23
2 измененных файлов с 19 добавлено и 29 удалено
  1. 14 27
      src/client/js/components/FakeApi.jsx
  2. 5 2
      src/client/js/components/PageHistory.jsx

+ 14 - 27
src/client/js/components/FakeApi.jsx

@@ -1,28 +1,21 @@
 
-// Suspense integrations like Relay implement
-// a contract like this to integrate with React.
-// Real implementations can be significantly more complex.
-
-import Axios from 'axios';
-
-// Don't copy-paste this into your project!
-function wrapPromise(promise) {
+function wrapPromise() {
   let status = 'pending';
   let result;
-  const suspender = promise.then(
-    (r) => {
-      status = 'success';
-      result = r;
-    },
-    (e) => {
-      status = 'error';
-      result = e;
-    },
-  );
+
   return {
-    read() {
+    read(promise) {
       if (status === 'pending') {
-        throw suspender;
+        throw promise.then(
+          (r) => {
+            status = 'success';
+            result = r;
+          },
+          (e) => {
+            status = 'error';
+            result = e;
+          },
+        );
       }
       else if (status === 'error') {
         throw result;
@@ -34,15 +27,9 @@ function wrapPromise(promise) {
   };
 }
 
-function fetchUser() {
-  console.log('fetch user...');
-  return Axios.get('/api/v2/authenticated_user/items?page=1&per_page=20');
-}
-
 function fetchProfileData() {
-  const userPromise = fetchUser();
 
-  return wrapPromise(userPromise);
+  return wrapPromise();
 }
 
 

+ 5 - 2
src/client/js/components/PageHistory.jsx

@@ -36,6 +36,9 @@ function PageHistory(props) {
   const [revisions, setRevisions] = useState([]);
   const [diffOpened, setDiffOpened] = useState(null);
 
+  const { appContainer, pageContainer } = props;
+  const { shareLinkId, pageId } = pageContainer.state;
+
   function fetchPageRevisionBody(revision) {
     const { appContainer, pageContainer } = props;
     const { pageId, shareLinkId } = pageContainer.state;
@@ -135,8 +138,8 @@ function PageHistory(props) {
     fetchPageRevisionBody(getPreviousRevision(revision));
   }
 
-  const user = resource.read();
-  console.log(user);
+  const res = resource.read(appContainer.apiv3Get('/revisions/list', { pageId, share_link_id: shareLinkId }));
+  console.log(res);
 
   return (
     <div className="mt-4">