fix(ui): cleanup conditions

This commit is contained in:
Łukasz Mierzwa
2020-07-23 09:36:52 +01:00
committed by Łukasz Mierzwa
parent 3e16031203
commit 867532cde9
2 changed files with 14 additions and 14 deletions

View File

@@ -173,7 +173,7 @@ describe("<Browser />", () => {
it("renders loading placeholder before fetch finishes", () => {
(useFetchGet as any).fetch.setMockedData({
response: null,
error: false,
error: null,
isLoading: true,
isRetrying: false,
});
@@ -185,7 +185,7 @@ describe("<Browser />", () => {
it("renders loading placeholder before fetch finishes", () => {
(useFetchGet as any).fetch.setMockedData({
response: null,
error: false,
error: null,
isLoading: true,
isRetrying: true,
});
@@ -197,7 +197,7 @@ describe("<Browser />", () => {
it("renders empty placeholder after fetch with zero results", () => {
(useFetchGet as any).fetch.setMockedData({
response: [],
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -215,7 +215,7 @@ describe("<Browser />", () => {
silence: silence,
},
],
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -227,7 +227,7 @@ describe("<Browser />", () => {
global.window.innerWidth = 1024;
(useFetchGet as any).fetch.setMockedData({
response: MockSilenceList(7),
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -239,7 +239,7 @@ describe("<Browser />", () => {
global.window.innerWidth = 500;
(useFetchGet as any).fetch.setMockedData({
response: MockSilenceList(7),
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -250,7 +250,7 @@ describe("<Browser />", () => {
it("renders last silence after page change", () => {
(useFetchGet as any).fetch.setMockedData({
response: MockSilenceList(7),
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -270,7 +270,7 @@ describe("<Browser />", () => {
it("renders next/previous page after arrow key press", () => {
(useFetchGet as any).fetch.setMockedData({
response: MockSilenceList(13),
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -316,7 +316,7 @@ describe("<Browser />", () => {
it("resets pagination to last page on truncation", () => {
(useFetchGet as any).fetch.setMockedData({
response: MockSilenceList(13),
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -331,7 +331,7 @@ describe("<Browser />", () => {
(useFetchGet as any).fetch.setMockedData({
response: MockSilenceList(8),
error: false,
error: null,
isLoading: false,
isRetrying: false,
});
@@ -342,7 +342,7 @@ describe("<Browser />", () => {
(useFetchGet as any).fetch.setMockedData({
response: [],
error: false,
error: null,
isLoading: false,
isRetrying: false,
});

View File

@@ -127,7 +127,7 @@ const Browser: FC<{
Sort order
</button>
</div>
{response === null && isLoading ? (
{isLoading ? (
<Placeholder
content={
<FontAwesomeIcon
@@ -138,9 +138,9 @@ const Browser: FC<{
/>
}
/>
) : error || response === null ? (
) : error !== null ? (
<FetchError message={error} />
) : response.length === 0 ? (
) : response === null || response.length === 0 ? (
<Placeholder content="Nothing to show" />
) : (
<React.Fragment>