fix useOnlyEnvVarsForIsBulkExportPagesEnabled usage in PageBulkExportSettings

apps/app/src/client/components/Admin/App/PageBulkExportSettings.tsx

@@ -39,7 +39,12 @@ const PageBulkExportSettings = (): JSX.Element => {
   }, [isBulkExportPagesEnabled, bulkExportDownloadExpirationSeconds, mutate, t]);
 
   useEffect(() => {
-    setIsBulkExportPagesEnabled(data?.isBulkExportPagesEnabled);
+    if (data?.useOnlyEnvVarForFileUploadType) {
+      setIsBulkExportPagesEnabled(data?.envIsBulkExportPagesEnabled);
+    }
+    else {
+      setIsBulkExportPagesEnabled(data?.isBulkExportPagesEnabled);
+    }
     setBulkExportDownloadExpirationSeconds(data?.bulkExportDownloadExpirationSeconds);
   }, [data]);
 
@@ -75,13 +80,25 @@ const PageBulkExportSettings = (): JSX.Element => {
                   className="form-check-input"
                   id="cbIsPageBulkExportEnabled"
                   checked={isBulkExportPagesEnabled}
-                  disabled={data?.isFixedIsBulkExportPagesEnabled}
+                  disabled={data?.useOnlyEnvVarsForIsBulkExportPagesEnabled}
                   onChange={e => setIsBulkExportPagesEnabled(e.target.checked)}
                 />
                 <label className="form-label form-check-label" htmlFor="cbIsPageBulkExportEnabled">
                   {t('app_setting.enable_page_bulk_export')}
                 </label>
               </div>
+              {data?.useOnlyEnvVarsForIsBulkExportPagesEnabled && (
+                <p className="form-text text-muted">
+                  {/* eslint-disable-next-line react/no-danger */}
+                  <b dangerouslySetInnerHTML={{
+                    __html: t('admin:app_setting.fixed_by_env_var', {
+                      envKey: 'BULK_EXPORT_PAGES_ENABLED',
+                      envVar: isBulkExportPagesEnabled,
+                    }),
+                  }}
+                  />
+                </p>
+              )}
             </div>
           </div>
 
@@ -107,21 +124,6 @@ const PageBulkExportSettings = (): JSX.Element => {
                 </select>
               </div>
             </div>
-
-            {data?.isFixedIsBulkExportPagesEnabled && (
-              <p className="alert alert-warning mt-2 text-start">
-                <span className="material-symbols-outlined">help</span>
-                <b>FIXED</b><br />
-                {/* eslint-disable-next-line react/no-danger */}
-                <b dangerouslySetInnerHTML={{
-                  __html: t('admin:app_setting.fixed_by_env_var', {
-                    envKey: 'BULK_EXPORT_PAGES_ENABLED',
-                    envVar: isBulkExportPagesEnabled,
-                  }),
-                }}
-                />
-              </p>
-            )}
           </div>
 
           <AdminUpdateButtonRow onClick={onSubmitHandler} />

apps/app/src/client/services/AdminAppContainer.js

@@ -23,8 +23,6 @@ export default class AdminAppContainer extends Container {
       globalLang: '',
       isEmailPublishedForNewUser: true,
       fileUpload: '',
-      isBulkExportPagesEnabled: false,
-      isFixedIsBulkExportPagesEnabled: false,
 
       isV5Compatible: null,
       siteUrl: '',
@@ -102,7 +100,6 @@ export default class AdminAppContainer extends Container {
       globalLang: appSettingsParams.globalLang,
       isEmailPublishedForNewUser: appSettingsParams.isEmailPublishedForNewUser,
       fileUpload: appSettingsParams.fileUpload,
-      isBulkExportPagesEnabled: appSettingsParams.isBulkExportPagesEnabled,
       isV5Compatible: appSettingsParams.isV5Compatible,
       siteUrl: appSettingsParams.siteUrl,
       siteUrlUseOnlyEnvVars: appSettingsParams.siteUrlUseOnlyEnvVars,
@@ -160,12 +157,6 @@ export default class AdminAppContainer extends Container {
       this.setState({ fileUploadType: appSettingsParams.envFileUploadType });
       this.setState({ isFixedFileUploadByEnvVar: true });
     }
-
-    if (appSettingsParams.useOnlyEnvVarsForIsBulkExportPagesEnabled) {
-      this.setState({ isBulkExportPagesEnabled: appSettingsParams.envIsBulkExportPagesEnabled });
-      this.setState({ isFixedIsBulkExportPagesEnabled: true });
-    }
-
   }
 
   /**
@@ -405,7 +396,6 @@ export default class AdminAppContainer extends Container {
       globalLang: this.state.globalLang,
       isEmailPublishedForNewUser: this.state.isEmailPublishedForNewUser,
       fileUpload: this.state.fileUpload,
-      isBulkExportPagesEnabled: this.state.isBulkExportPagesEnabled,
     });
     const { appSettingParams } = response.data;
     return appSettingParams;

apps/app/src/interfaces/res/admin/app-settings.ts

@@ -63,5 +63,5 @@ export type IResAppSettings = {
   isBulkExportPagesEnabled: boolean,
   envIsBulkExportPagesEnabled: boolean,
   bulkExportDownloadExpirationSeconds: number,
-  isFixedIsBulkExportPagesEnabled: boolean,
+  useOnlyEnvVarsForIsBulkExportPagesEnabled: boolean,
 }