diff --git a/ui/src/Components/SilenceModal/Browser/index.test.tsx b/ui/src/Components/SilenceModal/Browser/index.test.tsx index 708be1078..473c8d182 100644 --- a/ui/src/Components/SilenceModal/Browser/index.test.tsx +++ b/ui/src/Components/SilenceModal/Browser/index.test.tsx @@ -173,7 +173,7 @@ describe("", () => { 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("", () => { 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("", () => { 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("", () => { silence: silence, }, ], - error: false, + error: null, isLoading: false, isRetrying: false, }); @@ -227,7 +227,7 @@ describe("", () => { 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("", () => { 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("", () => { 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("", () => { 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("", () => { 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("", () => { (useFetchGet as any).fetch.setMockedData({ response: MockSilenceList(8), - error: false, + error: null, isLoading: false, isRetrying: false, }); @@ -342,7 +342,7 @@ describe("", () => { (useFetchGet as any).fetch.setMockedData({ response: [], - error: false, + error: null, isLoading: false, isRetrying: false, }); diff --git a/ui/src/Components/SilenceModal/Browser/index.tsx b/ui/src/Components/SilenceModal/Browser/index.tsx index dd844e5ca..bb7b19582 100644 --- a/ui/src/Components/SilenceModal/Browser/index.tsx +++ b/ui/src/Components/SilenceModal/Browser/index.tsx @@ -127,7 +127,7 @@ const Browser: FC<{ Sort order - {response === null && isLoading ? ( + {isLoading ? ( } /> - ) : error || response === null ? ( + ) : error !== null ? ( - ) : response.length === 0 ? ( + ) : response === null || response.length === 0 ? ( ) : (