IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rita Anene 2024-10-11 12:44:53 +01:00 committed by GitHub
parent 160be23dc0
commit 2f08b0df44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
webapp/channels/src/components/integrations/installed_oauth_app/__snapshots__/installed_oauth_app.test.tsx.snap
View File

@ -85,11 +85,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot 1`] = `
<span <span
className="item-details__url word-break--all" className="item-details__url word-break--all"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Is Trusted: **{isTrusted}**" defaultMessage="Is Trusted: <b>{isTrusted}</b>"
id="installed_oauth_apps.is_trusted" id="installedOauthApps.isTrusted"
values={ values={
Object { Object {
"b": [Function],
"isTrusted": "Yes", "isTrusted": "Yes",
} }
} }
@ -102,11 +103,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot 1`] = `
<span <span
className="item-details__token" className="item-details__token"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Client ID: **{clientId}**" defaultMessage="Client ID: <b>{clientId}</b>"
id="installed_integrations.client_id" id="installedIntegrations.clientId"
values={ values={
Object { Object {
"b": [Function],
"clientId": "facxd9wpzpbpfp8pad78xj75pr", "clientId": "facxd9wpzpbpfp8pad78xj75pr",
} }
} }
@ -129,10 +131,11 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot 1`] = `
className="item-details__token" className="item-details__token"
> >
<MemoizedFormattedMessage <MemoizedFormattedMessage
defaultMessage="Client Secret: **{clientSecret}**" defaultMessage="Client Secret: <b>{clientSecret}</b>"
id="installed_integrations.client_secret" id="installedIntegrations.clientSecret"
values={ values={
Object { Object {
"b": [Function],
"clientSecret": "***************", "clientSecret": "***************",
} }
} }
@ -316,11 +319,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, on err
<span <span
className="item-details__url word-break--all" className="item-details__url word-break--all"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Is Trusted: **{isTrusted}**" defaultMessage="Is Trusted: <b>{isTrusted}</b>"
id="installed_oauth_apps.is_trusted" id="installedOauthApps.isTrusted"
values={ values={
Object { Object {
"b": [Function],
"isTrusted": "No", "isTrusted": "No",
} }
} }
@ -333,11 +337,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, on err
<span <span
className="item-details__token" className="item-details__token"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Client ID: **{clientId}**" defaultMessage="Client ID: <b>{clientId}</b>"
id="installed_integrations.client_id" id="installedIntegrations.clientId"
values={ values={
Object { Object {
"b": [Function],
"clientId": "facxd9wpzpbpfp8pad78xj75pr", "clientId": "facxd9wpzpbpfp8pad78xj75pr",
} }
} }
@ -360,10 +365,11 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, on err
className="item-details__token" className="item-details__token"
> >
<MemoizedFormattedMessage <MemoizedFormattedMessage
defaultMessage="Client Secret: **{clientSecret}**" defaultMessage="Client Secret: <b>{clientSecret}</b>"
id="installed_integrations.client_secret" id="installedIntegrations.clientSecret"
values={ values={
Object { Object {
"b": [Function],
"clientSecret": "***************", "clientSecret": "***************",
} }
} }
@ -495,11 +501,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, when o
<span <span
className="item-details__url word-break--all" className="item-details__url word-break--all"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Is Trusted: **{isTrusted}**" defaultMessage="Is Trusted: <b>{isTrusted}</b>"
id="installed_oauth_apps.is_trusted" id="installedOauthApps.isTrusted"
values={ values={
Object { Object {
"b": [Function],
"isTrusted": "No", "isTrusted": "No",
} }
} }
@ -512,11 +519,12 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, when o
<span <span
className="item-details__token" className="item-details__token"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Client ID: **{clientId}**" defaultMessage="Client ID: <b>{clientId}</b>"
id="installed_integrations.client_id" id="installedIntegrations.clientId"
values={ values={
Object { Object {
"b": [Function],
"clientId": "facxd9wpzpbpfp8pad78xj75pr", "clientId": "facxd9wpzpbpfp8pad78xj75pr",
} }
} }
@ -539,10 +547,11 @@ exports[`components/integrations/InstalledOAuthApp should match snapshot, when o
className="item-details__token" className="item-details__token"
> >
<MemoizedFormattedMessage <MemoizedFormattedMessage
defaultMessage="Client Secret: **{clientSecret}**" defaultMessage="Client Secret: <b>{clientSecret}</b>"
id="installed_integrations.client_secret" id="installedIntegrations.clientSecret"
values={ values={
Object { Object {
"b": [Function],
"clientSecret": "***************", "clientSecret": "***************",
} }
} }

27
webapp/channels/src/components/integrations/installed_oauth_app/installed_oauth_app.tsx
View File

@ -10,7 +10,6 @@ import type {Team} from '@mattermost/types/teams';
import CopyText from 'components/copy_text'; import CopyText from 'components/copy_text';
import FormError from 'components/form_error'; import FormError from 'components/form_error';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import * as Utils from 'utils/utils'; import * as Utils from 'utils/utils';
@ -183,10 +182,11 @@ export default class InstalledOAuthApp extends React.PureComponent<InstalledOAut
clientSecret = ( clientSecret = (
<span className='item-details__token'> <span className='item-details__token'>
<FormattedMessage <FormattedMessage
id='installed_integrations.client_secret' id='installedIntegrations.clientSecret'
defaultMessage='Client Secret: **{clientSecret}**' defaultMessage='Client Secret: <b>{clientSecret}</b>'
values={{ values={{
clientSecret: this.state.clientSecret, clientSecret: this.state.clientSecret,
b: (chunks: string) => <b>{chunks}</b>,
}} }}
/> />
</span> </span>
@ -206,11 +206,12 @@ export default class InstalledOAuthApp extends React.PureComponent<InstalledOAut
); );
clientSecret = ( clientSecret = (
<span className='item-details__token'> <span className='item-details__token'>
<FormattedMarkdownMessage <FormattedMessage
id='installed_integrations.client_secret' id='installedIntegrations.clientSecret'
defaultMessage='Client Secret: **{clientSecret}**' defaultMessage='Client Secret: <b>{clientSecret}</b>'
values={{ values={{
clientSecret: this.state.clientSecret, clientSecret: this.state.clientSecret,
b: (chunks: string) => <b>{chunks}</b>,
}} }}
/> />
<CopyText <CopyText
@ -294,22 +295,24 @@ export default class InstalledOAuthApp extends React.PureComponent<InstalledOAut
<> <>
<div className='item-details__row'> <div className='item-details__row'>
<span className='item-details__url word-break--all'> <span className='item-details__url word-break--all'>
<FormattedMarkdownMessage <FormattedMessage
id='installed_oauth_apps.is_trusted' id='installedOauthApps.isTrusted'
defaultMessage='Is Trusted: **{isTrusted}**' defaultMessage='Is Trusted: <b>{isTrusted}</b>'
values={{ values={{
isTrusted, isTrusted,
b: (chunks: string) => <b>{chunks}</b>,
}} }}
/> />
</span> </span>
</div> </div>
<div className='item-details__row'> <div className='item-details__row'>
<span className='item-details__token'> <span className='item-details__token'>
<FormattedMarkdownMessage <FormattedMessage
id='installed_integrations.client_id' id='installedIntegrations.clientId'
defaultMessage='Client ID: **{clientId}**' defaultMessage='Client ID: <b>{clientId}</b>'
values={{ values={{
clientId: oauthApp.id, clientId: oauthApp.id,
b: (chunks: string) => <b>{chunks}</b>,
}} }}
/> />
<CopyText <CopyText

7
webapp/channels/src/components/integrations/outgoing_oauth_connections/__snapshots__/installed_outgoing_oauth_connection.test.tsx.snap
View File

@ -57,11 +57,12 @@ exports[`components/integrations/InstalledOutgoingOAuthConnection should match s
<span <span
className="item-details__token" className="item-details__token"
> >
<FormattedMarkdownMessage <MemoizedFormattedMessage
defaultMessage="Client ID: **{clientId}**" defaultMessage="Client ID: <b>{clientId}</b>"
id="installed_integrations.client_id" id="installedIntegrations.clientId"
values={ values={
Object { Object {
"b": [Function],
"clientId": "someid", "clientId": "someid",
} }
} }

7
webapp/channels/src/components/integrations/outgoing_oauth_connections/installed_outgoing_oauth_connection.tsx
View File

@ -122,11 +122,12 @@ const InstalledOutgoingOAuthConnection = (props: InstalledOutgoingOAuthConnectio
<> <>
<div className='item-details__row'> <div className='item-details__row'>
<span className='item-details__token'> <span className='item-details__token'>
<FormattedMarkdownMessage <FormattedMessage
id='installed_integrations.client_id' id='installedIntegrations.clientId'
defaultMessage='Client ID: **{clientId}**' defaultMessage='Client ID: <b>{clientId}</b>'
values={{ values={{
clientId: outgoingOAuthConnection.client_id, clientId: outgoingOAuthConnection.client_id,
b: (chunks: string) => <b>{chunks}</b>,
}} }}
/> />
</span> </span>

6
webapp/channels/src/i18n/en.json
View File

@ -3933,8 +3933,6 @@
"installed_incoming_webhooks.unknown_channel": "A Private Webhook", "installed_incoming_webhooks.unknown_channel": "A Private Webhook",
"installed_integrations.audience_urls": "Audience URLs: {urls}", "installed_integrations.audience_urls": "Audience URLs: {urls}",
"installed_integrations.callback_urls": "Callback 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.content_type": "Content-Type: {contentType}",
"installed_integrations.creation": "Created by {creator} on {createAt, date, full}", "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
"installed_integrations.delete": "Delete", "installed_integrations.delete": "Delete",
@ -3964,7 +3962,6 @@
"installed_oauth_apps.help.oauthApplications": "OAuth 2.0 applications", "installed_oauth_apps.help.oauthApplications": "OAuth 2.0 applications",
"installed_oauth_apps.homepage": "Homepage", "installed_oauth_apps.homepage": "Homepage",
"installed_oauth_apps.iconUrl": "Icon URL", "installed_oauth_apps.iconUrl": "Icon URL",
"installed_oauth_apps.is_trusted": "Is Trusted: **{isTrusted}**",
"installed_oauth_apps.name": "Display Name", "installed_oauth_apps.name": "Display Name",
"installed_oauth_apps.save": "Save", "installed_oauth_apps.save": "Save",
"installed_oauth_apps.saving": "Saving...", "installed_oauth_apps.saving": "Saving...",
@ -3995,6 +3992,9 @@
"installed_outgoing_webhooks.help.buildYourOwn": "Build your own", "installed_outgoing_webhooks.help.buildYourOwn": "Build your own",
"installed_outgoing_webhooks.search": "Search Outgoing Webhooks", "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
"installed_outgoing_webhooks.unknown_channel": "A Private Webhook", "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.add": "Add",
"integrations.command.description": "Slash commands send events to external integrations", "integrations.command.description": "Slash commands send events to external integrations",
"integrations.command.title": "Slash Commands", "integrations.command.title": "Slash Commands",