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

Fix system console plugin headers (#26196)

Browse Source 
* Fix system console plugin headers

* Fix tests
This commit is contained in:
Daniel Espino García 2024-02-13 10:28:38 +01:00 committed by GitHub
parent 578216a5e4
commit 845f28cb76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/channels/src/components/admin_console/__snapshots__/schema_admin_settings.test.tsx.snap
View File

@ -92,7 +92,9 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
<div <div
className="wrapper--fixed " className="wrapper--fixed "
> >
config <AdminHeader>
config
</AdminHeader>
<div <div
className="admin-console__wrapper" className="admin-console__wrapper"
> >

12
webapp/channels/src/components/admin_console/custom_plugin_settings/__snapshots__/custom_plugin_settings.test.tsx.snap
View File

@ -4,7 +4,9 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
<div <div
className="wrapper--fixed " className="wrapper--fixed "
> >
testplugin <AdminHeader>
testplugin
</AdminHeader>
<div <div
className="admin-console__wrapper" className="admin-console__wrapper"
> >
@ -233,7 +235,9 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
<div <div
className="wrapper--fixed " className="wrapper--fixed "
> >
testplugin <AdminHeader>
testplugin
</AdminHeader>
<div <div
className="admin-console__wrapper" className="admin-console__wrapper"
> >
@ -300,7 +304,9 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
<div <div
className="wrapper--fixed " className="wrapper--fixed "
> >
testplugin <AdminHeader>
testplugin
</AdminHeader>
<div <div
className="admin-console__wrapper" className="admin-console__wrapper"
> >

16
webapp/channels/src/components/admin_console/schema_admin_settings.tsx
View File

@ -329,18 +329,24 @@ export class SchemaAdminSettings extends React.PureComponent<Props, State> {
if (!this.props.schema) { if (!this.props.schema) {
return ''; return '';
} }
if (!('name' in this.props.schema)) {
return this.props.schema.id; let name: string | MessageDescriptor = this.props.schema.id;
if (('name' in this.props.schema)) {
name = this.props.schema.name;
} }
if (typeof this.props.schema.name === 'string') { if (typeof name === 'string') {
return this.props.schema.name; return (
<AdminHeader>
{name}
</AdminHeader>
);
} }
return ( return (
<AdminHeader> <AdminHeader>
<FormattedMessage <FormattedMessage
{...this.props.schema.name} {...name}
/> />
</AdminHeader> </AdminHeader>
); );