use normal setting instead of UIFeature

Signed-off-by: Kerry Archibald <kerrya@element.io>
matrix-org · Jan 27, 2022 · 6998302 · t3chguy · Jan 27, 2022 · t3chguy
1 parent 74ccf3d
commit 6998302
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/components/views/dialogs/ExportDialog.tsx b/src/components/views/dialogs/ExportDialog.tsx
@@ -40,7 +40,6 @@ import Exporter from "../../../utils/exportUtils/Exporter";
 import Spinner from "../elements/Spinner";
 import InfoDialog from "./InfoDialog";
 import SettingsStore from "../../../settings/SettingsStore";
-import { UIFeature } from "../../../settings/UIFeature";
 
 interface IProps extends IDialogProps {
     room: Room;
@@ -61,7 +60,7 @@ export type ForceRoomExportParameters = {
     format?: ExportFormat; range?: ExportType; numberOfMessages?: number; includeAttachments?: boolean; sizeMb?: number;
 };
 export const getSafeForceRoomExportParameters = (): ForceRoomExportParameters => {
-    const config = SettingsStore.getValue<ForceRoomExportParameters>(UIFeature.ForceRoomExportParameters);
+    const config = SettingsStore.getValue<ForceRoomExportParameters>("forceRoomExportParameters");
     if (!config || typeof config !== "object") return {};
 
     const { format, range, numberOfMessages, includeAttachments, sizeMb } = config;
@@ -90,7 +89,7 @@ interface ExportConfig {
 }
 
 /**
- * Set up form state using UIFeature.ForceRoomExportParameters or defaults
+ * Set up form state using "forceRoomExportParameters" or defaults
  * Form fields configured in ForceRoomExportParameters are not allowed to be edited
  * Only return change handlers for editable values
  */

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -883,6 +883,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: false,
         controller: new ReloadOnChangeController(),
     },
+    "forceRoomExportParameters": {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: {},
+    },
     [UIFeature.RoomHistorySettings]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
@@ -956,8 +960,4 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
-    [UIFeature.ForceRoomExportParameters]: {
-        supportedLevels: LEVELS_UI_FEATURE,
-        default: {},
-    },
 };
diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
@@ -33,7 +33,6 @@ export enum UIFeature {
     AdvancedSettings = "UIFeature.advancedSettings",
     RoomHistorySettings = "UIFeature.roomHistorySettings",
     TimelineEnableRelativeDates = "UIFeature.timelineEnableRelativeDates",
-    ForceRoomExportParameters = "UIFeature.ForceRoomExportParameters"
 }
 
 export enum UIComponent {