mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Convert ./components/widgets/loading/loading_wrapper.tsx from Class C… (#24997)

Просмотр исходного кода 
* Convert ./components/widgets/loading/loading_wrapper.tsx from Class Component to Function Component

* removed snapshots from the testcase

---------

Co-authored-by: sjcode99 <misuraj2611@gmail.com>
Этот коммит содержится в:
sjcode99
2023-10-26 01:20:26 +05:30
коммит произвёл GitHub
родитель 00108d44bb
Коммит fb11048d87
13 изменённых файлов: 189 добавлений и 127 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
webapp/channels/src/components/__snapshots__/save_button.test.tsx.snap
Просмотреть файл

@@ -8,7 +8,7 @@ exports[`components/SaveButton should match snapshot, extraClasses 1`] = `
id="saveSetting" id="saveSetting"
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -23,7 +23,7 @@ exports[`components/SaveButton should match snapshot, extraClasses 1`] = `
id="save_button.save" id="save_button.save"
/> />
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
`; `;
@@ -35,7 +35,7 @@ exports[`components/SaveButton should match snapshot, on defaultMessage 1`] = `
id="saveSetting" id="saveSetting"
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -50,7 +50,7 @@ exports[`components/SaveButton should match snapshot, on defaultMessage 1`] = `
id="save_button.save" id="save_button.save"
/> />
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
`; `;
@@ -62,7 +62,7 @@ exports[`components/SaveButton should match snapshot, on defaultMessage 2`] = `
id="saveSetting" id="saveSetting"
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -74,7 +74,7 @@ exports[`components/SaveButton should match snapshot, on defaultMessage 2`] = `
<span> <span>
Go Go
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
`; `;
@@ -86,7 +86,7 @@ exports[`components/SaveButton should match snapshot, on savingMessage 1`] = `
id="saveSetting" id="saveSetting"
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={true} loading={true}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -101,7 +101,7 @@ exports[`components/SaveButton should match snapshot, on savingMessage 1`] = `
id="save_button.save" id="save_button.save"
/> />
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
`; `;
@@ -113,7 +113,7 @@ exports[`components/SaveButton should match snapshot, on savingMessage 2`] = `
id="saveSetting" id="saveSetting"
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={true} loading={true}
text="Saving Config..." text="Saving Config..."
> >
@@ -123,6 +123,6 @@ exports[`components/SaveButton should match snapshot, on savingMessage 2`] = `
id="save_button.save" id="save_button.save"
/> />
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
`; `;

32
webapp/channels/src/components/__snapshots__/setting_picture.test.tsx.snap
Просмотреть файл

@@ -87,7 +87,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
onClick={[Function]} onClick={[Function]}
tabIndex={0} tabIndex={0}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -95,7 +95,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -192,7 +192,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
onClick={[Function]} onClick={[Function]}
tabIndex={0} tabIndex={0}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -200,7 +200,7 @@ exports[`components/SettingItemMin should match snapshot with active Save button
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -307,7 +307,7 @@ exports[`components/SettingItemMin should match snapshot, on loading picture 1`]
onClick={[Function]} onClick={[Function]}
tabIndex={-1} tabIndex={-1}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={true} loading={true}
text="Uploading..." text="Uploading..."
> >
@@ -315,7 +315,7 @@ exports[`components/SettingItemMin should match snapshot, on loading picture 1`]
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -434,7 +434,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on fil
onClick={[Function]} onClick={[Function]}
tabIndex={-1} tabIndex={-1}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -442,7 +442,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on fil
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -549,7 +549,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on sou
onClick={[Function]} onClick={[Function]}
tabIndex={-1} tabIndex={-1}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -557,7 +557,7 @@ exports[`components/SettingItemMin should match snapshot, profile picture on sou
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -676,7 +676,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
onClick={[Function]} onClick={[Function]}
tabIndex={-1} tabIndex={-1}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -684,7 +684,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on file 1`]
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -845,7 +845,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
onClick={[Function]} onClick={[Function]}
tabIndex={-1} tabIndex={-1}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -853,7 +853,7 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button
@@ -1014,7 +1014,7 @@ exports[`components/SettingItemMin should match snapshot, user icon on source 1`
onClick={[Function]} onClick={[Function]}
tabIndex={-1} tabIndex={-1}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Uploading..." text="Uploading..."
> >
@@ -1022,7 +1022,7 @@ exports[`components/SettingItemMin should match snapshot, user icon on source 1`
defaultMessage="Save" defaultMessage="Save"
id="setting_picture.save" id="setting_picture.save"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</span> </span>
<button <button

8
webapp/channels/src/components/__snapshots__/spinner_button.test.tsx.snap
Просмотреть файл

@@ -4,7 +4,7 @@ exports[`components/SpinnerButton should match snapshot with children 1`] = `
<button <button
disabled={false} disabled={false}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Test" text="Test"
> >
@@ -14,7 +14,7 @@ exports[`components/SpinnerButton should match snapshot with children 1`] = `
<span <span
id="child2" id="child2"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
`; `;
@@ -22,7 +22,7 @@ exports[`components/SpinnerButton should match snapshot with required props 1`]
<button <button
disabled={false} disabled={false}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Test" text="Test"
/> />
@@ -33,7 +33,7 @@ exports[`components/SpinnerButton should match snapshot with spinning 1`] = `
<button <button
disabled={true} disabled={true}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={true} loading={true}
text="Test" text="Test"
/> />

12
webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_scheme_summary/__snapshots__/permissions_scheme_summary.test.tsx.snap
Просмотреть файл

@@ -12,7 +12,7 @@ exports[`components/admin_console/permission_schemes_settings/permissions_scheme
<ConfirmModal <ConfirmModal
confirmButtonClass="btn btn-primary" confirmButtonClass="btn btn-primary"
confirmButtonText={ confirmButtonText={
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Deleting..." text="Deleting..."
> >
@@ -20,7 +20,7 @@ exports[`components/admin_console/permission_schemes_settings/permissions_scheme
defaultMessage="Yes, Delete" defaultMessage="Yes, Delete"
id="admin.permissions.permissionsSchemeSummary.deleteConfirmButton" id="admin.permissions.permissionsSchemeSummary.deleteConfirmButton"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
} }
message={ message={
<div> <div>
@@ -130,7 +130,7 @@ exports[`components/admin_console/permission_schemes_settings/permissions_scheme
<ConfirmModal <ConfirmModal
confirmButtonClass="btn btn-primary" confirmButtonClass="btn btn-primary"
confirmButtonText={ confirmButtonText={
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Deleting..." text="Deleting..."
> >
@@ -138,7 +138,7 @@ exports[`components/admin_console/permission_schemes_settings/permissions_scheme
defaultMessage="Yes, Delete" defaultMessage="Yes, Delete"
id="admin.permissions.permissionsSchemeSummary.deleteConfirmButton" id="admin.permissions.permissionsSchemeSummary.deleteConfirmButton"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
} }
message={ message={
<div> <div>
@@ -321,7 +321,7 @@ exports[`components/admin_console/permission_schemes_settings/permissions_scheme
<ConfirmModal <ConfirmModal
confirmButtonClass="btn btn-primary" confirmButtonClass="btn btn-primary"
confirmButtonText={ confirmButtonText={
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Deleting..." text="Deleting..."
> >
@@ -329,7 +329,7 @@ exports[`components/admin_console/permission_schemes_settings/permissions_scheme
defaultMessage="Yes, Delete" defaultMessage="Yes, Delete"
id="admin.permissions.permissionsSchemeSummary.deleteConfirmButton" id="admin.permissions.permissionsSchemeSummary.deleteConfirmButton"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
} }
message={ message={
<div> <div>

20
webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap
Просмотреть файл

@@ -14,7 +14,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
onClick={[Function]} onClick={[Function]}
type="button" type="button"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Loading..." text="Loading..."
> >
@@ -22,7 +22,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
defaultMessage="Button Text" defaultMessage="Button Text"
id="test2" id="test2"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</div> </div>
<div <div
@@ -97,7 +97,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
onClick={[Function]} onClick={[Function]}
type="button" type="button"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Loading..." text="Loading..."
> >
@@ -109,7 +109,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
Button Text Button Text
</span> </span>
</FormattedMessage> </FormattedMessage>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
<div> <div>
<div <div
@@ -234,7 +234,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
onClick={[Function]} onClick={[Function]}
type="button" type="button"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Loading..." text="Loading..."
> >
@@ -246,7 +246,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
Button Text Button Text
</span> </span>
</FormattedMessage> </FormattedMessage>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
<div> <div>
<div <div
@@ -363,7 +363,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
onClick={[Function]} onClick={[Function]}
type="button" type="button"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Loading..." text="Loading..."
> >
@@ -375,7 +375,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
Button Text Button Text
</span> </span>
</FormattedMessage> </FormattedMessage>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
<div> <div>
<div <div
@@ -493,7 +493,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
onClick={[Function]} onClick={[Function]}
type="button" type="button"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Loading..." text="Loading..."
> >
@@ -505,7 +505,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match
Button Text Button Text
</span> </span>
</FormattedMessage> </FormattedMessage>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</div> </div>
<div <div

36
webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_app/__snapshots__/marketplace_item_app.test.tsx.snap
Просмотреть файл

@@ -15,7 +15,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render 1`] = `
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -23,7 +23,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render 1`] = `
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -87,7 +87,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with empty
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -95,7 +95,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with empty
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -127,7 +127,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with icon 1
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -135,7 +135,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with icon 1
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -168,7 +168,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with no hom
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -176,7 +176,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with no hom
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -206,7 +206,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with no plu
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -214,7 +214,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with no plu
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
homepageUrl="http://example.com" homepageUrl="http://example.com"
@@ -244,7 +244,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with one la
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -252,7 +252,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with one la
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -292,7 +292,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with server
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -300,7 +300,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with server
defaultMessage="Try Again" defaultMessage="Try Again"
id="marketplace_modal.list.try_again" id="marketplace_modal.list.try_again"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -332,7 +332,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with two la
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -340,7 +340,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem should render with two la
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -385,7 +385,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem when installing 1`] = `
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -393,7 +393,7 @@ exports[`components/MarketplaceItemApp MarketplaceItem when installing 1`] = `
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"

36
webapp/channels/src/components/plugin_marketplace/marketplace_item/marketplace_item_plugin/__snapshots__/marketplace_item_plugin.test.tsx.snap
Просмотреть файл

@@ -15,7 +15,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render 1`] = `
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -23,7 +23,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render 1`] = `
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -141,7 +141,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with emp
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -149,7 +149,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with emp
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -206,7 +206,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with no
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -214,7 +214,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with no
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -269,7 +269,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with no
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -277,7 +277,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with no
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
homepageUrl="http://example.com" homepageUrl="http://example.com"
@@ -332,7 +332,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with no
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -340,7 +340,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with no
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -394,7 +394,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with one
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -402,7 +402,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with one
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -467,7 +467,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with plu
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -475,7 +475,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with plu
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -544,7 +544,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with ser
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -552,7 +552,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with ser
defaultMessage="Try Again" defaultMessage="Try Again"
id="marketplace_modal.list.try_again" id="marketplace_modal.list.try_again"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"
@@ -609,7 +609,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with two
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Installing..." text="Installing..."
> >
@@ -617,7 +617,7 @@ exports[`components/MarketplaceItemPlugin MarketplaceItem should render with two
defaultMessage="Install" defaultMessage="Install"
id="marketplace_modal.list.install" id="marketplace_modal.list.install"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
} }
description="test plugin" description="test plugin"

8
webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
Просмотреть файл

@@ -221,7 +221,7 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
onClick={[Function]} onClick={[Function]}
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -240,7 +240,7 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
</span> </span>
</FormattedMessage> </FormattedMessage>
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</SaveButton> </SaveButton>
<button <button
@@ -638,7 +638,7 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
onClick={[Function]} onClick={[Function]}
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -657,7 +657,7 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
</span> </span>
</FormattedMessage> </FormattedMessage>
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</SaveButton> </SaveButton>
<button <button

8
webapp/channels/src/components/user_settings/notifications/manage_auto_responder/__snapshots__/manage_auto_responder.test.tsx.snap
Просмотреть файл

@@ -148,7 +148,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
onClick={[Function]} onClick={[Function]}
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -167,7 +167,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
</span> </span>
</FormattedMessage> </FormattedMessage>
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</SaveButton> </SaveButton>
<button <button
@@ -385,7 +385,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
onClick={[Function]} onClick={[Function]}
type="submit" type="submit"
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text={ text={
<Memo(MemoizedFormattedMessage) <Memo(MemoizedFormattedMessage)
@@ -404,7 +404,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
</span> </span>
</FormattedMessage> </FormattedMessage>
</span> </span>
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</SaveButton> </SaveButton>
<button <button

8
webapp/channels/src/components/warn_metric_ack_modal/__snapshots__/warn_metric_ack_modal.test.tsx.snap
Просмотреть файл

@@ -109,7 +109,7 @@ exports[`components/WarnMetricAckModal error display 1`] = `
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Sending email" text="Sending email"
> >
@@ -117,7 +117,7 @@ exports[`components/WarnMetricAckModal error display 1`] = `
defaultMessage="Acknowledge" defaultMessage="Acknowledge"
id="warn_metric_ack_modal.contact_support" id="warn_metric_ack_modal.contact_support"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</ModalFooter> </ModalFooter>
</Modal> </Modal>
@@ -208,7 +208,7 @@ exports[`components/WarnMetricAckModal should match snapshot, init 1`] = `
disabled={false} disabled={false}
onClick={[Function]} onClick={[Function]}
> >
<LoadingWrapper <Memo(LoadingWrapper)
loading={false} loading={false}
text="Sending email" text="Sending email"
> >
@@ -216,7 +216,7 @@ exports[`components/WarnMetricAckModal should match snapshot, init 1`] = `
defaultMessage="Acknowledge" defaultMessage="Acknowledge"
id="warn_metric_ack_modal.contact_support" id="warn_metric_ack_modal.contact_support"
/> />
</LoadingWrapper> </Memo(LoadingWrapper)>
</button> </button>
</ModalFooter> </ModalFooter>
</Modal> </Modal>

81
webapp/channels/src/components/widgets/loading/__snapshots__/loading_wrapper.test.tsx.snap Обычный файл
Просмотреть файл

@@ -0,0 +1,81 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`components/widgets/loading/LoadingWrapper showing content with children 1`] = `
<Memo(LoadingWrapper)
loading={false}
>
text
</Memo(LoadingWrapper)>
`;
exports[`components/widgets/loading/LoadingWrapper showing content without children 1`] = `
<Memo(LoadingWrapper)
loading={false}
/>
`;
exports[`components/widgets/loading/LoadingWrapper showing spinner with text 1`] = `
<Memo(LoadingWrapper)
loading={true}
text="test"
>
<LoadingSpinner
text="test"
>
<span
className="LoadingSpinner with-text"
data-testid="loadingSpinner"
id="loadingSpinner"
>
<LocalizedIcon
className="fa fa-spinner fa-fw fa-pulse spinner"
component="span"
title={
Object {
"defaultMessage": "Loading Icon",
"id": "generic_icons.loading",
}
}
>
<span
className="fa fa-spinner fa-fw fa-pulse spinner"
title="Loading Icon"
/>
</LocalizedIcon>
test
</span>
</LoadingSpinner>
</Memo(LoadingWrapper)>
`;
exports[`components/widgets/loading/LoadingWrapper showing spinner without text 1`] = `
<Memo(LoadingWrapper)
loading={true}
>
<LoadingSpinner
text={null}
>
<span
className="LoadingSpinner"
data-testid="loadingSpinner"
id="loadingSpinner"
>
<LocalizedIcon
className="fa fa-spinner fa-fw fa-pulse spinner"
component="span"
title={
Object {
"defaultMessage": "Loading Icon",
"id": "generic_icons.loading",
}
}
>
<span
className="fa fa-spinner fa-fw fa-pulse spinner"
title="Loading Icon"
/>
</LocalizedIcon>
</span>
</LoadingSpinner>
</Memo(LoadingWrapper)>
`;

18
webapp/channels/src/components/widgets/loading/loading_wrapper.test.tsx
Просмотреть файл

@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {shallow} from 'enzyme'; import {mount} from 'enzyme';
import React from 'react'; import React from 'react';
import LoadingWrapper from './loading_wrapper'; import LoadingWrapper from './loading_wrapper';
@@ -13,37 +13,25 @@ describe('components/widgets/loading/LoadingWrapper', () => {
loading: true, loading: true,
text: 'test', text: 'test',
children: 'children', children: 'children',
snapshot: `
<LoadingSpinner
text="test"
/>
`,
}, },
{ {
name: 'showing spinner without text', name: 'showing spinner without text',
loading: true, loading: true,
children: 'text', children: 'text',
snapshot: `
<LoadingSpinner
text={null}
/>
`,
}, },
{ {
name: 'showing content with children', name: 'showing content with children',
loading: false, loading: false,
children: 'text', children: 'text',
snapshot: '"text"',
}, },
{ {
name: 'showing content without children', name: 'showing content without children',
loading: false, loading: false,
snapshot: '""',
}, },
]; ];
for (const testCase of testCases) { for (const testCase of testCases) {
test(testCase.name, () => { test(testCase.name, () => {
const wrapper = shallow( const wrapper = mount(
<LoadingWrapper <LoadingWrapper
loading={testCase.loading} loading={testCase.loading}
text={testCase.text} text={testCase.text}
@@ -51,7 +39,7 @@ describe('components/widgets/loading/LoadingWrapper', () => {
{testCase.children} {testCase.children}
</LoadingWrapper>, </LoadingWrapper>,
); );
expect(wrapper).toMatchInlineSnapshot(testCase.snapshot); expect(wrapper).toMatchSnapshot();
}); });
} }
}); });

29
webapp/channels/src/components/widgets/loading/loading_wrapper.tsx
Просмотреть файл

@@ -6,24 +6,17 @@ import React from 'react';
import LoadingSpinner from './loading_spinner'; import LoadingSpinner from './loading_spinner';
type Props = { type Props = {
loading: boolean; loading?: boolean;
text: React.ReactNode; text?: React.ReactNode;
children: React.ReactNode; children?: React.ReactNode;
} }
export default class LoadingWrapper extends React.PureComponent<Props> { const LoadingWrapper = ({loading = true, text = null, children = null}: Props) => {
public static defaultProps: Props = { return (
loading: true, <>
text: null, {loading ? <LoadingSpinner text={text}/> : children}
children: null, </>
}; );
};
public render() { export default React.memo(LoadingWrapper);
const {text, loading, children} = this.props;
if (!loading) {
return children;
}
return <LoadingSpinner text={text}/>;
}
}