-
-This repo hosts the webapp client code. If you'd like to report an issue with Mattermost, please create an issue on [mattermost-server](https://github.com/mattermost/mattermost-server), which hosts the server code. You can also look at the [Get Help With Mattermost](https://docs.mattermost.com/guides/get-help.html) guide to find the resources available to our community.
-
-- [Product documentation](https://docs.mattermost.com/)
-- [Developer documentation](https://developers.mattermost.com/)
-- [Download compiled version](https://mattermost.com/download)
-
-## Try out Mattermost
-
-- [Join the Mattermost Contributor's server](https://community.mattermost.com/signup_user_complete/?id=codoy5s743rq5mk18i7u5ksz7e) to join community discussions about contributions, development and more
-- [Get started with Mattermost Cloud](https://customers.mattermost.com/cloud/signup) to try out Mattermost
-
-[](https://heroku.com/deploy?template=https://github.com/mattermost/mattermost-heroku)
-
-_Note: Heroku preview does not include email or persistent storage._
-
-## Install Mattermost
-
-- [Deploy Guide](https://docs.mattermost.com/guides/deployment.html) - Deploy Mattermost in minutes via Docker, Ubuntu, or tar.
-- [Developer Machine Setup](https://developers.mattermost.com/contribute/server/developer-setup) - Follow this guide if you want to write code for Mattermost
-
-Other Install Guides:
-- [Deploy Mattermost on Docker](https://docs.mattermost.com/install/install-docker.html)
-- [Mattermost Omnibus](https://docs.mattermost.com/install/installing-mattermost-omnibus.html)
-- [Install Mattermost from Tar](https://docs.mattermost.com/install/install-tar.html)
-- [Ubuntu 20.04 LTS](https://docs.mattermost.com/install/installing-ubuntu-2004-LTS.html)
-- [Kubernetes](https://docs.mattermost.com/install/install-kubernetes.html)
-- [Helm](https://docs.mattermost.com/install/install-kubernetes.html#installing-the-operators-via-helm)
-- [Debian Buster](https://docs.mattermost.com/install/install-debian.html)
-- [RHEL 8](https://docs.mattermost.com/install/install-rhel-8.html)
-- [More server install guides](https://docs.mattermost.com/guides/deployment.html)
-
-## Get Involved
-
-- [Contribute to Mattermost](https://handbook.mattermost.com/contributors/contributors/ways-to-contribute)
-- [Find "Help Wanted" projects](https://github.com/mattermost/mattermost-server/issues?page=1&q=is%3Aissue+is%3Aopen+%22Help+Wanted%22&utf8=%E2%9C%93)
-- [Join Developer Discussion on a Mattermost Server for contributors](https://docs.mattermost.com/guides/community-chat.html)
-- [Get Help With Mattermost](https://docs.mattermost.com/guides/get-help.html)
-
-## Learn More
-
-- [API Options - webhooks, slash commands, drivers and web service](https://api.mattermost.com/)
-- [Localization Guide](https://handbook.mattermost.com/contributors/contributors/localization)
-
-## Get the Latest News
-
-- **Twitter** - Follow [Mattermost](https://twitter.com/Mattermost)
-- **Email** - Subscribe to our [newsletter](https://mattermost.com/community-newsletter/)
-
-Any other questions, mail us at [info@mattermost.com](mailto:info@mattermost.com). We'd love to meet you!
diff --git a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml
index 66b2cef95e..9d9bb1c246 100644
--- a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml
+++ b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml
@@ -13,4 +13,4 @@ test:
before_script:
- npm ci --ignore-scripts
script:
- - npm run test:speed
+ - npm run test
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index 5156360006..c2f702aa9b 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -51,7 +51,7 @@
"localforage": "1.10.0",
"localforage-observable": "2.1.1",
"lodash": "4.17.21",
- "luxon": "3.0.4",
+ "luxon": "3.3.0",
"mark.js": "8.11.1",
"marked": "github:mattermost/marked#2ef7f28cc7718e3f551c4ce9ea75fdd7580c2008",
"memoize-one": "6.0.0",
@@ -70,7 +70,7 @@
"react-day-picker": "8.3.6",
"react-dom": "17.0.2",
"react-hot-loader": "4.13.0",
- "react-intl": "5.20.10",
+ "react-intl": "*",
"react-is": "17.0.2",
"react-overlays": "0.9.3",
"react-popper": "2.3.0",
@@ -116,6 +116,7 @@
"@redux-devtools/extension": "3.2.3",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "12.1.4",
+ "@testing-library/user-event": "12.1.4",
"@types/bootstrap": "4.5.0",
"@types/country-list": "2.1.0",
"@types/enzyme": "3.10.11",
@@ -155,14 +156,12 @@
"babel-plugin-typescript-to-proptypes": "1.4.2",
"bundle-loader": "0.2.0",
"copy-webpack-plugin": "11.0.0",
- "cross-env": "7.0.3",
"css-loader": "5.2.6",
"dotenv-webpack": "8.0.1",
"enzyme": "3.11.0",
"enzyme-adapter-react-17-updated": "1.0.2",
"enzyme-to-json": "3.6.2",
"eslint-import-resolver-webpack": "0.13.2",
- "eslint-plugin-formatjs": "4.9.1",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e",
@@ -215,15 +214,13 @@
"build": "cross-env NODE_ENV=production webpack",
"run": "webpack --progress --watch",
"dev-server": "webpack serve --mode development",
- "test": "cross-env TZ=Etc/UTC jest --maxWorkers=50%",
+ "test": "cross-env TZ=Etc/UTC jest",
+ "test:watch": "cross-env TZ=Etc/UTC jest --watch",
+ "test:updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot",
+ "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose",
"test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%",
"clean": "rm -rf dist node_modules .eslintcache .stylelintcache tsconfig.tsbuildinfo",
"stats": "cross-env NODE_ENV=production webpack --profile --json > webpack_stats.json",
- "updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot",
- "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles",
- "test:speed": "cross-env TZ=Etc/UTC jest",
- "test:watch": "cross-env TZ=Etc/UTC jest --watch",
- "test:coverage": "cross-env TZ=Etc/UTC jest --coverage",
"mmjstool": "mmjstool",
"i18n-extract": "npm run mmjstool -- i18n extract-webapp --webapp-dir ./src",
"i18n-clean-empty": "npm run mmjstool -- i18n clean-empty --webapp-dir ./src",
diff --git a/webapp/channels/src/actions/notification_actions.jsx b/webapp/channels/src/actions/notification_actions.jsx
index 95e3d450e2..088cf1aedb 100644
--- a/webapp/channels/src/actions/notification_actions.jsx
+++ b/webapp/channels/src/actions/notification_actions.jsx
@@ -14,9 +14,11 @@ import {isSystemMessage, isUserAddedInChannel} from 'mattermost-redux/utils/post
import {displayUsername} from 'mattermost-redux/utils/user_utils';
import {isThreadOpen} from 'selectors/views/threads';
+import {getChannelURL, getPermalinkURL} from 'selectors/urls';
import {getHistory} from 'utils/browser_history';
import Constants, {NotificationLevels, UserStatuses} from 'utils/constants';
+import * as NotificationSounds from 'utils/notification_sounds';
import {showNotification} from 'utils/notifications';
import {isDesktopApp, isMobileApp, isWindowsApp} from 'utils/user_agent';
import * as Utils from 'utils/utils';
@@ -178,17 +180,17 @@ export function sendDesktopNotification(post, msgProps) {
if (notify) {
const updatedState = getState();
- let url = Utils.getChannelURL(updatedState, channel, teamId);
+ let url = getChannelURL(updatedState, channel, teamId);
if (isCrtReply) {
- url = Utils.getPermalinkURL(updatedState, teamId, post.id);
+ url = getPermalinkURL(updatedState, teamId, post.id);
}
dispatch(notifyMe(title, body, channel, teamId, !sound, soundName, url));
//Don't add extra sounds on native desktop clients
if (sound && !isDesktopApp() && !isMobileApp()) {
- Utils.ding(soundName);
+ NotificationSounds.ding(soundName);
}
}
};
diff --git a/webapp/channels/src/actions/notification_actions.test.js b/webapp/channels/src/actions/notification_actions.test.js
index 56fbca06db..c8b5a70599 100644
--- a/webapp/channels/src/actions/notification_actions.test.js
+++ b/webapp/channels/src/actions/notification_actions.test.js
@@ -5,8 +5,8 @@ import testConfigureStore from 'tests/test_store';
import {getHistory} from 'utils/browser_history';
import Constants, {NotificationLevels, UserStatuses} from 'utils/constants';
+import * as NotificationSounds from 'utils/notification_sounds';
import * as utils from 'utils/notifications';
-import * as baseUtils from 'utils/utils';
import {sendDesktopNotification} from './notification_actions';
@@ -22,7 +22,7 @@ describe('notification_actions', () => {
beforeEach(() => {
spy = jest.spyOn(utils, 'showNotification');
- baseUtils.ding = jest.fn();
+ NotificationSounds.ding = jest.fn();
crt = {
user_id: 'current_user_id',
@@ -315,7 +315,7 @@ describe('notification_actions', () => {
});
test('should default sound when no sound is specified', () => {
- const dingSpy = jest.spyOn(baseUtils, 'ding');
+ const dingSpy = jest.spyOn(NotificationSounds, 'ding');
baseState.entities.users.profiles.current_user_id.notify_props.desktop_sound = 'true';
const store = testConfigureStore(baseState);
return store.dispatch(sendDesktopNotification(post, msgProps)).then(() => {
@@ -324,7 +324,7 @@ describe('notification_actions', () => {
});
test('should use specified sound when specified', () => {
- const dingSpy = jest.spyOn(baseUtils, 'ding');
+ const dingSpy = jest.spyOn(NotificationSounds, 'ding');
baseState.entities.users.profiles.current_user_id.notify_props.desktop_sound = 'true';
baseState.entities.users.profiles.current_user_id.notify_props.desktop_notification_sound = 'Crackle';
const store = testConfigureStore(baseState);
diff --git a/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap b/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap
index 4c65f52555..07a4830b20 100644
--- a/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap
+++ b/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`components/FormattedMarkdownMessage should allow to disable links 1`] =
-
-
-
-
-
-
- Mattermost
-
-
-
-
-
- Mattermost
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mattermost.com
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Mattermost
-
-
-
-
-
- Mattermost
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mattermost.com/community/
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Mattermost
-
-
-
-
-
- Mattermost
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mattermost.com/community/
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Mattermost
-
-
-
-
-
- Mattermost
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mattermost.com/community/
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
+
{
{subTitle}
= {
+export const impactModifiers: Record = {
[ItemStatus.NONE]: 1,
[ItemStatus.OK]: 1,
[ItemStatus.INFO]: 0.5,
@@ -71,11 +38,191 @@ const impactModifiers: Record = {
[ItemStatus.ERROR]: 0,
};
-const useMetricsData = () => {
+const getUpdatesData = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => ({
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.title',
+ defaultMessage: 'Server updates',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.description',
+ defaultMessage: 'An update is available.',
+ }),
+ descriptionOk: formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.descriptionOk',
+ defaultMessage: 'Your workspace is completely up to date!',
+ }),
+ icon: (
+ ,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => ({
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.title',
+ defaultMessage: 'Configuration',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.description',
+ defaultMessage: 'You have configuration issues to resolve',
+ }),
+ hide: options.isCloud,
+ descriptionOk: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.descriptionOk',
+ defaultMessage: 'You\'ve successfully configured SSL and Session Lengths!',
+ }),
+ icon: (
+ ,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => ({
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.access.title',
+ defaultMessage: 'Workspace access',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.access.description',
+ defaultMessage: 'Web server configuration may be affecting access to your Mattermost workspace.',
+ }),
+ hide: options.isCloud,
+ descriptionOk: formatMessage({
+ id: 'admin.reporting.workspace_optimization.access.descriptionOk',
+ defaultMessage: 'Your web server configuration is passing a live URL test!',
+ }),
+ icon: (
+ ,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => ({
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.performance.title',
+ defaultMessage: 'Performance',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.performance.description',
+ defaultMessage: 'Your server would benefit from some performance tweaks.',
+ }),
+ hide: options.isCloud,
+ descriptionOk: formatMessage({
+ id: 'admin.reporting.workspace_optimization.performance.descriptionOk',
+ defaultMessage: 'Your search performance suits your workspace usage!',
+ }),
+ icon: (
+ ,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => ({
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.data_privacy.title',
+ defaultMessage: 'Data privacy',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.data_privacy.description',
+ defaultMessage: 'Get better insight and control over your data.',
+ }),
+ descriptionOk: formatMessage({
+ id: 'admin.reporting.workspace_optimization.data_privacy.descriptionOk',
+ defaultMessage: 'You\'ve enabled data retention and compliance features!',
+ }),
+ icon: (
+ ,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => ({
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.ease_of_management.title',
+ defaultMessage: 'Ease of management',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.ease_of_management.description',
+ defaultMessage: 'Make it easier to manage your Mattermost workspace.',
+ }),
+ descriptionOk: formatMessage({
+ id: 'admin.reporting.workspace_optimization.ease_of_management.descriptionOk',
+ defaultMessage: 'Your user authentication setup is appropriate based on your current usage!',
+ }),
+ icon: (
+ ,
+) => {
+ const [loading, setLoading] = useState(true);
+ const [data, setData] = useState(undefined);
+
const {formatMessage} = useIntl();
const prevTrialLicense = useSelector((state: GlobalState) => state.entities.admin.prevTrialLicense);
const license = useSelector(getLicense);
+ // get the currently installed server version
+ const installedVersion = useSelector((state: GlobalState) => getServerVersion(state));
+ const analytics = useSelector((state: GlobalState) => state.entities.admin.analytics) as unknown as Options['analytics'];
+
const canStartTrial = license?.IsLicensed !== 'true' && prevTrialLicense?.IsLicensed !== 'true';
const daysUntilExpiration = daysToLicenseExpire(license) || -1;
@@ -87,358 +234,46 @@ const useMetricsData = () => {
const [, contactSalesLink] = useOpenSalesLink();
- const trialOrEnterpriseCtaConfig = {
+ const trialOrEnterpriseCtaConfig = useMemo(() => ({
configUrl: canStartTrial ? ConsolePages.LICENSE : contactSalesLink,
configText: canStartTrial ? formatMessage({id: 'admin.reporting.workspace_optimization.cta.startTrial', defaultMessage: 'Start trial'}) : formatMessage({id: 'admin.reporting.workspace_optimization.cta.upgradeLicense', defaultMessage: 'Contact sales'}),
+ }), [canStartTrial, contactSalesLink, formatMessage]);
+
+ const options: Options = useMemo(() => ({
+ isLicensed,
+ isEnterpriseLicense,
+ trialOrEnterpriseCtaConfig,
+ isStarterLicense,
+ isCloud,
+ analytics,
+ installedVersion,
+ }), [isLicensed, isEnterpriseLicense, trialOrEnterpriseCtaConfig, isStarterLicense, isCloud, analytics, installedVersion]);
+
+ useEffect(() => {
+ setLoading(true);
+ const refreshData = async () => {
+ const data = {
+ updates: await getUpdatesData(config, formatMessage, options),
+ configuration: await getConfigurationData(config, formatMessage, options),
+ access: await getAccessData(config, formatMessage, options),
+ performance: await getPerformanceData(config, formatMessage, options),
+ dataPrivacy: await getDataPrivacyData(config, formatMessage, options),
+ easyManagement: await getEaseOfManagementData(config, formatMessage, options),
+ };
+
+ return data;
+ };
+
+ refreshData().then((data) => {
+ setData(data);
+ setLoading(false);
+ });
+ }, [config, formatMessage, options]);
+
+ return {
+ data,
+ loading,
};
-
- const getUpdatesData = (data: UpdatesParam) => ({
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.title',
- defaultMessage: 'Server updates',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.description',
- defaultMessage: 'An update is available.',
- }),
- descriptionOk: formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.descriptionOk',
- defaultMessage: 'Your workspace is completely up to date!',
- }),
- icon: (
- ({type: '', description: '', status: ItemStatus.NONE});
-
- // const [guestAccountStatus, setGuestAccountStatus] = useState('none');
- const [liveUrlStatus, setLiveUrlStatus] = useState(ItemStatus.ERROR);
- const [elastisearchStatus, setElasticsearchStatus] = useState(ItemStatus.INFO);
- const [ldapStatus, setLdapStatus] = useState(ItemStatus.INFO);
- const [dataRetentionStatus, setDataRetentionStatus] = useState(ItemStatus.INFO);
- const {formatMessage} = useIntl();
- const {getAccessData, getConfigurationData, getUpdatesData, getPerformanceData, getDataPrivacyData, getEaseOfManagementData, isLicensed, isEnterpriseLicense} = useMetricsData();
-
- // get the currently installed server version
- const installedVersion = useSelector((state: GlobalState) => getServerVersion(state));
- const analytics = useSelector((state: GlobalState) => state.entities.admin.analytics);
- const {TOTAL_USERS: totalUsers, TOTAL_POSTS: totalPosts} = analytics!;
-
- // gather locally available data
- const {
- ServiceSettings,
- DataRetentionSettings,
- ElasticsearchSettings,
- LdapSettings,
-
- // TeamSettings,
- // GuestAccountsSettings,
- } = props.config;
- const {location} = document;
-
- const sessionLengthWebInHours = ServiceSettings?.SessionLengthWebInHours || -1;
-
- const testURL = () => {
- if (!ServiceSettings?.SiteURL) {
- return Promise.resolve();
- }
-
- const onSuccess = ({status}: any) => setLiveUrlStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.ERROR);
- const onError = () => setLiveUrlStatus(ItemStatus.ERROR);
- return testSiteURL(onSuccess, onError, ServiceSettings?.SiteURL);
- };
-
- const testDataRetention = async () => {
- if (!isLicensed || !isEnterpriseLicense) {
- return Promise.resolve();
- }
-
- if (DataRetentionSettings?.EnableMessageDeletion || DataRetentionSettings?.EnableFileDeletion) {
- setDataRetentionStatus(ItemStatus.OK);
- return Promise.resolve();
- }
-
- const result = await fetch(`${Client4.getBaseRoute()}/data_retention/policies?page=0&per_page=0`).then((result) => result.json());
-
- setDataRetentionStatus(result.total_count > 0 ? ItemStatus.OK : ItemStatus.INFO);
- return Promise.resolve();
- };
-
- const fetchVersion = async () => {
- const result = await fetch(`${Client4.getBaseRoute()}/latest_version`).then((result) => result.json());
-
- if (result.tag_name) {
- const sanitizedVersion = result.tag_name.startsWith('v') ? result.tag_name.slice(1) : result.tag_name;
- const newVersionParts = sanitizedVersion.split('.');
- const installedVersionParts = installedVersion.split('.').slice(0, 3);
-
- // quick general check if a newer version is available
- let type = '';
- let status: ItemStatus = ItemStatus.OK;
-
- if (newVersionParts.join('') > installedVersionParts.join('')) {
- // get correct values to be inserted into the accordion item
- switch (true) {
- case newVersionParts[0] > installedVersionParts[0]:
- type = formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.major',
- defaultMessage: 'Major',
- });
- status = ItemStatus.ERROR;
- break;
- case newVersionParts[1] > installedVersionParts[1]:
- type = formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.minor',
- defaultMessage: 'Minor',
- });
- status = ItemStatus.WARNING;
- break;
- case newVersionParts[2] > installedVersionParts[2]:
- type = formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.patch',
- defaultMessage: 'Patch',
- });
- status = ItemStatus.INFO;
- break;
- }
- }
-
- setVersionData({type, description: result.body, status});
- }
- };
-
- const testElasticsearch = () => {
- if (!isLicensed || !isEnterpriseLicense || !(ElasticsearchSettings?.EnableIndexing && ElasticsearchSettings?.EnableSearching)) {
- return Promise.resolve();
- }
-
- const onSuccess = ({status}: any) => setElasticsearchStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.INFO);
- const onError = () => setElasticsearchStatus(ItemStatus.INFO);
-
- return elasticsearchTest(props.config, onSuccess, onError);
- };
-
- const testLdap = () => {
- if (!isLicensed || !LdapSettings?.Enable) {
- return Promise.resolve();
- }
-
- const onSuccess = ({status}: any) => setLdapStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.INFO);
- const onError = () => setLdapStatus(ItemStatus.INFO);
-
- return ldapTest(onSuccess, onError);
- };
-
- // commented out for now.
- // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
- // const fetchGuestAccounts = async () => {
- // if (TeamSettings?.EnableOpenServer && GuestAccountsSettings?.Enable) {
- // let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json());
- //
- // // this setting is just a string with a list of domains, or an empty string
- // if (GuestAccountsSettings?.RestrictCreationToDomains) {
- // const domainList = GuestAccountsSettings?.RestrictCreationToDomains;
- // usersArray = usersArray.filter(({email}: Record) => domainList.includes((email as string).split('@')[1]));
- // }
- //
- // // if guest accounts make up more than 5% of the user base show the info accordion
- // if (usersArray.length > (totalUsers as number * 0.05)) {
- // setGuestAccountStatus(ItemStatus.INFO);
- // return;
- // }
- // }
- //
- // setGuestAccountStatus(ItemStatus.OK);
- // };
-
- useEffect(() => {
- const promises = [];
- promises.push(testURL());
- promises.push(testLdap());
- promises.push(fetchVersion());
- promises.push(testElasticsearch());
- promises.push(testDataRetention());
-
- // promises.push(fetchGuestAccounts());
- Promise.all(promises).then(() => setLoading(false));
- }, [props.config, isLicensed, isEnterpriseLicense]);
-
- const data: DataModel = {
- updates: getUpdatesData({serverVersion: versionData}),
- configuration: getConfigurationData({
- ssl: {status: location.protocol === 'https:' ? ItemStatus.OK : ItemStatus.ERROR},
- sessionLength: {status: sessionLengthWebInHours === 720 ? ItemStatus.INFO : ItemStatus.OK},
- }),
- access: getAccessData({siteUrl: {status: liveUrlStatus}}),
- performance: getPerformanceData({
- search: {
- status: totalPosts < 2_000_000 && totalUsers < 500 ? ItemStatus.OK : elastisearchStatus,
- },
- }),
- dataPrivacy: getDataPrivacyData({retention: {status: dataRetentionStatus}}),
- easyManagement: getEaseOfManagementData({
- ldap: {status: totalUsers < 100 ? ItemStatus.OK : ldapStatus},
-
- // guestAccounts: {status: guestAccountStatus},
- }),
- };
+ const {data, loading} = useMetricsData(props.config);
const overallScoreChips: ChipsInfoType = {
[ItemStatus.INFO]: 0,
@@ -236,7 +58,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => {
};
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- const accData: AccordionItemType[] = Object.entries(data).filter(([_, y]) => !y.hide).map(([accordionKey, accordionData]) => {
+ const accordionItemsData: AccordionItemType[] | undefined = data && Object.entries(data).filter(([_, y]) => !y.hide).map(([accordionKey, accordionData]) => {
const accordionDataChips: ChipsInfoType = {
[ItemStatus.INFO]: 0,
[ItemStatus.WARNING]: 0,
@@ -297,7 +119,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => {
};
});
- return loading ? {
chartValue={Math.floor((overallScore.current / overallScore.max) * 100)}
/>
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts
new file mode 100644
index 0000000000..b87c9d1bdd
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts
@@ -0,0 +1,75 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+export type DataModel = {
+ [key: string]: {
+ title: string;
+ description: string;
+ descriptionOk: string;
+ items: ItemModel[];
+ icon: React.ReactNode;
+ hide?: boolean;
+ };
+}
+
+export enum ItemStatus {
+
+ /** Return NONE if it's not relevant, not configured, or not an option */
+ NONE = 'none',
+
+ /** Return OK if all checks for this have passed */
+ OK = 'ok',
+
+ /** Return info if it might not be relevant to them, but they could utilize it */
+ INFO = 'info',
+ WARNING = 'warning',
+ ERROR = 'error',
+}
+
+export type ItemModel = {
+ id: string;
+ title: string;
+ description: string;
+ status: ItemStatus;
+ scoreImpact: number;
+ impactModifier: number;
+ configUrl?: string;
+ configText?: string;
+ telemetryAction?: string;
+ infoUrl?: string;
+ infoText?: string;
+}
+
+export type UpdatesParam = {
+ serverVersion: {
+ type: string;
+ status: ItemStatus;
+ description: string;
+ };
+}
+
+type Analytics = {
+ DAILY_ACTIVE_USERS: number;
+ MONTHLY_ACTIVE_USERS: number;
+ TOTAL_INACTIVE_USERS: number;
+ TOTAL_MASTER_DB_CONNECTIONS: number;
+ TOTAL_POSTS: number;
+ TOTAL_PRIVATE_GROUPS: number;
+ TOTAL_PUBLIC_CHANNELS: number;
+ TOTAL_READ_DB_CONNECTIONS: number;
+ TOTAL_TEAMS: number;
+ TOTAL_USERS: number;
+ TOTAL_WEBSOCKET_CONNECTIONS: number;
+}
+export type Options = {
+ isLicensed: boolean;
+ isEnterpriseLicense: boolean;
+ trialOrEnterpriseCtaConfig: {
+ configUrl: string;
+ configText: string;
+ };
+ isCloud: boolean;
+ isStarterLicense: boolean;
+ analytics: Analytics | undefined;
+ installedVersion: string;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts
new file mode 100644
index 0000000000..e8f37024bb
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts
@@ -0,0 +1,66 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {useIntl} from 'react-intl';
+import {ItemModel, ItemStatus} from '../dashboard.type';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+import {AdminConfig} from '@mattermost/types/config';
+import {testSiteURL} from 'actions/admin_actions';
+
+/**
+ *
+ * @description Checking to see if the siteURL is configured correctly by running it through the same "check siteURL" button that exists on the webserver page.
+ */
+const siteURLCheck = async (config: Partial, formatMessage: ReturnType['formatMessage']): Promise => {
+ let status = ItemStatus.OK;
+ const testURL = async () => {
+ if (!config.ServiceSettings?.SiteURL) {
+ status = ItemStatus.ERROR;
+ }
+
+ const onSuccess = ({status: s}: any) => {
+ if (s === 'OK') {
+ status = ItemStatus.OK;
+ }
+ };
+ const onError = () => {
+ status = ItemStatus.ERROR;
+ };
+ await testSiteURL(onSuccess, onError, config.ServiceSettings?.SiteURL);
+ };
+
+ await testURL();
+ return {
+ id: 'site-url',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.access.site_url.title',
+ defaultMessage: 'Misconfigured web server',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.access.site_url.description',
+ defaultMessage: 'Your web server settings aren\'t passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.',
+ }),
+ configUrl: ConsolePages.WEB_SERVER,
+ configText: formatMessage({id: 'admin.reporting.workspace_optimization.access.site_url.cta', defaultMessage: 'Configure web server'}),
+ infoUrl: DocLinks.SITE_URL,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'site-url',
+ status,
+ scoreImpact: 12,
+ impactModifier: impactModifiers[status],
+ };
+};
+
+const checks = [
+ siteURLCheck,
+];
+
+export const runAccessChecks = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+) => {
+ const results = await Promise.all(checks.map((check) => check(config, formatMessage)));
+ return results;
+};
+
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts
new file mode 100644
index 0000000000..3cc59e7939
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts
@@ -0,0 +1,84 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+import {AdminConfig} from '@mattermost/types/config';
+import {useIntl} from 'react-intl';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {ItemModel, ItemStatus, Options} from '../dashboard.type';
+import {impactModifiers} from '../dashboard.data';
+
+/**
+ *
+ * @description This checks to see if the user's active session is done over https. This does not check if the server is configured to use https.
+ */
+const ssl = (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+): ItemModel => {
+ const status = document.location.protocol === 'https:' ? ItemStatus.OK : ItemStatus.ERROR;
+
+ return {
+ id: 'ssl',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.ssl.title',
+ defaultMessage: 'Configure SSL to make your server more secure',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.ssl.description',
+ defaultMessage: 'We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.',
+ }),
+ infoUrl: DocLinks.SSL_CERTIFICATE,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'ssl',
+ status,
+ scoreImpact: 25,
+ impactModifier: impactModifiers[status],
+ };
+};
+
+/**
+ *
+ * @description This checks to see if the user has adjusted the default session lengths to something other than 720 hours.
+ */
+const sessionLength = (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+): ItemModel => {
+ const status = config.ServiceSettings?.SessionLengthMobileInHours === 720 ? ItemStatus.INFO : ItemStatus.OK;
+ return {
+ id: 'session-length',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.session_length.title',
+ defaultMessage: 'Session lengths is set to default',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.configuration.session_length.description',
+ defaultMessage: 'Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization\'s security policies.',
+ }),
+ configUrl: ConsolePages.SESSION_LENGTHS,
+ configText: formatMessage({id: 'admin.reporting.workspace_optimization.configuration.session_length.cta', defaultMessage: 'Configure session length'}),
+ infoUrl: DocLinks.SESSION_LENGTHS,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'session-length',
+ status,
+ scoreImpact: 8,
+ impactModifier: impactModifiers[status],
+ };
+};
+
+export const runConfigChecks = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => {
+ const checks = [
+ ssl,
+ sessionLength,
+ ];
+ const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+ return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts
new file mode 100644
index 0000000000..049f90015c
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts
@@ -0,0 +1,70 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {useIntl} from 'react-intl';
+import {impactModifiers} from '../dashboard.data';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {Client4} from 'mattermost-redux/client';
+import {ItemStatus, Options} from '../dashboard.type';
+import {AdminConfig} from '@mattermost/types/config';
+
+/**
+ *
+ * @description Checks if they they have a global policy deletion enabled, or if a custom policy has been created.
+ */
+const dataRetentionCheck = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => {
+ const testDataRetention = async (
+ config: Partial,
+ options: Options,
+ ) => {
+ if (!options.isLicensed || !options.isEnterpriseLicense) {
+ return ItemStatus.INFO;
+ }
+
+ if (config.DataRetentionSettings?.EnableMessageDeletion || config.DataRetentionSettings?.EnableFileDeletion) {
+ return ItemStatus.OK;
+ }
+
+ const policyCount: {total_count: number} = await fetch(`${Client4.getBaseRoute()}/data_retention/policies_count`).then((result) => result.json());
+ return policyCount.total_count > 0 ? ItemStatus.OK : ItemStatus.INFO;
+ };
+
+ const status = await testDataRetention(config, options);
+ return {
+ id: 'data-retention',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.data_privacy.retention.title',
+ defaultMessage: 'Become more data aware',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.data_privacy.retention.description',
+ defaultMessage: 'Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.',
+ }),
+ ...(options.isLicensed && options.isEnterpriseLicense ? {
+ configUrl: ConsolePages.DATA_RETENTION,
+ configText: formatMessage({id: 'admin.reporting.workspace_optimization.data_privacy.retention.cta', defaultMessage: 'Try data retention'}),
+ } : options.trialOrEnterpriseCtaConfig),
+ infoUrl: DocLinks.DATA_RETENTION_POLICY,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'data-retention',
+ status,
+ scoreImpact: 16,
+ impactModifier: impactModifiers[status],
+ };
+};
+
+export const runDataPrivacyChecks = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => {
+ const checks = [
+ dataRetentionCheck,
+ ];
+ const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+ return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts
new file mode 100644
index 0000000000..1a959918ad
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts
@@ -0,0 +1,129 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {AdminConfig} from '@mattermost/types/config';
+import {useIntl} from 'react-intl';
+import {ItemModel, ItemStatus, Options} from '../dashboard.type';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+
+// import {Client4} from 'mattermost-redux/client';
+// import {AnalyticsRow} from '@mattermost/types/admin';
+import {ldapTest} from 'actions/admin_actions';
+
+const usesLDAP = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+): Promise => {
+ const testLdap = async (
+ config: Partial,
+ options: Options,
+ ): Promise => {
+ let check = ItemStatus.INFO;
+
+ if (!options.isLicensed || !config.LdapSettings?.Enable) {
+ return check;
+ }
+
+ const onSuccess = ({status}: any) => {
+ if (status === 'OK') {
+ check = ItemStatus.OK;
+ }
+ };
+
+ await ldapTest(onSuccess);
+
+ return check;
+ };
+
+ // something feels flawed in this check.
+ const status = options.analytics?.TOTAL_USERS as number > 100 ? await testLdap(config, options) : ItemStatus.OK;
+
+ return {
+ id: 'ad-ldap',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.title',
+ defaultMessage: 'AD/LDAP integration recommended',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.description',
+ defaultMessage: 'You\'ve reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.',
+ }),
+ ...(options.isLicensed && !options.isStarterLicense ? {
+ configUrl: ConsolePages.AD_LDAP,
+ configText: formatMessage({id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.cta', defaultMessage: 'Try AD/LDAP'}),
+ } : options.trialOrEnterpriseCtaConfig),
+ infoUrl: DocLinks.AD_LDAP,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'ad-ldap',
+ status,
+ scoreImpact: 22,
+ impactModifier: impactModifiers[status],
+ };
+};
+
+// // commented out for now.
+// // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
+// const fetchGuestAccounts = async (
+// config: Partial,
+// analytics: Record | undefined,
+// ) => {
+// if (config.TeamSettings?.EnableOpenServer && config.GuestAccountsSettings?.Enable) {
+// let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json());
+
+// // this setting is just a string with a list of domains, or an empty string
+// if (config.GuestAccountsSettings?.RestrictCreationToDomains) {
+// const domainList = config.GuestAccountsSettings?.RestrictCreationToDomains;
+// usersArray = usersArray.filter(({email}: Record) => domainList.includes((email as string).split('@')[1]));
+// }
+
+// // if guest accounts make up more than 5% of the user base show the info accordion
+// if (analytics && usersArray.length > (analytics.totalUsers as number * 0.05)) {
+// return ItemStatus.INFO;
+// }
+// }
+
+// return ItemStatus.OK;
+// };
+
+// const guestAccounts = async (
+// config: Partial,
+// formatMessage: ReturnType['formatMessage'],
+// options: Options,
+// ): Promise => {
+// const status = await fetchGuestAccounts(config, options.analytics);
+// return {
+// id: 'guest-accounts',
+// title: formatMessage({
+// id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.title',
+// defaultMessage: 'Guest Accounts recommended',
+// }),
+// description: formatMessage({
+// id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.description',
+// defaultMessage: 'Several user accounts are using different domains than your Site URL. You can control user access to channels and teams with guest accounts. We recommend starting an Enterprise trial and enabling Guest Access.',
+// }),
+// ...options.trialOrEnterpriseCtaConfig,
+// infoUrl: 'https://docs.mattermost.com/onboard/guest-accounts.html',
+// infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+// telemetryAction: 'guest-accounts',
+// status,
+// scoreImpact: 6,
+// impactModifier: impactModifiers[status],
+// };
+// };
+
+export const runEaseOfUseChecks = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+): Promise => {
+ const checks = [
+ usesLDAP,
+
+ // guestAccounts,
+ ];
+
+ const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+ return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts
new file mode 100644
index 0000000000..50d7f6f662
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts
@@ -0,0 +1,72 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {AdminConfig} from '@mattermost/types/config';
+import {ItemModel, ItemStatus, Options} from '../dashboard.type';
+import {elasticsearchTest} from 'actions/admin_actions';
+import {useIntl} from 'react-intl';
+import {ConsolePages, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+
+const search = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+): Promise => {
+ const testElasticsearch = async (
+ config: Partial,
+ options: Options,
+ ) => {
+ let check = ItemStatus.INFO;
+
+ if (!options.isLicensed || !options.isEnterpriseLicense || !(config.ElasticsearchSettings?.EnableIndexing && config.ElasticsearchSettings?.EnableSearching)) {
+ return check;
+ }
+
+ const onSuccess = ({status}: any) => {
+ if (status === 'OK') {
+ check = ItemStatus.OK;
+ }
+ };
+ await elasticsearchTest(config, onSuccess);
+ return check;
+ };
+
+ const totalPosts = options.analytics?.TOTAL_POSTS as number;
+ const totalUsers = options.analytics?.TOTAL_USERS as number;
+ const status = totalPosts < 2_000_000 && totalUsers < 500 ? ItemStatus.OK : await testElasticsearch(config, options);
+ return {
+ id: 'search',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.performance.search.title',
+ defaultMessage: 'Search performance',
+ }),
+ description: formatMessage({
+ id: 'admin.reporting.workspace_optimization.performance.search.description',
+ defaultMessage: 'Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.',
+ }),
+ ...(options.isLicensed && options.isEnterpriseLicense ? {
+ configUrl: ConsolePages.ELASTICSEARCH,
+ configText: formatMessage({id: 'admin.reporting.workspace_optimization.search.cta', defaultMessage: 'Try Elasticsearch'}),
+ } : options.trialOrEnterpriseCtaConfig),
+ infoUrl: DocLinks.ELASTICSEARCH,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'search-optimization',
+ status,
+ scoreImpact: 20,
+ impactModifier: impactModifiers[status],
+ };
+};
+
+export const runPerformanceChecks = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => {
+ const checks = [
+ search,
+ ];
+
+ const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+ return results;
+};
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts
new file mode 100644
index 0000000000..438e358f6d
--- /dev/null
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts
@@ -0,0 +1,94 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {Client4} from 'mattermost-redux/client';
+import {ItemStatus, Options} from '../dashboard.type';
+import {useIntl} from 'react-intl';
+import {AdminConfig} from '@mattermost/types/config';
+import {CloudLinks, DocLinks} from 'utils/constants';
+import {impactModifiers} from '../dashboard.data';
+
+const testServerVersion = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => {
+ const fetchVersion = async (
+ installedVersion: string,
+ formatMessage: ReturnType['formatMessage'],
+ ) => {
+ const result = await fetch(`${Client4.getBaseRoute()}/latest_version`).then((result) => result.json());
+
+ if (result.tag_name) {
+ const sanitizedVersion = result.tag_name.startsWith('v') ? result.tag_name.slice(1) : result.tag_name;
+ const newVersionParts = sanitizedVersion.split('.');
+ const installedVersionParts = installedVersion.split('.').slice(0, 3);
+
+ // quick general check if a newer version is available
+ let type = '';
+ let status: ItemStatus = ItemStatus.OK;
+
+ if (newVersionParts.join('') > installedVersionParts.join('')) {
+ // get correct values to be inserted into the accordion item
+ switch (true) {
+ case newVersionParts[0] > installedVersionParts[0]:
+ type = formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.major',
+ defaultMessage: 'Major',
+ });
+ status = ItemStatus.ERROR;
+ break;
+ case newVersionParts[1] > installedVersionParts[1]:
+ type = formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.minor',
+ defaultMessage: 'Minor',
+ });
+ status = ItemStatus.WARNING;
+ break;
+ case newVersionParts[2] > installedVersionParts[2]:
+ type = formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.patch',
+ defaultMessage: 'Patch',
+ });
+ status = ItemStatus.INFO;
+ break;
+ }
+ }
+
+ return {type, description: result.body, status};
+ }
+
+ return {type: '', description: '', status: ItemStatus.OK};
+ };
+
+ const serverVersion = await fetchVersion(options.installedVersion, formatMessage);
+ return {
+ id: 'server_version',
+ title: formatMessage({
+ id: 'admin.reporting.workspace_optimization.updates.server_version.status.title',
+ defaultMessage: '{type} version update available.',
+ }, {type: serverVersion.type}),
+ description: serverVersion.description,
+ configUrl: CloudLinks.DOWNLOAD_UPDATE,
+ configText: formatMessage({id: 'admin.reporting.workspace_optimization.updates.server_version.cta', defaultMessage: 'Download update'}),
+ infoUrl: DocLinks.UPGRADE_SERVER,
+ infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
+ telemetryAction: 'server-version',
+ status: serverVersion.status,
+ scoreImpact: 15,
+ impactModifier: impactModifiers[serverVersion.status],
+ };
+};
+
+export const runUpdateChecks = async (
+ config: Partial,
+ formatMessage: ReturnType['formatMessage'],
+ options: Options,
+) => {
+ const checks = [
+ testServerVersion,
+ ];
+
+ const results = await Promise.all(checks.map((check) => check(config, formatMessage, options)));
+ return results;
+};
diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
index b0679ea814..a484dc4bb2 100644
--- a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
+++ b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx
@@ -13,6 +13,7 @@ import * as GlobalActions from 'actions/global_actions';
import Constants, {AdvancedTextEditor as AdvancedTextEditorConst, Locations, ModalIdentifiers, Preferences} from 'utils/constants';
import {PreferenceType} from '@mattermost/types/preferences';
+import * as Keyboard from 'utils/keyboard';
import * as UserAgent from 'utils/user_agent';
import * as Utils from 'utils/utils';
import {
@@ -819,11 +820,11 @@ class AdvancedCreateComment extends React.PureComponent {
handleKeyDown = (e: React.KeyboardEvent) => {
const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
- const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.BACK_SLASH);
+ const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.BACK_SLASH);
- const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
- const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
- const shiftAltCombo = !Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
+ const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+ const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
+ const shiftAltCombo = !Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
// listen for line break key combo and insert new line character
if (Utils.isUnhandledLineBreakKeyCombo(e)) {
@@ -838,7 +839,7 @@ class AdvancedCreateComment extends React.PureComponent {
if (
(this.props.ctrlSend || this.props.codeBlockOnCtrlEnter) &&
- Utils.isKeyPressed(e, KeyCodes.ENTER) &&
+ Keyboard.isKeyPressed(e, KeyCodes.ENTER) &&
(e.ctrlKey || e.metaKey)
) {
this.setShowPreview(false);
@@ -849,7 +850,7 @@ class AdvancedCreateComment extends React.PureComponent {
const draft = this.state.draft!;
const {message} = draft;
- if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) {
this.textboxRef.current?.blur();
}
@@ -858,7 +859,7 @@ class AdvancedCreateComment extends React.PureComponent {
!e.metaKey &&
!e.altKey &&
!e.shiftKey &&
- Utils.isKeyPressed(e, KeyCodes.UP) &&
+ Keyboard.isKeyPressed(e, KeyCodes.UP) &&
message === ''
) {
e.preventDefault();
@@ -879,13 +880,13 @@ class AdvancedCreateComment extends React.PureComponent {
} = e.target as TextboxElement;
if (ctrlKeyCombo) {
- if (Utils.isKeyPressed(e, KeyCodes.UP)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.UP)) {
e.preventDefault();
this.props.onMoveHistoryIndexBack();
- } else if (Utils.isKeyPressed(e, KeyCodes.DOWN)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.DOWN)) {
e.preventDefault();
this.props.onMoveHistoryIndexForward();
- } else if (Utils.isKeyPressed(e, KeyCodes.B)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.B)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -894,7 +895,7 @@ class AdvancedCreateComment extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.I)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.I)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -905,7 +906,7 @@ class AdvancedCreateComment extends React.PureComponent {
});
}
} else if (ctrlAltCombo) {
- if (Utils.isKeyPressed(e, KeyCodes.K)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.K)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -914,7 +915,7 @@ class AdvancedCreateComment extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.C)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.C)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -923,21 +924,21 @@ class AdvancedCreateComment extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.E)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.E)) {
e.stopPropagation();
e.preventDefault();
this.toggleEmojiPicker();
- } else if (Utils.isKeyPressed(e, KeyCodes.T)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.T)) {
e.stopPropagation();
e.preventDefault();
this.toggleAdvanceTextEditor();
- } else if (Utils.isKeyPressed(e, KeyCodes.P) && draft.message.length) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.P) && draft.message.length) {
e.stopPropagation();
e.preventDefault();
this.setShowPreview(!this.props.shouldShowPreview);
}
} else if (shiftAltCombo) {
- if (Utils.isKeyPressed(e, KeyCodes.X)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.X)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -946,7 +947,7 @@ class AdvancedCreateComment extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.SEVEN)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.SEVEN)) {
e.preventDefault();
this.applyMarkdown({
markdownMode: 'ol',
@@ -954,7 +955,7 @@ class AdvancedCreateComment extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.EIGHT)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.EIGHT)) {
e.preventDefault();
this.applyMarkdown({
markdownMode: 'ul',
@@ -962,7 +963,7 @@ class AdvancedCreateComment extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.NINE)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.NINE)) {
e.preventDefault();
this.applyMarkdown({
markdownMode: 'quote',
diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
index 630ad71188..a8bcd5bbba 100644
--- a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
+++ b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx
@@ -22,6 +22,7 @@ import Constants, {
Preferences,
AdvancedTextEditor as AdvancedTextEditorConst,
} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
import {
containsAtChannel,
specialMentionsInText,
@@ -34,7 +35,6 @@ import {
} from 'utils/post_utils';
import {getTable, hasHtmlLink, formatMarkdownMessage, formatGithubCodePaste, isGitHubCodeBlock} from 'utils/paste';
import * as UserAgent from 'utils/user_agent';
-import {isMac} from 'utils/utils';
import * as Utils from 'utils/utils';
import EmojiMap from 'utils/emoji_map';
import {applyMarkdown, ApplyMarkdownOptions} from 'utils/markdown/apply_markdown';
@@ -1096,7 +1096,7 @@ class AdvancedCreatePost extends React.PureComponent {
documentKeyHandler = (e: KeyboardEvent) => {
const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
- const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.BACK_SLASH);
+ const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.BACK_SLASH);
if (lastMessageReactionKeyCombo) {
this.reactToLastMessage(e);
return;
@@ -1134,12 +1134,12 @@ class AdvancedCreatePost extends React.PureComponent {
const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
const ctrlEnterKeyCombo = (this.props.ctrlSend || this.props.codeBlockOnCtrlEnter) &&
- Utils.isKeyPressed(e, KeyCodes.ENTER) &&
+ Keyboard.isKeyPressed(e, KeyCodes.ENTER) &&
ctrlOrMetaKeyPressed;
- const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
- const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
- const shiftAltCombo = !Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
+ const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+ const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
+ const shiftAltCombo = !Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey;
// listen for line break key combo and insert new line character
if (Utils.isUnhandledLineBreakKeyCombo(e)) {
@@ -1155,7 +1155,7 @@ class AdvancedCreatePost extends React.PureComponent {
const {message} = this.state;
- if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) {
this.textboxRef.current?.blur();
}
@@ -1164,7 +1164,7 @@ class AdvancedCreatePost extends React.PureComponent {
!e.metaKey &&
!e.altKey &&
!e.shiftKey &&
- Utils.isKeyPressed(e, KeyCodes.UP) &&
+ Keyboard.isKeyPressed(e, KeyCodes.UP) &&
message === ''
) {
e.preventDefault();
@@ -1182,15 +1182,15 @@ class AdvancedCreatePost extends React.PureComponent {
} = e.target as TextboxElement;
if (ctrlKeyCombo) {
- if (draftMessageIsEmpty && Utils.isKeyPressed(e, KeyCodes.UP)) {
+ if (draftMessageIsEmpty && Keyboard.isKeyPressed(e, KeyCodes.UP)) {
e.stopPropagation();
e.preventDefault();
this.loadPrevMessage(e);
- } else if (draftMessageIsEmpty && Utils.isKeyPressed(e, KeyCodes.DOWN)) {
+ } else if (draftMessageIsEmpty && Keyboard.isKeyPressed(e, KeyCodes.DOWN)) {
e.stopPropagation();
e.preventDefault();
this.loadNextMessage(e);
- } else if (Utils.isKeyPressed(e, KeyCodes.B)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.B)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -1199,7 +1199,7 @@ class AdvancedCreatePost extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.I)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.I)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -1210,7 +1210,7 @@ class AdvancedCreatePost extends React.PureComponent {
});
}
} else if (ctrlAltCombo) {
- if (Utils.isKeyPressed(e, KeyCodes.K)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.K)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -1219,7 +1219,7 @@ class AdvancedCreatePost extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.C)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.C)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -1228,21 +1228,21 @@ class AdvancedCreatePost extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.E)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.E)) {
e.stopPropagation();
e.preventDefault();
this.toggleEmojiPicker();
- } else if (Utils.isKeyPressed(e, KeyCodes.T)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.T)) {
e.stopPropagation();
e.preventDefault();
this.toggleAdvanceTextEditor();
- } else if (Utils.isKeyPressed(e, KeyCodes.P) && message.length) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.P) && message.length) {
e.stopPropagation();
e.preventDefault();
this.setShowPreview(!this.props.shouldShowPreview);
}
} else if (shiftAltCombo) {
- if (Utils.isKeyPressed(e, KeyCodes.X)) {
+ if (Keyboard.isKeyPressed(e, KeyCodes.X)) {
e.stopPropagation();
e.preventDefault();
this.applyMarkdown({
@@ -1251,7 +1251,7 @@ class AdvancedCreatePost extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.SEVEN)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.SEVEN)) {
e.preventDefault();
this.applyMarkdown({
markdownMode: 'ol',
@@ -1259,7 +1259,7 @@ class AdvancedCreatePost extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.EIGHT)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.EIGHT)) {
e.preventDefault();
this.applyMarkdown({
markdownMode: 'ul',
@@ -1267,7 +1267,7 @@ class AdvancedCreatePost extends React.PureComponent {
selectionEnd,
message: value,
});
- } else if (Utils.isKeyPressed(e, KeyCodes.NINE)) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.NINE)) {
e.preventDefault();
this.applyMarkdown({
markdownMode: 'quote',
@@ -1277,21 +1277,21 @@ class AdvancedCreatePost extends React.PureComponent {
});
}
}
- const upKeyOnly = !ctrlOrMetaKeyPressed && !e.altKey && !e.shiftKey && Utils.isKeyPressed(e, KeyCodes.UP);
- const shiftUpKeyCombo = !ctrlOrMetaKeyPressed && !e.altKey && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.UP);
- const ctrlShiftCombo = Utils.cmdOrCtrlPressed(e, true) && e.shiftKey;
+ const upKeyOnly = !ctrlOrMetaKeyPressed && !e.altKey && !e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.UP);
+ const shiftUpKeyCombo = !ctrlOrMetaKeyPressed && !e.altKey && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.UP);
+ const ctrlShiftCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.shiftKey;
if (upKeyOnly && messageIsEmpty) {
this.editLastPost(e);
} else if (shiftUpKeyCombo && messageIsEmpty) {
this.replyToLastPost(e);
- } else if (ctrlShiftCombo && Utils.isKeyPressed(e, KeyCodes.E)) {
+ } else if (ctrlShiftCombo && Keyboard.isKeyPressed(e, KeyCodes.E)) {
e.stopPropagation();
e.preventDefault();
this.toggleEmojiPicker();
- } else if (((isMac() && ctrlShiftCombo) || (!isMac() && ctrlAltCombo)) && Utils.isKeyPressed(e, KeyCodes.P) && this.state.message.length) {
+ } else if (((UserAgent.isMac() && ctrlShiftCombo) || (!UserAgent.isMac() && ctrlAltCombo)) && Keyboard.isKeyPressed(e, KeyCodes.P) && this.state.message.length) {
this.setShowPreview(!this.props.shouldShowPreview);
- } else if (ctrlAltCombo && Utils.isKeyPressed(e, KeyCodes.T)) {
+ } else if (ctrlAltCombo && Keyboard.isKeyPressed(e, KeyCodes.T)) {
this.toggleAdvanceTextEditor();
}
};
diff --git a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
index b6a0a0b572..5c8ef4c5f1 100644
--- a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
+++ b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import React from 'react';
+import React, {ReactNode} from 'react';
import {FormattedMessage, injectIntl, IntlShape} from 'react-intl';
import {Link} from 'react-router-dom';
@@ -395,7 +395,7 @@ const ConfigurationAnnouncementBar = (props: Props) => {
defaultMessage = 'Please configure your site URL on the System Console .';
}
- const values = {
+ const values: Record = {
linkSite: (msg: string) => (
{
id="copyButton"
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -321,6 +330,7 @@ const myFunction = () => {
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": Symbol(react.fragment),
"timeZone": undefined,
"wrapRichTextChunksInFragment": undefined,
@@ -452,10 +462,12 @@ exports[`codeBlock should render unknown language after syntax highlighting 1`]
{
const isShiftKeyPressed = e.shiftKey;
switch (true) {
- case Utils.isKeyPressed(e, Constants.KeyCodes.R):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.R):
this.handleCommentClick(e);
this.handleDropdownOpened(false);
break;
// edit post
- case Utils.isKeyPressed(e, Constants.KeyCodes.E):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.E):
this.handleEditMenuItemActivated(e);
this.handleDropdownOpened(false);
break;
// follow thread
- case Utils.isKeyPressed(e, Constants.KeyCodes.F) && !isShiftKeyPressed:
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.F) && !isShiftKeyPressed:
this.handleSetThreadFollow(e);
this.handleDropdownOpened(false);
break;
// forward post
- case Utils.isKeyPressed(e, Constants.KeyCodes.F) && isShiftKeyPressed:
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.F) && isShiftKeyPressed:
this.handleForwardMenuItemActivated(e);
this.handleDropdownOpened(false);
break;
// copy link
- case Utils.isKeyPressed(e, Constants.KeyCodes.K):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.K):
this.copyLink(e);
this.handleDropdownOpened(false);
break;
// copy text
- case Utils.isKeyPressed(e, Constants.KeyCodes.C):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.C):
this.copyText(e);
this.handleDropdownOpened(false);
break;
// delete post
- case Utils.isKeyPressed(e, Constants.KeyCodes.DELETE):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.DELETE):
this.handleDeleteMenuItemActivated(e);
this.handleDropdownOpened(false);
break;
// pin / unpin
- case Utils.isKeyPressed(e, Constants.KeyCodes.P):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.P):
this.handlePinMenuItemActivated(e);
this.handleDropdownOpened(false);
break;
// save / unsave
- case Utils.isKeyPressed(e, Constants.KeyCodes.S):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.S):
this.handleFlagMenuItemActivated(e);
this.handleDropdownOpened(false);
break;
// mark as unread
- case Utils.isKeyPressed(e, Constants.KeyCodes.U):
+ case Keyboard.isKeyPressed(e, Constants.KeyCodes.U):
this.handleMarkPostAsUnread(e);
this.handleDropdownOpened(false);
break;
diff --git a/webapp/channels/src/components/drafts/channel_draft/index.ts b/webapp/channels/src/components/drafts/channel_draft/index.ts
index e34d66c351..b3722f1cdf 100644
--- a/webapp/channels/src/components/drafts/channel_draft/index.ts
+++ b/webapp/channels/src/components/drafts/channel_draft/index.ts
@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
-import {getChannelURL} from 'utils/utils';
+import {getChannelURL} from 'selectors/urls';
import {GlobalState} from 'types/store';
diff --git a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
index 3026f7a40e..b173fc6031 100644
--- a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap
@@ -73,9 +73,11 @@ exports[`components/drafts/panel/panel_body should have called handleFormattedTe
hide={[Function]}
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -102,6 +104,7 @@ exports[`components/drafts/panel/panel_body should have called handleFormattedTe
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
@@ -351,9 +354,11 @@ exports[`components/drafts/panel/panel_body should match snapshot 1`] = `
hide={[Function]}
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -380,6 +385,7 @@ exports[`components/drafts/panel/panel_body should match snapshot 1`] = `
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
@@ -635,9 +641,11 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1
hide={[Function]}
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -664,6 +672,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
@@ -989,9 +998,11 @@ exports[`components/drafts/panel/panel_body should match snapshot for requested_
hide={[Function]}
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -1018,6 +1029,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for requested_
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx b/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
index c61e3a48db..655084b44c 100644
--- a/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
+++ b/webapp/channels/src/components/edit_channel_header_modal/edit_channel_header_modal.tsx
@@ -13,8 +13,9 @@ import Textbox, {TextboxElement} from 'components/textbox';
import TextboxClass from 'components/textbox/textbox';
import TextboxLinks from 'components/textbox/textbox_links';
import Constants from 'utils/constants';
+import {isKeyPressed} from 'utils/keyboard';
import {isMobile} from 'utils/user_agent';
-import {insertLineBreakFromKeyEvent, isKeyPressed, isUnhandledLineBreakKeyCombo, localizeMessage} from 'utils/utils';
+import {insertLineBreakFromKeyEvent, isUnhandledLineBreakKeyCombo, localizeMessage} from 'utils/utils';
const KeyCodes = Constants.KeyCodes;
diff --git a/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx b/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
index 0f932581e0..e7fbc1abd6 100644
--- a/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
+++ b/webapp/channels/src/components/edit_channel_purpose_modal/edit_channel_purpose_modal.tsx
@@ -9,6 +9,7 @@ import {Channel} from '@mattermost/types/channels';
import {ActionResult} from 'mattermost-redux/types/actions';
import Constants from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
import * as Utils from 'utils/utils';
type Actions = {
@@ -68,10 +69,10 @@ export class EditChannelPurposeModal extends React.PureComponent {
if (Utils.isUnhandledLineBreakKeyCombo(e)) {
e.preventDefault();
this.setState({purpose: Utils.insertLineBreakFromKeyEvent(e as React.KeyboardEvent)});
- } else if (ctrlSend && Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && e.ctrlKey) {
+ } else if (ctrlSend && Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && e.ctrlKey) {
e.preventDefault();
this.handleSave();
- } else if (!ctrlSend && Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && !e.shiftKey && !e.altKey) {
+ } else if (!ctrlSend && Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && !e.shiftKey && !e.altKey) {
e.preventDefault();
this.handleSave();
}
diff --git a/webapp/channels/src/components/edit_post/edit_post.tsx b/webapp/channels/src/components/edit_post/edit_post.tsx
index 9a467ebbbf..81c9ea4667 100644
--- a/webapp/channels/src/components/edit_post/edit_post.tsx
+++ b/webapp/channels/src/components/edit_post/edit_post.tsx
@@ -10,6 +10,7 @@ import {Post} from '@mattermost/types/posts';
import {Emoji, SystemEmoji} from '@mattermost/types/emojis';
import {AppEvents, Constants, ModalIdentifiers, StoragePrefixes} from 'utils/constants';
+import * as Keyboard from 'utils/keyboard';
import {
formatGithubCodePaste,
formatMarkdownMessage,
@@ -220,7 +221,13 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
actions.unsetEditingPost();
};
- const handleAutomatedRefocusAndExit = () => handleRefocusAndExit(editingPost.refocusId || null);
+ const handleAutomatedRefocusAndExit = () => {
+ draftRef.current = {
+ ...draftRef.current,
+ message: '',
+ };
+ handleRefocusAndExit(editingPost.refocusId || null);
+ };
const handleEdit = async () => {
if (!editingPost.post || isSaveDisabled()) {
@@ -302,13 +309,13 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
const {ctrlSend, codeBlockOnCtrlEnter} = rest;
const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey;
- const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
- const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey;
+ const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey;
+ const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey;
const ctrlEnterKeyCombo =
(ctrlSend || codeBlockOnCtrlEnter) &&
- Utils.isKeyPressed(e, KeyCodes.ENTER) &&
+ Keyboard.isKeyPressed(e, KeyCodes.ENTER) &&
ctrlOrMetaKeyPressed;
- const markdownLinkKey = Utils.isKeyPressed(e, KeyCodes.K);
+ const markdownLinkKey = Keyboard.isKeyPressed(e, KeyCodes.K);
// listen for line break key combo and insert new line character
if (Utils.isUnhandledLineBreakKeyCombo(e)) {
@@ -316,7 +323,7 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
setEditText(Utils.insertLineBreakFromKeyEvent(e as React.KeyboardEvent));
} else if (ctrlEnterKeyCombo) {
handleEdit();
- } else if (Utils.isKeyPressed(e, KeyCodes.ESCAPE) && !showEmojiPicker) {
+ } else if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE) && !showEmojiPicker) {
handleAutomatedRefocusAndExit();
} else if (ctrlAltCombo && markdownLinkKey) {
applyHotkeyMarkdown({
@@ -325,14 +332,14 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft,
selectionEnd: e.currentTarget.selectionEnd,
message: e.currentTarget.value,
});
- } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.B)) {
+ } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.B)) {
applyHotkeyMarkdown({
markdownMode: 'bold',
selectionStart: e.currentTarget.selectionStart,
selectionEnd: e.currentTarget.selectionEnd,
message: e.currentTarget.value,
});
- } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.I)) {
+ } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.I)) {
applyHotkeyMarkdown({
markdownMode: 'italic',
selectionStart: e.currentTarget.selectionStart,
diff --git a/webapp/channels/src/components/edit_post/edit_post_footer.tsx b/webapp/channels/src/components/edit_post/edit_post_footer.tsx
index 12971eb2cc..432c27eebe 100644
--- a/webapp/channels/src/components/edit_post/edit_post_footer.tsx
+++ b/webapp/channels/src/components/edit_post/edit_post_footer.tsx
@@ -8,7 +8,7 @@ import {FormattedMessage} from 'react-intl';
import {getBool} from 'mattermost-redux/selectors/entities/preferences';
import {Preferences} from 'mattermost-redux/constants';
-import {isMac} from 'utils/utils';
+import {isMac} from 'utils/user_agent';
import {GlobalState} from 'types/store';
type Props = {
diff --git a/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx b/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
index 65174c147f..9b0fa90739 100644
--- a/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
+++ b/webapp/channels/src/components/feedback_modal/downgrade_feedback.tsx
@@ -6,7 +6,7 @@ import React from 'react';
import {injectIntl, WrappedComponentProps} from 'react-intl';
import {Feedback} from '@mattermost/types/cloud';
-import FeedbackModal from 'components/feedback_modal/feedback';
+import FeedbackModal, {FeedbackOption} from 'components/feedback_modal/feedback';
type Props = {
onSubmit: (downgradeFeedback: Feedback) => void;
@@ -28,23 +28,35 @@ const DowngradeFeedbackModal = (props: Props) => {
defaultMessage: 'Downgrade',
});
- const downgradeFeedbackOptions = [
- props.intl.formatMessage({
- id: 'feedback.downgradeWorkspace.technicalIssues',
- defaultMessage: 'Experienced technical issues',
- }),
- props.intl.formatMessage({
- id: 'feedback.downgradeWorkspace.noLongerNeeded',
- defaultMessage: 'No longer need Cloud Professional features',
- }),
- props.intl.formatMessage({
- id: 'feedback.downgradeWorkspace.exploringOptions',
- defaultMessage: 'Exploring other solutions',
- }),
- props.intl.formatMessage({
- id: 'feedback.downgradeWorkspace.tooExpensive',
- defaultMessage: 'Too expensive',
- }),
+ const downgradeFeedbackOptions: FeedbackOption[] = [
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.downgradeWorkspace.technicalIssues',
+ defaultMessage: 'Experienced technical issues',
+ }),
+ submissionValue: 'Experienced technical issues',
+ },
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.downgradeWorkspace.noLongerNeeded',
+ defaultMessage: 'No longer need Cloud Professional features',
+ }),
+ submissionValue: 'No longer need Cloud Professional features',
+ },
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.downgradeWorkspace.exploringOptions',
+ defaultMessage: 'Exploring other solutions',
+ }),
+ submissionValue: 'Exploring other solutions',
+ },
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.downgradeWorkspace.tooExpensive',
+ defaultMessage: 'Too expensive',
+ }),
+ submissionValue: 'Too expensive',
+ },
];
return (
diff --git a/webapp/channels/src/components/feedback_modal/feedback.tsx b/webapp/channels/src/components/feedback_modal/feedback.tsx
index af8daaac91..3f612017be 100644
--- a/webapp/channels/src/components/feedback_modal/feedback.tsx
+++ b/webapp/channels/src/components/feedback_modal/feedback.tsx
@@ -15,18 +15,23 @@ import {ModalIdentifiers} from 'utils/constants';
import './feedback.scss';
+export interface FeedbackOption {
+ translatedMessage: string;
+ submissionValue: string;
+}
+
type Props = {
onSubmit: (deleteFeedback: Feedback) => void;
title: string;
submitText: string;
- feedbackOptions: string[];
+ feedbackOptions: FeedbackOption[];
freeformTextPlaceholder: string;
} & WrappedComponentProps
function FeedbackModal(props: Props) {
const maxFreeFormTextLength = 500;
- const optionOther = props.intl.formatMessage({id: 'feedback.other', defaultMessage: 'Other'});
- const feedbackModalOptions: string[] = [
+ const optionOther = {translatedMessage: props.intl.formatMessage({id: 'feedback.other', defaultMessage: 'Other'}), submissionValue: 'Other'};
+ const feedbackModalOptions: FeedbackOption[] = [
...props.feedbackOptions,
optionOther,
];
@@ -34,9 +39,9 @@ function FeedbackModal(props: Props) {
const [reason, setReason] = useState('');
const [comments, setComments] = useState('');
const reasonNotSelected = reason === '';
- const reasonOther = reason === optionOther;
+ const reasonOther = reason === optionOther.submissionValue;
const commentsNotProvided = comments.trim() === '';
- const submitDisabled = reasonNotSelected || (reason === optionOther && commentsNotProvided);
+ const submitDisabled = reasonNotSelected || (reasonOther && commentsNotProvided);
const dispatch = useDispatch();
@@ -71,15 +76,15 @@ function FeedbackModal(props: Props) {
testId='FeedbackModalRadioGroup'
values={feedbackModalOptions.map((option) => {
return {
- value: option,
- key: option,
- testId: option,
+ value: option.submissionValue,
+ key: option.translatedMessage,
+ testId: option.submissionValue,
};
})}
value={reason}
onChange={(e) => setReason(e.target.value)}
/>
- {reason === optionOther &&
+ {reasonOther &&
<>
-
+
+
{
{'\u00a0' + mmversion}
-
+
+
+
+
+
+
+
+
+ {
+describe('ToYearlyNudgeBannerDismissable', () => {
test('should show for admins cloud professional monthly', () => {
const state = JSON.parse(JSON.stringify(initialState));
state.entities.users.profiles = {
@@ -63,14 +61,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
},
};
- const store = mockStore(state);
- const wrapper = mountWithIntl(
-
- ,
- );
+ renderWithIntlAndStore(
- ,
- );
+ renderWithIntlAndStore(
- ,
- );
+ renderWithIntlAndStore(
- ,
- );
+ renderWithIntlAndStore(
- ,
- );
-
- expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+ expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
});
test('should NOT show for admins when banner was dismissed in preferences', () => {
@@ -200,10 +172,10 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
};
state.entities.preferences = {
myPreferences: {
- 'cloud_yearly_nudge_banner--nudge_to_yearly_banner_dismissed': {
- category: 'cloud_yearly_nudge_banner',
- name: 'nudge_to_yearly_banner_dismissed',
- value: 'true',
+ 'to_cloud_yearly_plan_nudge--nudge_to_cloud_yearly_plan_snoozed': {
+ category: 'to_cloud_yearly_plan_nudge',
+ name: 'nudge_to_cloud_yearly_plan_snoozed',
+ value: '{"range": 0, "show": false}',
},
},
};
@@ -221,19 +193,13 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () =
},
},
};
+ renderWithIntlAndStore(
- ,
- );
-
- expect(wrapper.find('AnnouncementBar').exists()).toBe(false);
+ expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow();
});
});
-describe('components/admin_console/billing/ToYearlyNudgeBanner', () => {
+describe('ToYearlyNudgeBanner', () => {
test('should show for cloud professional monthly', () => {
const state = JSON.parse(JSON.stringify(initialState));
state.entities.cloud = {
@@ -251,14 +217,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBanner', () => {
},
};
- const store = mockStore(state);
- const wrapper = mountWithIntl(
-
- ,
- );
+ renderWithIntlAndStore(
- ,
- );
+ renderWithIntlAndStore( 10}
onButtonClick={() => openPurchaseModal({trackingLocation: 'to_yearly_nudge_annoucement_bar'})}
modalButtonText={t('cloud_billing.nudge_to_yearly.learn_more')}
modalButtonDefaultText='Learn more'
- message={ void;
@@ -28,23 +28,35 @@ const DeleteFeedbackModal = (props: Props) => {
defaultMessage: 'Delete Workspace',
});
- const deleteFeedbackOptions = [
- props.intl.formatMessage({
- id: 'feedback.deleteWorkspace.feedbackNoValue',
- defaultMessage: 'No longer found value',
- }),
- props.intl.formatMessage({
- id: 'feedback.deleteWorkspace.feedbackMoving',
- defaultMessage: 'Moving to a different solution',
- }),
- props.intl.formatMessage({
- id: 'feedback.deleteWorkspace.feedbackMistake',
- defaultMessage: 'Created a workspace by mistake',
- }),
- props.intl.formatMessage({
- id: 'feedback.deleteWorkspace.feedbackHosting',
- defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)',
- }),
+ const deleteFeedbackOptions: FeedbackOption[] = [
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.deleteWorkspace.feedbackNoValue',
+ defaultMessage: 'No longer found value',
+ }),
+ submissionValue: 'No longer found value',
+ },
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.deleteWorkspace.feedbackMoving',
+ defaultMessage: 'Moving to a different solution',
+ }),
+ submissionValue: 'Moving to a different solution',
+ },
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.deleteWorkspace.feedbackMistake',
+ defaultMessage: 'Created a workspace by mistake',
+ }),
+ submissionValue: 'Created a workspace by mistake',
+ },
+ {
+ translatedMessage: props.intl.formatMessage({
+ id: 'feedback.deleteWorkspace.feedbackHosting',
+ defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)',
+ }),
+ submissionValue: 'Moving to hosting my own Mattermost instance (self-hosted)',
+ },
];
return (
diff --git a/webapp/channels/src/components/admin_console/database_settings.jsx b/webapp/channels/src/components/admin_console/database_settings.jsx
index e75e100c89..520cb8e2a7 100644
--- a/webapp/channels/src/components/admin_console/database_settings.jsx
+++ b/webapp/channels/src/components/admin_console/database_settings.jsx
@@ -4,7 +4,7 @@
import React from 'react';
import {FormattedMessage} from 'react-intl';
-import {recycleDatabaseConnection} from 'actions/admin_actions.jsx';
+import {recycleDatabaseConnection, ping} from 'actions/admin_actions';
import * as Utils from 'utils/utils';
import {t} from 'utils/i18n';
@@ -19,6 +19,15 @@ import TextSetting from './text_setting';
import MigrationsTable from './database';
export default class DatabaseSettings extends AdminSettings {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ ...this.state,
+ searchBackend: '',
+ };
+ }
+
getConfigFromState = (config) => {
// driverName and dataSource are read-only from the UI
@@ -34,6 +43,17 @@ export default class DatabaseSettings extends AdminSettings {
return config;
};
+ componentDidMount() {
+ this.getSearchBackend().then((searchBackend) => {
+ this.setState({searchBackend});
+ });
+ }
+
+ async getSearchBackend() {
+ const res = await ping()();
+ return res.ActiveSearchBackend;
+ }
+
getStateFromConfig(config) {
return {
driverName: config.SqlSettings.DriverName,
@@ -368,6 +388,30 @@ export default class DatabaseSettings extends AdminSettings {
+
+
);
};
diff --git a/webapp/channels/src/components/admin_console/database_settings.test.jsx b/webapp/channels/src/components/admin_console/database_settings.test.jsx
index b6e98f8a6c..936ee41d13 100644
--- a/webapp/channels/src/components/admin_console/database_settings.test.jsx
+++ b/webapp/channels/src/components/admin_console/database_settings.test.jsx
@@ -7,8 +7,14 @@ import {shallow} from 'enzyme';
import DatabaseSettings from 'components/admin_console/database_settings.jsx';
jest.mock('actions/admin_actions.jsx', () => {
+ const pingFn = () => {
+ return jest.fn(() => {
+ return {ActiveSearchBackend: 'none'};
+ });
+ };
return {
recycleDatabaseConnection: jest.fn(),
+ ping: pingFn,
};
});
diff --git a/webapp/channels/src/components/admin_console/schema_admin_settings.jsx b/webapp/channels/src/components/admin_console/schema_admin_settings.jsx
index d1b8886a8e..b35db711ef 100644
--- a/webapp/channels/src/components/admin_console/schema_admin_settings.jsx
+++ b/webapp/channels/src/components/admin_console/schema_admin_settings.jsx
@@ -671,7 +671,7 @@ export default class SchemaAdminSettings extends React.PureComponent {
};
handleGeneratedChange = (id, s) => {
- this.handleChange(id, s.replace('+', '-').replace('/', '_'));
+ this.handleChange(id, s.replace(/\+/g, '-').replace(/\//g, '_'));
};
handleChange = (id, value, confirm = false, doSubmit = false, warning = false) => {
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
index f3da9ea817..a714b14a38 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap
@@ -213,9 +213,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho
content="name"
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -242,6 +244,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
@@ -457,9 +460,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
content="name"
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -486,6 +491,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
@@ -603,9 +609,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
id="sharedTooltip"
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -632,6 +640,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
@@ -834,9 +843,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
content="name"
intl={
Object {
+ "$t": [Function],
"defaultFormats": Object {},
"defaultLocale": "en",
"defaultRichTextElements": undefined,
+ "fallbackOnEmptyString": true,
"formatDate": [Function],
"formatDateTimeRange": [Function],
"formatDateToParts": [Function],
@@ -863,6 +874,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc
"locale": "en",
"messages": Object {},
"onError": [Function],
+ "onWarn": [Function],
"textComponent": "span",
"timeZone": "Etc/UTC",
"wrapRichTextChunksInFragment": undefined,
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx
index 3953977204..514597a354 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx
@@ -6,7 +6,7 @@ import {shallow} from 'enzyme';
import ChipsList, {ChipsInfoType} from 'components/admin_console/workspace-optimization/chips_list';
-import {ItemStatus} from './dashboard.data';
+import {ItemStatus} from './dashboard.type';
describe('components/admin_console/workspace-optimization/chips_list', () => {
const overallScoreChips: ChipsInfoType = {
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx
index 2dd06b5bc1..d9911f749b 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx
@@ -6,7 +6,7 @@ import {FormattedMessage} from 'react-intl';
import Chip from 'components/common/chip/chip';
-import {ItemStatus} from './dashboard.data';
+import {ItemStatus} from './dashboard.type';
import './dashboard.scss';
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx
index dd5ee9b565..93bfad13b8 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import React from 'react';
+import React, {useEffect, useMemo, useState} from 'react';
import {useIntl} from 'react-intl';
import {useSelector} from 'react-redux';
@@ -14,56 +14,23 @@ import {
AccountMultipleOutlineIcon,
} from '@mattermost/compass-icons/components';
-import {getLicense} from 'mattermost-redux/selectors/entities/general';
+import {getLicense, getServerVersion} from 'mattermost-redux/selectors/entities/general';
import {GlobalState} from '@mattermost/types/store';
-import {CloudLinks, ConsolePages, DocLinks} from 'utils/constants';
+import {ConsolePages} from 'utils/constants';
import {daysToLicenseExpire, isEnterpriseOrE20License, getIsStarterLicense} from '../../../utils/license_utils';
import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink';
+import {AdminConfig} from '@mattermost/types/config';
+import {runConfigChecks} from './dashboard_checks/config';
+import {DataModel, ItemStatus, Options} from './dashboard.type';
+import {runAccessChecks} from './dashboard_checks/access';
+import {runDataPrivacyChecks} from './dashboard_checks/data_privacy';
+import {runPerformanceChecks} from './dashboard_checks/performance';
+import {runEaseOfUseChecks} from './dashboard_checks/easy_management';
+import {runUpdateChecks} from './dashboard_checks/updates';
-export type DataModel = {
- [key: string]: {
- title: string;
- description: string;
- descriptionOk: string;
- items: ItemModel[];
- icon: React.ReactNode;
- hide?: boolean;
- };
-}
-
-export enum ItemStatus {
- NONE = 'none',
- OK = 'ok',
- INFO = 'info',
- WARNING = 'warning',
- ERROR = 'error',
-}
-
-export type ItemModel = {
- id: string;
- title: string;
- description: string;
- status: ItemStatus;
- scoreImpact: number;
- impactModifier: number;
- configUrl?: string;
- configText?: string;
- telemetryAction?: string;
- infoUrl?: string;
- infoText?: string;
-}
-
-export type UpdatesParam = {
- serverVersion: {
- type: string;
- status: ItemStatus;
- description: string;
- };
-}
-
-const impactModifiers: Record
+
+
+
+
+
+
+ ),
+ items: await runUpdateChecks(config, formatMessage, options),
+});
+
+const getConfigurationData = async (
+ config: Partial
+
+ ),
+ items: await runConfigChecks(config, formatMessage, options),
+});
+
+const getAccessData = async (
+ config: Partial
+
+ ),
+ items: await runAccessChecks(config, formatMessage),
+});
+
+const getPerformanceData = async (
+ config: Partial
+
+ ),
+ items: await runPerformanceChecks(config, formatMessage, options),
+});
+
+const getDataPrivacyData = async (
+ config: Partial
+
+ ),
+ items: await runDataPrivacyChecks(config, formatMessage, options),
+});
+
+const getEaseOfManagementData = async (
+ config: Partial
+
+ ),
+ items: await runEaseOfUseChecks(config, formatMessage, options),
+});
+
+const useMetricsData = (
+ config: Partial
-
- ),
- items: [
- {
- id: 'server_version',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.updates.server_version.status.title',
- defaultMessage: '{type} version update available.',
- }, {type: data.serverVersion.type}),
- description: data.serverVersion.description,
- configUrl: CloudLinks.DOWNLOAD_UPDATE,
- configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.downloadUpdate', defaultMessage: 'Download update'}),
- infoUrl: DocLinks.UPGRADE_SERVER,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'server-version',
- status: data.serverVersion.status,
- scoreImpact: 15,
- impactModifier: impactModifiers[data.serverVersion.status],
- },
- ],
- });
-
- type ConfigurationParam = {
- ssl: {
- status: ItemStatus;
- };
- sessionLength: {
- status: ItemStatus;
- };
- }
-
- const getConfigurationData = (data: ConfigurationParam) => ({
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.title',
- defaultMessage: 'Configuration',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.description',
- defaultMessage: 'You have configuration issues to resolve',
- }),
- hide: isCloud,
- descriptionOk: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.descriptionOk',
- defaultMessage: 'You\'ve successfully configured SSL and Session Lengths!',
- }),
- icon: (
-
-
- ),
- items: [
- {
- id: 'ssl',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.ssl.title',
- defaultMessage: 'Configure SSL to make your server more secure',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.ssl.description',
- defaultMessage: 'We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.',
- }),
- infoUrl: DocLinks.SSL_CERTIFICATE,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'ssl',
- status: data.ssl.status,
- scoreImpact: 25,
- impactModifier: impactModifiers[data.ssl.status],
- },
- {
- id: 'session-length',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.session_length.title',
- defaultMessage: 'Session lengths is set to default',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.configuration.session_length.description',
- defaultMessage: 'Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization\'s security policies.',
- }),
- configUrl: ConsolePages.SESSION_LENGTHS,
- configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureSessionLength', defaultMessage: 'Configure session length'}),
- infoUrl: DocLinks.SESSION_LENGTHS,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'session-length',
- status: data.sessionLength.status,
- scoreImpact: 8,
- impactModifier: impactModifiers[data.sessionLength.status],
- },
- ],
- });
-
- type AccessParam = {
- siteUrl: {
- status: ItemStatus;
- };
- }
-
- const getAccessData = (data: AccessParam) => ({
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.access.title',
- defaultMessage: 'Workspace access',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.access.description',
- defaultMessage: 'Web server configuration may be affecting access to your Mattermost workspace.',
- }),
- hide: isCloud,
- descriptionOk: formatMessage({
- id: 'admin.reporting.workspace_optimization.access.descriptionOk',
- defaultMessage: 'Your web server configuration is passing a live URL test!',
- }),
- icon: (
-
-
- ),
- items: [
- {
- id: 'site-url',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.access.site_url.title',
- defaultMessage: 'Misconfigured web server',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.access.site_url.description',
- defaultMessage: 'Your web server settings aren\'t passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.',
- }),
- configUrl: ConsolePages.WEB_SERVER,
- configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureWebServer', defaultMessage: 'Configure web server'}),
- infoUrl: DocLinks.SITE_URL,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'site-url',
- status: data.siteUrl.status,
- scoreImpact: 12,
- impactModifier: impactModifiers[data.siteUrl.status],
- },
- ],
- });
-
- type PerformanceParam = {
- search: {
- status: ItemStatus;
- };
- }
-
- const getPerformanceData = (data: PerformanceParam) => ({
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.performance.title',
- defaultMessage: 'Performance',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.performance.description',
- defaultMessage: 'Your server would benefit from some performance tweaks.',
- }),
- hide: isCloud,
- descriptionOk: formatMessage({
- id: 'admin.reporting.workspace_optimization.performance.descriptionOk',
- defaultMessage: 'Your search performance suits your workspace usage!',
- }),
- icon: (
-
-
- ),
- items: [
- {
- id: 'search',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.performance.search.title',
- defaultMessage: 'Search performance',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.performance.search.description',
- defaultMessage: 'Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.',
- }),
- ...(isLicensed && isEnterpriseLicense ? {
- configUrl: ConsolePages.ELASTICSEARCH,
- configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureElasticsearch', defaultMessage: 'Try Elasticsearch'}),
- } : trialOrEnterpriseCtaConfig),
- infoUrl: DocLinks.ELASTICSEARCH,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'search-optimization',
- status: data.search.status,
- scoreImpact: 20,
- impactModifier: impactModifiers[data.search.status],
- },
- ],
- });
-
- type DataPrivacyParam = {
- retention: {
- status: ItemStatus;
- };
- }
-
- // TBD
- const getDataPrivacyData = (data: DataPrivacyParam) => ({
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.data_privacy.title',
- defaultMessage: 'Data privacy',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.data_privacy.description',
- defaultMessage: 'Get better insight and control over your data.',
- }),
- descriptionOk: formatMessage({
- id: 'admin.reporting.workspace_optimization.data_privacy.descriptionOk',
- defaultMessage: 'You\'ve enabled data retention and compliance features!',
- }),
- icon: (
-
-
- ),
- items: [
- {
- id: 'data-retention',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.data_privacy.retention.title',
- defaultMessage: 'Become more data aware',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.data_privacy.retention.description',
- defaultMessage: 'Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.',
- }),
- ...(isLicensed && isEnterpriseLicense ? {
- configUrl: ConsolePages.DATA_RETENTION,
- configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureDataRetention', defaultMessage: 'Try data retention'}),
- } : trialOrEnterpriseCtaConfig),
- infoUrl: DocLinks.DATA_RETENTION_POLICY,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'data-retention',
- status: data.retention.status,
- scoreImpact: 16,
- impactModifier: impactModifiers[data.retention.status],
- },
- ],
- });
-
- type EaseOfManagementParam = {
- ldap: {
- status: ItemStatus;
- };
- guestAccounts?: {
- status: ItemStatus;
- };
- }
-
- // TBD
- const getEaseOfManagementData = (data: EaseOfManagementParam) => ({
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.ease_of_management.title',
- defaultMessage: 'Ease of management',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.ease_of_management.description',
- defaultMessage: 'Make it easier to manage your Mattermost workspace.',
- }),
- descriptionOk: formatMessage({
- id: 'admin.reporting.workspace_optimization.ease_of_management.descriptionOk',
- defaultMessage: 'Your user authentication setup is appropriate based on your current usage!',
- }),
- icon: (
-
-
- ),
- items: [
- {
- id: 'ad-ldap',
- title: formatMessage({
- id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.title',
- defaultMessage: 'AD/LDAP integration recommended',
- }),
- description: formatMessage({
- id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.description',
- defaultMessage: 'You\'ve reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.',
- }),
- ...(isLicensed && !isStarterLicense ? {
- configUrl: ConsolePages.AD_LDAP,
- configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureLDAP', defaultMessage: 'Try AD/LDAP'}),
- } : trialOrEnterpriseCtaConfig),
- infoUrl: DocLinks.AD_LDAP,
- infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- telemetryAction: 'ad-ldap',
- status: data.ldap.status,
- scoreImpact: 22,
- impactModifier: impactModifiers[data.ldap.status],
- },
-
- // commented out for now.
- // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
- // {
- // id: 'guest-accounts',
- // title: formatMessage({
- // id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.title',
- // defaultMessage: 'Guest Accounts recommended',
- // }),
- // description: formatMessage({
- // id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.description',
- // defaultMessage: 'Several user accounts are using different domains than your Site URL. You can control user access to channels and teams with guest accounts. We recommend starting an Enterprise trial and enabling Guest Access.',
- // }),
- // ...trialOrEnterpriseCtaConfig,
- // infoUrl: 'https://docs.mattermost.com/onboard/guest-accounts.html',
- // infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}),
- // telemetryAction: 'guest-accounts',
- // status: data.guestAccounts.status,
- // scoreImpact: 6,
- // impactModifier: impactModifiers[data.guestAccounts.status],
- // },
- ],
- });
-
- return {getAccessData, getConfigurationData, getUpdatesData, getPerformanceData, getDataPrivacyData, getEaseOfManagementData, isLicensed, isEnterpriseLicense};
};
export default useMetricsData;
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx
index 6fcbd8b6f3..2409601512 100644
--- a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx
+++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx
@@ -4,17 +4,11 @@
import {CheckIcon} from '@mattermost/compass-icons/components';
import classNames from 'classnames';
-import React, {useEffect, useState} from 'react';
-import {useIntl} from 'react-intl';
-import {useSelector} from 'react-redux';
+import React from 'react';
import styled from 'styled-components';
-import {GlobalState} from '@mattermost/types/store';
-import {getServerVersion} from 'mattermost-redux/selectors/entities/general';
-import {Client4} from 'mattermost-redux/client';
import Accordion, {AccordionItemType} from 'components/common/accordion/accordion';
-import {elasticsearchTest, ldapTest, testSiteURL} from '../../../actions/admin_actions';
import LoadingScreen from '../../loading_screen';
import FormattedAdminHeader from '../../widgets/admin_console/formatted_admin_header';
import {Props} from '../admin_console';
@@ -22,10 +16,11 @@ import {Props} from '../admin_console';
import ChipsList, {ChipsInfoType} from './chips_list';
import CtaButtons from './cta_buttons';
-import useMetricsData, {DataModel, ItemStatus, UpdatesParam} from './dashboard.data';
+import useMetricsData from './dashboard.data';
import './dashboard.scss';
import OverallScore from './overall-score';
+import {ItemStatus} from './dashboard.type';
const AccordionItem = styled.div`
padding: 12px;
@@ -49,180 +44,7 @@ const successIcon = (
);
const WorkspaceOptimizationDashboard = (props: Props) => {
- const [loading, setLoading] = useState(true);
- const [versionData, setVersionData] = useState