From abec097da19a56a73270a3e9b30198c07b1210ea Mon Sep 17 00:00:00 2001 From: Florian Orben Date: Fri, 13 Nov 2015 03:15:33 +0100 Subject: PLT-1125: allow to toggle features in frontend --- config/pre_release_features.json | 6 + .../user_settings/user_settings_advanced.jsx | 134 ++++++++++++++++++--- web/react/utils/client.jsx | 13 ++ web/react/utils/utils.jsx | 4 + web/static/config/pre_release_features.json | 1 + 5 files changed, 142 insertions(+), 16 deletions(-) create mode 100644 config/pre_release_features.json create mode 120000 web/static/config/pre_release_features.json diff --git a/config/pre_release_features.json b/config/pre_release_features.json new file mode 100644 index 000000000..d1b27ecf9 --- /dev/null +++ b/config/pre_release_features.json @@ -0,0 +1,6 @@ +[ + { + "label": "#1389", + "description": "Show markdown preview option in message input box" + } +] \ No newline at end of file diff --git a/web/react/components/user_settings/user_settings_advanced.jsx b/web/react/components/user_settings/user_settings_advanced.jsx index ac82595f5..ae7f41020 100644 --- a/web/react/components/user_settings/user_settings_advanced.jsx +++ b/web/react/components/user_settings/user_settings_advanced.jsx @@ -13,21 +13,38 @@ export default class AdvancedSettingsDisplay extends React.Component { this.updateSection = this.updateSection.bind(this); this.updateSetting = this.updateSetting.bind(this); + this.toggleFeature = this.toggleFeature.bind(this); + this.saveEnabledFeatures = this.saveEnabledFeatures.bind(this); this.setupInitialState = this.setupInitialState.bind(this); - this.state = this.setupInitialState(); + this.state = {settings: {}, preReleaseFeatures: []}; + this.setupInitialState(); } setupInitialState() { - const sendOnCtrlEnter = PreferenceStore.getPreference( - Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, - 'send_on_ctrl_enter', - {value: 'false'} - ).value; - - return { - settings: {send_on_ctrl_enter: sendOnCtrlEnter} + const settings = { + send_on_ctrl_enter: PreferenceStore.getPreference( + Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, + 'send_on_ctrl_enter', + {value: 'false'} + ).value }; + + let enabledFeatures = 0; + PreferenceStore.getPreferences(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS).forEach((setting) => { + if (setting.name.lastIndexOf('feature_enabled_') === 0) { + settings[setting.name] = setting.value; + if (setting.value === 'true') { + enabledFeatures++; + } + } + }); + + Client.getAvailablePreReleaseFeatures((data) => { + this.setState({settings, preReleaseFeatures: data || [], enabledFeatures}); + }, () => { + this.setState({settings, preReleaseFeatures: [], enabledFeatures}); + }); } updateSetting(setting, value) { @@ -36,14 +53,45 @@ export default class AdvancedSettingsDisplay extends React.Component { this.setState(settings); } - handleSubmit(setting) { - const preference = PreferenceStore.setPreference( - Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, - setting, - this.state.settings[setting] - ); + toggleFeature(feature, checked) { + const settings = this.state.settings; + settings['feature_enabled_' + feature] = String(checked); - Client.savePreferences([preference], + let enabledFeatures = 0; + Object.keys(this.state.settings).forEach((setting) => { + if (setting.lastIndexOf('feature_enabled_') === 0 && this.state.settings[setting] === 'true') { + enabledFeatures++; + } + }); + + this.setState({settings, enabledFeatures}); + } + + saveEnabledFeatures() { + const features = []; + Object.keys(this.state.settings).forEach((setting) => { + if (setting.lastIndexOf('feature_enabled_') === 0) { + features.push(setting); + } + }); + + this.handleSubmit(features); + } + + handleSubmit(settings) { + const preferences = []; + + (Array.isArray(settings) ? settings : [settings]).forEach((setting) => { + preferences.push( + PreferenceStore.setPreference( + Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, + setting, + String(this.state.settings[setting]) + ) + ); + }); + + Client.savePreferences(preferences, () => { PreferenceStore.emitChange(); this.updateSection(''); @@ -118,6 +166,58 @@ export default class AdvancedSettingsDisplay extends React.Component { ); } + let previewFeaturesSection; + if (this.props.activeSection === 'advancedPreviewFeatures') { + const inputs = []; + + this.state.preReleaseFeatures.forEach((feature) => { + inputs.push( +
+
+ +
+
+ ); + }); + + inputs.push( +
+
+ {'Check any pre-released features you\'d like to preview.'} +
+ ); + + previewFeaturesSection = ( + { + this.updateSection(''); + e.preventDefault(); + }} + /> + ); + } else { + previewFeaturesSection = ( + this.props.updateSection('advancedPreviewFeatures')} + /> + ); + } + return (
@@ -145,6 +245,8 @@ export default class AdvancedSettingsDisplay extends React.Component {

{'Advanced Settings'}

{ctrlSendSection} +
+ {previewFeaturesSection}
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 09e962161..628e885f2 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -1320,3 +1320,16 @@ export function regenOutgoingHookToken(data, success, error) { } }); } + +export function getAvailablePreReleaseFeatures(success, error) { + $.ajax({ + url: '/static/config/pre_release_features.json', + dataType: 'json', + type: 'GET', + success, + error: (xhr, status, err) => { + var e = handleError('getAvailablePreReleaseFeatures', xhr, status, err); + error(e); + } + }); +} diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 9b2f7e057..432cb05e0 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1221,3 +1221,7 @@ export function getPostTerm(post) { return postTerm; } + +export function featureToggle(feature) { + return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'feature_enabled_' + feature, {value: 'false'}).value === 'true'; +} diff --git a/web/static/config/pre_release_features.json b/web/static/config/pre_release_features.json new file mode 120000 index 000000000..fa410e1d1 --- /dev/null +++ b/web/static/config/pre_release_features.json @@ -0,0 +1 @@ +../../../config/pre_release_features.json \ No newline at end of file -- cgit v1.2.3-1-g7c22