From 2f5b756d679c94bf4e5bba002441ca9b1a4c8a4e Mon Sep 17 00:00:00 2001 From: Maria A Nunez Date: Mon, 16 Oct 2023 06:24:47 -0400 Subject: [PATCH] MM-53481 Fix textbox broken Help link (#24889) * Fixed broken link * Fix importa * Lint * Fix import * Linting * fix snapshots --- .../edit_channel_header_modal.test.tsx.snap | 10 +++++----- .../edit_channel_header_modal.tsx | 3 +-- .../channels/src/components/textbox/index.ts | 2 ++ .../{textbox_links => }/textbox_links.tsx | 14 ++++++-------- .../components/textbox/textbox_links/index.ts | 18 ------------------ 5 files changed, 14 insertions(+), 33 deletions(-) rename webapp/channels/src/components/textbox/{textbox_links => }/textbox_links.tsx (93%) delete mode 100644 webapp/channels/src/components/textbox/textbox_links/index.ts diff --git a/webapp/channels/src/components/edit_channel_header_modal/__snapshots__/edit_channel_header_modal.test.tsx.snap b/webapp/channels/src/components/edit_channel_header_modal/__snapshots__/edit_channel_header_modal.test.tsx.snap index b2869296ce..104d8008a5 100644 --- a/webapp/channels/src/components/edit_channel_header_modal/__snapshots__/edit_channel_header_modal.test.tsx.snap +++ b/webapp/channels/src/components/edit_channel_header_modal/__snapshots__/edit_channel_header_modal.test.tsx.snap @@ -81,7 +81,7 @@ exports[`components/EditChannelHeaderModal edit direct message channel 1`] = `
- - - - - ({ export {Textbox as TextboxClass}; export default connect(makeMapStateToProps, mapDispatchToProps, null, {forwardRef: true})(Textbox); +export {TextboxLinks}; diff --git a/webapp/channels/src/components/textbox/textbox_links/textbox_links.tsx b/webapp/channels/src/components/textbox/textbox_links.tsx similarity index 93% rename from webapp/channels/src/components/textbox/textbox_links/textbox_links.tsx rename to webapp/channels/src/components/textbox/textbox_links.tsx index 714a5e5c4d..aeb5cafa70 100644 --- a/webapp/channels/src/components/textbox/textbox_links/textbox_links.tsx +++ b/webapp/channels/src/components/textbox/textbox_links.tsx @@ -4,7 +4,8 @@ import React from 'react'; import type {MouseEvent} from 'react'; import {FormattedMessage} from 'react-intl'; -import {Link} from 'react-router-dom'; + +import ExternalLink from 'components/external_link'; type Props = { showPreview?: boolean; @@ -12,7 +13,6 @@ type Props = { hasText?: boolean; hasExceededCharacterLimit?: boolean; isMarkdownPreviewEnabled: boolean; - currentLocale: string; updatePreview?: (showPreview: boolean) => void; }; @@ -22,7 +22,6 @@ function TextboxLinks({ hasText = false, hasExceededCharacterLimit = false, isMarkdownPreviewEnabled, - currentLocale, updatePreview, }: Props) { const togglePreview = (e: MouseEvent) => { @@ -125,17 +124,16 @@ function TextboxLinks({
{helpText} {previewLink} - - +
); } diff --git a/webapp/channels/src/components/textbox/textbox_links/index.ts b/webapp/channels/src/components/textbox/textbox_links/index.ts deleted file mode 100644 index 35ec2b2ee6..0000000000 --- a/webapp/channels/src/components/textbox/textbox_links/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -import {connect} from 'react-redux'; - -import {getCurrentLocale} from 'selectors/i18n'; - -import type {GlobalState} from 'types/store'; - -import TextboxLinks from './textbox_links'; - -function mapStateToProps(state: GlobalState) { - return ({ - currentLocale: getCurrentLocale(state), - }); -} - -export default connect(mapStateToProps)(TextboxLinks);