Skip to content

Commit 53cee7b

Browse files
committed
refactor(ml): remove filterEsql prop from MlDataSourcePicker and MlOpenSessionFlyout
- Eliminated the `filterEsql` prop from both `MlDataSourcePicker` and `MlOpenSessionFlyout` components to simplify their interfaces. - Updated the logic to filter out ES|QL-based saved searches directly within the `MlOpenSessionFlyout`
1 parent 04fe156 commit 53cee7b

3 files changed

Lines changed: 7 additions & 20 deletions

File tree

x-pack/platform/packages/private/ml/aiops_components/src/ml_data_source_picker/ml_data_source_picker.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ export interface MlDataSourcePickerProps {
4242
services: MlDataSourcePickerServices;
4343
DataViewPickerComponent: ComponentType<DataViewPickerProps>;
4444
SavedObjectFinderComponent: MlOpenSessionFlyoutProps['SavedObjectFinderComponent'];
45-
/** When true, ES|QL-based sessions are hidden from the session picker */
46-
filterEsql?: boolean;
4745
/** Called after a field is saved via the field editor */
4846
onFieldSaved?: () => void;
4947
}
@@ -55,7 +53,6 @@ export const MlDataSourcePicker: FC<MlDataSourcePickerProps> = ({
5553
services,
5654
DataViewPickerComponent,
5755
SavedObjectFinderComponent,
58-
filterEsql = false,
5956
onFieldSaved,
6057
}) => {
6158
const [savedDataViews, setSavedDataViews] = useState<DataViewListItem[]>([]);
@@ -189,7 +186,6 @@ export const MlDataSourcePicker: FC<MlDataSourcePickerProps> = ({
189186
onClose={onCloseSession}
190187
onOpenSavedSearch={onOpenSavedSearch}
191188
SavedObjectFinderComponent={SavedObjectFinderComponent}
192-
filterEsql={filterEsql}
193189
/>
194190
</>
195191
) : (

x-pack/platform/packages/private/ml/aiops_components/src/ml_data_source_picker/ml_open_session_flyout.tsx

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ import {
2121
EuiTitle,
2222
useGeneratedHtmlId,
2323
} from '@elastic/eui';
24-
import {
25-
SavedSearchType,
26-
SavedSearchTypeDisplayName,
27-
type SavedSearchAttributes,
28-
} from '@kbn/saved-search-plugin/common';
24+
import { SavedSearchType, SavedSearchTypeDisplayName } from '@kbn/saved-search-plugin/common';
2925
import type { ApplicationStart, IUiSettingsClient } from '@kbn/core/public';
3026
import type { ContentManagementPublicStart } from '@kbn/content-management-plugin/public';
3127
import type { SavedObjectFinderProps } from '@kbn/saved-objects-finder-plugin/public';
32-
import type { SavedObjectCommon } from '@kbn/saved-objects-finder-plugin/common';
28+
import type { FinderAttributes, SavedObjectCommon } from '@kbn/saved-objects-finder-plugin/common';
29+
import { isEsqlSavedSearch, type DiscoverSessionFinderAttributes } from '@kbn/discover-utils';
3330

3431
export type { SavedObjectFinderProps };
3532

@@ -49,16 +46,13 @@ export interface MlOpenSessionFlyoutProps {
4946
onClose: () => void;
5047
onOpenSavedSearch: (id: string) => void;
5148
SavedObjectFinderComponent: ComponentType<SavedObjectFinderProps>;
52-
/** When true, ES|QL-based sessions are hidden from the list */
53-
filterEsql?: boolean;
5449
}
5550

5651
export const MlOpenSessionFlyout: FC<MlOpenSessionFlyoutProps> = ({
5752
services,
5853
onClose,
5954
onOpenSavedSearch,
6055
SavedObjectFinderComponent,
61-
filterEsql = false,
6256
}) => {
6357
const modalTitleId = useGeneratedHtmlId();
6458
const { http, application, contentManagement, uiSettings } = services;
@@ -108,12 +102,10 @@ export const MlOpenSessionFlyout: FC<MlOpenSessionFlyoutProps> = ({
108102
defaultMessage: 'Discover session',
109103
}
110104
),
111-
...(filterEsql
112-
? {
113-
showSavedObject: (savedObject: SavedObjectCommon<SavedSearchAttributes>) =>
114-
!savedObject.attributes.isTextBasedQuery,
115-
}
116-
: {}),
105+
// ES|QL Based saved searches are not supported in Discover sessions, filter them out
106+
showSavedObject: (
107+
savedObject: SavedObjectCommon<FinderAttributes & DiscoverSessionFinderAttributes>
108+
) => !isEsqlSavedSearch(savedObject),
117109
},
118110
]}
119111
onChoose={onOpenSavedSearch}

x-pack/platform/plugins/shared/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ export const IndexDataVisualizerPage: FC<{ esql: boolean }> = ({ esql = false })
204204
services={services}
205205
DataViewPickerComponent={DataViewPicker}
206206
SavedObjectFinderComponent={SavedObjectFinder}
207-
filterEsql
208207
onFieldSaved={() => mlTimefilterRefresh$.next({ lastRefresh: Date.now() })}
209208
/>
210209
) : undefined;

0 commit comments

Comments
 (0)