[pull] master from mattermost:master

NOTICE.txt

@@ -6875,30 +6875,6 @@ Fake data generator for Go (Golang)
 
 
 
----
-
-## inobounce
-
-This product contains 'inobounce' by Larry Davis.
-
-Stop your iOS webapp from bouncing around when scrolling
-
-* HOMEPAGE:
-  * https://github.com/lazd/iNoBounce
-
-* LICENSE: BSD-2-Clause
-
-Copyright (c) 2013, Lawrence Davis
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 ---
 
 ## ipaddr.js

enterprise.pin

@@ -0,0 +1,3 @@
+# Enterprise commit this server branch is tested against.
+# Updated via: make bump-enterprise
+b03e11ccf5dca59cc3ffd2ed8c73604c5a5a48b8

server/Makefile

@@ -1,4 +1,4 @@
-.PHONY: build package run stop run-client run-server run-node run-haserver stop-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker update-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-freebsd build-windows package-prep package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-elasticsearch test-server-quick test-server-race test-mmctl-unit test-mmctl-e2e test-mmctl test-mmctl-coverage mmctl-build mmctl-docs new-migration migrations-extract test-public mocks-public run-server-faketime
+.PHONY: all build package run stop run-client run-server run-node run-haserver stop-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker update-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-freebsd build-windows package-prep package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-elasticsearch test-server-quick test-server-race test-mmctl-unit test-mmctl-e2e test-mmctl test-mmctl-coverage mmctl-build mmctl-docs new-migration migrations-extract test-public mocks-public run-server-faketime bump-enterprise
 
 ROOT := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
@@ -431,6 +431,19 @@ ifneq ($(SKIP_SETUP_GO_WORK),true)
 	fi
 endif
 
+bump-enterprise: ## Update enterprise.pin to the current enterprise HEAD
+	@if [ ! -d "$(BUILD_ENTERPRISE_DIR)" ]; then \
+		echo "Enterprise directory not found at $(BUILD_ENTERPRISE_DIR)"; \
+		exit 1; \
+	fi
+	@set -e; \
+	SHA=$$(cd "$(BUILD_ENTERPRISE_DIR)" && git rev-parse HEAD); \
+	PIN_FILE="$(ROOT)/../enterprise.pin"; \
+	echo "# Enterprise commit this server branch is tested against." > "$$PIN_FILE"; \
+	echo "# Updated via: make bump-enterprise" >> "$$PIN_FILE"; \
+	echo "$$SHA" >> "$$PIN_FILE"; \
+	echo "Updated enterprise.pin to $$SHA"
+
 check-style: plugin-checker vet golangci-lint ## Runs style/lint checks
 
 gotestsum:

webapp/channels/jest.config.js

@@ -21,6 +21,7 @@ const config = {
         '^@mattermost/(components)$': '<rootDir>/../platform/$1/src',
         '^@mattermost/(client)$': '<rootDir>/../platform/$1/src',
         '^@mattermost/(types)/(.*)$': '<rootDir>/../platform/$1/src/$2',
+        '^@mattermost/shared/(.*)$': '<rootDir>/../platform/shared/src/$1',
         '^mattermost-redux/test/(.*)$':
             '<rootDir>/src/packages/mattermost-redux/test/$1',
         '^mattermost-redux/(.*)$': '<rootDir>/src/packages/mattermost-redux/src/$1',

webapp/channels/package.json

@@ -43,7 +43,6 @@
     "history": "4.10.1",
     "hoist-non-react-statics": "3.3.2",
     "html-to-react": "1.6.0",
-    "inobounce": "0.2.1",
     "ipaddr.js": "2.1.0",
     "katex": "0.16.21",
     "localforage": "1.10.0",

webapp/channels/src/actions/command.test.js

@@ -1,6 +1,8 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import * as UserAgent from '@mattermost/shared/utils/user_agent';
+
 import {Client4} from 'mattermost-redux/client';
 import {Permissions} from 'mattermost-redux/constants';
 import {AppCallResponseTypes} from 'mattermost-redux/constants/apps';
@@ -13,7 +15,6 @@ import UserSettingsModal from 'components/user_settings/modal';
 
 import mockStore from 'tests/test_store';
 import {ActionTypes, Constants, ModalIdentifiers} from 'utils/constants';
-import * as UserAgent from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 
 import {executeCommand} from './command';
@@ -132,7 +133,11 @@ const initialState = {
     },
 };
 
-jest.mock('utils/user_agent');
+const isMobileMock = jest.mocked(UserAgent.isMobile);
+jest.mock('@mattermost/shared/utils/user_agent', () => ({
+    isDesktopApp: jest.fn(),
+    isMobile: jest.fn(),
+}));
 jest.mock('actions/global_actions');
 
 describe('executeCommand', () => {
@@ -159,10 +164,8 @@ describe('executeCommand', () => {
     });
 
     describe('shortcuts', () => {
-        UserAgent.isMobile = jest.fn();
-
         test('should return error in case of mobile', async () => {
-            UserAgent.isMobile.mockReturnValueOnce(true);
+            isMobileMock.mockReturnValueOnce(true);
 
             const result = await store.dispatch(executeCommand('/shortcuts', []));
 
@@ -174,7 +177,7 @@ describe('executeCommand', () => {
         });
 
         test('should open shortcut modal in case of no mobile', async () => {
-            UserAgent.isMobile.mockReturnValueOnce(false);
+            isMobileMock.mockReturnValueOnce(false);
 
             const result = await store.dispatch(executeCommand('/shortcuts', []));
 

webapp/channels/src/actions/command.ts

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import * as UserAgent from '@mattermost/shared/utils/user_agent';
 import type {AppCallResponse} from '@mattermost/types/apps';
 import type {CommandArgs, CommandResponse} from '@mattermost/types/integrations';
 
@@ -31,7 +32,6 @@ import {getHistory} from 'utils/browser_history';
 import {Constants, ModalIdentifiers} from 'utils/constants';
 import {getIntl} from 'utils/i18n';
 import {isUrlSafe, getSiteURL} from 'utils/url';
-import * as UserAgent from 'utils/user_agent';
 import {getUserIdFromChannelName} from 'utils/utils';
 
 import type {ActionFuncAsync} from 'types/store';

webapp/channels/src/actions/notification_actions.tsx

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {isDesktopApp, isMobile} from '@mattermost/shared/utils/user_agent';
 import type {Channel, ChannelMembership} from '@mattermost/types/channels';
 import type {ServerError} from '@mattermost/types/errors';
 import {isMessageAttachmentArray} from '@mattermost/types/message_attachments';
@@ -33,7 +34,6 @@ import {DesktopNotificationSounds, ding} from 'utils/notification_sounds';
 import {showNotification} from 'utils/notifications';
 import {getFocusedPopoutInfo} from 'utils/popouts/focus';
 import {cjkrPattern} from 'utils/text_formatting';
-import {isDesktopApp, isMobileApp} from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 
 import type {ActionFuncAsync, GlobalState} from 'types/store';
@@ -166,7 +166,7 @@ export function sendDesktopNotification(post: Post, msgProps: NewPostMessageProp
         const result = dispatch(notifyMe(argsAfterHooks.title, argsAfterHooks.body, channel.id, teamId, argsAfterHooks.silent, argsAfterHooks.soundName, argsAfterHooks.url));
 
         //Don't add extra sounds on native desktop clients
-        if (desktopSoundEnabled && !isDesktopApp() && !isMobileApp()) {
+        if (desktopSoundEnabled && !isDesktopApp() && !isMobile()) {
             ding(soundName);
         }
 

webapp/channels/src/actions/post_actions.test.ts

@@ -48,8 +48,7 @@ jest.mock('actions/storage', () => {
     };
 });
 
-jest.mock('utils/user_agent', () => ({
-    isIosClassic: jest.fn().mockReturnValueOnce(true).mockReturnValue(false),
+jest.mock('@mattermost/shared/utils/user_agent', () => ({
     isDesktopApp: jest.fn().mockReturnValue(false),
 }));
 

webapp/channels/src/components/about_build_modal/about_build_modal.tsx

@@ -5,6 +5,7 @@ import React, {useState, useEffect} from 'react';
 import {Modal} from 'react-bootstrap';
 import {FormattedMessage, useIntl} from 'react-intl';
 
+import {getDesktopVersion, isDesktopApp} from '@mattermost/shared/utils/user_agent';
 import type {ClientConfig, ClientLicense} from '@mattermost/types/config';
 
 import {Client4} from 'mattermost-redux/client';
@@ -16,7 +17,6 @@ import MattermostLogo from 'components/widgets/icons/mattermost_logo';
 
 import {AboutLinks} from 'utils/constants';
 import {getSkuDisplayName} from 'utils/subscription';
-import {getDesktopVersion, isDesktopApp} from 'utils/user_agent';
 
 import AboutBuildModalCloud from './about_build_modal_cloud/about_build_modal_cloud';
 

webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx

@@ -82,7 +82,6 @@ import UnifiedLabelsWrapper from './unified_labels_wrapper';
 import useBurnOnRead from './use_burn_on_read';
 import useEditorEmojiPicker from './use_editor_emoji_picker';
 import useKeyHandler from './use_key_handler';
-import useOrientationHandler from './use_orientation_handler';
 import usePluginItems from './use_plugin_items';
 import usePriority from './use_priority';
 import useRewrite from './use_rewrite';
@@ -312,7 +311,6 @@ const AdvancedTextEditor = ({
         }]));
     }, [dispatch, currentUserId, getFormattingBarPreferenceName, isFormattingBarHidden]);
 
-    useOrientationHandler(textboxRef, rootId);
     const pluginItems = usePluginItems(draft, textboxRef, handleDraftChange, channelId);
     const focusTextbox = useTextboxFocus(textboxRef, channelId, isRHS, canPost);
     const {

webapp/channels/src/components/advanced_text_editor/edit_post_footer.tsx

@@ -5,11 +5,11 @@ import React from 'react';
 import {FormattedMessage} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
 
+import {isMac} from '@mattermost/shared/utils/user_agent';
+
 import {unsetEditingPost} from 'actions/post_actions';
 import {isSendOnCtrlEnter} from 'selectors/preferences';
 
-import {isMac} from 'utils/user_agent';
-
 type Props = {
     onSave: () => void;
     onCancel?: () => void;

webapp/channels/src/components/advanced_text_editor/use_key_handler.tsx

@@ -5,6 +5,7 @@ import type React from 'react';
 import {useCallback, useEffect, useRef} from 'react';
 import {useDispatch, useSelector} from 'react-redux';
 
+import * as UserAgent from '@mattermost/shared/utils/user_agent';
 import type {SchedulingInfo} from '@mattermost/types/schedule_post';
 
 import {getBool} from 'mattermost-redux/selectors/entities/preferences';
@@ -22,7 +23,6 @@ import * as Keyboard from 'utils/keyboard';
 import {type ApplyMarkdownOptions} from 'utils/markdown/apply_markdown';
 import {pasteHandler} from 'utils/paste';
 import {isWithinCodeBlock, postMessageOnKeyPress} from 'utils/post_utils';
-import * as UserAgent from 'utils/user_agent';
 import * as Utils from 'utils/utils';
 
 import type {GlobalState} from 'types/store';

webapp/channels/src/components/advanced_text_editor/use_textbox_focus.tsx

@@ -5,6 +5,8 @@ import type React from 'react';
 import {useCallback, useEffect, useRef} from 'react';
 import {useDispatch, useSelector} from 'react-redux';
 
+import * as UserAgent from '@mattermost/shared/utils/user_agent';
+
 import {focusedRHS} from 'actions/views/rhs';
 import {getIsRhsExpanded, getIsRhsOpen} from 'selectors/rhs';
 import {getShouldFocusRHS} from 'selectors/views/rhs';
@@ -13,7 +15,6 @@ import useDidUpdate from 'components/common/hooks/useDidUpdate';
 import type TextboxClass from 'components/textbox/textbox';
 
 import {shouldFocusMainTextbox} from 'utils/post_utils';
-import * as UserAgent from 'utils/user_agent';
 
 const useTextboxFocus = (
     textboxRef: React.RefObject<TextboxClass>,

webapp/channels/src/components/announcement_bar/notification_permission_bar/index.tsx

@@ -4,6 +4,8 @@
 import React from 'react';
 import {useSelector} from 'react-redux';
 
+import * as UserAgent from '@mattermost/shared/utils/user_agent';
+
 import {getCloudSubscription} from 'mattermost-redux/selectors/entities/cloud';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 
@@ -17,7 +19,6 @@ import {
     NotificationPermissionNeverGranted,
     getNotificationPermission,
 } from 'utils/notifications';
-import * as UserAgent from 'utils/user_agent';
 
 export default function NotificationPermissionBar() {
     const isLoggedIn = Boolean(useSelector(getCurrentUserId));

webapp/channels/src/components/channel_popout/channel_popout.tsx

@@ -6,6 +6,7 @@ import React, {useEffect} from 'react';
 import {useDispatch, useSelector} from 'react-redux';
 import {useParams} from 'react-router-dom';
 
+import {isDesktopApp} from '@mattermost/shared/utils/user_agent';
 import type {ChannelType} from '@mattermost/types/channels';
 
 import {fetchMyCategories} from 'mattermost-redux/actions/channel_categories';
@@ -25,7 +26,6 @@ import UnreadsStatusHandler from 'components/unreads_status_handler';
 import Constants from 'utils/constants';
 import usePopoutFocus from 'utils/popouts/use_popout_focus';
 import usePopoutTitle from 'utils/popouts/use_popout_title';
-import {isDesktopApp} from 'utils/user_agent';
 
 import './channel_popout.scss';
 

webapp/channels/src/components/common/hooks/use_desktop_notification_permission.ts

@@ -3,9 +3,10 @@
 
 import {useCallback, useEffect, useState} from 'react';
 
+import {isDesktopApp} from '@mattermost/shared/utils/user_agent';
+
 import type {NotificationPermissionNeverGranted} from 'utils/notifications';
 import {isNotificationAPISupported} from 'utils/notifications';
-import {isDesktopApp} from 'utils/user_agent';
 
 export type DesktopNotificationPermission = Exclude<NotificationPermission, typeof NotificationPermissionNeverGranted> | undefined;
 

webapp/channels/src/components/delete_post_modal/delete_post_modal.tsx

@@ -6,14 +6,14 @@ import {Modal} from 'react-bootstrap';
 import {FormattedMessage, useIntl} from 'react-intl';
 import {matchPath} from 'react-router-dom';
 
+import * as UserAgent from '@mattermost/shared/utils/user_agent';
 import type {Post} from '@mattermost/types/posts';
 
 import type {ActionResult} from 'mattermost-redux/types/actions';
 
 import SectionNotice from 'components/section_notice';
 
 import {getHistory} from 'utils/browser_history';
-import * as UserAgent from 'utils/user_agent';
 
 const urlFormatForDMGMPermalink = '/:teamName/messages/:username/:postid';
 const urlFormatForChannelPermalink = '/:teamName/channels/:channelname/:postid';

webapp/channels/src/components/desktop_auth_token.tsx

@@ -8,13 +8,14 @@ import {FormattedMessage} from 'react-intl';
 import {useDispatch, useSelector} from 'react-redux';
 import {useHistory, useLocation} from 'react-router-dom';
 
+import {isDesktopApp} from '@mattermost/shared/utils/user_agent';
+
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 
 import {redirectUserToDefaultTeam} from 'actions/global_actions';
 import {loginWithDesktopToken} from 'actions/views/login';
 
 import DesktopApp from 'utils/desktop_api';
-import {isDesktopApp} from 'utils/user_agent';
 
 import './desktop_auth_token.scss';