Преглед изворни кода

Code improvement

https://youtrack.weseek.co.jp/issue/GW-7759
- Set isDefaultLogo true in AdminCustomizeContainer
- Add showModal method in CustomizeLogoSetting
- Add validation options of uploadedLogoSrc in customize-setting route
I Komang Mudana пре 3 година
родитељ
комит
3841123c7f

+ 1 - 1
packages/app/src/client/services/AdminCustomizeContainer.js

@@ -60,7 +60,7 @@ export default class AdminCustomizeContainer extends Container {
       },
       uploadedLogoSrc: null,
       defaultLogoSrc: DEFAULT_LOGO,
-      isDefaultLogo: false,
+      isDefaultLogo: true,
       attachmentId: '',
       /* eslint-enable quote-props, no-multi-spaces */
     };

+ 5 - 1
packages/app/src/components/Admin/Customize/CustomizeLogoSetting.tsx

@@ -36,12 +36,16 @@ const CustomizeLogoSetting: FC<Props> = (props: Props) => {
     hideModal();
   };
 
+  const showModal = () => {
+    setIsShow(true);
+  };
+
   const onSelectFile = (e) => {
     if (e.target.files != null && e.target.files.length > 0) {
       const reader = new FileReader();
       reader.addEventListener('load', () => setSrc(reader.result));
       reader.readAsDataURL(e.target.files[0]);
-      setIsShow(true);
+      showModal();
     }
   };
 

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

@@ -139,6 +139,7 @@ module.exports = (crowi) => {
     logo: [
       body('attachmentId').isString().optional({ nullable: true }),
       body('isDefaultLogo').isBoolean(),
+      body('uploadedLogoSrc').isString(),
     ],
   };