|
@@ -1,50 +1,53 @@
|
|
|
-import React, { useState, useEffect, useCallback } from 'react';
|
|
|
|
|
|
|
+import React, { useEffect, useCallback } from 'react';
|
|
|
import PropTypes from 'prop-types';
|
|
import PropTypes from 'prop-types';
|
|
|
|
|
|
|
|
import Page from './PageList/Page';
|
|
import Page from './PageList/Page';
|
|
|
import { withUnstatedContainers } from './UnstatedUtils';
|
|
import { withUnstatedContainers } from './UnstatedUtils';
|
|
|
|
|
+import { toastError } from '../util/apiNotification';
|
|
|
|
|
|
|
|
import { withLoadingSppiner } from './SuspenseUtils';
|
|
import { withLoadingSppiner } from './SuspenseUtils';
|
|
|
|
|
|
|
|
-
|
|
|
|
|
import AppContainer from '../services/AppContainer';
|
|
import AppContainer from '../services/AppContainer';
|
|
|
import PageContainer from '../services/PageContainer';
|
|
import PageContainer from '../services/PageContainer';
|
|
|
|
|
|
|
|
|
|
+// let retrieveError = null;
|
|
|
|
|
+const pageDummyData = 0;
|
|
|
|
|
+const pageDummyDataError = 1;
|
|
|
|
|
+let pages = pageDummyData;
|
|
|
|
|
+
|
|
|
const PageList = (props) => {
|
|
const PageList = (props) => {
|
|
|
const { appContainer, pageContainer } = props;
|
|
const { appContainer, pageContainer } = props;
|
|
|
const { path } = pageContainer.state;
|
|
const { path } = pageContainer.state;
|
|
|
|
|
|
|
|
- const [pages, setPages] = useState(null);
|
|
|
|
|
|
|
+ // const [pages, setPages] = useState(pageDummyData);
|
|
|
// const [spinnerError, setSpinnerError] = useState(null);
|
|
// const [spinnerError, setSpinnerError] = useState(null);
|
|
|
|
|
|
|
|
|
|
+ if (pages === pageDummyDataError) {
|
|
|
|
|
+ throw new Error('hoge');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
const getPageList = useCallback(async() => {
|
|
const getPageList = useCallback(async() => {
|
|
|
const res = await appContainer.apiv3Get('/pages/list', { path });
|
|
const res = await appContainer.apiv3Get('/pages/list', { path });
|
|
|
- setPages(res.data.pages);
|
|
|
|
|
|
|
+ pages = res.data.pages;
|
|
|
}, [appContainer, path]);
|
|
}, [appContainer, path]);
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
|
getPageList();
|
|
getPageList();
|
|
|
}, [getPageList]);
|
|
}, [getPageList]);
|
|
|
|
|
|
|
|
- if (pages == null) {
|
|
|
|
|
- // throw (async() => {
|
|
|
|
|
- // try {
|
|
|
|
|
- // await hoge;
|
|
|
|
|
- // }
|
|
|
|
|
- // catch (err) {
|
|
|
|
|
- // setSpinnerError('hoge');
|
|
|
|
|
- // return spinnerError;
|
|
|
|
|
- // }
|
|
|
|
|
- // });
|
|
|
|
|
- throw new Promise(async() => {
|
|
|
|
|
- try { await [hoge] }
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (pages === pageDummyData) {
|
|
|
|
|
+ throw (async() => {
|
|
|
|
|
+ try {
|
|
|
|
|
+ await getPageList();
|
|
|
|
|
+ }
|
|
|
catch (err) {
|
|
catch (err) {
|
|
|
- console.log('hoge');
|
|
|
|
|
|
|
+ pages = 1;
|
|
|
|
|
+ toastError(err);
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ })();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
return pages.map(page => (
|
|
return pages.map(page => (
|
|
|
<li key={page._id}>
|
|
<li key={page._id}>
|
|
|
<Page page={page} />
|
|
<Page page={page} />
|