Skip to content

[Lens] Code cleanup #221248

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

Merged
markov00 merged 6 commits into from
May 28, 2025
Merged

[Lens] Code cleanup #221248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cc5a51
remove useless code
markov00 May 22, 2025
6b744e7
remove useless imports
markov00 May 22, 2025
ab1378e
[CI] Auto-commit changed files from 'node scripts/build_plugin_list_d…
kibanamachine May 22, 2025
5ad668a
Merge branch 'main' into 2025_05_22-code_cleanup
markov00 May 22, 2025
8548ec0
Merge branch 'main' into 2025_05_22-code_cleanup
markov00 May 23, 2025
5902522
Merge branch 'main' into 2025_05_22-code_cleanup
markov00 May 26, 2025
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
8 changes: 4 additions & 4 deletions ...atform/plugins/shared/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function getDatasourceExpressionsByLayers(
nowInstant: Date,
searchSessionId?: string,
forceDSL?: boolean
): null | Record<string, Ast> {
): undefined | Record<string, Ast> {
const datasourceExpressions: Array<[string, Ast | string]> = [];

Object.entries(datasourceMap).forEach(([datasourceId, datasource]) => {
Expand Down Expand Up @@ -45,7 +45,7 @@ export function getDatasourceExpressionsByLayers(
});

if (datasourceExpressions.length === 0) {
return null;
return undefined;
}

return datasourceExpressions.reduce(
Expand Down Expand Up @@ -107,10 +107,10 @@ export function buildExpression({
title,
description,
},
datasourceExpressionsByLayers ?? undefined
datasourceExpressionsByLayers
);

if (datasourceExpressionsByLayers === null || visualizationExpression === null) {
if (!datasourceExpressionsByLayers || visualizationExpression === null) {
return null;
}

Expand Down
29 changes: 2 additions & 27 deletions ...latform/plugins/shared/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { camelCase, pick } from 'lodash';
import { camelCase } from 'lodash';
import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';
import { FormattedMessage } from '@kbn/i18n-react';
import { css } from '@emotion/react';
Expand Down Expand Up @@ -46,7 +46,6 @@ import {
FramePublicAPI,
DatasourceMap,
VisualizationMap,
DatasourceLayers,
UserMessagesGetter,
} from '../../types';
import { getSuggestions, switchToSuggestion } from './suggestion_helpers';
Expand Down Expand Up @@ -708,30 +707,6 @@ function getPreviewExpression(
datasourceLayers: { ...frame.datasourceLayers },
};
try {
// use current frame api and patch apis for changed datasource layers
if (
visualizableState.keptLayerIds &&
visualizableState.datasourceId &&
visualizableState.datasourceState
) {
const datasource = datasources[visualizableState.datasourceId];
const datasourceState = visualizableState.datasourceState;
const updatedLayerApis: DatasourceLayers = pick(
frame.datasourceLayers,
visualizableState.keptLayerIds
);
const changedLayers = datasource.getLayers(visualizableState.datasourceState);
changedLayers.forEach((layerId) => {
if (updatedLayerApis[layerId]) {
updatedLayerApis[layerId] = datasource.getPublicAPI({
layerId,
state: datasourceState,
indexPatterns: frame.dataViews.indexPatterns,
});
}
});
}
Comment on lines -711 to -733
Copy link
Copy Markdown
Contributor Author

@markov00 markov00 May 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

none of these variables are used outside that if and I hope the getPublicAPI or the getLayers are pure functions that doesn't modifies any external state.


const datasourceExpressionsByLayers = getDatasourceExpressionsByLayers(
datasources,
datasourceStates,
Expand All @@ -743,7 +718,7 @@ function getPreviewExpression(
return visualization.toPreviewExpression(
visualizableState.visualizationState,
suggestionFrameApi.datasourceLayers,
datasourceExpressionsByLayers ?? undefined
datasourceExpressionsByLayers
);
} catch (error) {
showMemoizedErrorNotification(error);
Expand Down