Skip to content

Commit

Permalink
fix(explore): adhoc metrics popover resets label after hovering outsi…
Browse files Browse the repository at this point in the history 
…de (apache#16196)

* fix(explore): adhoc metrics popover resets label after hovering outside

* Remove irrelevant tests and skip rest

* Use ensureIsArray
  • Loading branch information
@kgabryje
kgabryje authored Aug 11, 2021
1 parent b9329a8 commit 1c93bed
Show file tree
Hide file tree
Showing 2 changed files with 209 additions and 516 deletions.
237 changes: 2 additions & 235 deletions superset-frontend/spec/javascripts/explore/components/MetricsControl_spec.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,60 +67,14 @@ const sumValueAdhocMetric = new AdhocMetric({
label: 'SUM(value)',
});

describe('MetricsControl', () => {
// TODO: rewrite the tests to RTL
describe.skip('MetricsControl', () => {
it('renders Select', () => {
const { component } = setup();
expect(component.find(LabelsContainer)).toExist();
});

describe('constructor', () => {
it('unifies options for the dropdown select with aggregates', () => {
const { component } = setup();
expect(component.state('options')).toEqual([
{
optionName: '_col_source',
type: 'VARCHAR(255)',
column_name: 'source',
},
{
optionName: '_col_target',
type: 'VARCHAR(255)',
column_name: 'target',
},
{ optionName: '_col_value', type: 'DOUBLE', column_name: 'value' },
...Object.keys(AGGREGATES).map(aggregate => ({
aggregate_name: aggregate,
optionName: `_aggregate_${aggregate}`,
})),
{
optionName: 'sum__value',
metric_name: 'sum__value',
expression: 'SUM(energy_usage.value)',
},
{
optionName: 'avg__value',
metric_name: 'avg__value',
expression: 'AVG(energy_usage.value)',
},
]);
});

it('does not show aggregates in options if no columns', () => {
const { component } = setup({ columns: [] });
expect(component.state('options')).toEqual([
{
optionName: 'sum__value',
metric_name: 'sum__value',
expression: 'SUM(energy_usage.value)',
},
{
optionName: 'avg__value',
metric_name: 'avg__value',
expression: 'AVG(energy_usage.value)',
},
]);
});

it('coerces Adhoc Metrics from form data into instances of the AdhocMetric class and leaves saved metrics', () => {
const { component } = setup({
value: [
Expand Down Expand Up @@ -178,194 +132,7 @@ describe('MetricsControl', () => {
});
});

describe('checkIfAggregateInInput', () => {
it('handles an aggregate in the input', () => {
const { component } = setup();

expect(component.state('aggregateInInput')).toBeNull();
component.instance().checkIfAggregateInInput('AVG(');
expect(component.state('aggregateInInput')).toBe(AGGREGATES.AVG);
});

it('handles no aggregate in the input', () => {
const { component } = setup();

expect(component.state('aggregateInInput')).toBeNull();
component.instance().checkIfAggregateInInput('colu');
expect(component.state('aggregateInInput')).toBeNull();
});
});

describe('option filter', () => {
it('includes user defined metrics', () => {
const { component } = setup({ datasourceType: 'druid' });

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'a_metric',
optionName: 'a_metric',
expression: 'SUM(FANCY(metric))',
},
},
'a',
),
).toBe(true);
});

it('includes auto generated avg metrics for druid', () => {
const { component } = setup({ datasourceType: 'druid' });

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'avg__metric',
optionName: 'avg__metric',
expression: 'AVG(metric)',
},
},
'a',
),
).toBe(true);
});

it('includes columns and aggregates', () => {
const { component } = setup();

expect(
!!component.instance().selectFilterOption(
{
data: {
type: 'VARCHAR(255)',
column_name: 'source',
optionName: '_col_source',
},
},
'sou',
),
).toBe(true);

expect(
!!component
.instance()
.selectFilterOption(
{ data: { aggregate_name: 'AVG', optionName: '_aggregate_AVG' } },
'av',
),
).toBe(true);
});

it('includes columns based on verbose_name', () => {
const { component } = setup();

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'sum__num',
verbose_name: 'babies',
optionName: '_col_sum_num',
},
},
'bab',
),
).toBe(true);
});

it('excludes auto generated avg metrics for sqla', () => {
const { component } = setup();

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'avg__metric',
optionName: 'avg__metric',
expression: 'AVG(metric)',
},
},
'a',
),
).toBe(false);
});

it('includes custom made simple saved metrics', () => {
const { component } = setup();

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'my_fancy_sum_metric',
optionName: 'my_fancy_sum_metric',
expression: 'SUM(value)',
},
},
'sum',
),
).toBe(true);
});

it('excludes auto generated metrics', () => {
const { component } = setup();

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'sum__value',
optionName: 'sum__value',
expression: 'SUM(value)',
},
},
'sum',
),
).toBe(false);

expect(
!!component.instance().selectFilterOption(
{
data: {
metric_name: 'sum__value',
optionName: 'sum__value',
expression: 'SUM("table"."value")',
},
},
'sum',
),
).toBe(false);
});

it('filters out metrics if the input begins with an aggregate', () => {
const { component } = setup();
component.setState({ aggregateInInput: true });

expect(
!!component.instance().selectFilterOption(
{
data: { metric_name: 'metric', expression: 'SUM(FANCY(metric))' },
},
'SUM(',
),
).toBe(false);
});

it('includes columns if the input begins with an aggregate', () => {
const { component } = setup();
component.setState({ aggregateInInput: true });

expect(
!!component
.instance()
.selectFilterOption(
{ data: { type: 'DOUBLE', column_name: 'value' } },
'SUM(',
),
).toBe(true);
});

it('Removes metrics if savedMetrics changes', () => {
const { props, component, onChange } = setup({
value: [
Expand Down
Loading

0 comments on commit 1c93bed

Please sign in to comment.