diff --git a/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap b/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap
index b49efda2a1cf78..b167a3b22e9cb9 100644
--- a/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap
+++ b/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap
@@ -19,9 +19,7 @@ exports[`
is rendered 1`] = `
is rendered 1`] = `
(iterable: IterableInput, fn: AsyncMapFn) {
- await lastValueFrom(mapWithLimit$(iterable, Infinity, fn).pipe(defaultIfEmpty()));
+ await lastValueFrom(mapWithLimit$(iterable, Infinity, fn).pipe(defaultIfEmpty(undefined)));
}
/**
@@ -40,5 +38,5 @@ export async function asyncForEachWithLimit(
limit: number,
fn: AsyncMapFn
) {
- await lastValueFrom(mapWithLimit$(iterable, limit, fn).pipe(defaultIfEmpty()));
+ await lastValueFrom(mapWithLimit$(iterable, limit, fn).pipe(defaultIfEmpty(undefined)));
}
diff --git a/packages/kbn-std/src/iteration/map.ts b/packages/kbn-std/src/iteration/map.ts
index 4c8d65df57f378..44765d69e1bd0d 100644
--- a/packages/kbn-std/src/iteration/map.ts
+++ b/packages/kbn-std/src/iteration/map.ts
@@ -6,9 +6,8 @@
* Side Public License, v 1.
*/
-import { from } from 'rxjs';
+import { from, lastValueFrom } from 'rxjs';
import { toArray } from 'rxjs/operators';
-import { lastValueFrom } from '../rxjs_7';
import { IterableInput, AsyncMapFn, AsyncMapResult } from './types';
import { mapWithLimit$ } from './observable';
diff --git a/packages/kbn-std/src/iteration/observable.test.ts b/packages/kbn-std/src/iteration/observable.test.ts
index e84750e08148d3..b2c5d5d75e07c4 100644
--- a/packages/kbn-std/src/iteration/observable.test.ts
+++ b/packages/kbn-std/src/iteration/observable.test.ts
@@ -8,7 +8,6 @@
import * as Rx from 'rxjs';
import { toArray } from 'rxjs/operators';
-import { lastValueFrom } from '../rxjs_7';
import { map$, mapWithLimit$ } from './observable';
import { list, sleep, generator } from './test_helpers';
@@ -23,7 +22,7 @@ describe('mapWithLimit$', () => {
let active = 0;
const limit = Math.random() > 0.5 ? 20 : 40;
- const results = await lastValueFrom(
+ const results = await Rx.lastValueFrom(
mapWithLimit$(list(100), limit, async (n) => {
active += 1;
if (active > maxConcurrency) {
@@ -50,7 +49,7 @@ describe('mapWithLimit$', () => {
['observable', Rx.of(1, 2, 3, 4, 5), [1, 2, 3, 4, 5]] as const,
])('works with %p', async (_, iter, expected) => {
const mock = jest.fn(async (n) => n);
- const results = await lastValueFrom(mapWithLimit$(iter, 1, mock).pipe(toArray()));
+ const results = await Rx.lastValueFrom(mapWithLimit$(iter, 1, mock).pipe(toArray()));
expect(results).toEqual(expected);
});
});
@@ -60,7 +59,7 @@ describe('map$', () => {
let maxConcurrency = 0;
let active = 0;
- const results = await lastValueFrom(
+ const results = await Rx.lastValueFrom(
map$(list(100), async (n) => {
active += 1;
if (active > maxConcurrency) {
diff --git a/packages/kbn-std/src/iteration/types.ts b/packages/kbn-std/src/iteration/types.ts
index 6e0bfd9f22d7fa..a36522af5feac4 100644
--- a/packages/kbn-std/src/iteration/types.ts
+++ b/packages/kbn-std/src/iteration/types.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { Subscribable } from 'rxjs';
+import { ObservableInput } from 'rxjs';
-export type IterableInput = Iterable | Subscribable;
-export type AsyncMapResult = Promise | Subscribable;
+export type IterableInput = Iterable | ObservableInput;
+export type AsyncMapResult = Promise | ObservableInput;
export type AsyncMapFn = (item: T1, i: number) => AsyncMapResult;
diff --git a/packages/kbn-std/src/rxjs_7.test.ts b/packages/kbn-std/src/rxjs_7.test.ts
deleted file mode 100644
index 939f853394aeea..00000000000000
--- a/packages/kbn-std/src/rxjs_7.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import * as Rx from 'rxjs';
-
-import { firstValueFrom, lastValueFrom } from './rxjs_7';
-
-// create an empty observable that completes with no notifications
-// after a delay to ensure helpers aren't checking for the EMPTY constant
-function empty() {
- return new Rx.Observable((subscriber) => {
- setTimeout(() => {
- subscriber.complete();
- }, 0);
- });
-}
-
-describe('firstValueFrom()', () => {
- it('resolves to the first value from the observable', async () => {
- await expect(firstValueFrom(Rx.of(1, 2, 3))).resolves.toBe(1);
- });
-
- it('rejects if the observable is empty', async () => {
- await expect(firstValueFrom(empty())).rejects.toThrowErrorMatchingInlineSnapshot(
- `"no elements in sequence"`
- );
- });
-
- it('unsubscribes from a source observable that emits synchronously', async () => {
- const values = [1, 2, 3, 4];
- let unsubscribed = false;
- const source = new Rx.Observable((subscriber) => {
- while (!subscriber.closed && values.length) {
- subscriber.next(values.shift()!);
- }
- unsubscribed = subscriber.closed;
- subscriber.complete();
- });
-
- await expect(firstValueFrom(source)).resolves.toMatchInlineSnapshot(`1`);
- if (!unsubscribed) {
- throw new Error('expected source to be unsubscribed');
- }
- expect(values).toEqual([2, 3, 4]);
- });
-
- it('unsubscribes from the source observable after first async notification', async () => {
- const values = [1, 2, 3, 4];
- let unsubscribed = false;
- const source = new Rx.Observable((subscriber) => {
- setTimeout(() => {
- while (!subscriber.closed) {
- subscriber.next(values.shift()!);
- }
- unsubscribed = subscriber.closed;
- });
- });
-
- await expect(firstValueFrom(source)).resolves.toMatchInlineSnapshot(`1`);
- if (!unsubscribed) {
- throw new Error('expected source to be unsubscribed');
- }
- expect(values).toEqual([2, 3, 4]);
- });
-});
-
-describe('lastValueFrom()', () => {
- it('resolves to the last value from the observable', async () => {
- await expect(lastValueFrom(Rx.of(1, 2, 3))).resolves.toBe(3);
- });
-
- it('rejects if the observable is empty', async () => {
- await expect(lastValueFrom(empty())).rejects.toThrowErrorMatchingInlineSnapshot(
- `"no elements in sequence"`
- );
- });
-});
diff --git a/packages/kbn-std/src/rxjs_7.ts b/packages/kbn-std/src/rxjs_7.ts
deleted file mode 100644
index f31c864de53133..00000000000000
--- a/packages/kbn-std/src/rxjs_7.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { Observable } from 'rxjs';
-import { first, last } from 'rxjs/operators';
-
-export function firstValueFrom(source: Observable) {
- // we can't use SafeSubscriber the same way that RxJS 7 does, so instead we
- return source.pipe(first()).toPromise();
-}
-
-export function lastValueFrom(source: Observable) {
- return source.pipe(last()).toPromise();
-}
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
index 02861fcb27fdbe..97292b0268bc48 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
@@ -10,7 +10,6 @@ import { inspect } from 'util';
import * as Rx from 'rxjs';
import { mergeMap } from 'rxjs/operators';
-import { lastValueFrom } from '@kbn/std';
import { ToolingLog, isAxiosResponseError, createFailError } from '@kbn/dev-utils';
import { KbnClientRequester, uriencode } from './kbn_client_requester';
@@ -83,7 +82,7 @@ interface DeleteObjectsOptions {
async function concurrently(maxConcurrency: number, arr: T[], fn: (item: T) => Promise) {
if (arr.length) {
- await lastValueFrom(
+ await Rx.lastValueFrom(
Rx.from(arr).pipe(mergeMap(async (item) => await fn(item), maxConcurrency))
);
}
diff --git a/src/cli/serve/integration_tests/reload_logging_config.test.ts b/src/cli/serve/integration_tests/reload_logging_config.test.ts
index 4cee7dfae41267..7ad3495c39cd62 100644
--- a/src/cli/serve/integration_tests/reload_logging_config.test.ts
+++ b/src/cli/serve/integration_tests/reload_logging_config.test.ts
@@ -117,7 +117,7 @@ describe.skip('Server logging configuration', function () {
)
.toPromise();
- const lastMessage = await message$.pipe(take(1)).toPromise();
+ const lastMessage = await Rx.firstValueFrom(message$);
expect(containsJsonOnly(lastMessage)).toBe(true);
createConfigManager(configFilePath).modify((oldConfig) => {
diff --git a/src/core/public/application/__snapshots__/application_service.test.ts.snap b/src/core/public/application/__snapshots__/application_service.test.ts.snap
index 17de9503bd5332..712ed1a9f38f14 100644
--- a/src/core/public/application/__snapshots__/application_service.test.ts.snap
+++ b/src/core/public/application/__snapshots__/application_service.test.ts.snap
@@ -4,15 +4,15 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
{
);
const { applications$ } = await service.start(startDeps);
- let applications = await applications$.pipe(take(1)).toPromise();
+ let applications = await firstValueFrom(applications$);
expect(applications.size).toEqual(2);
expect(applications.get('app1')).toEqual(
expect.objectContaining({
@@ -125,7 +125,7 @@ describe('#setup()', () => {
deepLinks: [{ id: 'subapp2', title: 'Subapp 2', path: '/subapp2' }],
}));
- applications = await applications$.pipe(take(1)).toPromise();
+ applications = await firstValueFrom(applications$);
expect(applications.size).toEqual(2);
expect(applications.get('app1')).toEqual(
expect.objectContaining({
@@ -205,7 +205,7 @@ describe('#setup()', () => {
})
);
const start = await service.start(startDeps);
- const applications = await start.applications$.pipe(take(1)).toPromise();
+ const applications = await firstValueFrom(start.applications$);
expect(applications.size).toEqual(2);
expect(applications.get('app1')).toEqual(
@@ -252,7 +252,7 @@ describe('#setup()', () => {
);
const { applications$ } = await service.start(startDeps);
- const applications = await applications$.pipe(take(1)).toPromise();
+ const applications = await firstValueFrom(applications$);
expect(applications.size).toEqual(2);
expect(applications.get('app1')).toEqual(
@@ -295,7 +295,7 @@ describe('#setup()', () => {
);
const start = await service.start(startDeps);
- const applications = await start.applications$.pipe(take(1)).toPromise();
+ const applications = await firstValueFrom(start.applications$);
expect(applications.size).toEqual(1);
expect(applications.get('app1')).toEqual(
@@ -410,7 +410,7 @@ describe('#setup()', () => {
updater$.next((app) => ({ defaultPath: '/foo' }));
- let appInfos = await applications$.pipe(take(1)).toPromise();
+ let appInfos = await firstValueFrom(applications$);
expect(appInfos.get('app1')!.deepLinks).toEqual([
{
@@ -445,7 +445,7 @@ describe('#setup()', () => {
],
}));
- appInfos = await applications$.pipe(take(1)).toPromise();
+ appInfos = await firstValueFrom(applications$);
expect(appInfos.get('app1')!.deepLinks).toEqual([
{
@@ -496,7 +496,7 @@ describe('#start()', () => {
register(Symbol(), createApp({ id: 'app2' }));
const { applications$ } = await service.start(startDeps);
- const availableApps = await applications$.pipe(take(1)).toPromise();
+ const availableApps = await firstValueFrom(applications$);
expect(availableApps.size).toEqual(2);
expect([...availableApps.keys()]).toEqual(['app1', 'app2']);
@@ -548,7 +548,7 @@ describe('#start()', () => {
register(Symbol(), createApp({ id: 'app2' }));
const { applications$ } = await service.start(startDeps);
- const availableApps = await applications$.pipe(take(1)).toPromise();
+ const availableApps = await firstValueFrom(applications$);
expect([...availableApps.keys()]).toEqual(['app1']);
});
@@ -802,7 +802,7 @@ describe('#start()', () => {
service.setup(setupDeps);
const { currentAppId$, navigateToApp } = await service.start(startDeps);
- const stop$ = new Subject();
+ const stop$ = new Subject();
const promise = currentAppId$.pipe(bufferCount(4), takeUntil(stop$)).toPromise();
await navigateToApp('alpha');
@@ -827,7 +827,7 @@ describe('#start()', () => {
service.setup(setupDeps);
const { currentAppId$, navigateToApp } = await service.start(startDeps);
- const stop$ = new Subject();
+ const stop$ = new Subject();
const promise = currentAppId$.pipe(bufferCount(4), takeUntil(stop$)).toPromise();
await navigateToApp('delta', { openInNewTab: true });
@@ -871,7 +871,7 @@ describe('#start()', () => {
const { navigateToApp, getComponent } = await service.start(startDeps);
const httpLoadingCount$ = startDeps.http.addLoadingCountSource.mock.calls[0][0];
- const stop$ = new Subject();
+ const stop$ = new Subject();
const currentLoadingCount$ = new BehaviorSubject(0);
httpLoadingCount$.pipe(takeUntil(stop$)).subscribe(currentLoadingCount$);
const loadingPromise = httpLoadingCount$.pipe(bufferCount(5), takeUntil(stop$)).toPromise();
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 68807323c0a635..9a2703eb748720 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -7,7 +7,7 @@
*/
import React from 'react';
-import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, Observable, Subject, Subscription } from 'rxjs';
import { map, shareReplay, takeUntil, distinctUntilChanged, filter, take } from 'rxjs/operators';
import { createBrowserHistory, History } from 'history';
@@ -99,7 +99,7 @@ export class ApplicationService {
private currentActionMenu$ = new BehaviorSubject(undefined);
private readonly statusUpdaters$ = new BehaviorSubject>(new Map());
private readonly subscriptions: Subscription[] = [];
- private stop$ = new Subject();
+ private stop$ = new Subject();
private registrationClosed = false;
private history?: History;
private navigate?: (url: string, state: unknown, replace: boolean) => void;
@@ -120,7 +120,7 @@ export class ApplicationService {
createBrowserHistory({
basename,
getUserConfirmation: getUserConfirmationHandler({
- overlayPromise: this.overlayStart$.pipe(take(1)).toPromise(),
+ overlayPromise: firstValueFrom(this.overlayStart$.pipe(take(1))),
}),
});
diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
index 505f3fc7a23d28..dbdc867ea33b3e 100644
--- a/src/core/public/chrome/chrome_service.test.ts
+++ b/src/core/public/chrome/chrome_service.test.ts
@@ -9,7 +9,7 @@
import { shallow } from 'enzyme';
import React from 'react';
import * as Rx from 'rxjs';
-import { take, toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs/operators';
import { App, PublicAppInfo } from '../application';
import { applicationServiceMock } from '../application/application_service.mock';
import { docLinksServiceMock } from '../doc_links/doc_links_service.mock';
@@ -229,7 +229,7 @@ describe('start', () => {
const { chrome, service } = await start({ startDeps });
const promise = chrome.getIsVisible$().pipe(toArray()).toPromise();
- const availableApps = await applications$.pipe(take(1)).toPromise();
+ const availableApps = await Rx.firstValueFrom(applications$);
[...availableApps.keys()].forEach((appId) => navigateToApp(appId));
service.stop();
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 7db042313796d9..a9678613b5fd05 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -55,7 +55,7 @@ export interface StartDeps {
export class ChromeService {
private isVisible$!: Observable;
private isForceHidden$!: BehaviorSubject;
- private readonly stop$ = new ReplaySubject(1);
+ private readonly stop$ = new ReplaySubject(1);
private readonly navControls = new NavControlsService();
private readonly navLinks = new NavLinksService();
private readonly recentlyAccessed = new RecentlyAccessedService();
diff --git a/src/core/public/chrome/nav_controls/nav_controls_service.ts b/src/core/public/chrome/nav_controls/nav_controls_service.ts
index 1f45cd94706455..13c65b65e5725c 100644
--- a/src/core/public/chrome/nav_controls/nav_controls_service.ts
+++ b/src/core/public/chrome/nav_controls/nav_controls_service.ts
@@ -50,7 +50,7 @@ export interface ChromeNavControls {
/** @internal */
export class NavControlsService {
- private readonly stop$ = new ReplaySubject(1);
+ private readonly stop$ = new ReplaySubject(1);
public start() {
const navControlsLeft$ = new BehaviorSubject>(new Set());
diff --git a/src/core/public/chrome/nav_links/nav_links_service.ts b/src/core/public/chrome/nav_links/nav_links_service.ts
index 6a91d4d1790766..cd3be364c1b9b4 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.ts
@@ -69,7 +69,7 @@ export interface ChromeNavLinks {
}
export class NavLinksService {
- private readonly stop$ = new ReplaySubject(1);
+ private readonly stop$ = new ReplaySubject(1);
public start({ application, http }: StartDeps): ChromeNavLinks {
const navLinks$ = new BehaviorSubject>(new Map());
diff --git a/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts b/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts
index bcf58b7a40ab1d..feddf07760de29 100644
--- a/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts
+++ b/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts
@@ -90,7 +90,7 @@ describe('RecentlyAccessed#start()', () => {
it('exposes an observable', async () => {
const { recentlyAccessed } = await getStart();
- const stop$ = new Subject();
+ const stop$ = new Subject();
const observedValues$ = recentlyAccessed
.get$()
.pipe(bufferCount(3), takeUntil(stop$))
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 99d116b1dd9577..df638e4b66bbed 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -4,48 +4,32 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
{
- private readonly stop$ = new Subject();
+ private readonly stop$ = new Subject();
private readonly loadingCount$ = new BehaviorSubject(0);
public setup({ fatalErrors }: { fatalErrors: FatalErrorsSetup }) {
diff --git a/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap b/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap
index 6e453ed8e48f58..fb08a9b5f53cf3 100644
--- a/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap
+++ b/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap
@@ -12,7 +12,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -22,11 +21,10 @@ Array [
dismissToast={[Function]}
toasts$={
Observable {
- "_isScalar": false,
"source": BehaviorSubject {
- "_isScalar": false,
"_value": Array [],
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
diff --git a/src/core/public/notifications/toasts/toasts_api.test.ts b/src/core/public/notifications/toasts/toasts_api.test.ts
index 35f141a995d068..9130e060a37f86 100644
--- a/src/core/public/notifications/toasts/toasts_api.test.ts
+++ b/src/core/public/notifications/toasts/toasts_api.test.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { ToastsApi } from './toasts_api';
@@ -14,7 +14,7 @@ import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.moc
import { i18nServiceMock } from '../../i18n/i18n_service.mock';
async function getCurrentToasts(toasts: ToastsApi) {
- return await toasts.get$().pipe(take(1)).toPromise();
+ return await firstValueFrom(toasts.get$());
}
function uiSettingsMock() {
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index 3ee2e0e93b0877..655a767bca8f23 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -20,7 +20,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -56,7 +55,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -81,7 +79,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -103,7 +100,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -132,7 +128,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -157,7 +152,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -179,7 +173,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
index 2fc2000e559ab9..a04210758053e6 100644
--- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
@@ -22,7 +22,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -47,7 +46,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -69,7 +67,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -108,7 +105,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -131,7 +127,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -159,7 +154,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -180,7 +174,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -205,7 +198,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -241,7 +233,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -264,7 +255,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -290,7 +280,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -315,7 +304,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -336,7 +324,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -360,7 +347,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -382,7 +368,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -411,7 +396,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -434,7 +418,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -460,7 +443,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -485,7 +467,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -506,7 +487,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -530,7 +510,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -552,7 +531,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -586,7 +564,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -609,7 +586,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -635,7 +611,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -660,7 +635,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -681,7 +655,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -705,7 +678,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -727,7 +699,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -756,7 +727,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -779,7 +749,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -805,7 +774,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -830,7 +798,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -851,7 +818,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -875,7 +841,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -897,7 +862,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -929,7 +893,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -965,7 +928,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -990,7 +952,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1012,7 +973,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -1041,7 +1001,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1066,7 +1025,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1088,7 +1046,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -1122,7 +1079,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1147,7 +1103,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1169,7 +1124,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -1198,7 +1152,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1223,7 +1176,6 @@ Array [
globalStyles={false}
theme$={
Observable {
- "_isScalar": false,
"_subscribe": [Function],
}
}
@@ -1245,7 +1197,6 @@ Array [
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
diff --git a/src/core/public/plugins/plugin.ts b/src/core/public/plugins/plugin.ts
index a43cc2046b82d3..8e24573bd741c4 100644
--- a/src/core/public/plugins/plugin.ts
+++ b/src/core/public/plugins/plugin.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
import { DiscoveredPlugin, PluginOpaqueId } from '../../server';
import { PluginInitializerContext } from './plugin_context';
import { read } from './plugin_reader';
@@ -61,7 +60,7 @@ export class PluginWrapper<
private instance?: Plugin;
private readonly startDependencies$ = new Subject<[CoreStart, TPluginsStart, TStart]>();
- public readonly startDependencies = this.startDependencies$.pipe(first()).toPromise();
+ public readonly startDependencies = firstValueFrom(this.startDependencies$);
constructor(
public readonly discoveredPlugin: DiscoveredPlugin,
diff --git a/src/core/public/theme/theme_service.ts b/src/core/public/theme/theme_service.ts
index bdb00ee4fdce9e..e70bd901cde806 100644
--- a/src/core/public/theme/theme_service.ts
+++ b/src/core/public/theme/theme_service.ts
@@ -17,7 +17,7 @@ export interface SetupDeps {
export class ThemeService {
private theme$?: Observable;
- private stop$ = new Subject();
+ private stop$ = new Subject();
public setup({ injectedMetadata }: SetupDeps): ThemeServiceSetup {
const theme = injectedMetadata.getTheme();
diff --git a/src/core/public/ui_settings/ui_settings_api.test.ts b/src/core/public/ui_settings/ui_settings_api.test.ts
index d14bbfe7ca9538..d5f0f1175b9e5d 100644
--- a/src/core/public/ui_settings/ui_settings_api.test.ts
+++ b/src/core/public/ui_settings/ui_settings_api.test.ts
@@ -169,7 +169,7 @@ describe('#getLoadingCount$()', () => {
});
const { uiSettingsApi } = setup();
- const done$ = new Rx.Subject();
+ const done$ = new Rx.Subject();
const promise = uiSettingsApi.getLoadingCount$().pipe(takeUntil(done$), toArray()).toPromise();
await uiSettingsApi.batchSet('foo', 'bar');
@@ -194,7 +194,7 @@ describe('#getLoadingCount$()', () => {
);
const { uiSettingsApi } = setup();
- const done$ = new Rx.Subject();
+ const done$ = new Rx.Subject();
const promise = uiSettingsApi.getLoadingCount$().pipe(takeUntil(done$), toArray()).toPromise();
await uiSettingsApi.batchSet('foo', 'bar');
diff --git a/src/core/public/ui_settings/ui_settings_service.test.ts b/src/core/public/ui_settings/ui_settings_service.test.ts
index 9f0c6ac5fc9372..83b2c26091bfda 100644
--- a/src/core/public/ui_settings/ui_settings_service.test.ts
+++ b/src/core/public/ui_settings/ui_settings_service.test.ts
@@ -34,7 +34,10 @@ describe('#stop', () => {
service.stop();
await expect(
- Rx.combineLatest(client.getUpdate$(), client.getUpdateErrors$(), loadingCount$!).toPromise()
+ Rx.lastValueFrom(
+ Rx.combineLatest([client.getUpdate$(), client.getUpdateErrors$(), loadingCount$!]),
+ { defaultValue: undefined }
+ )
).resolves.toBe(undefined);
});
});
diff --git a/src/core/server/core_usage_data/core_usage_data_service.test.ts b/src/core/server/core_usage_data/core_usage_data_service.test.ts
index b2315a7cde2810..d8fb91809bfc36 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.test.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.test.ts
@@ -8,9 +8,11 @@
import type { ConfigPath } from '@kbn/config';
import { BehaviorSubject, Observable } from 'rxjs';
-import { HotObservable } from 'rxjs/internal/testing/HotObservable';
import { TestScheduler } from 'rxjs/testing';
+// eslint-disable-next-line @kbn/imports/no_unresolved_imports
+import { HotObservable } from 'rxjs/internal/testing/HotObservable';
+
import { configServiceMock } from '../config/mocks';
import { mockCoreContext } from '../core_context.mock';
diff --git a/src/core/server/core_usage_data/core_usage_data_service.ts b/src/core/server/core_usage_data/core_usage_data_service.ts
index bdd46932fd9a96..a74db26b984b63 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { Subject, Observable } from 'rxjs';
-import { takeUntil, first } from 'rxjs/operators';
+import { Subject, Observable, firstValueFrom } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
import { get } from 'lodash';
import { hasConfigPathIntersection, ChangedDeprecatedPaths } from '@kbn/config';
@@ -100,7 +100,7 @@ export class CoreUsageDataService
constructor(core: CoreContext) {
this.logger = core.logger.get('core-usage-stats-service');
this.configService = core.configService;
- this.stop$ = new Subject();
+ this.stop$ = new Subject();
}
private async getSavedObjectUsageData(
@@ -383,7 +383,7 @@ export class CoreUsageDataService
private async getNonDefaultKibanaConfigs(
exposedConfigsToUsage: ExposedConfigsToUsage
): Promise {
- const config = await this.configService.getConfig$().pipe(first()).toPromise();
+ const config = await firstValueFrom(this.configService.getConfig$());
const nonDefaultConfigs = config.toRaw();
const usedPaths = await this.configService.getUsedPaths();
const exposedConfigsKeys = [...exposedConfigsToUsage.keys()];
diff --git a/src/core/server/deprecations/deprecations_service.ts b/src/core/server/deprecations/deprecations_service.ts
index df8084e6c783a1..7d7af552f08df2 100644
--- a/src/core/server/deprecations/deprecations_service.ts
+++ b/src/core/server/deprecations/deprecations_service.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { DeprecationsFactory } from './deprecations_factory';
import { DomainDeprecationDetails, RegisterDeprecationsConfig } from './types';
@@ -144,10 +144,9 @@ export class DeprecationsService
public async setup({ http }: DeprecationsSetupDeps): Promise {
this.logger.debug('Setting up Deprecations service');
- const config = await this.configService
- .atPath(deprecationConfig.path)
- .pipe(take(1))
- .toPromise();
+ const config = await firstValueFrom(
+ this.configService.atPath(deprecationConfig.path)
+ );
this.deprecationsFactory = new DeprecationsFactory({
logger: this.logger,
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index 07462a52ef2204..d0cf23c5394166 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { Observable, Subject } from 'rxjs';
-import { first, map, shareReplay, takeUntil } from 'rxjs/operators';
+import { firstValueFrom, Observable, Subject } from 'rxjs';
+import { map, shareReplay, takeUntil } from 'rxjs/operators';
import { CoreService } from '../../types';
import { CoreContext } from '../core_context';
@@ -41,7 +41,7 @@ export class ElasticsearchService
{
private readonly log: Logger;
private readonly config$: Observable;
- private stop$ = new Subject();
+ private stop$ = new Subject();
private kibanaVersion: string;
private authHeaders?: IAuthHeadersStorage;
private executionContextClient?: IExecutionContext;
@@ -60,7 +60,7 @@ export class ElasticsearchService
public async preboot(): Promise {
this.log.debug('Prebooting elasticsearch service');
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
return {
config: {
hosts: config.hosts,
@@ -76,7 +76,7 @@ export class ElasticsearchService
public async setup(deps: SetupDeps): Promise {
this.log.debug('Setting up elasticsearch service');
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
this.authHeaders = deps.http.authRequestHeaders;
this.executionContextClient = deps.executionContext;
@@ -112,7 +112,7 @@ export class ElasticsearchService
throw new Error('ElasticsearchService needs to be setup before calling start');
}
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
// Log every error we may encounter in the connection to Elasticsearch
this.esNodesCompatibility$.subscribe(({ isCompatible, message }) => {
diff --git a/src/core/server/environment/environment_service.ts b/src/core/server/environment/environment_service.ts
index 472883c1f482c5..65c03b108b28a0 100644
--- a/src/core/server/environment/environment_service.ts
+++ b/src/core/server/environment/environment_service.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { PathConfigType, config as pathConfigDef } from '@kbn/utils';
import { CoreContext } from '../core_context';
import { Logger } from '../logging';
@@ -49,9 +49,9 @@ export class EnvironmentService {
// IMPORTANT: This code is based on the assumption that none of the configuration values used
// here is supposed to change during preboot phase and it's safe to read them only once.
const [pathConfig, serverConfig, pidConfig] = await Promise.all([
- this.configService.atPath(pathConfigDef.path).pipe(take(1)).toPromise(),
- this.configService.atPath(httpConfigDef.path).pipe(take(1)).toPromise(),
- this.configService.atPath(pidConfigDef.path).pipe(take(1)).toPromise(),
+ firstValueFrom(this.configService.atPath(pathConfigDef.path)),
+ firstValueFrom(this.configService.atPath(httpConfigDef.path)),
+ firstValueFrom(this.configService.atPath(pidConfigDef.path)),
]);
// Log unhandled rejections so that we can fix them in preparation for https://github.com/elastic/kibana/issues/77469
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index 813f8e97843326..bc9b3f41bfe193 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -19,7 +19,7 @@ import {
import agent from 'elastic-apm-node';
import type { Duration } from 'moment';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
import { take } from 'rxjs/operators';
import apm from 'elastic-apm-node';
import { Logger, LoggerFactory } from '../logging';
@@ -223,7 +223,7 @@ export class HttpServer {
if (hasStarted) {
this.log.debug('stopping http server');
- const shutdownTimeout = await this.shutdownTimeout$.pipe(take(1)).toPromise();
+ const shutdownTimeout = await firstValueFrom(this.shutdownTimeout$.pipe(take(1)));
await this.server.stop({ timeout: shutdownTimeout.asMilliseconds() });
this.log.debug(`http server stopped`);
diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts
index ca031e8ab282b4..58371899596beb 100644
--- a/src/core/server/http/http_service.ts
+++ b/src/core/server/http/http_service.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { Observable, Subscription, combineLatest } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { Observable, Subscription, combineLatest, firstValueFrom } from 'rxjs';
+import { map } from 'rxjs/operators';
import { pick } from '@kbn/std';
import type { RequestHandlerContext } from 'src/core/server';
@@ -84,7 +84,7 @@ export class HttpService
public async preboot(deps: PrebootDeps): Promise {
this.log.debug('setting up preboot server');
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
const prebootSetup = await this.prebootServer.setup(config);
prebootSetup.server.route({
@@ -147,7 +147,7 @@ export class HttpService
}
});
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
const { registerRouter, ...serverContract } = await this.httpServer.setup(
config,
@@ -196,7 +196,7 @@ export class HttpService
}
public async start() {
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
if (this.shouldListen(config)) {
this.log.debug('stopping preboot server');
await this.prebootServer.stop();
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index 5a914fb800da9c..15351b9f3906a8 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -9,7 +9,7 @@
import { URL } from 'url';
import uuid from 'uuid';
import { Request, RouteOptionsApp, RequestApplicationState, RouteOptions } from '@hapi/hapi';
-import { Observable, fromEvent } from 'rxjs';
+import { Observable, fromEvent, NEVER } from 'rxjs';
import { shareReplay, first, filter } from 'rxjs/operators';
import { RecursiveReadonly } from '@kbn/utility-types';
import { deepFreeze } from '@kbn/std';
@@ -216,6 +216,13 @@ export class KibanaRequest<
}
private getEvents(request: Request): KibanaRequestEvents {
+ if (!request.raw.res) {
+ return {
+ aborted$: NEVER,
+ completed$: NEVER,
+ };
+ }
+
const completed$ = fromEvent(request.raw.res, 'close').pipe(shareReplay(1), first());
// the response's underlying connection was terminated prematurely
const aborted$ = completed$.pipe(filter(() => !isCompleted(request)));
diff --git a/src/core/server/i18n/i18n_service.ts b/src/core/server/i18n/i18n_service.ts
index 5772703a5a6b8b..b8e397dc12ab56 100644
--- a/src/core/server/i18n/i18n_service.ts
+++ b/src/core/server/i18n/i18n_service.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { Logger } from '../logging';
import { IConfigService } from '../config';
import { CoreContext } from '../core_context';
@@ -68,10 +68,9 @@ export class I18nService {
}
private async initTranslations(pluginPaths: string[]) {
- const i18nConfig = await this.configService
- .atPath(i18nConfigDef.path)
- .pipe(take(1))
- .toPromise();
+ const i18nConfig = await firstValueFrom(
+ this.configService.atPath(i18nConfigDef.path)
+ );
const locale = i18nConfig.locale;
this.log.debug(`Using locale: ${locale}`);
diff --git a/src/core/server/metrics/integration_tests/server_collector.test.ts b/src/core/server/metrics/integration_tests/server_collector.test.ts
index 713d3ed1dc96e3..92df3c303f37df 100644
--- a/src/core/server/metrics/integration_tests/server_collector.test.ts
+++ b/src/core/server/metrics/integration_tests/server_collector.test.ts
@@ -76,8 +76,8 @@ describe('ServerMetricsCollector', () => {
it('collect disconnects requests infos', async () => {
const never = new Promise((resolve) => undefined);
- const disconnectRequested$ = new Subject(); // Controls the number of requests in the /disconnect endpoint
- const disconnectAborted$ = new Subject(); // Controls the abort event in the /disconnect endpoint
+ const disconnectRequested$ = new Subject(); // Controls the number of requests in the /disconnect endpoint
+ const disconnectAborted$ = new Subject(); // Controls the abort event in the /disconnect endpoint
router.get({ path: '/', validate: false }, async (ctx, req, res) => {
return res.ok({ body: '' });
diff --git a/src/core/server/metrics/metrics_service.ts b/src/core/server/metrics/metrics_service.ts
index 30609837447d1a..8c33b183603e7f 100644
--- a/src/core/server/metrics/metrics_service.ts
+++ b/src/core/server/metrics/metrics_service.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { ReplaySubject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, ReplaySubject } from 'rxjs';
import { CoreService } from '../../types';
import { CoreContext } from '../core_context';
import { Logger } from '../logging';
@@ -38,10 +37,9 @@ export class MetricsService
}
public async setup({ http }: MetricsServiceSetupDeps): Promise {
- const config = await this.coreContext.configService
- .atPath(opsConfig.path)
- .pipe(first())
- .toPromise();
+ const config = await firstValueFrom(
+ this.coreContext.configService.atPath(opsConfig.path)
+ );
this.metricsCollector = new OpsMetricsCollector(http.server, {
logger: this.logger,
diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts
index a6ffdff4422beb..91fc7bd403dca9 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.test.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts
@@ -13,8 +13,8 @@ import mockFs from 'mock-fs';
import { loggingSystemMock } from '../../logging/logging_system.mock';
import { getEnvOptions, rawConfigServiceMock } from '../../config/mocks';
-import { from } from 'rxjs';
-import { first, map, toArray } from 'rxjs/operators';
+import { firstValueFrom, from } from 'rxjs';
+import { map, toArray } from 'rxjs/operators';
import { resolve } from 'path';
import { ConfigService, Env } from '../../config';
import { PluginsConfig, PluginsConfigType, config } from '../plugins_config';
@@ -163,10 +163,7 @@ describe('plugins discovery system', () => {
logger,
};
- pluginConfig = await configService
- .atPath('plugins')
- .pipe(first())
- .toPromise();
+ pluginConfig = await firstValueFrom(configService.atPath('plugins'));
// jest relies on the filesystem to get sourcemaps when using console.log
// which breaks with the mocked FS, see https://github.com/tschaub/mock-fs/issues/234
@@ -195,7 +192,7 @@ describe('plugins discovery system', () => {
{ createCwd: false }
);
- const plugins = await plugin$.pipe(toArray()).toPromise();
+ const plugins = await firstValueFrom(plugin$.pipe(toArray()));
const pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toHaveLength(4);
@@ -362,7 +359,7 @@ describe('plugins discovery system', () => {
{ createCwd: false }
);
- const plugins = await plugin$.pipe(toArray()).toPromise();
+ const plugins = await firstValueFrom(plugin$.pipe(toArray()));
const pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toHaveLength(4);
@@ -401,7 +398,7 @@ describe('plugins discovery system', () => {
{ createCwd: false }
);
- const plugins = await plugin$.pipe(toArray()).toPromise();
+ const plugins = await firstValueFrom(plugin$.pipe(toArray()));
const pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toEqual(['pluginA']);
@@ -423,7 +420,7 @@ describe('plugins discovery system', () => {
{ createCwd: false }
);
- const plugins = await plugin$.pipe(toArray()).toPromise();
+ const plugins = await firstValueFrom(plugin$.pipe(toArray()));
const pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toHaveLength(5);
@@ -451,7 +448,7 @@ describe('plugins discovery system', () => {
{ createCwd: false }
);
- const plugins = await plugin$.pipe(toArray()).toPromise();
+ const plugins = await firstValueFrom(plugin$.pipe(toArray()));
const pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toHaveLength(3);
@@ -536,7 +533,7 @@ describe('plugins discovery system', () => {
let { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo);
expect(scanPluginSearchPathsMock).toHaveBeenCalledTimes(1);
- let plugins = await plugin$.pipe(toArray()).toPromise();
+ let plugins = await firstValueFrom(plugin$.pipe(toArray()));
let pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toHaveLength(3);
@@ -555,7 +552,7 @@ describe('plugins discovery system', () => {
plugin$ = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo).plugin$;
expect(scanPluginSearchPathsMock).toHaveBeenCalledTimes(2);
- plugins = await plugin$.pipe(toArray()).toPromise();
+ plugins = await firstValueFrom(plugin$.pipe(toArray()));
pluginNames = plugins.map((plugin) => plugin.name);
expect(pluginNames).toHaveLength(3);
diff --git a/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts b/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts
index 548c479975ddf6..e1c7397ef14068 100644
--- a/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts
+++ b/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts
@@ -12,6 +12,7 @@ import { toArray } from 'rxjs/operators';
import { resolve } from 'path';
import { scanPluginSearchPaths } from './scan_plugin_search_paths';
import { PluginDiscoveryError } from './plugin_discovery_error';
+import { firstValueFrom } from 'rxjs';
const KIBANA_ROOT = process.cwd();
@@ -82,7 +83,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths(scanPaths, logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(paths).toHaveLength(3);
expect(errors).toHaveLength(0);
@@ -106,7 +107,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(paths).toHaveLength(1);
expect(errors).toHaveLength(0);
@@ -128,7 +129,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(paths).toHaveLength(0);
expect(errors).toHaveLength(1);
@@ -153,7 +154,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(errors).toHaveLength(0);
expect(paths).toHaveLength(4);
@@ -180,7 +181,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(errors).toHaveLength(0);
expect(paths).toHaveLength(1);
@@ -203,7 +204,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(errors).toHaveLength(0);
expect(paths).toHaveLength(5);
@@ -236,7 +237,7 @@ describe('scanPluginSearchPaths', () => {
);
const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/plugins`], logger);
- const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+ const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
expect(errors).toHaveLength(0);
expect(paths).toHaveLength(2);
diff --git a/src/core/server/plugins/discovery/scan_plugin_search_paths.ts b/src/core/server/plugins/discovery/scan_plugin_search_paths.ts
index 51d5a29115c307..7c352d0d7c47fb 100644
--- a/src/core/server/plugins/discovery/scan_plugin_search_paths.ts
+++ b/src/core/server/plugins/discovery/scan_plugin_search_paths.ts
@@ -13,8 +13,8 @@ import { catchError, mergeMap } from 'rxjs/operators';
import { Logger } from '../../logging';
import { PluginDiscoveryError } from './plugin_discovery_error';
-const fsReadDir$ = bindNodeCallback(readdir);
-const fsStat$ = bindNodeCallback(stat);
+const fsReadDir$ = bindNodeCallback<[string], [string[]]>(readdir);
+const fsStat$ = bindNodeCallback<[PathLike], [Stats]>(stat);
const maxScanDepth = 5;
diff --git a/src/core/server/plugins/plugin.ts b/src/core/server/plugins/plugin.ts
index dc861b4489dcf3..67c32526f2bf45 100644
--- a/src/core/server/plugins/plugin.ts
+++ b/src/core/server/plugins/plugin.ts
@@ -8,8 +8,7 @@
import { join } from 'path';
import typeDetect from 'type-detect';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
import { isPromise } from '@kbn/std';
import { isConfigSchema } from '@kbn/config-schema';
@@ -63,7 +62,7 @@ export class PluginWrapper<
| AsyncPlugin;
private readonly startDependencies$ = new Subject<[CoreStart, TPluginsStart, TStart]>();
- public readonly startDependencies = this.startDependencies$.pipe(first()).toPromise();
+ public readonly startDependencies = firstValueFrom(this.startDependencies$);
constructor(
public readonly params: {
diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
index 2c1ba26b96ebbe..43e10fbe59b6a5 100644
--- a/src/core/server/plugins/plugins_service.ts
+++ b/src/core/server/plugins/plugins_service.ts
@@ -7,8 +7,8 @@
*/
import Path from 'path';
-import { Observable } from 'rxjs';
-import { filter, first, map, tap, toArray } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
+import { filter, map, tap, toArray } from 'rxjs/operators';
import { getFlattenedObject } from '@kbn/std';
import { CoreService } from '../../types';
@@ -111,7 +111,7 @@ export class PluginsService implements CoreService {
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
const { error$, plugin$ } = discover(config, this.coreContext, {
uuid: environment.instanceUuid,
@@ -151,7 +151,7 @@ export class PluginsService implements CoreService();
if (config.initialize) {
@@ -186,7 +186,7 @@ export class PluginsService implements CoreService errorTypesToReport.includes(error.type)),
tap((pluginError) => this.log.error(pluginError)),
toArray()
)
- .toPromise();
+ );
if (errors.length > 0) {
throw new Error(
`Failed to initialize plugins:${errors.map((err) => `\n\t${err.message}`).join('')}`
@@ -265,7 +265,7 @@ export class PluginsService implements CoreService();
- const plugins = await plugin$.pipe(toArray()).toPromise();
+ const plugins = await firstValueFrom(plugin$.pipe(toArray()));
// Register config descriptors and deprecations
for (const plugin of plugins) {
diff --git a/src/core/server/saved_objects/migrations/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
index 2adf4d5dee184c..e5aa51f9d6b0ab 100644
--- a/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
@@ -16,6 +16,7 @@ import { SavedObjectTypeRegistry } from '../saved_objects_type_registry';
import { SavedObjectsType } from '../types';
import { DocumentMigrator } from './core/document_migrator';
import { ByteSizeValue } from '@kbn/config-schema';
+import { lastValueFrom } from 'rxjs';
jest.mock('./core/document_migrator', () => {
return {
@@ -134,7 +135,7 @@ describe('KibanaMigrator', () => {
it('emits results on getMigratorResult$()', async () => {
const options = mockV2MigrationOptions();
const migrator = new KibanaMigrator(options);
- const migratorStatus = migrator.getStatus$().pipe(take(3)).toPromise();
+ const migratorStatus = lastValueFrom(migrator.getStatus$().pipe(take(3)));
migrator.prepareMigrations();
await migrator.runMigrations();
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index fef20937c9cfe9..0fc5057d1b88bb 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { Subject, Observable } from 'rxjs';
-import { first, filter, take, switchMap } from 'rxjs/operators';
+import { Subject, Observable, firstValueFrom } from 'rxjs';
+import { filter, take, switchMap } from 'rxjs/operators';
import { CoreService } from '../../types';
import {
SavedObjectsClient,
@@ -314,14 +314,12 @@ export class SavedObjectsService
this.setupDeps = setupDeps;
const { http, elasticsearch, coreUsageData, deprecations } = setupDeps;
- const savedObjectsConfig = await this.coreContext.configService
- .atPath('savedObjects')
- .pipe(first())
- .toPromise();
- const savedObjectsMigrationConfig = await this.coreContext.configService
- .atPath('migrations')
- .pipe(first())
- .toPromise();
+ const savedObjectsConfig = await firstValueFrom(
+ this.coreContext.configService.atPath('savedObjects')
+ );
+ const savedObjectsMigrationConfig = await firstValueFrom(
+ this.coreContext.configService.atPath('migrations')
+ );
this.config = new SavedObjectConfig(savedObjectsConfig, savedObjectsMigrationConfig);
deprecations.getRegistry('savedObjects').registerDeprecations(
@@ -340,7 +338,7 @@ export class SavedObjectsService
coreUsageData,
logger: this.logger,
config: this.config,
- migratorPromise: this.migrator$.pipe(first()).toPromise(),
+ migratorPromise: firstValueFrom(this.migrator$),
kibanaIndex,
kibanaVersion: this.kibanaVersion,
});
diff --git a/src/core/server/status/routes/integration_tests/status.test.ts b/src/core/server/status/routes/integration_tests/status.test.ts
index df203675725a8e..3f83a05d0e0a61 100644
--- a/src/core/server/status/routes/integration_tests/status.test.ts
+++ b/src/core/server/status/routes/integration_tests/status.test.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { BehaviorSubject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
import supertest from 'supertest';
import { omit } from 'lodash';
@@ -144,7 +143,7 @@ describe('GET /api/status', () => {
build_number: 1234,
build_snapshot: true,
});
- const metricsMockValue = await metrics.getOpsMetrics$().pipe(first()).toPromise();
+ const metricsMockValue = await firstValueFrom(metrics.getOpsMetrics$());
expect(result.body.metrics).toEqual({
last_updated: expect.any(String),
collection_interval_in_millis: metrics.collectionInterval,
diff --git a/src/core/server/status/routes/status.ts b/src/core/server/status/routes/status.ts
index 7751980ae6ec37..4fb0900b232387 100644
--- a/src/core/server/status/routes/status.ts
+++ b/src/core/server/status/routes/status.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Observable, combineLatest, ReplaySubject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { Observable, combineLatest, ReplaySubject, firstValueFrom } from 'rxjs';
import { schema } from '@kbn/config-schema';
import { IRouter } from '../../http';
@@ -92,7 +91,7 @@ export const registerStatusRoute = ({
async (context, req, res) => {
const { version, buildSha, buildNum } = config.packageInfo;
const versionWithoutSnapshot = version.replace(SNAPSHOT_POSTFIX, '');
- const [overall, coreOverall, core, plugins] = await combinedStatus$.pipe(first()).toPromise();
+ const [overall, coreOverall, core, plugins] = await firstValueFrom(combinedStatus$);
const { v8format = true, v7format = false } = req.query ?? {};
@@ -113,7 +112,7 @@ export const registerStatusRoute = ({
});
}
- const lastMetrics = await metrics.getOpsMetrics$().pipe(first()).toPromise();
+ const lastMetrics = await firstValueFrom(metrics.getOpsMetrics$());
const body: StatusHttpBody = {
name: config.serverName,
diff --git a/src/core/server/status/status_service.ts b/src/core/server/status/status_service.ts
index a5b5f0a37397ac..6c8f8716c036ea 100644
--- a/src/core/server/status/status_service.ts
+++ b/src/core/server/status/status_service.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { Observable, combineLatest, Subscription, Subject } from 'rxjs';
-import { map, distinctUntilChanged, shareReplay, take, debounceTime } from 'rxjs/operators';
+import { Observable, combineLatest, Subscription, Subject, firstValueFrom } from 'rxjs';
+import { map, distinctUntilChanged, shareReplay, debounceTime } from 'rxjs/operators';
import { isDeepStrictEqual } from 'util';
import { CoreService } from '../../types';
@@ -65,7 +65,7 @@ export class StatusService implements CoreService {
environment,
coreUsageData,
}: SetupDeps) {
- const statusConfig = await this.config$.pipe(take(1)).toPromise();
+ const statusConfig = await firstValueFrom(this.config$);
const core$ = this.setupCoreStatus({ elasticsearch, savedObjects });
this.pluginsStatus = new PluginsStatusService({ core$, pluginDependencies });
diff --git a/src/core/server/ui_settings/ui_settings_service.ts b/src/core/server/ui_settings/ui_settings_service.ts
index 924aaa0717f70e..64765ec7d6c74b 100644
--- a/src/core/server/ui_settings/ui_settings_service.ts
+++ b/src/core/server/ui_settings/ui_settings_service.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
import { mapToObject } from '@kbn/std';
import { CoreService } from '../../types';
@@ -53,7 +52,7 @@ export class UiSettingsService
public async preboot(): Promise {
this.log.debug('Prebooting ui settings service');
- const { overrides } = await this.config$.pipe(first()).toPromise();
+ const { overrides } = await firstValueFrom(this.config$);
this.overrides = overrides;
this.register(getCoreSettings({ isDist: this.isDist }));
@@ -74,7 +73,7 @@ export class UiSettingsService
savedObjects.registerType(uiSettingsType);
registerRoutes(http.createRouter(''));
- const config = await this.config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(this.config$);
this.overrides = config.overrides;
return {
diff --git a/src/dev/build/lib/scan.ts b/src/dev/build/lib/scan.ts
index 422a455d44a0c4..5ba7385792d745 100644
--- a/src/dev/build/lib/scan.ts
+++ b/src/dev/build/lib/scan.ts
@@ -15,8 +15,8 @@ import { map, mergeAll, mergeMap } from 'rxjs/operators';
// @ts-ignore
import { assertAbsolute } from './fs';
-const getStat$ = Rx.bindNodeCallback(Fs.stat) as (path: string) => Rx.Observable;
-const getReadDir$ = Rx.bindNodeCallback(Fs.readdir) as (path: string) => Rx.Observable;
+const getStat$ = Rx.bindNodeCallback<[string], [Fs.Stats]>(Fs.stat);
+const getReadDir$ = Rx.bindNodeCallback<[string], [string[]]>(Fs.readdir);
/**
* Return an observable of all files in a directory, starting with the
diff --git a/src/dev/build/lib/scan_delete.ts b/src/dev/build/lib/scan_delete.ts
index 2a12c54972bf43..cc193f2cffd00a 100644
--- a/src/dev/build/lib/scan_delete.ts
+++ b/src/dev/build/lib/scan_delete.ts
@@ -16,8 +16,8 @@ import { count, map, mergeAll, mergeMap } from 'rxjs/operators';
// @ts-ignore
import { assertAbsolute } from './fs';
-const getStat$ = Rx.bindNodeCallback(Fs.stat);
-const getReadDir$ = Rx.bindNodeCallback(Fs.readdir);
+const getStat$ = Rx.bindNodeCallback<[Fs.PathLike], [Fs.Stats]>(Fs.stat);
+const getReadDir$ = Rx.bindNodeCallback<[string], [string[]]>(Fs.readdir);
interface Options {
directory: string;
diff --git a/src/dev/build/tasks/build_kibana_platform_plugins.ts b/src/dev/build/tasks/build_kibana_platform_plugins.ts
index 48d249ca374095..aa9101abb507f3 100644
--- a/src/dev/build/tasks/build_kibana_platform_plugins.ts
+++ b/src/dev/build/tasks/build_kibana_platform_plugins.ts
@@ -9,7 +9,7 @@
import Path from 'path';
import { REPO_ROOT } from '@kbn/utils';
-import { lastValueFrom } from '@kbn/std';
+import { lastValueFrom } from 'rxjs';
import { CiStatsMetric } from '@kbn/dev-utils';
import {
runOptimizer,
diff --git a/src/dev/eslint/run_eslint_with_types.ts b/src/dev/eslint/run_eslint_with_types.ts
index d7f2482fcb26b9..1ac7e1c6a91c72 100644
--- a/src/dev/eslint/run_eslint_with_types.ts
+++ b/src/dev/eslint/run_eslint_with_types.ts
@@ -16,7 +16,6 @@ import { mergeMap, reduce } from 'rxjs/operators';
import { supportsColor } from 'chalk';
import { run, createFailError } from '@kbn/dev-utils';
import { REPO_ROOT } from '@kbn/utils';
-import { lastValueFrom } from '@kbn/std';
import { PROJECTS } from '../typescript/projects';
import { Project } from '../typescript/project';
@@ -61,7 +60,7 @@ export function runEslintWithTypes() {
const concurrency = Math.max(1, Math.round((Os.cpus() || []).length / 2) || 1) || 1;
log.info(`Linting ${projects.length} projects, ${concurrency} at a time`);
- const failures = await lastValueFrom(
+ const failures = await Rx.lastValueFrom(
Rx.from(projects).pipe(
mergeMap(async (project) => {
const configFilePath = Path.resolve(project.directory, 'types.eslint.config.js');
diff --git a/src/dev/typescript/concurrent_map.ts b/src/dev/typescript/concurrent_map.ts
index b40da14f4162bd..ad7231687faadd 100644
--- a/src/dev/typescript/concurrent_map.ts
+++ b/src/dev/typescript/concurrent_map.ts
@@ -8,7 +8,6 @@
import * as Rx from 'rxjs';
import { mergeMap, toArray, map } from 'rxjs/operators';
-import { lastValueFrom } from '@kbn/std';
export async function concurrentMap(
concurrency: number,
@@ -19,7 +18,7 @@ export async function concurrentMap(
return [];
}
- return await lastValueFrom(
+ return await Rx.lastValueFrom(
Rx.from(arr).pipe(
// execute items in parallel based on concurrency
mergeMap(async (item, index) => ({ index, result: await fn(item, index) }), concurrency),
diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts
index 5888e6eaf6806b..bafd2406c1095a 100644
--- a/src/dev/typescript/run_type_check_cli.ts
+++ b/src/dev/typescript/run_type_check_cli.ts
@@ -13,7 +13,6 @@ import * as Rx from 'rxjs';
import { mergeMap, reduce } from 'rxjs/operators';
import execa from 'execa';
import { run, createFailError } from '@kbn/dev-utils';
-import { lastValueFrom } from '@kbn/std';
import { PROJECTS } from './projects';
import { buildTsRefs } from './build_ts_refs';
@@ -65,7 +64,7 @@ export async function runTypeCheckCli() {
: ['--skipLibCheck', 'false']),
];
- const failureCount = await lastValueFrom(
+ const failureCount = await Rx.lastValueFrom(
Rx.from(projects).pipe(
mergeMap(async (p) => {
const relativePath = Path.relative(process.cwd(), p.tsConfigPath);
diff --git a/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts b/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts
index 7f840c858d603d..ad0dbb4f5e3632 100644
--- a/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts
+++ b/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts
@@ -22,8 +22,8 @@ describe('ActiveCursor', () => {
expect(activeCursor.activeCursor$).toMatchInlineSnapshot(`
Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
diff --git a/src/plugins/console/server/services/es_legacy_config_service.ts b/src/plugins/console/server/services/es_legacy_config_service.ts
index ba13c63e8f95b5..f599398c2c34ad 100644
--- a/src/plugins/console/server/services/es_legacy_config_service.ts
+++ b/src/plugins/console/server/services/es_legacy_config_service.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Observable, Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable, Subscription } from 'rxjs';
import { ElasticsearchConfig } from 'kibana/server';
export class EsLegacyConfigService {
@@ -45,7 +44,7 @@ export class EsLegacyConfigService {
}
if (!this.config) {
- return this.config$.pipe(first()).toPromise();
+ return firstValueFrom(this.config$);
}
return this.config;
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
index 6f0f3e1a232187..263343e299a9ca 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
@@ -59,7 +59,7 @@ export const ControlGroupChainingSystems: {
onChildChange: ({ childOutputChangedId, childOrder, recalculateFilters$, getChild }) => {
if (childOutputChangedId === childOrder.lastChildId) {
// the last control's output has updated, recalculate filters
- recalculateFilters$.next();
+ recalculateFilters$.next(null);
return;
}
@@ -75,6 +75,6 @@ export const ControlGroupChainingSystems: {
NONE: {
getContainerSettings: () => undefined,
getPrecedingFilters: () => undefined,
- onChildChange: ({ recalculateFilters$ }) => recalculateFilters$.next(),
+ onChildChange: ({ recalculateFilters$ }) => recalculateFilters$.next(null),
},
};
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
index d6507c10b2d6f7..fcc8b6652f992b 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
@@ -151,7 +151,7 @@ export class TimeSliderControlEmbeddable extends Embeddable<
const min = value ? value[0] : null;
const max = value ? value[1] : null;
const hasRange =
- this.componentState.range!.max !== undefined && this.componentState.range!.min !== undefined;
+ this.componentState.range?.max !== undefined && this.componentState.range?.min !== undefined;
this.getCurrentDataView$().subscribe((dataView) => {
const range: RangeFilterParams = {};
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
index a8daffcf614406..a103c888436646 100644
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
@@ -310,7 +310,7 @@ export const useDashboardAppState = ({
* the last saved state on save.
*/
setLastSavedState(savedDashboardState);
- dashboardBuildContext.$checkForUnsavedChanges.next();
+ dashboardBuildContext.$checkForUnsavedChanges.next(undefined);
const updateLastSavedState = () => {
setLastSavedState(
savedObjectToDashboardState({
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
index 541724549011eb..8bf2f0881f4f4b 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
@@ -60,7 +60,7 @@ export const syncDashboardContainerInput = (
.getInput$()
.subscribe(() => applyContainerChangesToState(syncDashboardContainerProps))
);
- subscriptions.add($onDashboardStateChange.subscribe(() => $triggerDashboardRefresh.next()));
+ subscriptions.add($onDashboardStateChange.subscribe(() => $triggerDashboardRefresh.next({})));
subscriptions.add(
getSessionURLObservable(history).subscribe(() => {
$triggerDashboardRefresh.next({ force: true });
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
index d187ee207b2fe0..ff64f4672922c5 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
@@ -103,13 +103,14 @@ export const syncDashboardFilterState = ({
.subscribe(() => applyFilters(queryString.getQuery(), filterManager.getFilters()));
const timeRefreshSubscription = merge(
- ...[timefilterService.getRefreshIntervalUpdate$(), timefilterService.getTimeUpdate$()]
+ timefilterService.getRefreshIntervalUpdate$(),
+ timefilterService.getTimeUpdate$()
).subscribe(() => {
- $triggerDashboardRefresh.next();
+ $triggerDashboardRefresh.next({});
// manually check for unsaved changes here because the time range is not stored on the dashboardState,
// but it could trigger the unsaved changes badge.
- $checkForUnsavedChanges.next();
+ $checkForUnsavedChanges.next(undefined);
});
const forceRefreshSubscription = timefilterService
diff --git a/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
index 6706deeaa1de44..d4513837efa11d 100644
--- a/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
@@ -25,9 +25,9 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -39,10 +39,9 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -129,7 +128,6 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -175,9 +173,9 @@ exports[`after fetch initialFilter 1`] = `
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -189,10 +187,9 @@ exports[`after fetch initialFilter 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -279,7 +276,6 @@ exports[`after fetch initialFilter 1`] = `
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -324,9 +320,9 @@ exports[`after fetch renders all table rows 1`] = `
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -338,10 +334,9 @@ exports[`after fetch renders all table rows 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -428,7 +423,6 @@ exports[`after fetch renders all table rows 1`] = `
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -473,9 +467,9 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -487,10 +481,9 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -577,7 +570,6 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -622,9 +614,9 @@ exports[`after fetch renders call to action with continue when no dashboards exi
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -636,10 +628,9 @@ exports[`after fetch renders call to action with continue when no dashboards exi
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -737,7 +728,6 @@ exports[`after fetch renders call to action with continue when no dashboards exi
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -782,9 +772,9 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -796,10 +786,9 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -886,7 +875,6 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
@@ -931,9 +919,9 @@ exports[`after fetch showWriteControls 1`] = `
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -945,10 +933,9 @@ exports[`after fetch showWriteControls 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -1005,7 +992,6 @@ exports[`after fetch showWriteControls 1`] = `
theme={
Object {
"theme$": Observable {
- "_isScalar": false,
"_subscribe": [Function],
},
}
diff --git a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
index d781971f83aab5..cc49c896bdfe5b 100644
--- a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
+++ b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
@@ -15,6 +15,7 @@ import {
buildQueryFromFilters,
Filter,
} from '@kbn/es-query';
+import { lastValueFrom } from 'rxjs';
import { AggGroupNames } from '../agg_groups';
import { IAggConfigs } from '../agg_configs';
import { IAggType } from '../agg_type';
@@ -342,8 +343,8 @@ export const createOtherBucketPostFlightRequest = (
nestedSearchSource.setField('aggs', filterAgg);
- const { rawResponse: response } = await nestedSearchSource
- .fetch$({
+ const { rawResponse: response } = await lastValueFrom(
+ nestedSearchSource.fetch$({
abortSignal,
sessionId: searchSessionId,
inspector: {
@@ -358,7 +359,7 @@ export const createOtherBucketPostFlightRequest = (
}),
},
})
- .toPromise();
+ );
resp = mergeOtherBucketAggResponse(
aggConfigs,
diff --git a/src/plugins/data/common/search/expressions/eql.ts b/src/plugins/data/common/search/expressions/eql.ts
index b7a8c479856017..cef099ca447c06 100644
--- a/src/plugins/data/common/search/expressions/eql.ts
+++ b/src/plugins/data/common/search/expressions/eql.ts
@@ -11,6 +11,7 @@ import { buildEsQuery } from '@kbn/es-query';
import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
import { EqlSearchRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { lastValueFrom } from 'rxjs';
import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
import {
ISearchGeneric,
@@ -143,15 +144,17 @@ export const getEqlFn = ({
});
try {
- const response = await search(
- {
- params: {
- index: args.index,
- body: dsl,
+ const response = await lastValueFrom(
+ search(
+ {
+ params: {
+ index: args.index,
+ body: dsl,
+ },
},
- },
- { abortSignal, strategy: EQL_SEARCH_STRATEGY }
- ).toPromise();
+ { abortSignal, strategy: EQL_SEARCH_STRATEGY }
+ )
+ );
const stats: RequestStatistics = {};
diff --git a/src/plugins/data/common/search/expressions/esdsl.ts b/src/plugins/data/common/search/expressions/esdsl.ts
index 69e3c54e438069..fbf8add29bb93b 100644
--- a/src/plugins/data/common/search/expressions/esdsl.ts
+++ b/src/plugins/data/common/search/expressions/esdsl.ts
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
import { buildEsQuery } from '@kbn/es-query';
import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { lastValueFrom } from 'rxjs';
import { EsRawResponse } from './es_raw_response';
import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
import { ISearchGeneric, KibanaContext } from '..';
@@ -125,16 +126,18 @@ export const getEsdslFn = ({
});
try {
- const { rawResponse } = await search(
- {
- params: {
- index: args.index,
- size: args.size,
- body: dsl,
+ const { rawResponse } = await lastValueFrom(
+ search(
+ {
+ params: {
+ index: args.index,
+ size: args.size,
+ body: dsl,
+ },
},
- },
- { abortSignal }
- ).toPromise();
+ { abortSignal }
+ )
+ );
const stats: RequestStatistics = {};
diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
index 87e249acab8b18..4c8ac7b46d867c 100644
--- a/src/plugins/data/common/search/search_source/search_source.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { of, throwError } from 'rxjs';
+import { lastValueFrom, of, throwError } from 'rxjs';
import { IndexPattern } from '../..';
import { SearchSource, SearchSourceDependencies, SortDirection } from './';
import { AggConfigs, AggTypesRegistryStart } from '../../';
@@ -1240,7 +1240,7 @@ describe('SearchSource', () => {
const fetch$ = searchSource.fetch$({});
fetch$.subscribe(fetchSub);
- const resp = await fetch$.toPromise();
+ const resp = await lastValueFrom(fetch$);
expect(fetchSub.next).toHaveBeenCalledTimes(3);
expect(fetchSub.complete).toHaveBeenCalledTimes(1);
diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
index 8acdb0514cccb1..1115eff507154c 100644
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@@ -70,7 +70,7 @@ import {
switchMap,
tap,
} from 'rxjs/operators';
-import { defer, EMPTY, from, Observable } from 'rxjs';
+import { defer, EMPTY, from, lastValueFrom, Observable } from 'rxjs';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { buildEsQuery, Filter } from '@kbn/es-query';
import { normalizeSortRequest } from './normalize_sort_request';
@@ -325,11 +325,9 @@ export class SearchSource {
* @removeBy 8.1
*/
fetch(options: ISearchOptions = {}) {
- return this.fetch$(options)
- .toPromise()
- .then((r) => {
- return r.rawResponse as estypes.SearchResponse;
- });
+ return lastValueFrom(this.fetch$(options)).then((r) => {
+ return r.rawResponse as estypes.SearchResponse;
+ });
}
/**
diff --git a/src/plugins/data/public/query/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
index b81a95618b815c..d4ceb83940d273 100644
--- a/src/plugins/data/public/query/timefilter/timefilter.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -32,10 +32,10 @@ export class Timefilter {
// Fired when isTimeRangeSelectorEnabled \ isAutoRefreshSelectorEnabled are toggled
private enabledUpdated$ = new BehaviorSubject(false);
// Fired when a user changes the timerange
- private timeUpdate$ = new Subject();
+ private timeUpdate$ = new Subject();
// Fired when a user changes the the autorefresh settings
- private refreshIntervalUpdate$ = new Subject();
- private fetch$ = new Subject();
+ private refreshIntervalUpdate$ = new Subject();
+ private fetch$ = new Subject();
private _time: TimeRange;
// Denotes whether setTime has been called, can be used to determine if the constructor defaults are being used.
diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
index ec5caae0314980..6a16924a0f20b6 100644
--- a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
@@ -23,7 +23,7 @@ const createSetupContractMock = () => {
getTimeUpdate$: jest.fn(),
getRefreshIntervalUpdate$: jest.fn(),
getAutoRefreshFetch$: jest.fn(() => new Observable<() => void>()),
- getFetch$: jest.fn(() => new Observable<() => void>()),
+ getFetch$: jest.fn().mockImplementation(() => new Observable<() => void>()),
getTime: jest.fn(),
setTime: jest.fn(),
setRefreshInterval: jest.fn(),
diff --git a/src/plugins/data/public/search/session/session_helpers.test.ts b/src/plugins/data/public/search/session/session_helpers.test.ts
index 5b64e7b554d18f..fdebe4bce75861 100644
--- a/src/plugins/data/public/search/session/session_helpers.test.ts
+++ b/src/plugins/data/public/search/session/session_helpers.test.ts
@@ -9,6 +9,7 @@
import { waitUntilNextSessionCompletes$ } from './session_helpers';
import { ISessionService, SessionService } from './session_service';
import { BehaviorSubject } from 'rxjs';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
import { SearchSessionState } from './search_session_state';
import { NowProviderInternalContract } from '../../now_provider';
import { coreMock } from '../../../../../core/public/mocks';
@@ -62,27 +63,30 @@ describe('waitUntilNextSessionCompletes$', () => {
afterEach(() => {
jest.useRealTimers();
});
- test('emits when next session starts', () => {
- sessionService.start();
- let untrackSearch = sessionService.trackSearch({ abort: () => {} });
- untrackSearch();
+ test(
+ 'emits when next session starts',
+ fakeSchedulers((advance) => {
+ sessionService.start();
+ let untrackSearch = sessionService.trackSearch({ abort: () => {} });
+ untrackSearch();
- const next = jest.fn();
- const complete = jest.fn();
- waitUntilNextSessionCompletes$(sessionService).subscribe({ next, complete });
- expect(next).not.toBeCalled();
+ const next = jest.fn();
+ const complete = jest.fn();
+ waitUntilNextSessionCompletes$(sessionService).subscribe({ next, complete });
+ expect(next).not.toBeCalled();
- sessionService.start();
- expect(next).not.toBeCalled();
+ sessionService.start();
+ expect(next).not.toBeCalled();
- untrackSearch = sessionService.trackSearch({ abort: () => {} });
- untrackSearch();
+ untrackSearch = sessionService.trackSearch({ abort: () => {} });
+ untrackSearch();
- expect(next).not.toBeCalled();
- jest.advanceTimersByTime(500);
- expect(next).not.toBeCalled();
- jest.advanceTimersByTime(1000);
- expect(next).toBeCalledTimes(1);
- expect(complete).toBeCalled();
- });
+ expect(next).not.toBeCalled();
+ advance(500);
+ expect(next).not.toBeCalled();
+ advance(1000);
+ expect(next).toBeCalledTimes(1);
+ expect(complete).toBeCalled();
+ })
+ );
});
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
index de76183da3be39..302abae2bdc84c 100644
--- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts
+++ b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -8,8 +8,7 @@
import { schema } from '@kbn/config-schema';
import { IRouter } from 'kibana/server';
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
import { getRequestAbortedSignal } from '../lib';
import { getKbnServerError, reportServerError } from '../../../kibana_utils/server';
import type { ConfigSchema } from '../../config';
@@ -42,7 +41,7 @@ export function registerValueSuggestionsRoute(router: IRouter, config$: Observab
},
},
async (context, request, response) => {
- const config = await config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(config$);
const { field: fieldName, query, filters, fieldMeta, method } = request.body;
const { index } = request.params;
const abortSignal = getRequestAbortedSignal(request.events.aborted$);
diff --git a/src/plugins/data/server/search/routes/bsearch.ts b/src/plugins/data/server/search/routes/bsearch.ts
index 25b1bd0d7009d4..649a86591d0a14 100644
--- a/src/plugins/data/server/search/routes/bsearch.ts
+++ b/src/plugins/data/server/search/routes/bsearch.ts
@@ -6,7 +6,8 @@
* Side Public License, v 1.
*/
-import { catchError, first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
+import { catchError } from 'rxjs/operators';
import { BfetchServerSetup } from 'src/plugins/bfetch/server';
import type { ExecutionContextSetup } from 'src/core/server';
import apm from 'elastic-apm-node';
@@ -37,10 +38,8 @@ export function registerBsearchRoute(
return executionContextService.withContext(executionContext, () => {
apm.addLabels(executionContextService.getAsLabels());
- return search
- .search(requestData, restOptions)
- .pipe(
- first(),
+ return firstValueFrom(
+ search.search(requestData, restOptions).pipe(
catchError((err) => {
// Re-throw as object, to get attributes passed to the client
// eslint-disable-next-line no-throw-literal
@@ -51,7 +50,7 @@ export function registerBsearchRoute(
};
})
)
- .toPromise();
+ );
});
},
};
diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts
index f449018612cefa..92487796d363b3 100644
--- a/src/plugins/data/server/search/search_service.test.ts
+++ b/src/plugins/data/server/search/search_service.test.ts
@@ -16,7 +16,7 @@ import { createIndexPatternsStartMock } from '../data_views/mocks';
import { SearchService, SearchServiceSetupDependencies } from './search_service';
import { bfetchPluginMock } from '../../../bfetch/server/mocks';
-import { of } from 'rxjs';
+import { lastValueFrom, of } from 'rxjs';
import type {
IEsSearchRequest,
IEsSearchResponse,
@@ -182,7 +182,7 @@ describe('Search service', () => {
throw new NoSearchIdInSessionError();
});
- const res = await mockScopedClient.search(searchRequest, options).toPromise();
+ const res = await lastValueFrom(mockScopedClient.search(searchRequest, options));
const [request, callOptions] = mockStrategy.search.mock.calls[0];
expect(callOptions).toBe(options);
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 7c01fefc92d659..9841263f745424 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { from, Observable, throwError } from 'rxjs';
+import { firstValueFrom, from, Observable, throwError } from 'rxjs';
import { pick } from 'lodash';
import moment from 'moment';
import {
@@ -19,7 +19,7 @@ import {
SharedGlobalConfig,
StartServicesAccessor,
} from 'src/core/server';
-import { first, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
import { BfetchServerSetup } from 'src/plugins/bfetch/server';
import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
import type {
@@ -221,16 +221,12 @@ export class SearchService implements Plugin {
const aggs = this.aggsService.setup({ registerFunction: expressions.registerFunction });
- this.initializerContext.config
- .create()
- .pipe(first())
- .toPromise()
- .then((value) => {
- if (value.search.aggs.shardDelay.enabled) {
- aggs.types.registerBucket(SHARD_DELAY_AGG_NAME, getShardDelayBucketAgg);
- expressions.registerFunction(aggShardDelay);
- }
- });
+ firstValueFrom(this.initializerContext.config.create()).then((value) => {
+ if (value.search.aggs.shardDelay.enabled) {
+ aggs.types.registerBucket(SHARD_DELAY_AGG_NAME, getShardDelayBucketAgg);
+ expressions.registerFunction(aggShardDelay);
+ }
+ });
return {
__enhance: (enhancements: SearchEnhancements) => {
diff --git a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
index 5fd734138824de..de59402c2c19c9 100644
--- a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { from, Observable } from 'rxjs';
-import { first, tap } from 'rxjs/operators';
+import { firstValueFrom, from, Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
import type { Logger, SharedGlobalConfig } from 'kibana/server';
import type { ISearchStrategy } from '../../types';
import type { SearchUsage } from '../../collectors';
@@ -37,7 +37,7 @@ export const esSearchStrategyProvider = (
const search = async () => {
try {
- const config = await config$.pipe(first()).toPromise();
+ const config = await firstValueFrom(config$);
// @ts-expect-error params fall back to any, but should be valid SearchRequest params
const { terminateAfter, ...requestParams } = request.params ?? {};
const params = {
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index 7a9caa4998f9ae..34cc98131fb485 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -8,9 +8,9 @@
import type { Observable } from 'rxjs';
import type { IScopedClusterClient, Logger, SharedGlobalConfig } from 'kibana/server';
-import { catchError, first, tap } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs/operators';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { from } from 'rxjs';
+import { firstValueFrom, from } from 'rxjs';
import type { ISearchStrategy, SearchStrategyDependencies } from '../../types';
import type {
IAsyncSearchOptions,
@@ -107,7 +107,7 @@ export const enhancedEsSearchStrategyProvider = (
{ esClient, uiSettingsClient }: SearchStrategyDependencies
): Promise {
const client = useInternalUser ? esClient.asInternalUser : esClient.asCurrentUser;
- const legacyConfig = await legacyConfig$.pipe(first()).toPromise();
+ const legacyConfig = await firstValueFrom(legacyConfig$);
const { body, index, ...params } = request.params!;
const method = 'POST';
const path = encodeURI(`/${index}/_rollup_search`);
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
index 02d4f713871a36..ce0fb1b3a915f4 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
@@ -12,6 +12,7 @@ import './jest.mocks';
import React, { FunctionComponent } from 'react';
import { merge } from 'lodash';
+import { defer } from 'rxjs';
import { notificationServiceMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
import { dataPluginMock } from '../../../../data/public/mocks';
import { FieldEditorProvider, Context } from '../../../public/components/field_editor_context';
@@ -36,22 +37,20 @@ export const setSearchResponseLatency = (ms: number) => {
};
spySearchQuery.mockImplementation(() => {
- return {
- toPromise: () => {
- if (searchResponseDelay === 0) {
- // no delay, it is synchronous
- return spySearchQueryResponse();
- }
-
- return new Promise((resolve) => {
- setTimeout(() => {
- resolve(undefined);
- }, searchResponseDelay);
- }).then(() => {
- return spySearchQueryResponse();
- });
- },
- };
+ return defer(() => {
+ if (searchResponseDelay === 0) {
+ // no delay, it is synchronous
+ return spySearchQueryResponse();
+ }
+
+ return new Promise((resolve) => {
+ setTimeout(() => {
+ resolve(undefined);
+ }, searchResponseDelay);
+ }).then(() => {
+ return spySearchQueryResponse();
+ });
+ });
});
search.search = spySearchQuery;
diff --git a/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx b/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
index c5eaeb02c05cf9..a7cd508401c6cc 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
@@ -7,13 +7,12 @@
*/
import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';
-import { first } from 'rxjs/operators';
+import { first, firstValueFrom } from 'rxjs';
import type { Subscription } from 'rxjs';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import { EuiFormRow, EuiLink, EuiCode } from '@elastic/eui';
import { PainlessLang, PainlessContext, monaco } from '@kbn/monaco';
-import { firstValueFrom } from '@kbn/std';
import {
UseField,
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
index b6ee4133f1f758..088b89b682ca1f 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -307,7 +307,7 @@ export function DiscoverLayout({
/>
)}
{resultState === 'uninitialized' && (
- savedSearchRefetch$.next()} />
+ savedSearchRefetch$.next(undefined)} />
)}
{resultState === 'loading' && }
{resultState === 'ready' && (
diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
index d63b2323f607e8..bb5d2be1b6d9bd 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import { FetchStatus } from '../../types';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
import { reduce } from 'rxjs/operators';
import { SearchSource } from '../../../../../data/public';
import { RequestAdapter } from '../../../../../inspector';
@@ -45,9 +45,9 @@ const mockFetchTotalHits = fetchTotalHits as unknown as jest.MockedFunction;
function subjectCollector(subject: Subject): () => Promise {
- const promise = subject
- .pipe(reduce((history, value) => history.concat([value]), [] as T[]))
- .toPromise();
+ const promise = firstValueFrom(
+ subject.pipe(reduce((history, value) => history.concat([value]), [] as T[]))
+ );
return () => {
subject.complete();
diff --git a/src/plugins/discover/public/application/main/utils/fetch_chart.ts b/src/plugins/discover/public/application/main/utils/fetch_chart.ts
index 9d1baf6e57cb28..e279651fccebb7 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_chart.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_chart.ts
@@ -7,6 +7,7 @@
*/
import { i18n } from '@kbn/i18n';
import { filter, map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
import {
DataPublicPluginStart,
isCompleteResponse,
@@ -77,7 +78,7 @@ export function fetchChart(
})
);
- return fetch$.toPromise();
+ return lastValueFrom(fetch$);
}
export function updateSearchSource(
diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
index 57be8911d7d0ed..78535dfcf12ac9 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_documents.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
@@ -7,6 +7,7 @@
*/
import { i18n } from '@kbn/i18n';
import { filter, map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
import { isCompleteResponse, ISearchSource } from '../../../../../data/public';
import { SAMPLE_SIZE_SETTING } from '../../../../common';
import { FetchDeps } from './fetch_all';
@@ -55,5 +56,5 @@ export const fetchDocuments = (
map((res) => res.rawResponse.hits.hits)
);
- return fetch$.toPromise();
+ return lastValueFrom(fetch$);
};
diff --git a/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts b/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
index 080cec6cf26461..0a968c43da5920 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
@@ -8,6 +8,7 @@
import { i18n } from '@kbn/i18n';
import { filter, map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
import { isCompleteResponse, ISearchSource } from '../../../../../data/public';
import { DataViewType } from '../../../../../data_views/public';
import { FetchDeps } from './fetch_all';
@@ -53,5 +54,5 @@ export function fetchTotalHits(
map((res) => res.rawResponse.hits.total as number)
);
- return fetch$.toPromise();
+ return lastValueFrom(fetch$);
}
diff --git a/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts b/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
index 58fcc20396deeb..7fb51506f6ce48 100644
--- a/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
@@ -5,9 +5,10 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
+import { BehaviorSubject, Subject } from 'rxjs';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
import { getFetch$ } from './get_fetch_observable';
import { FetchStatus } from '../../types';
-import { BehaviorSubject, Subject } from 'rxjs';
import { DataPublicPluginStart } from '../../../../../data/public';
import { createSearchSessionMock } from '../../../__mocks__/search_session';
import { DataRefetch$ } from './use_saved_search';
@@ -46,6 +47,10 @@ function createDataMock(
}
describe('getFetchObservable', () => {
+ afterEach(() => {
+ jest.useRealTimers();
+ });
+
test('refetch$.next should trigger fetch$.next', async (done) => {
const searchSessionManagerMock = createSearchSessionMock();
@@ -64,34 +69,43 @@ describe('getFetchObservable', () => {
fetch$.subscribe(() => {
done();
});
- refetch$.next();
+ refetch$.next(undefined);
});
- test('getAutoRefreshFetch$ should trigger fetch$.next', async () => {
- jest.useFakeTimers();
- const searchSessionManagerMock = createSearchSessionMock();
- const autoRefreshFetch$ = new Subject();
- const main$ = new BehaviorSubject({ fetchStatus: FetchStatus.UNINITIALIZED });
- const refetch$: DataRefetch$ = new Subject();
- const dataMock = createDataMock(new Subject(), new Subject(), new Subject(), autoRefreshFetch$);
- const setAutoRefreshDone = jest.fn();
- const fetch$ = getFetch$({
- setAutoRefreshDone,
- main$,
- refetch$,
- data: dataMock,
- searchSessionManager: searchSessionManagerMock.searchSessionManager,
- searchSource: savedSearchMockWithTimeField.searchSource,
- initialFetchStatus: FetchStatus.LOADING,
- });
+ test(
+ 'getAutoRefreshFetch$ should trigger fetch$.next',
+ fakeSchedulers((advance) => {
+ jest.useFakeTimers();
+ const searchSessionManagerMock = createSearchSessionMock();
+ const autoRefreshFetch$ = new Subject();
- const fetchfnMock = jest.fn();
- fetch$.subscribe(() => {
- fetchfnMock();
- });
- autoRefreshFetch$.next(jest.fn());
- jest.runAllTimers();
- expect(fetchfnMock).toHaveBeenCalledTimes(1);
- expect(setAutoRefreshDone).toHaveBeenCalled();
- });
+ const main$ = new BehaviorSubject({ fetchStatus: FetchStatus.UNINITIALIZED });
+ const refetch$: DataRefetch$ = new Subject();
+ const dataMock = createDataMock(
+ new Subject(),
+ new Subject(),
+ new Subject(),
+ autoRefreshFetch$
+ );
+ const setAutoRefreshDone = jest.fn();
+ const fetch$ = getFetch$({
+ setAutoRefreshDone,
+ main$,
+ refetch$,
+ data: dataMock,
+ searchSessionManager: searchSessionManagerMock.searchSessionManager,
+ searchSource: savedSearchMockWithTimeField.searchSource,
+ initialFetchStatus: FetchStatus.LOADING,
+ });
+
+ const fetchfnMock = jest.fn();
+ fetch$.subscribe(() => {
+ fetchfnMock();
+ });
+ autoRefreshFetch$.next(jest.fn());
+ advance(100);
+ expect(fetchfnMock).toHaveBeenCalledTimes(1);
+ expect(setAutoRefreshDone).toHaveBeenCalled();
+ })
+ );
});
diff --git a/src/plugins/discover/public/application/main/utils/use_discover_state.ts b/src/plugins/discover/public/application/main/utils/use_discover_state.ts
index 4d5d911f8abf30..607aba88e033ca 100644
--- a/src/plugins/discover/public/application/main/utils/use_discover_state.ts
+++ b/src/plugins/discover/public/application/main/utils/use_discover_state.ts
@@ -141,7 +141,7 @@ export function useDiscoverState({
}
if (chartDisplayChanged || chartIntervalChanged || docTableSortChanged) {
- refetch$.next();
+ refetch$.next(undefined);
}
setState(nextState);
});
@@ -211,7 +211,7 @@ export function useDiscoverState({
(_payload, isUpdate?: boolean) => {
if (isUpdate === false) {
searchSessionManager.removeSearchSessionIdFromURL({ replace: false });
- refetch$.next();
+ refetch$.next(undefined);
}
},
[refetch$, searchSessionManager]
@@ -222,7 +222,7 @@ export function useDiscoverState({
*/
useEffect(() => {
if (indexPattern) {
- refetch$.next();
+ refetch$.next(undefined);
}
}, [initialFetchStatus, refetch$, indexPattern, savedSearch.id]);
diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
index 0430b5672aebdf..597d8b76be8aac 100644
--- a/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
+++ b/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
@@ -76,7 +76,7 @@ describe('test useSavedSearch', () => {
});
});
- result.current.refetch$.next();
+ result.current.refetch$.next(undefined);
await waitForValueToChange(() => {
return result.current.data$.main$.value.fetchStatus === 'complete';
@@ -119,7 +119,7 @@ describe('test useSavedSearch', () => {
});
});
- result.current.refetch$.next();
+ result.current.refetch$.next(undefined);
await waitForValueToChange(() => {
return result.current.data$.main$.value.fetchStatus === FetchStatus.COMPLETE;
diff --git a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
index b1fd1ae873e088..a5702da29975cd 100644
--- a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
+++ b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { Subscription } from 'rxjs';
+import { lastValueFrom, Subscription } from 'rxjs';
import { onlyDisabledFiltersChanged, Filter } from '@kbn/es-query';
import React from 'react';
import ReactDOM from 'react-dom';
@@ -182,8 +182,8 @@ export class SavedSearchEmbeddable
try {
// Make the request
- const { rawResponse: resp } = await searchSource
- .fetch$({
+ const { rawResponse: resp } = await lastValueFrom(
+ searchSource.fetch$({
abortSignal: this.abortController.signal,
sessionId: searchSessionId,
inspector: {
@@ -198,7 +198,7 @@ export class SavedSearchEmbeddable
},
executionContext,
})
- .toPromise();
+ );
this.updateOutput({ loading: false, error: undefined });
this.searchProps!.rows = resp.hits.hits;
diff --git a/src/plugins/discover/public/utils/use_es_doc_search.ts b/src/plugins/discover/public/utils/use_es_doc_search.ts
index e33d30d65979e3..106b5828b2f01f 100644
--- a/src/plugins/discover/public/utils/use_es_doc_search.ts
+++ b/src/plugins/discover/public/utils/use_es_doc_search.ts
@@ -8,6 +8,7 @@
import { useCallback, useEffect, useMemo, useState } from 'react';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { firstValueFrom } from 'rxjs';
import { DataView } from '../../../data_views/public';
import { DocProps } from '../application/doc/components/doc';
import { ElasticRequestState } from '../application/doc/types';
@@ -74,14 +75,14 @@ export function useEsDocSearch({
const requestData = useCallback(async () => {
try {
- const { rawResponse } = await data.search
- .search({
+ const { rawResponse } = await firstValueFrom(
+ data.search.search({
params: {
index,
body: buildSearchBody(id, indexPattern, useNewFieldsApi, requestSource)?.body,
},
})
- .toPromise();
+ );
const hits = rawResponse.hits;
diff --git a/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx b/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx
index 0273a0e3b30700..0f4e9617d9af32 100644
--- a/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx
+++ b/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx
@@ -357,7 +357,7 @@ const schema = {
}
// myform.tsx
-import { firstValueFrom } from '@kbn/std';
+import { firstValueFrom } from 'rxjs';
const MyForm = () => {
const { form } = useForm();
diff --git a/src/plugins/expressions/common/execution/execution.abortion.test.ts b/src/plugins/expressions/common/execution/execution.abortion.test.ts
index fca030fb9a0803..1664dd86870a85 100644
--- a/src/plugins/expressions/common/execution/execution.abortion.test.ts
+++ b/src/plugins/expressions/common/execution/execution.abortion.test.ts
@@ -7,6 +7,7 @@
*/
import { waitFor } from '@testing-library/react';
+import { lastValueFrom } from 'rxjs';
import { Execution } from './execution';
import { parseExpression } from '../ast';
import { createUnitTestExecutor } from '../test_helpers';
@@ -75,7 +76,7 @@ describe('Execution abortion tests', () => {
execution.start();
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
execution.cancel();
@@ -135,7 +136,7 @@ describe('Execution abortion tests', () => {
await waitFor(() => expect(started).toHaveBeenCalledTimes(1));
execution.cancel();
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toMatchObject({
type: 'error',
error: {
diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts
index 786b18405309f2..b065d39a16e2e1 100644
--- a/src/plugins/expressions/common/execution/execution.test.ts
+++ b/src/plugins/expressions/common/execution/execution.test.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { of } from 'rxjs';
+import { lastValueFrom, of } from 'rxjs';
import { scan } from 'rxjs/operators';
import { TestScheduler } from 'rxjs/testing';
import { Execution } from './execution';
@@ -45,7 +45,7 @@ const run = async (
) => {
const execution = createExecution(expression, context);
execution.start(input);
- return await execution.result.toPromise();
+ return await lastValueFrom(execution.result);
};
let testScheduler: TestScheduler;
@@ -84,7 +84,7 @@ describe('Execution', () => {
/* eslint-enable no-console */
execution.start(123);
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toBe(123);
expect(spy).toHaveBeenCalledTimes(1);
@@ -102,7 +102,7 @@ describe('Execution', () => {
value: -1,
});
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -117,7 +117,7 @@ describe('Execution', () => {
value: 0,
});
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -131,7 +131,7 @@ describe('Execution', () => {
// Below 1 is cast to { type: 'num', value: 1 }.
execution.start(1);
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -143,7 +143,7 @@ describe('Execution', () => {
const execution = createExecution('add val=1');
execution.start(Promise.resolve(1));
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -155,7 +155,7 @@ describe('Execution', () => {
const execution = createExecution('add val=1');
execution.start(of(1));
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -372,7 +372,7 @@ describe('Execution', () => {
value: 0,
});
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -460,7 +460,7 @@ describe('Execution', () => {
const execution = await createExecution('error "foo"');
execution.start(null);
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toMatchObject({
type: 'error',
@@ -709,7 +709,7 @@ describe('Execution', () => {
};
const executor = createUnitTestExecutor();
executor.registerFunction(requiredArg);
- const { result } = await executor.run('requiredArg', null, {}).toPromise();
+ const { result } = await lastValueFrom(executor.run('requiredArg', null, {}));
expect(result).toMatchObject({
type: 'error',
@@ -758,7 +758,7 @@ describe('Execution', () => {
});
it('errors when argument is invalid', async () => {
- const { result } = await executor.run('validateArg arg="invalid"', null).toPromise();
+ const { result } = await lastValueFrom(executor.run('validateArg arg="invalid"', null));
expect(result).toMatchObject({
type: 'error',
@@ -770,9 +770,9 @@ describe('Execution', () => {
});
it('errors when at least one value is invalid', async () => {
- const { result } = await executor
- .run('validateArg arg="valid" arg="invalid"', null)
- .toPromise();
+ const { result } = await lastValueFrom(
+ executor.run('validateArg arg="valid" arg="invalid"', null)
+ );
expect(result).toMatchObject({
type: 'error',
@@ -784,7 +784,7 @@ describe('Execution', () => {
});
it('does not error when argument is valid', async () => {
- const { result } = await executor.run('validateArg arg="valid"', null).toPromise();
+ const { result } = await lastValueFrom(executor.run('validateArg arg="valid"', null));
expect(result).toBe('something');
});
@@ -794,7 +794,7 @@ describe('Execution', () => {
test('can execute expression in debug mode', async () => {
const execution = createExecution('add val=1 | add val=2 | add val=3', {}, true);
execution.start(-1);
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
@@ -809,7 +809,7 @@ describe('Execution', () => {
true
);
execution.start(0);
- const { result } = await execution.result.toPromise();
+ const { result } = await lastValueFrom(execution.result);
expect(result).toEqual({
type: 'num',
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index 4eafd1ff5a2786..4c7549061914cd 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -281,8 +281,8 @@ export class Execution<
this.context.inspectorAdapters.requests?.reset();
}
- if (isObservable(input)) {
- input.subscribe(this.input$);
+ if (isObservable(input)) {
+ (input as Observable).subscribe(this.input$);
} else if (isPromise(input)) {
from(input).subscribe(this.input$);
} else {
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
index b98e8285a1a84a..cbe64063082510 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
@@ -10,7 +10,7 @@ import { functionWrapper } from './utils';
import { variableSet } from '../var_set';
import { ExecutionContext } from '../../../execution/types';
import { createUnitTestExecutor } from '../../../test_helpers';
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
describe('expression_functions', () => {
describe('var_set', () => {
@@ -66,10 +66,9 @@ describe('expression_functions', () => {
it('sets the variables', async () => {
const vars = {};
- const { result } = await executor
- .run('var_set name=test1 name=test2 value=1', 2, { variables: vars })
- .pipe(first())
- .toPromise();
+ const { result } = await firstValueFrom(
+ executor.run('var_set name=test1 name=test2 value=1', 2, { variables: vars })
+ );
expect(result).toEqual(2);
diff --git a/src/plugins/expressions/common/service/expressions_services.test.ts b/src/plugins/expressions/common/service/expressions_services.test.ts
index 8e83cd8e556514..882e66e1471c83 100644
--- a/src/plugins/expressions/common/service/expressions_services.test.ts
+++ b/src/plugins/expressions/common/service/expressions_services.test.ts
@@ -6,6 +6,7 @@
* Side Public License, v 1.
*/
+import { lastValueFrom } from 'rxjs';
import { ExpressionsService } from './expressions_services';
import { ExpressionsServiceFork } from './expressions_fork';
@@ -131,7 +132,7 @@ describe('ExpressionsService', () => {
},
});
- const { result } = await forkStart.run('__test__', null).toPromise();
+ const { result } = await lastValueFrom(forkStart.run('__test__', null));
expect(result).toBe('123');
});
diff --git a/src/plugins/expressions/public/loader.test.ts b/src/plugins/expressions/public/loader.test.ts
index 61a6ee3bda912b..06cb30a74fe976 100644
--- a/src/plugins/expressions/public/loader.test.ts
+++ b/src/plugins/expressions/public/loader.test.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { of } from 'rxjs';
+import { firstValueFrom, of } from 'rxjs';
import { first, skip, toArray } from 'rxjs/operators';
import { TestScheduler } from 'rxjs/testing';
import { loader, ExpressionLoader } from './loader';
@@ -125,7 +125,7 @@ describe('ExpressionLoader', () => {
it('emits on $data when data is available', async () => {
const expressionLoader = new ExpressionLoader(element, 'var foo', { variables: { foo: 123 } });
- const { result } = await expressionLoader.data$.pipe(first()).toPromise();
+ const { result } = await firstValueFrom(expressionLoader.data$);
expect(result).toBe(123);
});
@@ -133,7 +133,7 @@ describe('ExpressionLoader', () => {
const expressionLoader = new ExpressionLoader(element, 'var foo', {
variables: { foo: of(1, 2) },
});
- const { result, partial } = await expressionLoader.data$.pipe(first()).toPromise();
+ const { result, partial } = await firstValueFrom(expressionLoader.data$);
expect(partial).toBe(false);
expect(result).toBe(2);
@@ -145,7 +145,7 @@ describe('ExpressionLoader', () => {
partial: true,
throttle: 0,
});
- const { result, partial } = await expressionLoader.data$.pipe(first()).toPromise();
+ const { result, partial } = await firstValueFrom(expressionLoader.data$);
expect(partial).toBe(true);
expect(result).toBe(1);
@@ -159,7 +159,7 @@ describe('ExpressionLoader', () => {
throttle: 20,
});
- expectObservable(expressionLoader.data$).toBe('a 19ms c 2ms d', {
+ expectObservable(expressionLoader.data$).toBe('a 19ms c 19ms d', {
a: expect.objectContaining({ result: 1 }),
c: expect.objectContaining({ result: 3 }),
d: expect.objectContaining({ result: 4 }),
diff --git a/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx b/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
index d7e08b0f7fc931..a23ac9d90df4c7 100644
--- a/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
+++ b/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
@@ -32,7 +32,7 @@ describe('ExpressionRenderer', () => {
const data$ = dataSubject.asObservable().pipe(share());
const renderSubject = new Subject();
const render$ = renderSubject.asObservable().pipe(share());
- const loadingSubject = new Subject();
+ const loadingSubject = new Subject();
const loading$ = loadingSubject.asObservable().pipe(share());
(ExpressionLoader as jest.Mock).mockImplementation(() => {
@@ -78,7 +78,7 @@ describe('ExpressionRenderer', () => {
});
it('updates the expression loader when refresh subject emits', () => {
- const refreshSubject = new Subject();
+ const refreshSubject = new Subject();
const loaderUpdate = jest.fn();
(ExpressionLoader as jest.Mock).mockImplementation(() => {
@@ -207,7 +207,7 @@ describe('ExpressionRenderer', () => {
const data$ = dataSubject.asObservable().pipe(share());
const renderSubject = new Subject();
const render$ = renderSubject.asObservable().pipe(share());
- const loadingSubject = new Subject();
+ const loadingSubject = new Subject();
const loading$ = loadingSubject.asObservable().pipe(share());
let onRenderError: RenderErrorHandlerFnType;
diff --git a/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts b/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts
index 581fb4b182b413..3ed68338dc4e43 100644
--- a/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts
+++ b/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts
@@ -205,7 +205,7 @@ describe('useExpressionRenderer', () => {
});
it('should update on reload', () => {
- const reload$ = new Subject();
+ const reload$ = new Subject();
hook.rerender({ reload$, expression: 'something' });
expect(expressionLoader.update).not.toHaveBeenCalled();
diff --git a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index 4381db10f8cd0b..fa3cbbdec6df0b 100644
--- a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -14,9 +14,9 @@ exports[`InspectorPanel should render as expected 1`] = `
Object {
"application": Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -28,10 +28,9 @@ exports[`InspectorPanel should render as expected 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -199,9 +198,9 @@ exports[`InspectorPanel should render as expected 1`] = `
Object {
"application": Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -213,10 +212,9 @@ exports[`InspectorPanel should render as expected 1`] = `
"navLinks": Object {},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.ts b/src/plugins/interactive_setup/server/elasticsearch_service.ts
index f9bcbd60d02d37..41183eb67f1214 100644
--- a/src/plugins/interactive_setup/server/elasticsearch_service.ts
+++ b/src/plugins/interactive_setup/server/elasticsearch_service.ts
@@ -10,12 +10,11 @@ import { errors } from '@elastic/elasticsearch';
import type { TransportResult } from '@elastic/elasticsearch';
import type { Duration } from 'moment';
import type { Observable } from 'rxjs';
-import { from, of, timer } from 'rxjs';
+import { firstValueFrom, from, of, timer } from 'rxjs';
import {
catchError,
distinctUntilChanged,
exhaustMap,
- first,
map,
shareReplay,
takeWhile,
@@ -388,15 +387,15 @@ export class ElasticsearchService {
}
private async checkCompatibility(internalClient: ElasticsearchClient) {
- return pollEsNodesVersion({
- internalClient,
- log: this.logger,
- kibanaVersion: this.kibanaVersion,
- ignoreVersionMismatch: false,
- esVersionCheckInterval: -1, // Passing a negative number here will result in immediate completion after the first value is emitted
- })
- .pipe(first())
- .toPromise();
+ return firstValueFrom(
+ pollEsNodesVersion({
+ internalClient,
+ log: this.logger,
+ kibanaVersion: this.kibanaVersion,
+ ignoreVersionMismatch: false,
+ esVersionCheckInterval: -1, // Passing a negative number here will result in immediate completion after the first value is emitted
+ })
+ );
}
private static fetchPeerCertificate(host: string, port: string | number) {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
index 54a7d3e220242d..312fb9b9bc1d94 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Subject } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
import {
Collector,
createUsageCollectionSetupMock,
@@ -47,7 +46,7 @@ describe('telemetry_ops_stats', () => {
});
test('should return something when there is a metric', async () => {
- const opsMetrics = await metricsServiceSetupMock.getOpsMetrics$().pipe(take(1)).toPromise();
+ const opsMetrics = await firstValueFrom(metricsServiceSetupMock.getOpsMetrics$());
metrics$.next(opsMetrics);
expect(collector.isReady()).toBe(true);
expect(await collector.fetch(mockedFetchContext)).toMatchSnapshot({
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
index 1d659ae3fe61c7..4021ee7790bb8f 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
@@ -73,7 +73,7 @@ describe('KbnUrlStateStorage', () => {
it('should notify about url changes', async () => {
expect(urlStateStorage.change$).toBeDefined();
const key = '_s';
- const destroy$ = new Subject();
+ const destroy$ = new Subject();
const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
history.push(`/#?${key}=(ok:1,test:test)`);
@@ -139,7 +139,7 @@ describe('KbnUrlStateStorage', () => {
it('should notify about url changes', async () => {
expect(urlStateStorage.change$).toBeDefined();
const key = '_s';
- const destroy$ = new Subject();
+ const destroy$ = new Subject();
const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
history.push(`/#?${key}=(ok:1,test:test)`);
@@ -248,7 +248,7 @@ describe('KbnUrlStateStorage', () => {
it('should notify about url changes', async () => {
expect(urlStateStorage.change$).toBeDefined();
const key = '_s';
- const destroy$ = new Subject();
+ const destroy$ = new Subject();
const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
history.push(`/?${key}=(ok:1,test:test)`);
@@ -357,7 +357,7 @@ describe('KbnUrlStateStorage', () => {
it('should notify about url changes', async () => {
expect(urlStateStorage.change$).toBeDefined();
const key = '_s';
- const destroy$ = new Subject();
+ const destroy$ = new Subject();
const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
history.push(`/#?${key}=(ok:1,test:test)`);
diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx
index 04d7c18d070af4..2194e1cc43381e 100644
--- a/src/plugins/newsfeed/public/plugin.tsx
+++ b/src/plugins/newsfeed/public/plugin.tsx
@@ -25,7 +25,7 @@ export class NewsfeedPublicPlugin
{
private readonly kibanaVersion: string;
private readonly config: NewsfeedPluginBrowserConfig;
- private readonly stop$ = new Rx.ReplaySubject(1);
+ private readonly stop$ = new Rx.ReplaySubject(1);
constructor(initializerContext: PluginInitializerContext) {
this.kibanaVersion = initializerContext.env.packageInfo.version;
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 03f30d65cbaf86..f7026af66c5007 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -104,9 +104,9 @@ exports[`SavedObjectsTable should render normally 1`] = `
application={
Object {
"applications$": BehaviorSubject {
- "_isScalar": false,
"_value": Map {},
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
@@ -123,10 +123,9 @@ exports[`SavedObjectsTable should render normally 1`] = `
},
},
"currentAppId$": Observable {
- "_isScalar": false,
"source": Subject {
- "_isScalar": false,
"closed": false,
+ "currentObservers": null,
"hasError": false,
"isStopped": false,
"observers": Array [],
diff --git a/src/plugins/saved_objects_management/server/plugin.ts b/src/plugins/saved_objects_management/server/plugin.ts
index c84f7b6277207f..379ef29b02105b 100644
--- a/src/plugins/saved_objects_management/server/plugin.ts
+++ b/src/plugins/saved_objects_management/server/plugin.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './types';
import { SavedObjectsManagement } from './services';
@@ -28,7 +27,7 @@ export class SavedObjectsManagementPlugin
this.logger.debug('Setting up SavedObjectsManagement plugin');
registerRoutes({
http,
- managementServicePromise: this.managementService$.pipe(first()).toPromise(),
+ managementServicePromise: firstValueFrom(this.managementService$),
});
capabilities.registerProvider(capabilitiesProvider);
diff --git a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
index 6d1266b7f27a7c..6b26254d0d339a 100644
--- a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
+++ b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { Observable, firstValueFrom } from 'rxjs';
import { ISavedObjectsRepository, SavedObjectsClient } from '../../../../../core/server';
import { getTelemetrySavedObject, TelemetrySavedObject } from '../../telemetry_repository';
import { getTelemetryOptIn, getTelemetrySendUsageFrom } from '../../../common/telemetry_config';
@@ -32,11 +31,7 @@ export function createCollectorFetch({
getSavedObjectsClient,
}: TelemetryPluginUsageCollectorOptions) {
return async function fetchUsageStats(): Promise {
- const {
- sendUsageFrom,
- allowChangingOptInStatus,
- optIn = null,
- } = await config$.pipe(take(1)).toPromise();
+ const { sendUsageFrom, allowChangingOptInStatus, optIn = null } = await firstValueFrom(config$);
const configTelemetrySendUsageFrom = sendUsageFrom;
const configTelemetryOptIn = optIn;
diff --git a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
index f26196c0806865..3c0428c10eb804 100644
--- a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
@@ -9,11 +9,10 @@
import { accessSync, constants, readFileSync, statSync } from 'fs';
import { safeLoad } from 'js-yaml';
import { dirname, join } from 'path';
-import { Observable } from 'rxjs';
+import { Observable, firstValueFrom } from 'rxjs';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { take } from 'rxjs/operators';
import { TelemetryConfigType } from '../../config';
// look for telemetry.yml in the same places we expect kibana.yml
@@ -129,7 +128,7 @@ export function registerTelemetryUsageCollector(
config$: Observable
) {
const collector = createTelemetryUsageCollector(usageCollection, async () => {
- const config = await config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(config$);
return config.config;
});
usageCollection.registerCollector(collector);
diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
index db890d2ea12eca..a09e9ca6ee667c 100644
--- a/src/plugins/telemetry/server/fetcher.ts
+++ b/src/plugins/telemetry/server/fetcher.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Observable, Subscription, timer } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, Subscription, timer } from 'rxjs';
import fetch from 'node-fetch';
import type { TelemetryCollectionManagerPluginStart } from 'src/plugins/telemetry_collection_manager/server';
import {
@@ -119,7 +118,7 @@ export class FetcherTask {
private async getCurrentConfigs(): Promise {
const telemetrySavedObject = await getTelemetrySavedObject(this.internalRepository!);
- const config = await this.config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(this.config$);
const currentKibanaVersion = this.currentKibanaVersion;
const configTelemetrySendUsageFrom = config.sendUsageFrom;
const allowChangingOptInStatus = config.allowChangingOptInStatus;
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
index 681a871ba105b6..2bab4fb4c7fe96 100644
--- a/src/plugins/telemetry/server/plugin.ts
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -8,8 +8,7 @@
import { URL } from 'url';
import type { Observable } from 'rxjs';
-import { ReplaySubject } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, ReplaySubject } from 'rxjs';
import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import type {
TelemetryCollectionManagerPluginSetup,
@@ -131,7 +130,7 @@ export class TelemetryPlugin implements Plugin {
- const { sendUsageTo } = await config$.pipe(take(1)).toPromise();
+ const { sendUsageTo } = await firstValueFrom(config$);
const telemetryUrl = getTelemetryChannelEndpoint({
env: sendUsageTo,
channelName: 'snapshot',
@@ -157,9 +156,7 @@ export class TelemetryPlugin implements Plugin {
- const internalRepositoryClient = await this.savedObjectsInternalClient$
- .pipe(take(1))
- .toPromise();
+ const internalRepositoryClient = await firstValueFrom(this.savedObjectsInternalClient$);
let telemetrySavedObject: TelemetrySavedObject = false; // if an error occurs while fetching opt-in status, a `false` result indicates that Kibana cannot opt-in
try {
telemetrySavedObject = await getTelemetrySavedObject(internalRepositoryClient);
@@ -167,7 +164,7 @@ export class TelemetryPlugin implements Plugin {
- const savedObjectsInternalClient = await savedObjectsInternalClient$
- .pipe(take(1))
- .toPromise();
+ const savedObjectsInternalClient = await firstValueFrom(savedObjectsInternalClient$);
const telemetrySavedObject = await getTelemetrySavedObject(savedObjectsInternalClient);
return res.ok({
@@ -42,9 +40,7 @@ export function registerTelemetryLastReported(
validate: false,
},
async (context, req, res) => {
- const savedObjectsInternalClient = await savedObjectsInternalClient$
- .pipe(take(1))
- .toPromise();
+ const savedObjectsInternalClient = await firstValueFrom(savedObjectsInternalClient$);
await updateTelemetrySavedObject(savedObjectsInternalClient, {
lastReported: Date.now(),
});
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
index e3fad0642303c2..92f5b0a746819d 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
import { schema } from '@kbn/config-schema';
import { IRouter, Logger } from 'kibana/server';
import {
@@ -53,7 +52,7 @@ export function registerTelemetryOptInRoutes({
enabled: newOptInStatus,
lastVersionChecked: currentKibanaVersion,
};
- const config = await config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(config$);
const telemetrySavedObject = await getTelemetrySavedObject(context.core.savedObjects.client);
if (telemetrySavedObject === false) {
diff --git a/src/plugins/usage_collection/server/routes/stats/stats.ts b/src/plugins/usage_collection/server/routes/stats/stats.ts
index 72cbd2e5899ff5..f987d83a5bb5f5 100644
--- a/src/plugins/usage_collection/server/routes/stats/stats.ts
+++ b/src/plugins/usage_collection/server/routes/stats/stats.ts
@@ -9,8 +9,7 @@
import { schema } from '@kbn/config-schema';
import { i18n } from '@kbn/i18n';
import defaultsDeep from 'lodash/defaultsDeep';
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
import {
ElasticsearchClient,
@@ -143,12 +142,11 @@ export function registerStatsRoute({
}
// Guaranteed to resolve immediately due to replay effect on getOpsMetrics$
- const { collected_at: collectedAt, ...lastMetrics } = await metrics
- .getOpsMetrics$()
- .pipe(first())
- .toPromise();
+ const { collected_at: collectedAt, ...lastMetrics } = await firstValueFrom(
+ metrics.getOpsMetrics$()
+ );
- const overallStatus = await overallStatus$.pipe(first()).toPromise();
+ const overallStatus = await firstValueFrom(overallStatus$);
const kibanaStats = collectorSet.toApiFieldNames({
...lastMetrics,
kibana: {
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
index a698ea3db5bad1..b3ddb93d1855d4 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
@@ -49,16 +49,16 @@ export interface UsageCountersServiceStartDeps {
}
export class UsageCountersService {
- private readonly stop$ = new Rx.Subject();
+ private readonly stop$ = new Rx.Subject();
private readonly retryCount: number;
private readonly bufferDurationMs: number;
private readonly counterSets = new Map();
private readonly source$ = new Rx.Subject();
private readonly counter$ = this.source$.pipe(rxOp.multicast(new Rx.Subject()), rxOp.refCount());
- private readonly flushCache$ = new Rx.Subject();
+ private readonly flushCache$ = new Rx.Subject();
- private readonly stopCaching$ = new Rx.Subject();
+ private readonly stopCaching$ = new Rx.Subject();
private readonly logger: Logger;
diff --git a/src/plugins/vis_types/timeseries/server/plugin.ts b/src/plugins/vis_types/timeseries/server/plugin.ts
index 36c8558afcd080..2dc1b6458e8d65 100644
--- a/src/plugins/vis_types/timeseries/server/plugin.ts
+++ b/src/plugins/vis_types/timeseries/server/plugin.ts
@@ -15,9 +15,9 @@ import {
KibanaRequest,
IUiSettingsClient,
} from 'src/core/server';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
import { Server } from '@hapi/hapi';
-import { first, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
import { VisTypeTimeseriesConfig } from './config';
import { getVisData } from './lib/get_vis_data';
import { UsageCollectionSetup } from '../../../usage_collection/server';
@@ -104,12 +104,9 @@ export class VisTypeTimeseriesPlugin implements Plugin {
logger,
searchStrategyRegistry,
getEsShardTimeout: () =>
- globalConfig$
- .pipe(
- first(),
- map((config) => config.elasticsearch.shardTimeout.asMilliseconds())
- )
- .toPromise(),
+ firstValueFrom(
+ globalConfig$.pipe(map((config) => config.elasticsearch.shardTimeout.asMilliseconds()))
+ ),
getIndexPatternsService: async (requestContext) => {
const [, { dataViews }] = await core.getStartServices();
diff --git a/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
index 214a23d2ee9358..a5aed0e882b6d7 100644
--- a/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
+++ b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
@@ -6,6 +6,7 @@
* Side Public License, v 1.
*/
+import { of } from 'rxjs';
import { cloneDeep } from 'lodash';
import moment from 'moment';
import { EsQueryParser } from './es_query_parser';
@@ -93,9 +94,7 @@ describe('EsQueryParser.populateData', () => {
beforeEach(() => {
searchApiStub = {
- search: jest.fn(() => ({
- toPromise: jest.fn(() => Promise.resolve(data)),
- })),
+ search: jest.fn(() => of(data)),
};
parser = new EsQueryParser({}, searchApiStub, undefined, undefined);
});
diff --git a/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js b/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
index 5b9213c4dc5831..35228cdb107a10 100644
--- a/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
+++ b/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
@@ -5,6 +5,7 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
+import { of } from 'rxjs';
import { cloneDeep } from 'lodash';
import 'jest-canvas-mock';
import { euiThemeVars } from '@kbn/ui-theme';
@@ -18,7 +19,7 @@ describe(`VegaParser.parseAsync`, () => {
function check(spec, useResize, expectedSpec, warnCount) {
return async () => {
const searchApiStub = {
- search: jest.fn(() => ({ toPromise: jest.fn(() => Promise.resolve({})) })),
+ search: jest.fn(() => of({})),
resetSearchStats: jest.fn(),
};
expectedSpec = expectedSpec || cloneDeep(spec);
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
index 463cb6f8d61720..c1856de48a3d2a 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
@@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
-import { ReplaySubject } from 'rxjs';
-import { filter, take, toArray } from 'rxjs/operators';
+import { ReplaySubject, firstValueFrom, filter, take, toArray } from 'rxjs';
import type { Plugin, CoreSetup, Event } from 'src/core/public';
import { CustomShipper } from './custom_shipper';
import './types';
@@ -23,8 +22,8 @@ export class AnalyticsFTRHelpers implements Plugin {
analytics.optIn({ global: { enabled: optIn } });
},
getLastEvents: async (takeNumberOfEvents, eventTypes = []) =>
- this.events$
- .pipe(
+ firstValueFrom(
+ this.events$.pipe(
filter((event) => {
if (eventTypes.length > 0) {
return eventTypes.includes(event.event_type);
@@ -34,7 +33,7 @@ export class AnalyticsFTRHelpers implements Plugin {
take(takeNumberOfEvents),
toArray()
)
- .toPromise(),
+ ),
};
}
public start() {}
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
index 26d61e2e5355f4..7ed851e76fd55a 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
@@ -6,10 +6,9 @@
* Side Public License, v 1.
*/
-import { ReplaySubject } from 'rxjs';
+import { firstValueFrom, ReplaySubject, filter, take, toArray } from 'rxjs';
import { schema } from '@kbn/config-schema';
import type { Plugin, CoreSetup, Event } from 'src/core/server';
-import { filter, take, toArray } from 'rxjs/operators';
import { CustomShipper } from './custom_shipper';
export class AnalyticsFTRHelpers implements Plugin {
@@ -52,8 +51,8 @@ export class AnalyticsFTRHelpers implements Plugin {
async (context, req, res) => {
const { takeNumberOfEvents, eventTypes } = req.query;
- const events = await events$
- .pipe(
+ const events = await firstValueFrom(
+ events$.pipe(
filter((event) => {
if (eventTypes.length > 0) {
return eventTypes.includes(event.event_type);
@@ -63,7 +62,7 @@ export class AnalyticsFTRHelpers implements Plugin {
take(takeNumberOfEvents),
toArray()
)
- .toPromise();
+ );
return res.ok({ body: events });
}
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
index 021a57f126612c..6d0e7a9509aed3 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { BehaviorSubject, ReplaySubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, ReplaySubject } from 'rxjs';
import { take, toArray } from 'rxjs/operators';
import type { Plugin, CoreSetup, TelemetryCounter, CoreStart } from 'src/core/public';
import type { Action } from './custom_shipper';
@@ -55,7 +55,7 @@ export class AnalyticsPluginA implements Plugin {
window.__analyticsPluginA__ = {
getLastActions: async (takeNumberOfActions: number) =>
- this.actions$.pipe(take(takeNumberOfActions), toArray()).toPromise(),
+ firstValueFrom(this.actions$.pipe(take(takeNumberOfActions), toArray())),
stats,
setOptIn(optIn: boolean) {
analytics.optIn({ global: { enabled: optIn } });
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
index 1abb73c09b37a3..35d235b896aaec 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { BehaviorSubject, ReplaySubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, ReplaySubject } from 'rxjs';
import { take, toArray } from 'rxjs/operators';
import { schema } from '@kbn/config-schema';
import type { Plugin, CoreSetup, CoreStart, TelemetryCounter } from 'src/core/server';
@@ -83,7 +83,7 @@ export class AnalyticsPluginAPlugin implements Plugin {
async (context, req, res) => {
const { takeNumberOfActions } = req.query;
- const actions = await actions$.pipe(take(takeNumberOfActions), toArray()).toPromise();
+ const actions = await firstValueFrom(actions$.pipe(take(takeNumberOfActions), toArray()));
return res.ok({ body: actions });
}
diff --git a/test/functional/services/remote/create_stdout_stream.ts b/test/functional/services/remote/create_stdout_stream.ts
index 54ca36f3258d80..d136c2549bca03 100644
--- a/test/functional/services/remote/create_stdout_stream.ts
+++ b/test/functional/services/remote/create_stdout_stream.ts
@@ -13,7 +13,7 @@ import { map, takeUntil, take } from 'rxjs/operators';
export async function createStdoutSocket() {
const chunk$ = new Rx.Subject();
- const cleanup$ = new Rx.ReplaySubject(1);
+ const cleanup$ = new Rx.ReplaySubject(1);
const server = Net.createServer();
server.on('connection', (socket) => {
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index d4e20a617a602a..2945418f5f4c7f 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -364,39 +364,41 @@ export async function initWebDriver(
}
let attempt = 1;
- return await Rx.race(
- Rx.timer(2 * MINUTE).pipe(
- map(() => {
- throw new Error('remote failed to start within 2 minutes');
- })
- ),
-
+ return await Rx.firstValueFrom(
Rx.race(
- Rx.defer(async () => {
- const command = await attemptToCreateCommand(log, browserType, lifecycle, config);
- if (!command) {
- throw new Error('remote creation aborted');
- }
- return command;
- }),
- Rx.timer(30 * SECOND).pipe(
+ Rx.timer(2 * MINUTE).pipe(
map(() => {
- throw new Error('remote failed to start within 30 seconds');
+ throw new Error('remote failed to start within 2 minutes');
+ })
+ ),
+
+ Rx.race(
+ Rx.defer(async () => {
+ const command = await attemptToCreateCommand(log, browserType, lifecycle, config);
+ if (!command) {
+ throw new Error('remote creation aborted');
+ }
+ return command;
+ }),
+ Rx.timer(30 * SECOND).pipe(
+ map(() => {
+ throw new Error('remote failed to start within 30 seconds');
+ })
+ )
+ ).pipe(
+ catchError((error, resubscribe) => {
+ log.warning('Failure while creating webdriver instance');
+ log.warning(error);
+
+ if (attempt > 5) {
+ throw new Error('out of retry attempts');
+ }
+
+ attempt += 1;
+ log.warning('...retrying in 15 seconds...');
+ return Rx.concat(sleep$(15000), resubscribe);
})
)
- ).pipe(
- catchError((error, resubscribe) => {
- log.warning('Failure while creating webdriver instance');
- log.warning(error);
-
- if (attempt > 5) {
- throw new Error('out of retry attempts');
- }
-
- attempt += 1;
- log.warning('...retrying in 15 seconds...');
- return Rx.concat(sleep$(15000), resubscribe);
- })
)
- ).toPromise();
+ );
}
diff --git a/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx b/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx
index c578f021bd17e5..0dfb9b6efd1a05 100644
--- a/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx
@@ -8,7 +8,7 @@
import React, { useEffect, useRef } from 'react';
import { Subject, Subscription } from 'rxjs';
-const refreshServiceGroupsSubject = new Subject();
+const refreshServiceGroupsSubject = new Subject();
export function refreshServiceGroups() {
refreshServiceGroupsSubject.next();
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index 310e9c30c71e06..70f23d389f256f 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { Observable, firstValueFrom } from 'rxjs';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import {
CoreSetup,
@@ -66,7 +65,7 @@ export async function createApmTelemetry({
const savedObjectsClient = await getInternalSavedObjectsClient(core);
const collectAndStore = async () => {
- const config = await config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(config$);
const [{ elasticsearch }] = await core.getStartServices();
const esClient = elasticsearch.client;
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index 4e603741ea2a51..f705b3c8e91621 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import {
CoreSetup,
CoreStart,
@@ -154,7 +154,7 @@ export class APMPlugin
const boundGetApmIndices = async () =>
getApmIndices({
savedObjectsClient: await getInternalSavedObjectsClient(core),
- config: await config$.pipe(take(1)).toPromise(),
+ config: await firstValueFrom(config$),
});
boundGetApmIndices().then((indices) => {
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
index 5fc32ea363bc6d..c1567d3c9ba6ed 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
@@ -6,7 +6,7 @@
*/
import { schema } from '@kbn/config-schema';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import {
ALERT_EVALUATION_THRESHOLD,
ALERT_EVALUATION_VALUE,
@@ -84,7 +84,7 @@ export function registerErrorCountAlertType({
minimumLicenseRequired: 'basic',
isExportable: true,
executor: async ({ services, params }) => {
- const config = await config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(config$);
const ruleParams = params;
const indices = await getApmIndices({
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
index bfbb2a99c662cc..fd90addd049654 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
@@ -12,7 +12,7 @@ import {
ALERT_EVALUATION_VALUE,
ALERT_REASON,
} from '@kbn/rule-data-utils';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { getAlertUrlTransaction } from '../../../common/utils/formatters';
import { asDuration } from '../../../../observability/common/utils/formatters';
import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
@@ -97,7 +97,7 @@ export function registerTransactionDurationAlertType({
minimumLicenseRequired: 'basic',
isExportable: true,
executor: async ({ services, params }) => {
- const config = await config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(config$);
const ruleParams = params;
const indices = await getApmIndices({
config,
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
index 219f992ad15be2..0119534912ba59 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
@@ -6,7 +6,7 @@
*/
import { schema } from '@kbn/config-schema';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import {
ALERT_EVALUATION_THRESHOLD,
ALERT_EVALUATION_VALUE,
@@ -93,7 +93,7 @@ export function registerTransactionErrorRateAlertType({
minimumLicenseRequired: 'basic',
isExportable: true,
executor: async ({ services, params: ruleParams }) => {
- const config = await config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(config$);
const indices = await getApmIndices({
config,
savedObjectsClient: services.savedObjectsClient,
diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
index c795bbb53d13f0..03067d727501d3 100644
--- a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
+++ b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
@@ -15,6 +15,7 @@ import { CoreSetup, Logger } from 'src/core/server';
import { APMConfig } from '../..';
import { APMRouteCreateOptions, APMRouteHandlerResources } from '../typings';
import { registerRoutes } from './register_apm_server_routes';
+import { NEVER } from 'rxjs';
type RegisterRouteDependencies = Parameters[0];
@@ -105,9 +106,7 @@ const initApi = (
query: {},
body: null,
events: {
- aborted$: {
- toPromise: () => new Promise(() => {}),
- },
+ aborted$: NEVER,
},
...request,
},
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
index c40e1ffd62439f..761d07499b100d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
@@ -9,6 +9,7 @@ import {
ExpressionFunctionDefinition,
ExpressionValueFilter,
} from 'src/plugins/expressions/common';
+import { lastValueFrom } from 'rxjs';
// @ts-expect-error untyped local
import { buildESRequest } from '../../../common/lib/request/build_es_request';
@@ -122,20 +123,19 @@ export function esdocs(): ExpressionFunctionDefinition<
// We're requesting the data using the ESSQL strategy because
// the SQL routes return type information with the result set
- return search
- .search(req, {
+ return lastValueFrom(
+ search.search(req, {
strategy: ESSQL_SEARCH_STRATEGY,
})
- .toPromise()
- .then((resp: EssqlSearchStrategyResponse) => {
- return {
- type: 'datatable',
- meta: {
- type: 'essql',
- },
- ...resp,
- };
- });
+ ).then((resp: EssqlSearchStrategyResponse) => {
+ return {
+ type: 'datatable',
+ meta: {
+ type: 'essql',
+ },
+ ...resp,
+ };
+ });
},
};
}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
index 1339c93032ea92..bf1d0549b6c9dd 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
@@ -9,6 +9,7 @@ import {
ExpressionFunctionDefinition,
ExpressionValueFilter,
} from 'src/plugins/expressions/common';
+import { lastValueFrom } from 'rxjs';
import { searchService } from '../../../public/services';
import { ESSQL_SEARCH_STRATEGY } from '../../../common/lib/constants';
import { EssqlSearchStrategyRequest, EssqlSearchStrategyResponse } from '../../../types';
@@ -69,11 +70,11 @@ export function essql(): ExpressionFunctionDefinition<
filter: input.and,
};
- return search
- .search(req, {
+ return lastValueFrom(
+ search.search(req, {
strategy: ESSQL_SEARCH_STRATEGY,
})
- .toPromise()
+ )
.then((resp: EssqlSearchStrategyResponse) => {
return {
type: 'datatable',
diff --git a/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts b/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts
index e343de569b22f8..e39c6f7e98976b 100644
--- a/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts
+++ b/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts
@@ -8,6 +8,7 @@
import { essqlSearchStrategyProvider } from './essql_strategy';
import { EssqlSearchStrategyRequest } from '../../types';
import { zipObject } from 'lodash';
+import { lastValueFrom } from 'rxjs';
const getMockEssqlResponse = () => ({
body: {
@@ -72,7 +73,7 @@ describe('ESSQL search strategy', () => {
describe('query functionality', () => {
it('performs a simple query', async () => {
const sqlSearch = await essqlSearchStrategyProvider();
- const result = await sqlSearch.search(basicReq, {}, mockDeps).toPromise();
+ const result = await lastValueFrom(sqlSearch.search(basicReq, {}, mockDeps));
const [[request]] = mockQuery.mock.calls;
expect(request.format).toEqual('json');
@@ -120,7 +121,9 @@ describe('ESSQL search strategy', () => {
mockQuery.mockReset().mockReturnValueOnce(pageOne).mockReturnValueOnce(pageTwo);
const sqlSearch = await essqlSearchStrategyProvider();
- const result = await sqlSearch.search({ ...basicReq, count: 2 }, {}, mockDeps).toPromise();
+ const result = await lastValueFrom(
+ sqlSearch.search({ ...basicReq, count: 2 }, {}, mockDeps)
+ );
expect(result.rows).toHaveLength(2);
});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
index 6d66542380e690..0e5de30cf64799 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
@@ -7,6 +7,7 @@
import React from 'react';
import type { UseQueryResult } from 'react-query';
import { render, screen } from '@testing-library/react';
+import { of } from 'rxjs';
import { useKubebeatDataView } from '../../common/api/use_kubebeat_data_view';
import { Findings } from './findings';
import { TestProvider } from '../../test/test_provider';
@@ -48,9 +49,7 @@ describe('', () => {
(useCisKubernetesIntegration as jest.Mock).mockImplementation(() => ({
data: { item: { status: 'installed' } },
}));
- (source.fetch$ as jest.Mock).mockReturnValue({
- toPromise: () => Promise.resolve({ rawResponse: { hits: { hits: [] } } }),
- });
+ (source.fetch$ as jest.Mock).mockReturnValue(of({ rawResponse: { hits: { hits: [] } } }));
(useKubebeatDataView as jest.Mock).mockReturnValue({
status: 'success',
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
index f9e2a59d6316c8..25054747808dc2 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
@@ -8,6 +8,7 @@ import type { Filter } from '@kbn/es-query';
import { type UseQueryResult, useQuery } from 'react-query';
import type { AggregationsAggregate, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
import { number } from 'io-ts';
+import { lastValueFrom } from 'rxjs';
import { extractErrorMessage } from '../../../common/utils/helpers';
import type {
DataView,
@@ -122,7 +123,7 @@ export const useFindings = (
createFindingsSearchSource({ ...searchProps, dataView }, query)
);
- const response = await source.fetch$().toPromise();
+ const response = await lastValueFrom(source.fetch$());
return response;
},
diff --git a/x-pack/plugins/cross_cluster_replication/public/plugin.ts b/x-pack/plugins/cross_cluster_replication/public/plugin.ts
index 87b8c931196240..5699ad0980dc42 100644
--- a/x-pack/plugins/cross_cluster_replication/public/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/plugin.ts
@@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import { get } from 'lodash';
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
import { PLUGIN, MANAGEMENT_ID } from '../common/constants';
@@ -75,7 +75,7 @@ export class CrossClusterReplicationPlugin implements Plugin {
// NOTE: We enable the plugin by default instead of disabling it by default because this
// creates a race condition that causes functional tests to fail on CI (see #66781).
- Promise.all([licensing.license$.pipe(first()).toPromise(), getStartServices()]).then(
+ Promise.all([firstValueFrom(licensing.license$), getStartServices()]).then(
([license, startServices]) => {
const licenseStatus = license.check(PLUGIN.ID, PLUGIN.minimumLicenseType);
const isLicenseOk = licenseStatus.state === 'valid';
diff --git a/x-pack/plugins/cross_cluster_replication/server/plugin.ts b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
index 9e4a8c484964b3..31c9647cad7885 100644
--- a/x-pack/plugins/cross_cluster_replication/server/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
import { CoreSetup, CoreStart, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
import { IScopedClusterClient } from 'kibana/server';
@@ -58,23 +57,20 @@ export class CrossClusterReplicationServerPlugin implements Plugin {
- // remoteClusters.isUiEnabled is driven by the xpack.remote_clusters.ui.enabled setting.
- // The CCR UI depends upon the Remote Clusters UI (e.g. by cross-linking to it), so if
- // the Remote Clusters UI is disabled we can't show the CCR UI.
- const isCcrUiEnabled = config.ui.enabled && remoteClusters.isUiEnabled;
+ firstValueFrom(this.config$).then((config) => {
+ // remoteClusters.isUiEnabled is driven by the xpack.remote_clusters.ui.enabled setting.
+ // The CCR UI depends upon the Remote Clusters UI (e.g. by cross-linking to it), so if
+ // the Remote Clusters UI is disabled we can't show the CCR UI.
+ const isCcrUiEnabled = config.ui.enabled && remoteClusters.isUiEnabled;
- // If the UI isn't enabled, then we don't want to expose any CCR concepts in the UI, including
- // "follower" badges for follower indices.
- if (isCcrUiEnabled) {
- if (indexManagement.indexDataEnricher) {
- indexManagement.indexDataEnricher.add(ccrDataEnricher);
- }
+ // If the UI isn't enabled, then we don't want to expose any CCR concepts in the UI, including
+ // "follower" badges for follower indices.
+ if (isCcrUiEnabled) {
+ if (indexManagement.indexDataEnricher) {
+ indexManagement.indexDataEnricher.add(ccrDataEnricher);
}
- });
+ }
+ });
this.license.setup({
pluginName: PLUGIN.TITLE,
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
index fbd7f472177cb4..ba6ab57eb0ea35 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
@@ -133,10 +133,6 @@ export class SearchSessionsMgmtAPI {
) {}
public async fetchTableData(): Promise {
- interface FetchResult {
- saved_objects: object[];
- }
-
const mgmtConfig = this.config.management;
const refreshTimeout = moment.duration(mgmtConfig.refreshTimeout);
@@ -165,7 +161,7 @@ export class SearchSessionsMgmtAPI {
// fetch the search sessions before timeout triggers
try {
- const result = await race(fetch$, timeout$).toPromise();
+ const result = await race(fetch$, timeout$).toPromise();
if (result && result.saved_objects) {
const savedObjects = result.saved_objects as Array<
SavedObject
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
index 5f5753b8858e02..a6dbe850b5e4f4 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
@@ -12,6 +12,7 @@ import { Storage } from '../../../../../../../src/plugins/kibana_utils/public/';
import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
import { createConnectedSearchSessionIndicator } from './connected_search_session_indicator';
import { BehaviorSubject } from 'rxjs';
+import { map } from 'rxjs/operators';
import {
ISessionService,
RefreshInterval,
@@ -35,7 +36,7 @@ let usageCollector: jest.Mocked;
const refreshInterval$ = new BehaviorSubject({ value: 0, pause: true });
const timeFilter = dataStart.query.timefilter.timefilter as jest.Mocked;
-timeFilter.getRefreshIntervalUpdate$.mockImplementation(() => refreshInterval$);
+timeFilter.getRefreshIntervalUpdate$.mockImplementation(() => refreshInterval$.pipe(map(() => {})));
timeFilter.getRefreshInterval.mockImplementation(() => refreshInterval$.getValue());
const disableSaveAfterSessionCompletesTimeout = 5 * 60 * 1000;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
index df2b7d964642d9..207dabe7c43d95 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
@@ -245,7 +245,7 @@ describe('checkSearchSessionsByPage', () => {
test('fetching is abortable', async () => {
let i = 0;
- const abort$ = new Subject();
+ const abort$ = new Subject();
const checkFn = jest.fn().mockImplementation(() => {
if (++i === 2) {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
index c44932470c7e8a..eac3732006525a 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
@@ -189,7 +189,7 @@ export class DataVisualizerGridEmbeddable extends Embeddable<
DataVisualizerGridEmbeddableOutput
> {
private node?: HTMLElement;
- private reload$ = new Subject();
+ private reload$ = new Subject();
public readonly type: string = DATA_VISUALIZER_GRID_EMBEDDABLE_TYPE;
constructor(
diff --git a/x-pack/plugins/discover_enhanced/server/plugin.ts b/x-pack/plugins/discover_enhanced/server/plugin.ts
index d5dd32791dcd59..50751cd5504196 100644
--- a/x-pack/plugins/discover_enhanced/server/plugin.ts
+++ b/x-pack/plugins/discover_enhanced/server/plugin.ts
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
import {
CoreSetup,
CoreStart,
@@ -46,7 +45,7 @@ export class DiscoverEnhancedPlugin
},
isReady: () => true,
fetch: async () => {
- const config = await this.config$.pipe(take(1)).toPromise();
+ const config = await firstValueFrom(this.config$);
return {
exploreDataInChartActionEnabled: config.actions.exploreDataInChart.enabled,
};
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts b/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
index 2411ca8a491cd8..8f07e8d0977252 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
+import { lastValueFrom } from 'rxjs';
import { TestScheduler } from 'rxjs/testing';
import { httpServiceMock } from '../../../../../src/core/public/mocks';
import { GlobalSearchResult } from '../../common/types';
@@ -55,11 +56,9 @@ describe('fetchServerResults', () => {
http.post.mockResolvedValue({ results: [resultA, resultB] });
- const results = await fetchServerResults(
- http,
- { term: 'some term' },
- { preference: 'pref' }
- ).toPromise();
+ const results = await lastValueFrom(
+ fetchServerResults(http, { term: 'some term' }, { preference: 'pref' })
+ );
expect(http.post).toHaveBeenCalledTimes(1);
expect(results).toHaveLength(2);
diff --git a/x-pack/plugins/global_search/public/services/search_service.test.ts b/x-pack/plugins/global_search/public/services/search_service.test.ts
index b0e6a72290438a..56f3b77bbaafbe 100644
--- a/x-pack/plugins/global_search/public/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.test.ts
@@ -11,8 +11,7 @@ import {
fetchServerSearchableTypesMock,
} from './search_service.test.mocks';
-import { Observable, of } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, of } from 'rxjs';
import { TestScheduler } from 'rxjs/testing';
import { duration } from 'moment';
import { httpServiceMock } from '../../../../../src/core/public/mocks';
@@ -472,7 +471,7 @@ describe('SearchService', () => {
registerResultProvider(provider);
const { find } = service.start(startDeps());
- const batch = await find({ term: 'foobar' }, {}).pipe(take(1)).toPromise();
+ const batch = await firstValueFrom(find({ term: 'foobar' }, {}));
expect(batch.results).toHaveLength(2);
expect(batch.results[0]).toEqual({
diff --git a/x-pack/plugins/global_search/server/services/search_service.test.ts b/x-pack/plugins/global_search/server/services/search_service.test.ts
index 45824fde26afea..f7a94bbbeb0e76 100644
--- a/x-pack/plugins/global_search/server/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.test.ts
@@ -5,8 +5,7 @@
* 2.0.
*/
-import { Observable, of } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, of } from 'rxjs';
import { TestScheduler } from 'rxjs/testing';
import { duration } from 'moment';
import { httpServiceMock, httpServerMock, coreMock } from '../../../../../src/core/server/mocks';
@@ -324,7 +323,7 @@ describe('SearchService', () => {
registerResultProvider(provider);
const { find } = service.start({ core: coreStart, licenseChecker });
- const batch = await find({ term: 'foobar' }, {}, request).pipe(take(1)).toPromise();
+ const batch = await firstValueFrom(find({ term: 'foobar' }, {}, request));
expect(batch.results).toHaveLength(2);
expect(batch.results[0]).toEqual({
diff --git a/x-pack/plugins/grokdebugger/public/plugin.js b/x-pack/plugins/grokdebugger/public/plugin.js
index b92cfce6ec0efd..0a8ff824e71308 100644
--- a/x-pack/plugins/grokdebugger/public/plugin.js
+++ b/x-pack/plugins/grokdebugger/public/plugin.js
@@ -6,7 +6,7 @@
*/
import { i18n } from '@kbn/i18n';
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { PLUGIN } from '../common/constants';
import { registerFeature } from './register_feature';
@@ -24,7 +24,7 @@ export class GrokDebuggerUIPlugin {
enableRouting: false,
async mount({ element, theme$ }) {
const [coreStart] = await coreSetup.getStartServices();
- const license = await plugins.licensing.license$.pipe(first()).toPromise();
+ const license = await firstValueFrom(plugins.licensing.license$);
const { renderApp } = await import('./render_app');
return renderApp(license, element, coreStart, theme$);
},
diff --git a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
index 3ab758c05b6e91..860bb4971cfc6e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { i18n } from '@kbn/i18n';
import { CoreSetup, PluginInitializerContext, Plugin } from 'src/core/public';
import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
@@ -59,7 +59,7 @@ export class IndexLifecycleManagementPlugin
executionContext,
} = coreStart;
- const license = await licensing.license$.pipe(first()).toPromise();
+ const license = await firstValueFrom(licensing.license$);
docTitle.change(PLUGIN.TITLE);
this.breadcrumbService.setup(setBreadcrumbs);
diff --git a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
index 46f961d6de4725..cb0fd2a3047d71 100644
--- a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
+++ b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
@@ -6,7 +6,7 @@
*/
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { from, of } from 'rxjs';
+import { firstValueFrom, from, of } from 'rxjs';
import { delay } from 'rxjs/operators';
import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/common';
import { fieldList, FieldSpec } from '../../../../../src/plugins/data/common';
@@ -68,13 +68,13 @@ export const createIndexPatternsMock = (
const indexPatterns$ = of(
indexPatterns.map(({ id = 'unknown_id', title }) => ({ id, title }))
);
- return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+ return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
},
async get(indexPatternId: string) {
const indexPatterns$ = from(
indexPatterns.filter((indexPattern) => indexPattern.id === indexPatternId)
);
- return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+ return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
},
};
};
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
index 99cd094b50e1e5..b5b831312d1842 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
@@ -6,7 +6,7 @@
*/
import React, { useMemo } from 'react';
-import { from, of } from 'rxjs';
+import { firstValueFrom, from, of } from 'rxjs';
import { delay } from 'rxjs/operators';
import { CoreStart } from '../../../../../src/core/public';
import { FieldSpec } from '../../../../../src/plugins/data/common';
@@ -60,13 +60,13 @@ export const createIndexPatternsMock = (
const indexPatterns$ = of(
indexPatterns.map(({ id = 'unknown_id', title }) => ({ id, title }))
);
- return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+ return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
},
async get(indexPatternId: string) {
const indexPatterns$ = from(
indexPatterns.filter((indexPattern) => indexPattern.id === indexPatternId)
);
- return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+ return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
},
};
};
diff --git a/x-pack/plugins/infra/public/services/log_views/log_views_client.ts b/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
index 75974e50351c6a..f6214a6164f4a3 100644
--- a/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
+++ b/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
@@ -9,6 +9,7 @@ import * as rt from 'io-ts';
import { HttpStart } from 'src/core/public';
import { ISearchGeneric } from 'src/plugins/data/public';
import { DataViewsContract } from 'src/plugins/data_views/public';
+import { lastValueFrom } from 'rxjs';
import {
getLogViewResponsePayloadRT,
getLogViewUrl,
@@ -57,39 +58,39 @@ export class LogViewsClient implements ILogViewsClient {
}
public async getResolvedLogViewStatus(resolvedLogView: ResolvedLogView): Promise {
- const indexStatus = await this.search({
- params: {
- ignore_unavailable: true,
- allow_no_indices: true,
- index: resolvedLogView.indices,
- size: 0,
- terminate_after: 1,
- track_total_hits: 1,
- },
- })
- .toPromise()
- .then(
- ({ rawResponse }) => {
- if (rawResponse._shards.total <= 0) {
- return 'missing' as const;
- }
+ const indexStatus = await lastValueFrom(
+ this.search({
+ params: {
+ ignore_unavailable: true,
+ allow_no_indices: true,
+ index: resolvedLogView.indices,
+ size: 0,
+ terminate_after: 1,
+ track_total_hits: 1,
+ },
+ })
+ ).then(
+ ({ rawResponse }) => {
+ if (rawResponse._shards.total <= 0) {
+ return 'missing' as const;
+ }
- const totalHits = decodeTotalHits(rawResponse.hits.total);
- if (typeof totalHits === 'number' ? totalHits > 0 : totalHits.value > 0) {
- return 'available' as const;
- }
+ const totalHits = decodeTotalHits(rawResponse.hits.total);
+ if (typeof totalHits === 'number' ? totalHits > 0 : totalHits.value > 0) {
+ return 'available' as const;
+ }
- return 'empty' as const;
- },
- (err) => {
- if (err.status === 404) {
- return 'missing' as const;
- }
- throw new FetchLogViewStatusError(
- `Failed to check status of log indices of "${resolvedLogView.indices}": ${err}`
- );
+ return 'empty' as const;
+ },
+ (err) => {
+ if (err.status === 404) {
+ return 'missing' as const;
}
- );
+ throw new FetchLogViewStatusError(
+ `Failed to check status of log indices of "${resolvedLogView.indices}": ${err}`
+ );
+ }
+ );
return {
index: indexStatus,
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
index 85bd1a694f135d..79fe53f0a81b31 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
@@ -7,8 +7,7 @@
import { act, renderHook } from '@testing-library/react-hooks';
import React from 'react';
-import { Observable, of, Subject } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, of, Subject } from 'rxjs';
import {
DataPublicPluginStart,
IKibanaSearchResponse,
@@ -92,7 +91,7 @@ describe('useDataSearch hook', () => {
expect(dataMock.search.search).not.toHaveBeenCalled();
// execute requests$ observable
- const firstRequestPromise = result.current.requests$.pipe(take(1)).toPromise();
+ const firstRequestPromise = firstValueFrom(result.current.requests$);
act(() => {
result.current.search('first', 'second');
@@ -161,7 +160,7 @@ describe('useDataSearch hook', () => {
expect(dataMock.search.search).not.toHaveBeenCalled();
// execute requests$ observable
- const firstRequestPromise = result.current.requests$.pipe(take(1)).toPromise();
+ const firstRequestPromise = firstValueFrom(result.current.requests$);
act(() => {
result.current.search('first', 'second');
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
index 2f91c65205b55c..594e79f8d2e1c2 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
@@ -6,7 +6,7 @@
*/
import { errors } from '@elastic/elasticsearch';
-import { of, throwError } from 'rxjs';
+import { lastValueFrom, of, throwError } from 'rxjs';
import {
elasticsearchServiceMock,
httpServerMock,
@@ -53,8 +53,8 @@ describe('LogEntries search strategy', () => {
logViews: logViewsMock,
});
- const response = await logEntriesSearchStrategy
- .search(
+ const response = await lastValueFrom(
+ logEntriesSearchStrategy.search(
{
params: {
sourceId: 'SOURCE_ID',
@@ -66,7 +66,7 @@ describe('LogEntries search strategy', () => {
{},
mockDependencies
)
- .toPromise();
+ );
expect(logViewsMock.getScopedClient).toHaveBeenCalled();
expect(logViewsClientMock.getResolvedLogView).toHaveBeenCalled();
@@ -138,8 +138,8 @@ describe('LogEntries search strategy', () => {
esRequestId: 'ASYNC_REQUEST_ID',
});
- const response = await logEntriesSearchStrategy
- .search(
+ const response = await lastValueFrom(
+ logEntriesSearchStrategy.search(
{
id: requestId,
params: {
@@ -152,7 +152,7 @@ describe('LogEntries search strategy', () => {
{},
mockDependencies
)
- .toPromise();
+ );
expect(logViewsMock.getScopedClient).toHaveBeenCalled();
expect(logViewsClientMock.getResolvedLogView).toHaveBeenCalled();
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
index c6ee6fb92ca47b..e705791b06bcde 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
@@ -6,7 +6,7 @@
*/
import { errors } from '@elastic/elasticsearch';
-import { of, throwError } from 'rxjs';
+import { lastValueFrom, of, throwError } from 'rxjs';
import {
elasticsearchServiceMock,
httpServerMock,
@@ -53,15 +53,15 @@ describe('LogEntry search strategy', () => {
logViews: logViewsMock,
});
- const response = await logEntrySearchStrategy
- .search(
+ const response = await lastValueFrom(
+ logEntrySearchStrategy.search(
{
params: { sourceId: 'SOURCE_ID', logEntryId: 'LOG_ENTRY_ID' },
},
{},
mockDependencies
)
- .toPromise();
+ );
expect(logViewsMock.getScopedClient).toHaveBeenCalled();
expect(logViewsClientMock.getResolvedLogView).toHaveBeenCalled();
@@ -137,8 +137,8 @@ describe('LogEntry search strategy', () => {
esRequestId: 'ASYNC_REQUEST_ID',
});
- const response = await logEntrySearchStrategy
- .search(
+ const response = await lastValueFrom(
+ logEntrySearchStrategy.search(
{
id: requestId,
params: { sourceId: 'SOURCE_ID', logEntryId: 'LOG_ENTRY_ID' },
@@ -146,7 +146,7 @@ describe('LogEntry search strategy', () => {
{},
mockDependencies
)
- .toPromise();
+ );
expect(logViewsMock.getScopedClient).not.toHaveBeenCalled();
expect(logViewsClientMock.getResolvedLogView).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/infra/types/redux_observable.d.ts b/x-pack/plugins/infra/types/redux_observable.d.ts
index f5072e33f70cb9..c1f9a2dda33521 100644
--- a/x-pack/plugins/infra/types/redux_observable.d.ts
+++ b/x-pack/plugins/infra/types/redux_observable.d.ts
@@ -5,9 +5,8 @@
* 2.0.
*/
-import { Action, MiddlewareAPI } from 'redux';
-import { ActionsObservable, Epic } from 'redux-observable';
-import { Observable } from 'rxjs';
+import { Action } from 'redux';
+import { Epic } from 'redux-observable';
declare module 'redux-observable' {
function combineEpics<
diff --git a/x-pack/plugins/license_management/public/plugin.ts b/x-pack/plugins/license_management/public/plugin.ts
index 67d954240d3c39..804e04245e99a3 100644
--- a/x-pack/plugins/license_management/public/plugin.ts
+++ b/x-pack/plugins/license_management/public/plugin.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
import { TelemetryPluginStart } from '../../../../src/plugins/telemetry/public';
@@ -59,7 +59,7 @@ export class LicenseManagementUIPlugin
order: 0,
mount: async ({ element, setBreadcrumbs, history, theme$ }) => {
const [coreStart, { telemetry }] = await getStartServices();
- const initialLicense = await plugins.licensing.license$.pipe(first()).toPromise();
+ const initialLicense = await firstValueFrom(plugins.licensing.license$);
// Setup documentation links
const {
diff --git a/x-pack/plugins/licensing/common/license_update.test.ts b/x-pack/plugins/licensing/common/license_update.test.ts
index c0a3c23c124ad8..1612f934fb45b8 100644
--- a/x-pack/plugins/licensing/common/license_update.test.ts
+++ b/x-pack/plugins/licensing/common/license_update.test.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { Subject } from 'rxjs';
+import { firstValueFrom, Subject } from 'rxjs';
import { take, toArray } from 'rxjs/operators';
import { ILicense } from './types';
@@ -13,10 +13,10 @@ import { createLicenseUpdate } from './license_update';
import { licenseMock } from './licensing.mock';
const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-const stop$ = new Subject();
+const stop$ = new Subject();
describe('licensing update', () => {
it('loads updates when triggered', async () => {
- const trigger$ = new Subject();
+ const trigger$ = new Subject();
const fetcher = jest
.fn()
.mockResolvedValueOnce(licenseMock.createLicense({ license: { type: 'basic' } }))
@@ -27,23 +27,23 @@ describe('licensing update', () => {
expect(fetcher).toHaveBeenCalledTimes(0);
trigger$.next();
- const first = await license$.pipe(take(1)).toPromise();
+ const first = await firstValueFrom(license$);
expect(first.type).toBe('basic');
trigger$.next();
- const [, second] = await license$.pipe(take(2), toArray()).toPromise();
+ const [, second] = await firstValueFrom(license$.pipe(take(2), toArray()));
expect(second.type).toBe('gold');
});
it('starts with initial value if presents', async () => {
const initialLicense = licenseMock.createLicense({ license: { type: 'platinum' } });
const fetchedLicense = licenseMock.createLicense({ license: { type: 'gold' } });
- const trigger$ = new Subject();
+ const trigger$ = new Subject();
const fetcher = jest.fn().mockResolvedValue(fetchedLicense);
const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher, initialLicense);
trigger$.next();
- const [first, second] = await license$.pipe(take(2), toArray()).toPromise();
+ const [first, second] = await firstValueFrom(license$.pipe(take(2), toArray()));
expect(first.type).toBe('platinum');
expect(second.type).toBe('gold');
@@ -51,7 +51,7 @@ describe('licensing update', () => {
});
it('does not emit if license has not changed', async () => {
- const trigger$ = new Subject();
+ const trigger$ = new Subject();
const fetcher = jest
.fn()
@@ -62,7 +62,7 @@ describe('licensing update', () => {
const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
trigger$.next();
- const [first] = await license$.pipe(take(1), toArray()).toPromise();
+ const [first] = await firstValueFrom(license$.pipe(take(1), toArray()));
expect(first.type).toBe('basic');
@@ -71,14 +71,14 @@ describe('licensing update', () => {
await Promise.resolve();
trigger$.next();
- const [, second] = await license$.pipe(take(2), toArray()).toPromise();
+ const [, second] = await firstValueFrom(license$.pipe(take(2), toArray()));
expect(second.type).toBe('gold');
expect(fetcher).toHaveBeenCalledTimes(3);
});
it('new subscriptions does not force re-fetch', async () => {
- const trigger$ = new Subject();
+ const trigger$ = new Subject();
const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
@@ -103,7 +103,7 @@ describe('licensing update', () => {
);
})
);
- const trigger$ = new Subject();
+ const trigger$ = new Subject