BackendList Config

haishanh · Oct 3, 2023 · 3b2666e · 3b2666e
1 parent bae31ea
commit 3b2666e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/src/components/BackendList.tsx b/src/components/BackendList.tsx
@@ -45,18 +45,14 @@ export function BackendList() {
       // manual clean up is too complex
       // we just reload the app
       try {
-        window.location.reload();
+        window.location.href = '/';
       } catch (err) {
         // ignore
       }
     },
     [apiConfigs, selectedClashAPIConfigIndex, setSelectedClashAPIConfigIndex],
   );
 
-  // const {
-  //   app: { selectClashAPIConfig },
-  // } = useStoreActions();
-
   const onRemove = React.useCallback(
     (conf: ClashAPIConfig) => {
       removeClashAPIConfig(conf);

diff --git a/src/components/Config.tsx b/src/components/Config.tsx
@@ -3,7 +3,7 @@ import { useAtom } from 'jotai';
 import * as React from 'react';
 import { LogOut } from 'react-feather';
 import { useTranslation } from 'react-i18next';
-import { redirect } from 'react-router';
+import { useNavigate } from 'react-router-dom';
 
 import { updateConfigs } from '$src/api/configs';
 import * as logsApi from '$src/api/logs';
@@ -65,6 +65,7 @@ type ConfigImplProps = {
 };
 
 function Config({ configs }: ConfigImplProps) {
+  const navigate = useNavigate();
   const [latencyTestUrl, setLatencyTestUrl] = useAtom(latencyTestUrlAtom);
   const [selectedChartStyleIndex, setSelectedChartStyleIndex] = useAtom(
     selectedChartStyleIndexAtom,
@@ -78,12 +79,6 @@ function Config({ configs }: ConfigImplProps) {
     }
     refConfigs.current = configs;
   }, [configs]);
-
-  const openAPIConfigModal = useCallback(() => {
-    redirect('/backend');
-    // dispatch(openModal('apiConfig'));
-  }, []);
-
   const setConfigState = useCallback(
     (name: keyof ClashGeneralConfig, val: ClashGeneralConfig[keyof ClashGeneralConfig]) => {
       setConfigStateInternal({ ...configState, [name]: val });
@@ -141,12 +136,6 @@ function Config({ configs }: ConfigImplProps) {
     (e) => handleChangeValue(e.target),
     [handleChangeValue],
   );
-  const selectChartStyleIndex = useCallback(
-    (idx: number) => {
-      setSelectedChartStyleIndex(idx);
-    },
-    [setSelectedChartStyleIndex],
-  );
 
   const handleInputOnBlur = useCallback<React.FocusEventHandler<HTMLInputElement>>(
     (e) => {
@@ -259,7 +248,7 @@ function Config({ configs }: ConfigImplProps) {
             OptionComponent={TrafficChartSample}
             optionPropsList={propsList}
             selectedIndex={selectedChartStyleIndex}
-            onChange={selectChartStyleIndex}
+            onChange={setSelectedChartStyleIndex}
           />
         </div>
         <div>
@@ -271,7 +260,7 @@ function Config({ configs }: ConfigImplProps) {
           <Button
             start={<LogOut size={16} />}
             label={t('switch_backend')}
-            onClick={openAPIConfigModal}
+            onClick={() => navigate('/backend')}
           />
         </div>
         <div className={s0.item}>