From 2c978fb0f0dec3db9bf7c87d351734b0b72853c2 Mon Sep 17 00:00:00 2001 From: Laura Benz <48948963+L-M-K-B@users.noreply.github.com> Date: Tue, 28 Mar 2023 15:36:47 +0200 Subject: [PATCH] refactor: add return value for logsSample (#65357) * refactor: add return value for logsSample * refactor: modify test for new use case --- .../explore/utils/supplementaryQueries.test.ts | 10 ++-------- .../app/features/explore/utils/supplementaryQueries.ts | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/public/app/features/explore/utils/supplementaryQueries.test.ts b/public/app/features/explore/utils/supplementaryQueries.test.ts index b90b981f09e..27430ebd36c 100644 --- a/public/app/features/explore/utils/supplementaryQueries.test.ts +++ b/public/app/features/explore/utils/supplementaryQueries.test.ts @@ -197,15 +197,9 @@ describe('SupplementaryQueries utils', function () { ]); }); }); - it('Does not use a fallback for logs sample', async () => { + it('Returns undefined for logs sample', async () => { const testProvider = await setup('no-data-providers', SupplementaryQueryType.LogsSample); - await expect(testProvider).toEmitValuesWith((received) => { - expect(received).toMatchObject([ - { - state: LoadingState.NotStarted, - }, - ]); - }); + await expect(testProvider).toBe(undefined); }); }); diff --git a/public/app/features/explore/utils/supplementaryQueries.ts b/public/app/features/explore/utils/supplementaryQueries.ts index cc7c75c4f1a..e213555693e 100644 --- a/public/app/features/explore/utils/supplementaryQueries.ts +++ b/public/app/features/explore/utils/supplementaryQueries.ts @@ -213,6 +213,8 @@ export const getSupplementaryQueryProvider = ( ), distinct() ); + } else if (type === SupplementaryQueryType.LogsSample) { + return undefined; } else { // Create a fallback to results based logs volume return getSupplementaryQueryFallback(type, explorePanelData, request.targets, datasourceInstance.name);