rename

src/client/js/services/AdminAppContainer.js

@@ -92,7 +92,7 @@ export default class AdminAppContainer extends Container {
 
       fileUploadType: appSettingsParams.fileUploadType,
       envFileUploadType: appSettingsParams.envFileUploadType,
-      useOnlyEnvVarsForFileUploadType: appSettingsParams.useOnlyEnvVarsForFileUploadType,
+      useOnlyEnvVarForFileUploadType: appSettingsParams.useOnlyEnvVarForFileUploadType,
 
       s3Region: appSettingsParams.s3Region,
       s3CustomEndpoint: appSettingsParams.s3CustomEndpoint,
@@ -109,9 +109,9 @@ export default class AdminAppContainer extends Container {
       isEnabledPlugins: appSettingsParams.isEnabledPlugins,
     });
 
-    // if useOnlyEnvVarsForFileUploadType is true, get fileUploadType from only env var and make the forms fixed.
+    // if useOnlyEnvVarForFileUploadType is true, get fileUploadType from only env var and make the forms fixed.
     // and if env var 'FILE_UPLOAD' is null, envFileUploadType is 'aws' that is default value of 'FILE_UPLOAD'.
-    if (appSettingsParams.useOnlyEnvVarsForFileUploadType) {
+    if (appSettingsParams.useOnlyEnvVarForFileUploadType) {
       this.setState({ fileUploadType: appSettingsParams.envFileUploadType });
       this.setState({ isFixedFileUploadByEnvVar: true });
     }

src/server/routes/apiv3/app-settings.js

@@ -226,7 +226,7 @@ module.exports = (crowi) => {
 
       fileUploadType: crowi.configManager.getConfig('crowi', 'app:fileUploadType'),
       envFileUploadType: crowi.configManager.getConfigFromEnvVars('crowi', 'app:fileUploadType'),
-      useOnlyEnvVarsForFileUploadType: crowi.configManager.getConfigFromEnvVars('crowi', 'app:useOnlyEnvVarsForFileUploadType'),
+      useOnlyEnvVarForFileUploadType: crowi.configManager.getConfigFromEnvVars('crowi', 'app:useOnlyEnvVarForFileUploadType'),
 
       s3Region: crowi.configManager.getConfig('crowi', 'aws:s3Region'),
       s3CustomEndpoint: crowi.configManager.getConfig('crowi', 'aws:s3CustomEndpoint'),

src/server/service/config-loader.js

@@ -29,9 +29,9 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: 'aws',
   },
-  FILE_UPLOAD_USES_ONLY_ENV_VARS_FOR_SOME_OPTIONS: {
+  FILE_UPLOAD_USES_ONLY_ENV_VAR: {
     ns:      'crowi',
-    key:     'app:useOnlyEnvVarsForFileUploadType',
+    key:     'app:useOnlyEnvVarForFileUploadType',
     type:    TYPES.BOOLEAN,
     default: false,
   },

src/server/service/config-manager.js

@@ -231,7 +231,7 @@ class ConfigManager extends S2sMessageHandlable {
       // file upload option
       || (
         KEYS_FOR_FIEL_UPLOAD_USE_ONLY_ENV_OPTION.includes(key)
-        && this.searchOnlyFromEnvVarConfigs('crowi', 'app:useOnlyEnvVarsForFileUploadType')
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'app:useOnlyEnvVarForFileUploadType')
       )
       // gcs option
       || (