[MM-28313] Admin config - Cloud Billing feature flag (#6376)

* [MM-28313] Admin config - Cloud Billing feature flag

* Update redux

components/admin_console/admin_definition.jsx

@@ -212,7 +212,10 @@ const AdminDefinition = {
  icon: 'fa-credit-card', // TODO: Need compass icon
  sectionTitle: t('admin.sidebar.billing'),
  sectionTitleDefault: 'Billing & Account',
- isHidden: it.not(it.licensedForFeature('Cloud')),
+ isHidden: it.any(
+ it.not(it.licensedForFeature('Cloud')),
+ it.configIsFalse('ExperimentalSettings', 'CloudBilling'),
+ ),
  subscription: {
  url: 'billing/subscription',
  title: t('admin.sidebar.subscription'),
@@ -5183,6 +5186,16 @@ const AdminDefinition = {
  // placeholder: t('admin.experimental.replyToAddress.example'),
  // placeholder_default: 'E.g.: "[email protected]"',
  // },
+ {
+ type: Constants.SettingsTypes.TYPE_BOOL,
+ key: 'ExperimentalSettings.CloudBilling',
+ label: t('admin.experimental.cloudBilling.title'),
+ label_default: 'Cloud Billing:',
+ help_text: t('admin.experimental.cloudBilling.desc'),
+ help_text_default: 'Show the new billing view for Cloud',
+ help_text_markdown: false,
+ isHidden: it.not(it.licensedForFeature('Cloud')),
+ },
  ],
  },
  },

i18n/en.json

@@ -590,6 +590,8 @@
  "admin.experimental.clientSideCertEnable.title": "Enable Client-Side Certification:",
  "admin.experimental.closeUnusedDirectMessages.desc": "When true, direct message conversations with no activity for 7 days will be hidden from the sidebar. When false, conversations remain in the sidebar until they are manually closed.",
  "admin.experimental.closeUnusedDirectMessages.title": "Autoclose Direct Messages in Sidebar:",
+ "admin.experimental.cloudBilling.desc": "Show the new billing view for Cloud",
+ "admin.experimental.cloudBilling.title": "Cloud Billing:",
  "admin.experimental.defaultTheme.desc": "Set a default theme that applies to all new users on the system.",
  "admin.experimental.defaultTheme.title": "Default Theme:",
  "admin.experimental.emailBatchingBufferSize.desc": "Specify the maximum number of notifications batched into a single email.",

package.json

@@ -36,7 +36,7 @@
  "localforage-observable": "2.0.1",
  "mark.js": "8.11.1",
  "marked": "github:mattermost/marked#87769262aa02e1784570f61f4f962050e07cc335",
- "mattermost-redux": "github:mattermost/mattermost-redux#2c5ca00792fc5785366c4877275628de4aedb24c",
+ "mattermost-redux": "github:mattermost/mattermost-redux#ec55fcb408bb0abc3d89aad906e18224c9e27eb5",
  "moment-timezone": "0.5.31",
  "p-queue": "^6.4.0",
  "pdfjs-dist": "2.0.489",