Browse Source

update partition enum position

tumao 4 years ago
parent
commit
6ae7e4dbcd

+ 5 - 5
client/src/pages/collections/Collection.tsx

@@ -11,6 +11,11 @@ import { parseLocationSearch } from '../../utils/Format';
 import Status from '../../components/status/Status';
 import Status from '../../components/status/Status';
 import { PartitionHttp } from '../../http/Partition';
 import { PartitionHttp } from '../../http/Partition';
 
 
+enum TAB_EMUM {
+  'partition',
+  'structure',
+}
+
 const Collection = () => {
 const Collection = () => {
   const { collectionName = '' } =
   const { collectionName = '' } =
     useParams<{
     useParams<{
@@ -26,11 +31,6 @@ const Collection = () => {
 
 
   const { t } = useTranslation('collection');
   const { t } = useTranslation('collection');
 
 
-  enum TAB_EMUM {
-    'partition',
-    'structure',
-  }
-
   const activeTabIndex = useMemo(() => {
   const activeTabIndex = useMemo(() => {
     const { activeIndex } = location.search
     const { activeIndex } = location.search
       ? parseLocationSearch(location.search)
       ? parseLocationSearch(location.search)

+ 3 - 7
client/src/pages/collections/Collections.tsx

@@ -17,7 +17,6 @@ import CustomToolTip from '../../components/customToolTip/CustomToolTip';
 import { rootContext } from '../../context/Root';
 import { rootContext } from '../../context/Root';
 import CreateCollection from './Create';
 import CreateCollection from './Create';
 import DeleteTemplate from '../../components/customDialog/DeleteDialogTemplate';
 import DeleteTemplate from '../../components/customDialog/DeleteDialogTemplate';
-import { useHistory } from 'react-router-dom';
 
 
 const useStyles = makeStyles((theme: Theme) => ({
 const useStyles = makeStyles((theme: Theme) => ({
   emptyWrapper: {
   emptyWrapper: {
@@ -51,7 +50,6 @@ const Collections = () => {
     CollectionView[]
     CollectionView[]
   >([]);
   >([]);
 
 
-  const history = useHistory();
   const { setDialog, handleCloseDialog } = useContext(rootContext);
   const { setDialog, handleCloseDialog } = useContext(rootContext);
   const { t } = useTranslation('collection');
   const { t } = useTranslation('collection');
   const { t: btnTrans } = useTranslation('btn');
   const { t: btnTrans } = useTranslation('btn');
@@ -71,8 +69,7 @@ const Collections = () => {
         name: 'collection_1',
         name: 'collection_1',
         nameElement: (
         nameElement: (
           <Link
           <Link
-            component="button"
-            onClick={() => history.push(`/collection/collection_1`)}
+            href="/collection/collection_1"
             underline="always"
             underline="always"
             color="textPrimary"
             color="textPrimary"
           >
           >
@@ -90,8 +87,7 @@ const Collections = () => {
         name: 'collection_2',
         name: 'collection_2',
         nameElement: (
         nameElement: (
           <Link
           <Link
-            component="button"
-            onClick={() => history.push(`/collection/collection_2`)}
+            href="/collection/collection_2"
             underline="always"
             underline="always"
             color="textPrimary"
             color="textPrimary"
           >
           >
@@ -107,7 +103,7 @@ const Collections = () => {
       },
       },
     ];
     ];
     setCollections(mockCollections);
     setCollections(mockCollections);
-  }, [history]);
+  }, []);
 
 
   const handleCreateCollection = (param: CollectionCreateParam) => {
   const handleCreateCollection = (param: CollectionCreateParam) => {
     handleCloseDialog();
     handleCloseDialog();