[7.x] [Search Sessions] Remove auto-refresh limitation (#96539)

x-pack/plugins/data_enhanced/public/plugin.ts

@@ -84,7 +84,6 @@ export class DataEnhancedPlugin
               sessionService: plugins.data.search.session,
               application: core.application,
               basePath: core.http.basePath,
-              timeFilter: plugins.data.query.timefilter.timefilter,
               storage: this.storage,
               disableSaveAfterSessionCompletesTimeout: moment
                 .duration(this.config.search.sessions.notTouchedTimeout)

x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx

@@ -60,7 +60,6 @@ test("shouldn't show indicator in case no active search session", async () => {
   const SearchSessionIndicator = createConnectedSearchSessionIndicator({
     sessionService,
     application,
-    timeFilter,
     storage,
     disableSaveAfterSessionCompletesTimeout,
     usageCollector,
@@ -89,7 +88,6 @@ test("shouldn't show indicator in case app hasn't opt-in", async () => {
   const SearchSessionIndicator = createConnectedSearchSessionIndicator({
     sessionService,
     application,
-    timeFilter,
     storage,
     disableSaveAfterSessionCompletesTimeout,
     usageCollector,
@@ -120,7 +118,6 @@ test('should show indicator in case there is an active search session', async ()
   const SearchSessionIndicator = createConnectedSearchSessionIndicator({
     sessionService: { ...sessionService, state$ },
     application,
-    timeFilter,
     storage,
     disableSaveAfterSessionCompletesTimeout,
     usageCollector,
@@ -146,7 +143,6 @@ test('should be disabled in case uiConfig says so ', async () => {
   const SearchSessionIndicator = createConnectedSearchSessionIndicator({
     sessionService: { ...sessionService, state$ },
     application,
-    timeFilter,
     storage,
     disableSaveAfterSessionCompletesTimeout,
     usageCollector,
@@ -171,7 +167,6 @@ test('should be disabled in case not enough permissions', async () => {
   const SearchSessionIndicator = createConnectedSearchSessionIndicator({
     sessionService: { ...sessionService, state$, hasAccess: () => false },
     application,
-    timeFilter,
     storage,
     disableSaveAfterSessionCompletesTimeout,
     basePath,
@@ -191,38 +186,6 @@ test('should be disabled in case not enough permissions', async () => {
   expect(screen.getByRole('button', { name: 'Manage sessions' })).toBeDisabled();
 });
 
-test('should be disabled during auto-refresh', async () => {
-  const state$ = new BehaviorSubject(SearchSessionState.Loading);
-
-  const SearchSessionIndicator = createConnectedSearchSessionIndicator({
-    sessionService: { ...sessionService, state$ },
-    application,
-    timeFilter,
-    storage,
-    disableSaveAfterSessionCompletesTimeout,
-    usageCollector,
-    basePath,
-  });
-
-  render(
-    <Container>
-      <SearchSessionIndicator />
-    </Container>
-  );
-
-  await waitFor(() => screen.getByTestId('searchSessionIndicator'));
-
-  await userEvent.click(screen.getByLabelText('Search session loading'));
-
-  expect(screen.getByRole('button', { name: 'Save session' })).not.toBeDisabled();
-
-  act(() => {
-    refreshInterval$.next({ value: 0, pause: false });
-  });
-
-  expect(screen.getByRole('button', { name: 'Save session' })).toBeDisabled();
-});
-
 describe('Completed inactivity', () => {
   beforeEach(() => {
     jest.useFakeTimers();
@@ -236,7 +199,6 @@ describe('Completed inactivity', () => {
     const SearchSessionIndicator = createConnectedSearchSessionIndicator({
       sessionService: { ...sessionService, state$ },
       application,
-      timeFilter,
       storage,
       disableSaveAfterSessionCompletesTimeout,
       usageCollector,
@@ -298,7 +260,6 @@ describe('tour steps', () => {
       const SearchSessionIndicator = createConnectedSearchSessionIndicator({
         sessionService: { ...sessionService, state$ },
         application,
-        timeFilter,
         storage,
         disableSaveAfterSessionCompletesTimeout,
         usageCollector,
@@ -340,7 +301,6 @@ describe('tour steps', () => {
       const SearchSessionIndicator = createConnectedSearchSessionIndicator({
         sessionService: { ...sessionService, state$ },
         application,
-        timeFilter,
         storage,
         disableSaveAfterSessionCompletesTimeout,
         usageCollector,
@@ -376,7 +336,6 @@ describe('tour steps', () => {
     const SearchSessionIndicator = createConnectedSearchSessionIndicator({
       sessionService: { ...sessionService, state$ },
       application,
-      timeFilter,
       storage,
       disableSaveAfterSessionCompletesTimeout,
       usageCollector,
@@ -404,7 +363,6 @@ describe('tour steps', () => {
     const SearchSessionIndicator = createConnectedSearchSessionIndicator({
       sessionService: { ...sessionService, state$ },
       application,
-      timeFilter,
       storage,
       disableSaveAfterSessionCompletesTimeout,
       usageCollector,

x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx

@@ -6,15 +6,14 @@
  */
 
 import React, { useCallback, useEffect, useState } from 'react';
-import { debounce, distinctUntilChanged, map, mapTo, switchMap, tap } from 'rxjs/operators';
+import { debounce, distinctUntilChanged, mapTo, switchMap, tap } from 'rxjs/operators';
 import { merge, of, timer } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 import { i18n } from '@kbn/i18n';
 import { SearchSessionIndicator, SearchSessionIndicatorRef } from '../search_session_indicator';
 import {
   ISessionService,
   SearchSessionState,
-  TimefilterContract,
   SearchUsageCollector,
 } from '../../../../../../../src/plugins/data/public';
 import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
@@ -24,7 +23,6 @@ import { useSearchSessionTour } from './search_session_tour';
 
 export interface SearchSessionIndicatorDeps {
   sessionService: ISessionService;
-  timeFilter: TimefilterContract;
   application: ApplicationStart;
   basePath: IBasePath;
   storage: IStorageWrapper;
@@ -39,17 +37,12 @@ export interface SearchSessionIndicatorDeps {
 export const createConnectedSearchSessionIndicator = ({
   sessionService,
   application,
-  timeFilter,
   storage,
   disableSaveAfterSessionCompletesTimeout,
   usageCollector,
   basePath,
 }: SearchSessionIndicatorDeps): React.FC => {
   const searchSessionsManagementUrl = basePath.prepend('/app/management/kibana/search_sessions');
-  const isAutoRefreshEnabled = () => !timeFilter.getRefreshInterval().pause;
-  const isAutoRefreshEnabled$ = timeFilter
-    .getRefreshIntervalUpdate$()
-    .pipe(map(isAutoRefreshEnabled), distinctUntilChanged());
 
   const debouncedSessionServiceState$ = sessionService.state$.pipe(
     debounce((_state) => timer(_state === SearchSessionState.None ? 50 : 300)) // switch to None faster to quickly remove indicator when navigating away
@@ -69,7 +62,6 @@ export const createConnectedSearchSessionIndicator = ({
 
   return () => {
     const state = useObservable(debouncedSessionServiceState$, SearchSessionState.None);
-    const autoRefreshEnabled = useObservable(isAutoRefreshEnabled$, isAutoRefreshEnabled());
     const isSaveDisabledByApp = sessionService.getSearchSessionIndicatorUiConfig().isDisabled();
     const disableSaveAfterSessionCompleteTimedOut = useObservable(
       disableSaveAfterSessionCompleteTimedOut$,
@@ -91,16 +83,6 @@ export const createConnectedSearchSessionIndicator = ({
     let managementDisabled = false;
     let managementDisabledReasonText: string = '';
 
-    if (autoRefreshEnabled) {
-      saveDisabled = true;
-      saveDisabledReasonText = i18n.translate(
-        'xpack.data.searchSessionIndicator.disabledDueToAutoRefreshMessage',
-        {
-          defaultMessage: 'Saving search session is not available when auto refresh is enabled.',
-        }
-      );
-    }
-
     if (disableSaveAfterSessionCompleteTimedOut) {
       saveDisabled = true;
       saveDisabledReasonText = i18n.translate(

x-pack/plugins/translations/translations/ja-JP.json

@@ -7331,7 +7331,6 @@
     "xpack.data.searchSessionIndicator.canceledTitleText": "検索セッションが停止しました",
     "xpack.data.searchSessionIndicator.canceledTooltipText": "検索セッションが停止しました",
     "xpack.data.searchSessionIndicator.continueInBackgroundButtonText": "セッションの保存",
-    "xpack.data.searchSessionIndicator.disabledDueToAutoRefreshMessage": "自動更新が有効な場合は、検索セッションの保存を使用できません。",
     "xpack.data.searchSessionIndicator.disabledDueToDisabledGloballyMessage": "検索セッションを管理するアクセス権がありません",
     "xpack.data.searchSessionIndicator.disabledDueToTimeoutMessage": "検索セッション結果が期限切れです。",
     "xpack.data.searchSessionIndicator.loadingInTheBackgroundDescriptionText": "管理から完了した結果に戻ることができます。",

x-pack/plugins/translations/translations/zh-CN.json

@@ -7394,7 +7394,6 @@
     "xpack.data.searchSessionIndicator.canceledTitleText": "搜索会话已停止",
     "xpack.data.searchSessionIndicator.canceledTooltipText": "搜索会话已停止",
     "xpack.data.searchSessionIndicator.continueInBackgroundButtonText": "保存会话",
-    "xpack.data.searchSessionIndicator.disabledDueToAutoRefreshMessage": "启用自动刷新时，保存搜索会话不可用。",
     "xpack.data.searchSessionIndicator.disabledDueToDisabledGloballyMessage": "您无权管理搜索会话",
     "xpack.data.searchSessionIndicator.disabledDueToTimeoutMessage": "搜索会话结果已过期。",
     "xpack.data.searchSessionIndicator.loadingInTheBackgroundDescriptionText": "可以从“管理”中返回至完成的结果。",