itizawa 5 лет назад
Родитель
Сommit
fd232c139e

+ 1 - 1
config/env.dev.js

@@ -1,6 +1,6 @@
 module.exports = {
   NODE_ENV: 'development',
-  FILE_UPLOAD: 'mongodb',
+  FILE_UPLOAD: 'gcp',
   // MONGO_GRIDFS_TOTAL_LIMIT: 10485760,   // 10MB
   MATHJAX: 1,
   // NO_CDN: true,

+ 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.isFileUploadTypeForced}
+                    disabled={adminAppContainer.state.isFileUploadTypeForced}
                     onChange={(e) => {
                     adminAppContainer.changeFileUploadType(type);
                   }}
@@ -67,7 +67,7 @@ function FileUploadSetting(props) {
               );
             })}
         </div>
-        {adminAppContainer.isFileUploadTypeForced && (
+        {adminAppContainer.state.isFileUploadTypeForced && (
           <p className="alert alert-warning mt-2 text-left offset-3 col-6">
             <i className="icon-exclamation icon-fw">
             </i><b>FIXED</b><br />

+ 10 - 2
src/client/js/services/AdminAppContainer.js

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