ソースを参照

refactor IResGrowiTheme

Yuki Takei 3 年 前
コミット
fa7e99cb98

+ 2 - 2
packages/app/src/components/Admin/Customize/CustomizeThemeSetting.tsx

@@ -49,9 +49,9 @@ const CustomizeThemeSetting = (props: Props): JSX.Element => {
     }
     }
   }, [selectedTheme, t]);
   }, [selectedTheme, t]);
 
 
-  const availableThemes = data?.customThemeSummaries == null
+  const availableThemes = data?.pluginThemesMetadatas == null
     ? PresetThemesMetadatas
     ? PresetThemesMetadatas
-    : PresetThemesMetadatas.concat(data.customThemeSummaries);
+    : PresetThemesMetadatas.concat(data.pluginThemesMetadatas);
 
 
   return (
   return (
     <div className="row">
     <div className="row">

+ 1 - 1
packages/app/src/interfaces/customize.ts

@@ -6,5 +6,5 @@ export type IResLayoutSetting = {
 
 
 export type IResGrowiTheme = {
 export type IResGrowiTheme = {
   currentTheme: string,
   currentTheme: string,
-  customThemeSummaries: GrowiThemeMetadata[],
+  pluginThemesMetadatas: GrowiThemeMetadata[],
 }
 }

+ 2 - 2
packages/app/src/server/routes/apiv3/customize-setting.js

@@ -279,11 +279,11 @@ module.exports = (crowi) => {
       const GrowiPluginModel = mongoose.model('GrowiPlugin');
       const GrowiPluginModel = mongoose.model('GrowiPlugin');
       const themePlugins = await GrowiPluginModel.findEnabledPluginsIncludingAnyTypes([GrowiPluginResourceType.Theme]);
       const themePlugins = await GrowiPluginModel.findEnabledPluginsIncludingAnyTypes([GrowiPluginResourceType.Theme]);
 
 
-      const customThemeSummaries = themePlugins
+      const pluginThemesMetadatas = themePlugins
         .map(themePlugin => themePlugin.meta.themes)
         .map(themePlugin => themePlugin.meta.themes)
         .flat();
         .flat();
 
 
-      return res.apiv3({ currentTheme, customThemeSummaries });
+      return res.apiv3({ currentTheme, pluginThemesMetadatas });
     }
     }
     catch (err) {
     catch (err) {
       const msg = 'Error occurred in getting theme';
       const msg = 'Error occurred in getting theme';