itizawa 5 tahun lalu
induk
melakukan
3a73c348af

+ 2 - 2
src/client/js/components/Admin/App/FileUploadSetting.jsx

@@ -57,7 +57,7 @@ function FileUploadSetting(props) {
                     name="file-upload-type"
                     id={`file-upload-type-radio-${type}`}
                     checked={adminAppContainer.state.fileUploadType === type}
-                    disabled={adminAppContainer.state.isFileUploadTypeForced}
+                    disabled={adminAppContainer.state.isFixedFileUploadByEnvVar}
                     onChange={(e) => {
                     adminAppContainer.changeFileUploadType(type);
                   }}
@@ -67,7 +67,7 @@ function FileUploadSetting(props) {
               );
             })}
         </div>
-        {adminAppContainer.state.isFileUploadTypeForced && (
+        {adminAppContainer.state.isFixedFileUploadByEnvVar && (
           <p className="alert alert-warning mt-2 text-left offset-3 col-6">
             <i className="icon-exclamation icon-fw">
             </i><b>FIXED</b><br />

+ 7 - 7
src/client/js/services/AdminAppContainer.js

@@ -37,7 +37,7 @@ export default class AdminAppContainer extends Container {
 
       fileUploadType: '',
       envFileUploadType: '',
-      isFileUploadTypeForced: false,
+      isFixedFileUploadByEnvVar: false,
 
       gcsApiKeyJsonPath: '',
       envGcsApiKeyJsonPath: '',
@@ -107,19 +107,19 @@ export default class AdminAppContainer extends Container {
     });
 
     // check is file upload type forced
-    if (this.isFileUploadTypeForced(appSettingsParams.envFileUploadType)) {
+    if (this.isFixedFileUploadByEnvVar(appSettingsParams.envFileUploadType)) {
       this.setState({ fileUploadType: appSettingsParams.envFileUploadType });
-      this.setState({ isFileUploadTypeForced: true });
+      this.setState({ isFixedFileUploadByEnvVar: true });
     }
 
   }
 
   /**
-   * get isFileUploadTypeForced
-   * @return {bool} isWikiModeForced
+   * get isFixedFileUploadByEnvVar
+   * @return {bool} isFixedFileUploadByEnvVar
    */
-  isFileUploadTypeForced(envFileUploadType) {
-    return envFileUploadType === 'aws' || envFileUploadType === 'gcp' || envFileUploadType === 'gcs';
+  isFixedFileUploadByEnvVar(envFileUploadType) {
+    return envFileUploadType !== '';
   }
 
   /**