[Search sessions] Don't show incomplete warning if search requests ar…

…en't in session"
elastic · Sep 15, 2021 · 4428d59 · 4428d59
1 parent 2567c4f
commit 4428d59
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
@@ -501,12 +501,12 @@ describe('SearchInterceptor', () => {
         opts: {
           isRestore?: boolean;
           isStored?: boolean;
-          sessionId: string;
+          sessionId?: string;
         } | null
       ) => {
         const sessionServiceMock = sessionService as jest.Mocked<ISessionService>;
         sessionServiceMock.getSearchOptions.mockImplementation(() =>
-          opts
+          opts && opts.sessionId
             ? {
                 sessionId: opts.sessionId,
                 isRestore: opts.isRestore ?? false,
@@ -515,6 +515,7 @@ describe('SearchInterceptor', () => {
             : null
         );
         sessionServiceMock.isRestore.mockReturnValue(!!opts?.isRestore);
+        sessionServiceMock.getSessionId.mockImplementation(() => opts?.sessionId);
         fetchMock.mockResolvedValue({ result: 200 });
       };
 
@@ -606,6 +607,41 @@ describe('SearchInterceptor', () => {
         expect(SearchSessionIncompleteWarning).toBeCalledTimes(0);
       });
 
+      test('should not show warning if a search outside of session is running', async () => {
+        setup({
+          isRestore: false,
+          isStored: false,
+        });
+
+        const responses = [
+          {
+            time: 10,
+            value: {
+              isPartial: false,
+              isRunning: false,
+              isRestored: false,
+              id: 1,
+              rawResponse: {
+                took: 1,
+              },
+            },
+          },
+        ];
+        mockFetchImplementation(responses);
+
+        const response = searchInterceptor.search(
+          {},
+          {
+            sessionId: undefined,
+          }
+        );
+        response.subscribe({ next, error, complete });
+
+        await timeTravel(10);
+
+        expect(SearchSessionIncompleteWarning).toBeCalledTimes(0);
+      });
+
       test('should show warning once if a search is not available during restore', async () => {
         setup({
           isRestore: true,

diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
@@ -352,8 +352,13 @@ export class SearchInterceptor {
             );
           }),
           tap((response) => {
-            if (this.deps.session.isRestore() && response.isRestored === false) {
-              this.showRestoreWarning(this.deps.session.getSessionId());
+            const isSearchInScopeOfSession = sessionId === this.deps.session.getSessionId();
+            if (
+              isSearchInScopeOfSession &&
+              this.deps.session.isRestore() &&
+              response.isRestored === false
+            ) {
+              this.showRestoreWarning(sessionId);
             }
           }),
           finalize(() => {