From caa87ec7f6dd762d1b3b7757236e9f5e78d5c7bf Mon Sep 17 00:00:00 2001 From: Umar Abid <75561750+umrkhn@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:22:16 +0500 Subject: [PATCH] [GH-24745] Convert ./components/admin_console/setting.tsx from Class Component to Function Component (#24861) * fix: convert admin_console/setting.tsx to FC * fix: update failing snapshots --- .../custom_url_schemes_setting.test.tsx.snap | 20 +++---- .../__snapshots__/radio_setting.test.tsx.snap | 4 +- .../src/components/admin_console/setting.tsx | 56 ++++++++----------- 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/webapp/channels/src/components/admin_console/__snapshots__/custom_url_schemes_setting.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/custom_url_schemes_setting.test.tsx.snap index 433104f946..1a7d736254 100644 --- a/webapp/channels/src/components/admin_console/__snapshots__/custom_url_schemes_setting.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/__snapshots__/custom_url_schemes_setting.test.tsx.snap @@ -52,7 +52,7 @@ exports[`components/AdminConsole/CustomUrlSchemeSetting initial state with multi ] } > - - + `; @@ -138,7 +138,7 @@ exports[`components/AdminConsole/CustomUrlSchemeSetting initial state with no it setByEnv={false} value={Array []} > - - + `; @@ -228,7 +228,7 @@ exports[`components/AdminConsole/CustomUrlSchemeSetting initial state with one i ] } > - - + `; @@ -319,7 +319,7 @@ exports[`components/AdminConsole/CustomUrlSchemeSetting renders properly when di ] } > - - + `; @@ -410,7 +410,7 @@ exports[`components/AdminConsole/CustomUrlSchemeSetting renders properly when se ] } > - - + `; diff --git a/webapp/channels/src/components/admin_console/__snapshots__/radio_setting.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/radio_setting.test.tsx.snap index 3a18f2d35e..94bc39abf4 100644 --- a/webapp/channels/src/components/admin_console/__snapshots__/radio_setting.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/__snapshots__/radio_setting.test.tsx.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`components/admin_console/RadioSetting should match snapshot 1`] = ` - - + `; diff --git a/webapp/channels/src/components/admin_console/setting.tsx b/webapp/channels/src/components/admin_console/setting.tsx index 9269bd7102..6f85a6f029 100644 --- a/webapp/channels/src/components/admin_console/setting.tsx +++ b/webapp/channels/src/components/admin_console/setting.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React, {PureComponent} from 'react'; +import React from 'react'; import SetByEnv from './set_by_env'; @@ -13,38 +13,30 @@ export type Props = { setByEnv?: boolean; } -export default class Settings extends PureComponent { - public render() { - const { - children, - setByEnv, - helpText, - inputId, - label, - } = this.props; - - return ( -
{ + return ( +
+