Просмотр исходного кода

imprv fetchCustomizeSettingsData

kaori 3 лет назад
Родитель
Сommit
9bd4e37c11

+ 8 - 8
packages/app/src/components/Admin/Customize/Customize.jsx

@@ -1,5 +1,5 @@
 
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
 
 import PropTypes from 'prop-types';
 
@@ -26,20 +26,20 @@ const logger = loggerFactory('growi:services:AdminCustomizePage');
 function Customize(props) {
   const { adminCustomizeContainer } = props;
 
-  useEffect(() => {
-    async function fetchCustomizeSettingsData() {
-      await adminCustomizeContainer.retrieveCustomizeData();
-    }
-
+  const fetchCustomizeSettingsData = useCallback(async() =>  {
     try {
-      fetchCustomizeSettingsData();
+      await adminCustomizeContainer.retrieveCustomizeData()
     }
     catch (err) {
       const errs = toArrayIfNot(err);
       toastError(errs);
       logger.error(errs);
     }
-  }, [adminCustomizeContainer]);
+  }, []);
+
+  useEffect(() => {
+    fetchCustomizeSettingsData();
+  }, [fetchCustomizeSettingsData]);
 
 
   return (

+ 1 - 1
packages/app/src/components/Admin/Customize/CustomizeThemeOptions.jsx

@@ -57,7 +57,7 @@ const CustomizeThemeOptions = (props) => {
 
   const selectedHandler = useCallback((themeName) => {
     adminCustomizeContainer.switchThemeType(themeName);
-    mutateGrowiTheme(themeName, false);
+    mutateGrowiTheme(themeName);
   }, [adminCustomizeContainer, mutateGrowiTheme]);
 
   return (

+ 0 - 1
packages/app/src/components/Layout/AdminLayout.tsx

@@ -46,7 +46,6 @@ const AdminLayout = ({
               <AdminNavigation selected={selectedNavOpt} />
             </div>
             <div className="col-lg-9">
-              {/* TODO: inject Admincontainer (injectableContainers & adminSecurityContainers) by https://redmine.weseek.co.jp/issues/100072 */}
               <Provider inject={injectableContainers}>
                 {children}
               </Provider>