rename 'featureToggle' to 'isFeatureEnable' and move definition of available prerelease-features to constants.jsx

3 files changed, 9 insertions, 16 deletions

diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 628e885f2..09e962161 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -1320,16 +1320,3 @@ 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/constants.jsx b/web/react/utils/constants.jsx
index 31c2b940e..2009e07dd 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -399,5 +399,11 @@ export default {
     NotificationPrefs: {
         MENTION: 'mention'
     },
-    FeatureTogglePrefix: 'feature_enabled_'
+    FeatureTogglePrefix: 'feature_enabled_',
+    PRE_RELEASE_FEATURES: {
+        MARKDOWN_PREVIEW: {
+            label: 'markdown_preview', // github issue: https://github.com/mattermost/platform/pull/1389
+            description: 'Show markdown preview option in message input box'
+        }
+    }
 };
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 58e570455..80c377d7f 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -1222,6 +1222,6 @@ export function getPostTerm(post) {
     return postTerm;
 }
 
-export function featureToggle(feature) {
-    return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature, {value: 'false'}).value === 'true';
+export function isFeatureEnabled(feature) {
+    return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label, {value: 'false'}).value === 'true';
 }