diff --git a/.circleci/config.yml b/.circleci/config.yml index a8dfb8fb90e2..379740beb9be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,10 +13,10 @@ executors: aliases: - &restore_cache restore_cache: - key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-3 + key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-4 - &save_cache save_cache: - key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-3 + key: dependencies-{{ .Branch }}-{{ checksum "package-lock.json" }}-4 paths: - ~/mattermost/mattermost-webapp/node_modules diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx index c30b3f916dab..abaa027c34ab 100644 --- a/components/admin_console/admin_definition.jsx +++ b/components/admin_console/admin_definition.jsx @@ -52,7 +52,7 @@ import CustomTermsOfServiceSettings from './custom_terms_of_service_settings'; import SessionLengthSettings from './session_length_settings'; import LDAPFeatureDiscovery from './feature_discovery/ldap.tsx'; import SAMLFeatureDiscovery from './feature_discovery/saml.tsx'; -import BillingSubscriptions from './billing/billing_subscriptions'; +import BillingSubscriptions from './billing/billing_subscriptions.tsx'; import BillingHistory from './billing/billing_history'; import CompanyInfo from './billing/company_info'; import PaymentInfo from './billing/payment_info'; diff --git a/components/admin_console/billing/billing_subscriptions.tsx b/components/admin_console/billing/billing_subscriptions.tsx index 39aa993ff566..ee9f8bb271bb 100644 --- a/components/admin_console/billing/billing_subscriptions.tsx +++ b/components/admin_console/billing/billing_subscriptions.tsx @@ -2,15 +2,27 @@ // See LICENSE.txt for license information. import React, {useState, useEffect} from 'react'; -import {useDispatch, useStore} from 'react-redux'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, useIntl} from 'react-intl'; +import {useDispatch, useStore, useSelector} from 'react-redux'; import {getCloudSubscription, getCloudProducts} from 'mattermost-redux/actions/cloud'; import {DispatchFunc} from 'mattermost-redux/types/actions'; +import {PreferenceType} from 'mattermost-redux/types/preferences'; + +import {getStandardAnalytics} from 'mattermost-redux/actions/admin'; +import {savePreferences} from 'mattermost-redux/actions/preferences'; +import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general'; +import {getCurrentUser} from 'mattermost-redux/selectors/entities/users'; +import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences'; + +import {GlobalState} from 'types/store'; import AlertBanner from 'components/alert_banner'; import FormattedMarkdownMessage from 'components/formatted_markdown_message'; import FormattedAdminHeader from 'components/widgets/admin_console/formatted_admin_header'; + +import {Preferences, CloudBanners} from 'utils/constants'; + import privateCloudImage from 'images/private-cloud-image.svg'; import upgradeMattermostCloudImage from 'images/upgrade-mattermost-cloud-image.svg'; @@ -19,10 +31,6 @@ import PlanDetails from './plan_details'; import './billing_subscriptions.scss'; import BillingSummary from './billing_summary'; -type Props = { - -}; - const upgradeMattermostCloud = () => (