diff --git a/studio/src/pages/menu/EditMenu.js b/studio/src/pages/menu/EditMenu.js
index ce3fc551d..c4f7abd0d 100644
--- a/studio/src/pages/menu/EditMenu.js
+++ b/studio/src/pages/menu/EditMenu.js
@@ -3,13 +3,14 @@ import MenuEditForm from './components/MenuForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { updateMenu, getMenu } from '../../actions/menu';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../components/ErrorsAndImage/RecordNotFound';
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function EditMenu() {
- const history = useHistory();
+ const history = useNavigation();
const { id } = useParams();
const dispatch = useDispatch();
@@ -31,7 +32,7 @@ function EditMenu() {
}
const onUpdate = (values) => {
dispatch(updateMenu({ ...menu, ...values })).then(() =>
- history.push(`/settings/website/menus/${id}/edit`),
+ history(`/settings/website/menus/${id}/edit`),
);
};
return (
diff --git a/studio/src/pages/menu/components/MenuList.js b/studio/src/pages/menu/components/MenuList.js
index 119c4d697..5a6f12e16 100644
--- a/studio/src/pages/menu/components/MenuList.js
+++ b/studio/src/pages/menu/components/MenuList.js
@@ -2,15 +2,16 @@ import React from 'react';
import { useDispatch } from 'react-redux';
import { deleteMenu } from '../../../actions/menu';
import { Space, Button, Modal, Table, ConfigProvider, Typography } from 'antd';
-import { Link, useHistory } from 'react-router-dom';
+import { Link } from 'react-router-dom';
import { DeleteOutlined } from '@ant-design/icons';
+import useNavigation from '../../../utils/useNavigation';
function MenuList({ actions, data, filters, setFilters, fetchMenus }) {
const [modalOpen, setModalOpen] = React.useState(false);
const [deleteItemId, setDeleteItemId] = React.useState(null);
const dispatch = useDispatch();
- const history = useHistory();
+ const history = useNavigation();
const columns = [
{
@@ -85,7 +86,7 @@ function MenuList({ actions, data, filters, setFilters, fetchMenus }) {
onRow={(record, rowIndex) => {
return {
onClick: (event) => {
- history.push(`/settings/website/menus/${record.id}/edit`);
+ history(`/settings/website/menus/${record.id}/edit`);
},
onMouseEnter: (event) => {
document.body.style.cursor = 'pointer';
diff --git a/studio/src/pages/pages/CreatePage.js b/studio/src/pages/pages/CreatePage.js
index b7a742626..9196bb93f 100644
--- a/studio/src/pages/pages/CreatePage.js
+++ b/studio/src/pages/pages/CreatePage.js
@@ -4,18 +4,19 @@ import { useDispatch, useSelector } from 'react-redux';
import { addPage } from '../../actions/pages';
import getUserPermission from '../../utils/getUserPermission';
import FormatNotFound from '../../components/ErrorsAndImage/RecordNotFound';
-import { useHistory } from 'react-router-dom';
+
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function CreatePage({ formats }) {
const spaces = useSelector(({ spaces }) => spaces);
const actions = getUserPermission({ resource: 'pages', action: 'get', spaces });
- const history = useHistory();
+ const history = useNavigation();
const dispatch = useDispatch();
const onCreate = (values) => {
dispatch(addPage(values)).then((page) => {
- if (page && page.id) history.replace(`/pages/${page.id}/edit`);
+ if (page && page.id) history(`/pages/${page.id}/edit`);
});
};
if (!formats.loading && formats.article) {
diff --git a/studio/src/pages/pages/EditPage.js b/studio/src/pages/pages/EditPage.js
index 0b2b92423..9f19b39de 100644
--- a/studio/src/pages/pages/EditPage.js
+++ b/studio/src/pages/pages/EditPage.js
@@ -3,14 +3,15 @@ import PageEditForm from '../posts/components/PostForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { updatePage, getPage } from '../../actions/pages';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../components/ErrorsAndImage/RecordNotFound';
import getUserPermission from '../../utils/getUserPermission';
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function EditPage({ formats }) {
- const history = useHistory();
+ const history = useNavigation();
const { id } = useParams();
const spaces = useSelector(({ spaces }) => spaces);
const actions = getUserPermission({ resource: 'pages', action: 'get', spaces });
@@ -37,7 +38,7 @@ function EditPage({ formats }) {
const onUpdate = (values) => {
dispatch(updatePage({ ...page, ...values })).then(() => {
- history.push(`/pages/${id}/edit`);
+ history(`/pages/${id}/edit`);
});
};
return (
diff --git a/studio/src/pages/pages/components/PageList.js b/studio/src/pages/pages/components/PageList.js
index 76922c312..97c421be9 100644
--- a/studio/src/pages/pages/components/PageList.js
+++ b/studio/src/pages/pages/components/PageList.js
@@ -11,10 +11,11 @@ import {
} from '@ant-design/icons';
import { useDispatch } from 'react-redux';
import { deletePage } from '../../../actions/pages';
-import { Link, useHistory } from 'react-router-dom';
+import { Link } from 'react-router-dom';
import QuickEdit from '../../../components/List/QuickEdit';
import QuickEditIcon from '../../../assets/QuickEditIcon';
import ThreeDotIcon from '../../../assets/ThreeDotIcon';
+import useNavigation from '../../../utils/useNavigation';
function PageList({ actions, format, status, data, filters, setFilters, fetchPages }) {
const dispatch = useDispatch();
@@ -23,7 +24,7 @@ function PageList({ actions, format, status, data, filters, setFilters, fetchPag
const [modalOpen, setModalOpen] = useState(false);
const [deleteItemID, setDeleteItemID] = useState(null);
- const history = useHistory();
+ const history = useNavigation();
const getTagList = (tagids) => {
return tagids.map((id) => (
@@ -183,7 +184,7 @@ function PageList({ actions, format, status, data, filters, setFilters, fetchPag
onRow={(record, rowIndex) => {
return {
onClick: (event) => {
- history.push(`/pages/${record.id}/edit`);
+ history(`/pages/${record.id}/edit`);
},
onMouseEnter: (event) => {
document.body.style.cursor = 'pointer';
@@ -195,7 +196,7 @@ function PageList({ actions, format, status, data, filters, setFilters, fetchPag
}}
// style={{ maxWidth: '100vw', overflowX: 'auto' }}
scroll={{
- x: "1000",
+ x: '1000',
}}
columns={columns}
rowKey={(record) => record.id}
@@ -218,7 +219,7 @@ function PageList({ actions, format, status, data, filters, setFilters, fetchPag
onQuickEditUpdate={() => setExpandedRowKeys([])}
/>
),
- expandIcon: () => { },
+ expandIcon: () => {},
}}
pagination={{
showTotal: (total, range) => `${range[0]}-${range[1]} of ${total} results`,
@@ -241,7 +242,7 @@ function PageList({ actions, format, status, data, filters, setFilters, fetchPag
}}
onOk={(e) => {
e.stopPropagation();
- dispatch(deletePage(deleteItemID)).then(() => fetchPages())
+ dispatch(deletePage(deleteItemID)).then(() => fetchPages());
setModalOpen(false);
setDeleteItemID(null);
}}
diff --git a/studio/src/pages/pages/index.js b/studio/src/pages/pages/index.js
index 98f33e79b..ba409e413 100644
--- a/studio/src/pages/pages/index.js
+++ b/studio/src/pages/pages/index.js
@@ -14,7 +14,7 @@ import {
ConfigProvider,
} from 'antd';
import { PlusOutlined, SearchOutlined } from '@ant-design/icons';
-import { Link, useLocation, useHistory } from 'react-router-dom';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
import PageList from './components/PageList';
import { useSelector, useDispatch } from 'react-redux';
import getUserPermission from '../../utils/getUserPermission';
@@ -36,7 +36,7 @@ function Pages({ formats }) {
const dispatch = useDispatch();
const { search, pathname } = useLocation();
const query = new URLSearchParams(search);
- const history = useHistory();
+ const history = useNavigate();
const [expand, setExpand] = React.useState(false);
const [searchFieldExpand, setSearchFieldExpand] = React.useState(false);
const [status, setStatus] = React.useState('all');
@@ -158,7 +158,7 @@ function Pages({ formats }) {
if (formats && !formats.loading && formats.article) {
searchFilter.set('format', formats.article.id);
}
- history.push({
+ history({
pathName: pathname,
search: '?' + searchFilter.toString(),
});
@@ -167,7 +167,7 @@ function Pages({ formats }) {
const onPagination = (page, limit) => {
query.set('limit', limit);
query.set('page', page);
- history.push({
+ history({
pathName: pathname,
search: '?' + query.toString(),
});
@@ -307,7 +307,7 @@ function Pages({ formats }) {
onChange={(key) => {
key === 'all' ? query.delete('status') : query.set('status', key);
setStatus(key);
- history.push({
+ history({
pathName: pathname,
search: '?' + query.toString(),
});
diff --git a/studio/src/pages/permissions/organisations/CreateOrganisationPermission.js b/studio/src/pages/permissions/organisations/CreateOrganisationPermission.js
index b4c2d6093..2146fe1e2 100644
--- a/studio/src/pages/permissions/organisations/CreateOrganisationPermission.js
+++ b/studio/src/pages/permissions/organisations/CreateOrganisationPermission.js
@@ -2,15 +2,16 @@ import React from 'react';
import OrganisationPermissionCreateForm from './components/PermissionForm';
import { useDispatch } from 'react-redux';
import { addOrganisationPermission } from '../../../actions/organisations';
-import { useHistory } from 'react-router-dom';
+
+import useNavigation from '../../../utils/useNavigation';
function CreateOrganisationPermission() {
- const history = useHistory();
+ const history = useNavigation();
const dispatch = useDispatch();
const onCreate = (values) => {
dispatch(addOrganisationPermission(values)).then(() =>
- history.push('/admin/permissions/organisations'),
+ history('/admin/permissions/organisations'),
);
};
return
;
diff --git a/studio/src/pages/permissions/organisations/EditOrganisationPermission.js b/studio/src/pages/permissions/organisations/EditOrganisationPermission.js
index 54f8102dd..9e526a362 100644
--- a/studio/src/pages/permissions/organisations/EditOrganisationPermission.js
+++ b/studio/src/pages/permissions/organisations/EditOrganisationPermission.js
@@ -3,12 +3,13 @@ import OrganisationPermissionEditForm from './components/PermissionForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { updateOrganisationPermission, getOrganisations } from '../../../actions/organisations';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../../components/ErrorsAndImage/RecordNotFound';
+import useNavigation from '../../../utils/useNavigation';
function EditOrganisationPermission() {
- const history = useHistory();
+ const history = useNavigation();
const { oid, pid } = useParams();
const dispatch = useDispatch();
@@ -30,7 +31,7 @@ function EditOrganisationPermission() {
const onUpdate = (values) => {
dispatch(updateOrganisationPermission({ ...organisation.permission, ...values })).then(() =>
- history.push('/admin/permissions/organisations'),
+ history('/admin/permissions/organisations'),
);
};
if (organisation)
diff --git a/studio/src/pages/permissions/spaces/CreateSpacePermission.js b/studio/src/pages/permissions/spaces/CreateSpacePermission.js
index be9ff923e..a4393479f 100644
--- a/studio/src/pages/permissions/spaces/CreateSpacePermission.js
+++ b/studio/src/pages/permissions/spaces/CreateSpacePermission.js
@@ -2,14 +2,15 @@ import React from 'react';
import SpacePermissionCreateForm from './components/PermissionForm';
import { useDispatch } from 'react-redux';
import { addSpacePermission } from '../../../actions/spacePermissions';
-import { useHistory } from 'react-router-dom';
+
+import useNavigation from '../../../utils/useNavigation';
function CreateSpacePermission() {
- const history = useHistory();
+ const history = useNavigation();
const dispatch = useDispatch();
const onCreate = (values) => {
- dispatch(addSpacePermission(values)).then(() => history.push('/admin/permissions/spaces'));
+ dispatch(addSpacePermission(values)).then(() => history('/admin/permissions/spaces'));
};
return
;
}
diff --git a/studio/src/pages/permissions/spaces/EditSpacePermission.js b/studio/src/pages/permissions/spaces/EditSpacePermission.js
index c7a11a8e3..3b6aacbc2 100644
--- a/studio/src/pages/permissions/spaces/EditSpacePermission.js
+++ b/studio/src/pages/permissions/spaces/EditSpacePermission.js
@@ -3,12 +3,13 @@ import SpacePermissionEditForm from './components/PermissionForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { updateSpacePermission, getSpaces } from '../../../actions/spacePermissions';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../../components/ErrorsAndImage/RecordNotFound';
+import useNavigation from '../../../utils/useNavigation';
function EditSpacePermission() {
- const history = useHistory();
+ const history = useNavigation();
const { sid, pid } = useParams();
const dispatch = useDispatch();
@@ -30,7 +31,7 @@ function EditSpacePermission() {
const onUpdate = (values) => {
dispatch(updateSpacePermission({ ...space.permission, ...values })).then(() =>
- history.push('/admin/permissions/spaces'),
+ history('/admin/permissions/spaces'),
);
};
if (space) {
diff --git a/studio/src/pages/podcasts/CreatePodcast.js b/studio/src/pages/podcasts/CreatePodcast.js
index d0c6afee6..aaecf4f7a 100644
--- a/studio/src/pages/podcasts/CreatePodcast.js
+++ b/studio/src/pages/podcasts/CreatePodcast.js
@@ -2,15 +2,16 @@ import React from 'react';
import PodcastCreateForm from './components/PodcastForm';
import { useDispatch } from 'react-redux';
import { addPodcast } from '../../actions/podcasts';
-import { useHistory } from 'react-router-dom';
+
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function CreatePodcast() {
- const history = useHistory();
+ const history = useNavigation();
const dispatch = useDispatch();
const onCreate = (values) => {
- dispatch(addPodcast(values)).then(() => history.push('/podcasts'));
+ dispatch(addPodcast(values)).then(() => history('/podcasts'));
};
return (
<>
diff --git a/studio/src/pages/podcasts/EditPodcast.js b/studio/src/pages/podcasts/EditPodcast.js
index 5eddd0fef..c411da882 100644
--- a/studio/src/pages/podcasts/EditPodcast.js
+++ b/studio/src/pages/podcasts/EditPodcast.js
@@ -3,13 +3,14 @@ import PodcastEditForm from './components/PodcastForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { updatePodcast, getPodcast } from '../../actions/podcasts';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../components/ErrorsAndImage/RecordNotFound';
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function EditPodcast() {
- const history = useHistory();
+ const history = useNavigation();
const { id } = useParams();
const dispatch = useDispatch();
@@ -32,9 +33,7 @@ function EditPodcast() {
}
const onUpdate = (values) => {
- dispatch(updatePodcast({ ...podcast, ...values })).then(() =>
- history.push(`/podcasts/${id}/edit`),
- );
+ dispatch(updatePodcast({ ...podcast, ...values })).then(() => history(`/podcasts/${id}/edit`));
};
return (
diff --git a/studio/src/pages/podcasts/components/PodcastList.js b/studio/src/pages/podcasts/components/PodcastList.js
index 80d2e523b..c1c4cfda4 100644
--- a/studio/src/pages/podcasts/components/PodcastList.js
+++ b/studio/src/pages/podcasts/components/PodcastList.js
@@ -3,12 +3,13 @@ import { Button, Table, Space, Typography, Modal, ConfigProvider } from 'antd';
import { useDispatch } from 'react-redux';
import { deletePodcast } from '../../../actions/podcasts';
-import { Link, useHistory } from 'react-router-dom';
+import { Link } from 'react-router-dom';
import { DeleteOutlined } from '@ant-design/icons';
+import useNavigation from '../../../utils/useNavigation';
function PodcastList({ actions, data, filters, setFilters, fetchPodcasts }) {
const dispatch = useDispatch();
- const history = useHistory();
+ const history = useNavigation();
const [modalOpen, setModalOpen] = React.useState(false);
const [deleteItemId, setDeleteItemId] = React.useState(null);
@@ -154,7 +155,7 @@ function PodcastList({ actions, data, filters, setFilters, fetchPodcasts }) {
onRow={(record, rowIndex) => {
return {
onClick: (event) => {
- history.push(`/podcasts/${record.id}/edit`);
+ history(`/podcasts/${record.id}/edit`);
},
onMouseEnter: (event) => {
document.body.style.cursor = 'pointer';
diff --git a/studio/src/pages/podcasts/index.js b/studio/src/pages/podcasts/index.js
index 33588a3f4..5533e0c1b 100644
--- a/studio/src/pages/podcasts/index.js
+++ b/studio/src/pages/podcasts/index.js
@@ -14,7 +14,7 @@ import {
ConfigProvider,
} from 'antd';
import { PlusOutlined, SearchOutlined } from '@ant-design/icons';
-import { Link, useLocation, useHistory } from 'react-router-dom';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';
import getUserPermission from '../../utils/getUserPermission';
import { getPodcasts } from '../../actions/podcasts';
@@ -29,7 +29,7 @@ function Podcasts({ permission }) {
const spaces = useSelector(({ spaces }) => spaces);
const actions = getUserPermission({ resource: 'podcasts', action: 'get', spaces });
const dispatch = useDispatch();
- const history = useHistory();
+ const history = useNavigate();
const query = new URLSearchParams(useLocation().search);
const keys = ['page', 'limit', 'q', 'sort', 'category', 'language'];
@@ -72,7 +72,7 @@ function Podcasts({ permission }) {
searchFilter.set(key, filters[key]);
}
});
- history.push({
+ history({
pathname: pathName,
search: '?' + searchFilter.toString(),
});
diff --git a/studio/src/pages/policies/CreatePolicy.js b/studio/src/pages/policies/CreatePolicy.js
index eef092948..853dcbc4e 100644
--- a/studio/src/pages/policies/CreatePolicy.js
+++ b/studio/src/pages/policies/CreatePolicy.js
@@ -1,19 +1,20 @@
import React from 'react';
import { createPolicy } from '../../actions/policies';
import { useDispatch } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+
import PolicyCreateForm from './components/PolicyForm';
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function CreatePolicy() {
- const history = useHistory();
+ const history = useNavigation();
const dispatch = useDispatch();
const onCreate = (values) => {
values.permissions = values.permissions?.filter(
(item) => item && item.resource && item.actions.length > 0,
);
- dispatch(createPolicy(values)).then(() => history.push('/settings/members/policies'));
+ dispatch(createPolicy(values)).then(() => history('/settings/members/policies'));
};
return (
diff --git a/studio/src/pages/policies/EditPolicy.js b/studio/src/pages/policies/EditPolicy.js
index e77a35eab..68f394ba9 100644
--- a/studio/src/pages/policies/EditPolicy.js
+++ b/studio/src/pages/policies/EditPolicy.js
@@ -3,13 +3,14 @@ import PolicyEditForm from './components/PolicyForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { getPolicy, updatePolicy } from '../../actions/policies';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../components/ErrorsAndImage/RecordNotFound';
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function EditPolicy() {
- const history = useHistory();
+ const history = useNavigation();
const { id } = useParams();
const dispatch = useDispatch();
@@ -48,7 +49,7 @@ function EditPolicy() {
const onUpdate = (values) => {
dispatch(updatePolicy({ ...policy, ...values })).then(() =>
- history.push(`/settings/members/policies/`),
+ history(`/settings/members/policies/`),
);
};
diff --git a/studio/src/pages/policies/components/PolicyList.js b/studio/src/pages/policies/components/PolicyList.js
index 541a17658..9f1099a5d 100644
--- a/studio/src/pages/policies/components/PolicyList.js
+++ b/studio/src/pages/policies/components/PolicyList.js
@@ -3,8 +3,9 @@ import { Modal, Button, Typography, Table, ConfigProvider } from 'antd';
import { useDispatch, useSelector } from 'react-redux';
import { deletePolicy } from '../../../actions/policies';
-import { Link, useHistory } from 'react-router-dom';
+import { Link } from 'react-router-dom';
import { DeleteOutlined, EyeOutlined } from '@ant-design/icons';
+import useNavigation from '../../../utils/useNavigation';
function PolicyList({ actions, data, filters, setFilters, fetchPolicies }) {
const [modalOpen, setModalOpen] = React.useState(false);
@@ -12,7 +13,7 @@ function PolicyList({ actions, data, filters, setFilters, fetchPolicies }) {
const dispatch = useDispatch();
- const history = useHistory();
+ const history = useNavigation();
const columns = [
{
@@ -136,7 +137,7 @@ function PolicyList({ actions, data, filters, setFilters, fetchPolicies }) {
onRow={(record, rowIndex) => {
return {
onClick: (event) => {
- history.push(`/settings/members/policies/${record.id}/edit`);
+ history(`/settings/members/policies/${record.id}/edit`);
},
onMouseEnter: (event) => {
document.body.style.cursor = 'pointer';
diff --git a/studio/src/pages/posts/CreatePost.js b/studio/src/pages/posts/CreatePost.js
index f6c4e1850..8b0a3337f 100644
--- a/studio/src/pages/posts/CreatePost.js
+++ b/studio/src/pages/posts/CreatePost.js
@@ -4,18 +4,19 @@ import { useDispatch, useSelector } from 'react-redux';
import { addPost } from '../../actions/posts';
import getUserPermission from '../../utils/getUserPermission';
import FormatNotFound from '../../components/ErrorsAndImage/RecordNotFound';
-import { useHistory } from 'react-router-dom';
+
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function CreatePost({ formats }) {
const spaces = useSelector(({ spaces }) => spaces);
const actions = getUserPermission({ resource: 'posts', action: 'get', spaces });
- const history = useHistory();
+ const history = useNavigation();
const dispatch = useDispatch();
const onCreate = (values) => {
dispatch(addPost(values)).then((post) => {
- if (post && post.id) history.replace(`/posts/${post.id}/edit`);
+ if (post && post.id) history(`/posts/${post.id}/edit`);
});
};
if (!formats.loading && formats.article) {
diff --git a/studio/src/pages/posts/EditPost.js b/studio/src/pages/posts/EditPost.js
index 77a55d99a..7d9ff9bec 100644
--- a/studio/src/pages/posts/EditPost.js
+++ b/studio/src/pages/posts/EditPost.js
@@ -3,14 +3,15 @@ import PostEditForm from './components/PostForm';
import { useDispatch, useSelector } from 'react-redux';
import { Skeleton } from 'antd';
import { updatePost, getPost } from '../../actions/posts';
-import { useHistory } from 'react-router-dom';
+
import { useParams } from 'react-router-dom';
import RecordNotFound from '../../components/ErrorsAndImage/RecordNotFound';
import getUserPermission from '../../utils/getUserPermission';
import { Helmet } from 'react-helmet';
+import useNavigation from '../../utils/useNavigation';
function EditPost({ formats }) {
- const history = useHistory();
+ const history = useNavigation();
const { id } = useParams();
const spaces = useSelector(({ spaces }) => spaces);
const actions = getUserPermission({ resource: 'posts', action: 'get', spaces });
@@ -39,7 +40,7 @@ function EditPost({ formats }) {
const onUpdate = (values) => {
dispatch(updatePost({ ...post, ...values })).then(() => {
- history.push(`/posts/${id}/edit`);
+ history(`/posts/${id}/edit`);
});
};
return (
diff --git a/studio/src/pages/posts/components/PostForm.js b/studio/src/pages/posts/components/PostForm.js
index 03267ec6c..d7ee92b75 100644
--- a/studio/src/pages/posts/components/PostForm.js
+++ b/studio/src/pages/posts/components/PostForm.js
@@ -16,7 +16,6 @@ import {
Typography,
Collapse,
Divider,
- ConfigProvider,
Select,
} from 'antd';
import Selector from '../../../components/Selector';
@@ -24,7 +23,6 @@ import { maker } from '../../../utils/sluger';
import MediaSelector from '../../../components/MediaSelector';
import { useDispatch } from 'react-redux';
import { addTemplate } from '../../../actions/posts';
-import { useHistory, Prompt } from 'react-router-dom';
import {
SettingFilled,
LeftOutlined,
@@ -44,16 +42,16 @@ import MonacoEditor from '../../../components/MonacoEditor';
import getJsonValue from '../../../utils/getJsonValue';
import { DescriptionInput, SlugInput } from '../../../components/FormItems';
import { formatDate } from '../../../utils/date';
-import languages from '../../../utils/languages.json'
+import languages from '../../../utils/languages.json';
+import useNavigation from '../../../utils/useNavigation';
function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
- const history = useHistory();
+ const navigate = useNavigation();
const formRef = useRef(null);
const [form] = Form.useForm();
const [status, setStatus] = useState(data.status ? data.status : 'draft');
const dispatch = useDispatch();
const [valueChange, setValueChange] = React.useState(false);
- const [metaDrawer, setMetaDrawer] = React.useState(false);
const [drawerVisible, setDrawerVisible] = useState(false);
const [codeDrawer, setCodeDrawerVisible] = useState(false);
const [metaFieldsDrawer, setMetaFieldsDrawerVisible] = useState(false);
@@ -74,13 +72,12 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
handleResize();
return () => window.removeEventListener('resize', handleResize);
}, []);
- const languagesList = languages.map(language => ({ value: language, label: language }));
+ const languagesList = languages.map((language) => ({ value: language, label: language }));
const handleLanguageChange = (value) => {
setSelectedLanguage(value);
};
-
const showSchemaModal = () => {
setIsModalVisible(true);
};
@@ -179,8 +176,7 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
const createTemplate = () => {
dispatch(addTemplate({ post_id: parseInt(data.id) })).then(() => {
- page ? history.push('/pages')
- : history.push('/posts')
+ page ? navigate('/pages') : navigate('/posts');
});
};
const setReadyFlag = () => {
@@ -248,10 +244,11 @@ function PostForm({ onCreate, data = {}, actions = {}, format, page = false }) {
return (
<>
-
+ /> */}
@@ -219,7 +222,7 @@ function Sidebar({ superOrg, permission, orgs, loading, applications, services,