[MM-28972] Added 'Always On' option for new sidebar (#6530)

* [MM-28972] Added 'Always On' option for new sidebar * Redux update
mattermost · Oct 27, 2020 · c7975a2 · c7975a2
1 parent 4d56b21
commit c7975a2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx
@@ -5168,6 +5168,11 @@ const AdminDefinition = {
  display_name: t('admin.experimental.experimentalChannelSidebarOrganization.default_off'),
  display_name_default: 'Enabled (Default Off)',
  },
+ {
+ value: 'always_on',
+ display_name: t('admin.experimental.experimentalChannelSidebarOrganization.always_on'),
+ display_name_default: 'Always On',
+ },
  ],
  isDisabled: it.not(it.userHasWritePermissionOnResource('experimental')),
  },

diff --git a/components/user_settings/sidebar/index.ts b/components/user_settings/sidebar/index.ts
@@ -41,7 +41,7 @@ function mapStateToProps(state: GlobalState) {
  channelSwitcherOption,
  channelSidebarOrganizationOption: String(channelSidebarOrganizationOption),
  showChannelOrganization: config.ExperimentalChannelOrganization === 'true',
- showChannelSidebarOrganization: config.ExperimentalChannelSidebarOrganization !== 'disabled',
+ showChannelSidebarOrganization: config.ExperimentalChannelSidebarOrganization !== 'disabled' && config.ExperimentalChannelSidebarOrganization !== 'always_on',
  showUnusedOption: config.CloseUnusedDirectMessages === 'true',
  user: getCurrentUser(state),
  };

diff --git a/i18n/en.json b/i18n/en.json
@@ -630,6 +630,7 @@
  "admin.experimental.enableXToLeaveChannelsFromLHS.title": "Enable X to Leave Channels from Left-Hand Sidebar:",
  "admin.experimental.experimentalChannelOrganization.desc": "Enables channel sidebar organization options in **Account Settings > Sidebar > Channel grouping and sorting** including options for grouping unread channels, sorting channels by most recent post and combining all channel types into a single list. These settings are not available if **Account Settings > Sidebar > Experimental Sidebar Features** are enabled.",
  "admin.experimental.experimentalChannelOrganization.title": "Channel Grouping and Sorting",
+ "admin.experimental.experimentalChannelSidebarOrganization.always_on": "Always On",
  "admin.experimental.experimentalChannelSidebarOrganization.default_off": "Enabled (Default Off)",
  "admin.experimental.experimentalChannelSidebarOrganization.default_on": "Enabled (Default On)",
  "admin.experimental.experimentalChannelSidebarOrganization.desc": "When enabled, users can access experimental channel sidebar features, including collapsible sections and unreads filtering. If default on, this enabled the new sidebar features by default for all users on this server. Users can disable the features in **Account Settings > Sidebar > Experimental Sidebar Features**. If default off, users must enable the experimental sidebar features in Account Settings. [Learn more](!https://about.mattermost.com/default-sidebar/) or [give us feedback](!https://about.mattermost.com/default-sidebar-survey/)",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
  "localforage-observable": "2.0.1",
  "mark.js": "8.11.1",
  "marked": "github:mattermost/marked#87769262aa02e1784570f61f4f962050e07cc335",
- "mattermost-redux": "github:mattermost/mattermost-redux#50813febcf5ff7bb60f71dcdf53e573aed3f9b55",
+ "mattermost-redux": "github:mattermost/mattermost-redux#7a241e2a4f56217320ae79facca5a3a3fb83e95d",
  "moment-timezone": "0.5.31",
  "p-queue": "6.6.1",
  "pdfjs-dist": "2.1.266",