From 4c204e88be2364468c0b1fa27ca0a60d1065c129 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 24 Dec 2018 15:09:10 +0000 Subject: [PATCH] Add feature flag for counters --- src/components/views/rooms/AuxPanel.js | 3 ++- src/i18n/strings/en_EN.json | 3 ++- src/settings/Settings.js | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js index 32abb41ce2..dd11ee8ad0 100644 --- a/src/components/views/rooms/AuxPanel.js +++ b/src/components/views/rooms/AuxPanel.js @@ -25,6 +25,7 @@ import AppsDrawer from './AppsDrawer'; import { _t } from '../../../languageHandler'; import classNames from 'classnames'; import RateLimitedFunc from '../../../ratelimitedfunc'; +import SettingsStore from "../../../settings/SettingsStore"; module.exports = React.createClass({ @@ -164,7 +165,7 @@ module.exports = React.createClass({ />; let stateViews = null; - if (this.props.room) { + if (this.props.room && SettingsStore.isFeatureEnabled("feature_state_counters")) { const stateEvs = this.props.room.currentState.getStateEvents('re.jki.counter'); let counters = []; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 85cb8c9868..a6b04ec338 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1404,5 +1404,6 @@ "Go to Settings": "Go to Settings", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", + "Render simple counters in room header": "Render simple counters in room header" } diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 14f4bdc6dd..ec7dadc341 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -102,6 +102,12 @@ export const SETTINGS = { supportedLevels: LEVELS_FEATURE, default: false, }, + "feature_state_counters": { + isFeature: true, + displayName: _td("Render simple counters in room header"), + supportedLevels: LEVELS_FEATURE, + default: false, + }, "MessageComposerInput.dontSuggestEmoji": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td('Disable Emoji suggestions while typing'),