Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] Fix Anomaly Swim Lane Embeddable not updating properly on query change #195090

Merged
merged 9 commits into from
Oct 10, 2024
Merged

[ML] Fix Anomaly Swim Lane Embeddable not updating properly on query change #195090

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
31cf041
remove query sizing based on previous query cardinality
rbrtj Oct 4, 2024
aca7988
Merge branch 'main' into anomaly-swim-lane-embbedable-not-updating-wh…
rbrtj Oct 7, 2024
133ece2
fix querying across vaious pagination pages
rbrtj Oct 8, 2024
c2e7e9e
Merge branch 'main' into anomaly-swim-lane-embbedable-not-updating-wh…
rbrtj Oct 8, 2024
868dd88
modify swimLaneInput based on emitted values
rbrtj Oct 8, 2024
fdcfc26
cleanup
rbrtj Oct 8, 2024
5a95ba0
swimlane controls handle external deps
rbrtj Oct 9, 2024
ab9b445
use fetch$
rbrtj Oct 9, 2024
55c3e67
use existing subscription
rbrtj Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ...ck/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
apiHasExecutionContext,
apiHasParentApi,
apiPublishesTimeRange,
fetch$,
initializeTimeRange,
initializeTitles,
useBatchedPublishingSubjects,
Expand All @@ -26,7 +27,8 @@ import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
import React, { useCallback, useState } from 'react';
import useUnmount from 'react-use/lib/useUnmount';
import type { Observable } from 'rxjs';
import { BehaviorSubject, combineLatest, map, of, Subscription } from 'rxjs';
import { BehaviorSubject, combineLatest, distinctUntilChanged, map, of, Subscription } from 'rxjs';
import fastIsEqual from 'fast-deep-equal';
import type { AnomalySwimlaneEmbeddableServices } from '..';
import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE } from '..';
import type { MlDependencies } from '../../application/app';
Expand Down Expand Up @@ -235,6 +237,19 @@ export const getAnomalySwimLaneEmbeddableFactory = (
anomalySwimLaneServices
);

const fetchSubscription = fetch$(api)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need a dedicated subscription. Try

Suggested change
const fetchSubscription = fetch$(api)
subscriptions.add(fetch$(api)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in: 55c3e67

.pipe(
map((fetchContext) => ({
query: fetchContext.query,
filters: fetchContext.filters,
timeRange: fetchContext.timeRange,
})),
distinctUntilChanged(fastIsEqual)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I presume it's more expensive than skipWhile, because you need to compare objects on every emission instead of checking a boolean value of isReload.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed offline, neither skipWhile nor filter will work in this case, as fetchContext.isReload emits true even when changing the query, and the skipWhile operator only checks until the condition is met.

)
.subscribe(() => {
api.updatePagination({ fromPage: 1 });
});

const onRenderComplete = () => {};

return {
Expand All @@ -260,6 +275,7 @@ export const getAnomalySwimLaneEmbeddableFactory = (
onSwimLaneDestroy();
onDestroy();
subscriptions.unsubscribe();
fetchSubscription.unsubscribe();
});

const [fromPage, perPage, swimlaneType, swimlaneData, error] =
Expand Down
10 changes: 2 additions & 8 deletions x-pack/plugins/ml/public/embeddables/anomaly_swimlane/initialize_swim_lane_data_fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import type { estypes } from '@elastic/elasticsearch';
import type { TimeRange } from '@kbn/es-query';
import { type TimeRange } from '@kbn/es-query';
import type { PublishesUnifiedSearch } from '@kbn/presentation-publishing';
import {
BehaviorSubject,
Expand All @@ -29,7 +29,6 @@ import {
SWIMLANE_TYPE,
} from '../../application/explorer/explorer_constants';
import type { OverallSwimlaneData } from '../../application/explorer/explorer_utils';
import { isViewBySwimLaneData } from '../../application/explorer/swimlane_container';
import { CONTROLLED_BY_SWIM_LANE_FILTER } from '../../ui_actions/constants';
import { getJobsObservable } from '../common/get_jobs_observable';
import { processFilters } from '../common/process_filters';
Expand Down Expand Up @@ -114,12 +113,7 @@ export const initializeSwimLaneDataFetcher = (
const { earliest, latest } = overallSwimlaneData;

if (overallSwimlaneData && swimlaneType === SWIMLANE_TYPE.VIEW_BY) {
const swimlaneData = swimLaneData$.value;

let swimLaneLimit = ANOMALY_SWIM_LANE_HARD_LIMIT;
if (isViewBySwimLaneData(swimlaneData) && viewBy === swimlaneData.fieldName) {
swimLaneLimit = swimlaneData.cardinality;
}
const swimLaneLimit = ANOMALY_SWIM_LANE_HARD_LIMIT;

return from(
anomalyTimelineService.loadViewBySwimlane(
Expand Down