Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 6998302

Browse files
author
Kerry Archibald
committed
use normal setting instead of UIFeature
Signed-off-by: Kerry Archibald <[email protected]>
1 parent 74ccf3d commit 6998302

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

src/components/views/dialogs/ExportDialog.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import Exporter from "../../../utils/exportUtils/Exporter";
4040
import Spinner from "../elements/Spinner";
4141
import InfoDialog from "./InfoDialog";
4242
import SettingsStore from "../../../settings/SettingsStore";
43-
import { UIFeature } from "../../../settings/UIFeature";
4443

4544
interface IProps extends IDialogProps {
4645
room: Room;
@@ -61,7 +60,7 @@ export type ForceRoomExportParameters = {
6160
format?: ExportFormat; range?: ExportType; numberOfMessages?: number; includeAttachments?: boolean; sizeMb?: number;
6261
};
6362
export const getSafeForceRoomExportParameters = (): ForceRoomExportParameters => {
64-
const config = SettingsStore.getValue<ForceRoomExportParameters>(UIFeature.ForceRoomExportParameters);
63+
const config = SettingsStore.getValue<ForceRoomExportParameters>("forceRoomExportParameters");
6564
if (!config || typeof config !== "object") return {};
6665

6766
const { format, range, numberOfMessages, includeAttachments, sizeMb } = config;
@@ -90,7 +89,7 @@ interface ExportConfig {
9089
}
9190

9291
/**
93-
* Set up form state using UIFeature.ForceRoomExportParameters or defaults
92+
* Set up form state using "forceRoomExportParameters" or defaults
9493
* Form fields configured in ForceRoomExportParameters are not allowed to be edited
9594
* Only return change handlers for editable values
9695
*/

src/settings/Settings.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
883883
default: false,
884884
controller: new ReloadOnChangeController(),
885885
},
886+
"forceRoomExportParameters": {
887+
supportedLevels: LEVELS_UI_FEATURE,
888+
default: {},
889+
},
886890
[UIFeature.RoomHistorySettings]: {
887891
supportedLevels: LEVELS_UI_FEATURE,
888892
default: true,
@@ -956,8 +960,4 @@ export const SETTINGS: {[setting: string]: ISetting} = {
956960
supportedLevels: LEVELS_UI_FEATURE,
957961
default: true,
958962
},
959-
[UIFeature.ForceRoomExportParameters]: {
960-
supportedLevels: LEVELS_UI_FEATURE,
961-
default: {},
962-
},
963963
};

src/settings/UIFeature.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export enum UIFeature {
3333
AdvancedSettings = "UIFeature.advancedSettings",
3434
RoomHistorySettings = "UIFeature.roomHistorySettings",
3535
TimelineEnableRelativeDates = "UIFeature.timelineEnableRelativeDates",
36-
ForceRoomExportParameters = "UIFeature.ForceRoomExportParameters"
3736
}
3837

3938
export enum UIComponent {

0 commit comments

Comments
 (0)