Skip to content

Issue #16: remove Script field #30

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
merged 2 commits into from
Nov 24, 2023
Merged

Issue #16: remove Script field #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
397fb19
Issue #16: remove Script field
idrissneumann Nov 24, 2023
653dae6
Issue #16: code review, delete unused code
idrissneumann Nov 24, 2023
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
39 changes: 1 addition & 38 deletions src/components/QueryEditor/MetricAggregationsEditor/MetricEditor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,47 +10,10 @@ import { defaultBucketAgg } from '../../../queryDef';
import { ElasticsearchQuery } from '../../../types';
import { ElasticsearchProvider } from '../ElasticsearchQueryContext';

import { Average, Count, UniqueCount } from './../../../types';
import { Count, UniqueCount } from './../../../types';
import { MetricEditor } from './MetricEditor';

describe('Metric Editor', () => {
it('Should display a "None" option for "field" if the metric supports inline script', async () => {
const avg: Average = {
id: '1',
type: 'avg',
};

const query: ElasticsearchQuery = {
refId: 'A',
query: '',
metrics: [avg],
bucketAggs: [defaultBucketAgg('2')],
};

const getFields: ElasticDatasource['getFields'] = jest.fn(() => from([[]]));

const wrapper = ({ children }: PropsWithChildren<{}>) => (
<ElasticsearchProvider
datasource={{ getFields } as ElasticDatasource}
query={query}
app={undefined}
range={getDefaultTimeRange()}
onChange={() => {}}
onRunQuery={() => {}}
>
{children}
</ElasticsearchProvider>
);

render(<MetricEditor value={avg} />, { wrapper });

act(() => {
fireEvent.click(screen.getByText('Select Field'));
});

expect(await screen.findByText('None')).toBeInTheDocument();
});

it('Should not display a "None" option for "field" if the metric does not support inline script', async () => {
const avg: UniqueCount = {
id: '1',
Expand Down
10 changes: 2 additions & 8 deletions src/components/QueryEditor/MetricAggregationsEditor/MetricEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ import { segmentStyles } from '../styles';
import { SettingsEditor } from './SettingsEditor';
import {
isMetricAggregationWithField,
isMetricAggregationWithInlineScript,
isMetricAggregationWithSettings,
isPipelineAggregation,
isPipelineAggregationWithMultipleBucketPaths,
isPipelineAggregationWithMultipleBucketPaths
} from './aggregations';
import { changeMetricField, changeMetricType } from './state/actions';
import { getStyles } from './styles';
Expand Down Expand Up @@ -64,13 +63,8 @@ export const MetricEditor = ({ value }: Props) => {
const loadOptions = useCallback(async () => {
const remoteFields = await getFields();

// Metric aggregations that have inline script support don't require a field to be set.
if (isMetricAggregationWithInlineScript(value)) {
return [{ label: 'None' }, ...remoteFields];
}

return remoteFields;
}, [getFields, value]);
}, [getFields]);

const previousMetrics = query.metrics!.slice(
0,
Expand Down
6 changes: 1 addition & 5 deletions src/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { extendedStats } from '../../../../queryDef';
import { MetricAggregation, ExtendedStat } from '../../../../types';
import { useQuery } from '../../ElasticsearchQueryContext';
import { SettingsEditorContainer } from '../../SettingsEditorContainer';
import { isMetricAggregationWithInlineScript, isMetricAggregationWithMissingSupport } from '../aggregations';
import { isMetricAggregationWithMissingSupport } from '../aggregations';
import { changeMetricMeta, changeMetricSetting } from '../state/actions';
import { metricAggregationConfig } from '../utils';

Expand Down Expand Up @@ -152,10 +152,6 @@ export const SettingsEditor = ({ metric, previousMetrics }: Props) => {
</>
)}

{isMetricAggregationWithInlineScript(metric) && (
<SettingField label="Script" metric={metric} settingName="script" placeholder="_value * 1" />
)}

{isMetricAggregationWithMissingSupport(metric) && (
<SettingField
label="Missing"
Expand Down
5 changes: 0 additions & 5 deletions src/components/QueryEditor/MetricAggregationsEditor/aggregations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
BaseMetricAggregation,
MetricAggregationWithField,
MetricAggregationWithMissingSupport,
MetricAggregationWithInlineScript,
PipelineMetricAggregation,
MetricAggregationWithSettings,
} from '../../../types';
Expand Down Expand Up @@ -62,10 +61,6 @@ export const isMetricAggregationWithMeta = (
metric: BaseMetricAggregation | MetricAggregationWithMeta
): metric is MetricAggregationWithMeta => metricAggregationConfig[metric.type].hasMeta;

export const isMetricAggregationWithInlineScript = (
metric: BaseMetricAggregation | MetricAggregationWithInlineScript
): metric is MetricAggregationWithInlineScript => metricAggregationConfig[metric.type].supportsInlineScript;

export const METRIC_AGGREGATION_TYPES: MetricAggregationType[] = [
'count',
'avg',
Expand Down