[MM-60821] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/integrations/installed_oauth_app/installed_oauth_app.tsx' with FormattedMessage (#28612)

2025-02-25 18:55:24 -06:00 · 2024-10-11 12:44:53 +01:00 · 2024-10-11 12:44:53 +01:00 · 2f08b0df44
commit 2f08b0df44
parent 160be23dc0
5 changed files with 59 additions and 45 deletions
--- a/webapp/channels/src/components/integrations/installed_oauth_app/snapshots/installed_oauth_app.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/installed_oauth_app/snapshots/installed_oauth_app.test.tsx.snap
@ -85,11 +85,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot 1`] = `
      <span
        className="item-details__url word-break--all"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Is Trusted: **{isTrusted}**"
-          id="installed_oauth_apps.is_trusted"
+        <MemoizedFormattedMessage
+          defaultMessage="Is Trusted: <b>{isTrusted}</b>"
+          id="installedOauthApps.isTrusted"
          values={
            Object {
+              "b": [Function],
              "isTrusted": "Yes",
            }
          }
@ -102,11 +103,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot 1`] = `
      <span
        className="item-details__token"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Client ID: **{clientId}**"
-          id="installed_integrations.client_id"
+        <MemoizedFormattedMessage
+          defaultMessage="Client ID: <b>{clientId}</b>"
+          id="installedIntegrations.clientId"
          values={
            Object {
+              "b": [Function],
              "clientId": "facxd9wpzpbpfp8pad78xj75pr",
            }
          }
@ -129,10 +131,11 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot 1`] = `
        className="item-details__token"
      >
        <MemoizedFormattedMessage
-          defaultMessage="Client Secret: **{clientSecret}**"
-          id="installed_integrations.client_secret"
+          defaultMessage="Client Secret: <b>{clientSecret}</b>"
+          id="installedIntegrations.clientSecret"
          values={
            Object {
+              "b": [Function],
              "clientSecret": "***************",
            }
          }
@ -316,11 +319,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, on err
      <span
        className="item-details__url word-break--all"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Is Trusted: **{isTrusted}**"
-          id="installed_oauth_apps.is_trusted"
+        <MemoizedFormattedMessage
+          defaultMessage="Is Trusted: <b>{isTrusted}</b>"
+          id="installedOauthApps.isTrusted"
          values={
            Object {
+              "b": [Function],
              "isTrusted": "No",
            }
          }
@ -333,11 +337,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, on err
      <span
        className="item-details__token"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Client ID: **{clientId}**"
-          id="installed_integrations.client_id"
+        <MemoizedFormattedMessage
+          defaultMessage="Client ID: <b>{clientId}</b>"
+          id="installedIntegrations.clientId"
          values={
            Object {
+              "b": [Function],
              "clientId": "facxd9wpzpbpfp8pad78xj75pr",
            }
          }
@ -360,10 +365,11 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, on err
        className="item-details__token"
      >
        <MemoizedFormattedMessage
-          defaultMessage="Client Secret: **{clientSecret}**"
-          id="installed_integrations.client_secret"
+          defaultMessage="Client Secret: <b>{clientSecret}</b>"
+          id="installedIntegrations.clientSecret"
          values={
            Object {
+              "b": [Function],
              "clientSecret": "***************",
            }
          }
@ -495,11 +501,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, when o
      <span
        className="item-details__url word-break--all"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Is Trusted: **{isTrusted}**"
-          id="installed_oauth_apps.is_trusted"
+        <MemoizedFormattedMessage
+          defaultMessage="Is Trusted: <b>{isTrusted}</b>"
+          id="installedOauthApps.isTrusted"
          values={
            Object {
+              "b": [Function],
              "isTrusted": "No",
            }
          }
@ -512,11 +519,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, when o
      <span
        className="item-details__token"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Client ID: **{clientId}**"
-          id="installed_integrations.client_id"
+        <MemoizedFormattedMessage
+          defaultMessage="Client ID: <b>{clientId}</b>"
+          id="installedIntegrations.clientId"
          values={
            Object {
+              "b": [Function],
              "clientId": "facxd9wpzpbpfp8pad78xj75pr",
            }
          }
@ -539,10 +547,11 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, when o
        className="item-details__token"
      >
        <MemoizedFormattedMessage
-          defaultMessage="Client Secret: **{clientSecret}**"
-          id="installed_integrations.client_secret"
+          defaultMessage="Client Secret: <b>{clientSecret}</b>"
+          id="installedIntegrations.clientSecret"
          values={
            Object {
+              "b": [Function],
              "clientSecret": "***************",
            }
          }
--- a/webapp/channels/src/components/integrations/installed_oauth_app/installed_oauth_app.tsx
+++ b/webapp/channels/src/components/integrations/installed_oauth_app/installed_oauth_app.tsx
@ -10,7 +10,6 @@ import type {Team} from '@mattermost/types/teams';

 import CopyText from 'components/copy_text';
 import FormError from 'components/form_error';
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';

 import * as Utils from 'utils/utils';

@ -183,10 +182,11 @@ export default class InstalledOAuthApp extends React.PureComponent<InstalledOAut
            clientSecret = (
                <span className='item-details__token'>
                    <FormattedMessage
-                        id='installed_integrations.client_secret'
-                        defaultMessage='Client Secret: **{clientSecret}**'
+                        id='installedIntegrations.clientSecret'
+                        defaultMessage='Client Secret: <b>{clientSecret}</b>'
                        values={{
                            clientSecret: this.state.clientSecret,
+                            b: (chunks: string) => <b>{chunks}</b>,
                        }}
                    />
                </span>
@ -206,11 +206,12 @@ export default class InstalledOAuthApp extends React.PureComponent<InstalledOAut
            );
            clientSecret = (
                <span className='item-details__token'>
-                    <FormattedMarkdownMessage
-                        id='installed_integrations.client_secret'
-                        defaultMessage='Client Secret: **{clientSecret}**'
+                    <FormattedMessage
+                        id='installedIntegrations.clientSecret'
+                        defaultMessage='Client Secret: <b>{clientSecret}</b>'
                        values={{
                            clientSecret: this.state.clientSecret,
+                            b: (chunks: string) => <b>{chunks}</b>,
                        }}
                    />
                    <CopyText
@ -294,22 +295,24 @@ export default class InstalledOAuthApp extends React.PureComponent<InstalledOAut
                <>
                    <div className='item-details__row'>
                        <span className='item-details__url word-break--all'>
-                            <FormattedMarkdownMessage
-                                id='installed_oauth_apps.is_trusted'
-                                defaultMessage='Is Trusted: **{isTrusted}**'
+                            <FormattedMessage
+                                id='installedOauthApps.isTrusted'
+                                defaultMessage='Is Trusted: <b>{isTrusted}</b>'
                                values={{
                                    isTrusted,
+                                    b: (chunks: string) => <b>{chunks}</b>,
                                }}
                            />
                        </span>
                    </div>
                    <div className='item-details__row'>
                        <span className='item-details__token'>
-                            <FormattedMarkdownMessage
-                                id='installed_integrations.client_id'
-                                defaultMessage='Client ID: **{clientId}**'
+                            <FormattedMessage
+                                id='installedIntegrations.clientId'
+                                defaultMessage='Client ID: <b>{clientId}</b>'
                                values={{
                                    clientId: oauthApp.id,
+                                    b: (chunks: string) => <b>{chunks}</b>,
                                }}
                            />
                            <CopyText
--- a/webapp/channels/src/components/integrations/outgoing_oauth_connections/snapshots/installed_outgoing_oauth_connection.test.tsx.snap
+++ b/webapp/channels/src/components/integrations/outgoing_oauth_connections/snapshots/installed_outgoing_oauth_connection.test.tsx.snap
@ -57,11 +57,12 @@ exports[`components/integrations/InstalledOutgoingOAuthConnection should match s
      <span
        className="item-details__token"
      >
-        <FormattedMarkdownMessage
-          defaultMessage="Client ID: **{clientId}**"
-          id="installed_integrations.client_id"
+        <MemoizedFormattedMessage
+          defaultMessage="Client ID: <b>{clientId}</b>"
+          id="installedIntegrations.clientId"
          values={
            Object {
+              "b": [Function],
              "clientId": "someid",
            }
          }
--- a/webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connection.tsx
+++ b/webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connection.tsx
@ -122,11 +122,12 @@ const InstalledOutgoingOAuthConnection = (props: InstalledOutgoingOAuthConnectio
        <>
            <div className='item-details__row'>
                <span className='item-details__token'>
-                    <FormattedMarkdownMessage
-                        id='installed_integrations.client_id'
-                        defaultMessage='Client ID: **{clientId}**'
+                    <FormattedMessage
+                        id='installedIntegrations.clientId'
+                        defaultMessage='Client ID: <b>{clientId}</b>'
                        values={{
                            clientId: outgoingOAuthConnection.client_id,
+                            b: (chunks: string) => <b>{chunks}</b>,
                        }}
                    />
                </span>
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@ -3933,8 +3933,6 @@
  "installed_incoming_webhooks.unknown_channel": "A Private Webhook",
  "installed_integrations.audience_urls": "Audience URLs: {urls}",
  "installed_integrations.callback_urls": "Callback URLs: {urls}",
-  "installed_integrations.client_id": "Client ID: **{clientId}**",
-  "installed_integrations.client_secret": "Client Secret: **{clientSecret}**",
  "installed_integrations.content_type": "Content-Type: {contentType}",
  "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
  "installed_integrations.delete": "Delete",
@ -3964,7 +3962,6 @@
  "installed_oauth_apps.help.oauthApplications": "OAuth 2.0 applications",
  "installed_oauth_apps.homepage": "Homepage",
  "installed_oauth_apps.iconUrl": "Icon URL",
-  "installed_oauth_apps.is_trusted": "Is Trusted: **{isTrusted}**",
  "installed_oauth_apps.name": "Display Name",
  "installed_oauth_apps.save": "Save",
  "installed_oauth_apps.saving": "Saving...",
@ -3995,6 +3992,9 @@
  "installed_outgoing_webhooks.help.buildYourOwn": "Build your own",
  "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
  "installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
+  "installedIntegrations.clientId": "Client ID: <b>{clientId}</b>",
+  "installedIntegrations.clientSecret": "Client Secret: <b>{clientSecret}</b>",
+  "installedOauthApps.isTrusted": "Is Trusted: <b>{isTrusted}</b>",
  "integrations.add": "Add",
  "integrations.command.description": "Slash commands send events to external integrations",
  "integrations.command.title": "Slash Commands",