Skip to content
Snippets Groups Projects
Commit a5fe4829 authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix lint and flow errors

parent c654098d
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 51 deletions
......@@ -280,7 +280,7 @@ export default class FieldRemapping extends React.Component {
dimensions: [],
fks: this.getForeignKeys(),
}}
tableMetadata={table}
table={table}
onFieldChange={this.onForeignKeyFieldChange}
hideSectionHeader
/>
......
......@@ -62,7 +62,6 @@ export default (name: string, icon: string, fieldFilter: FieldFilter) => ({
breakoutOptions={breakoutOptions}
onCommitBreakout={breakout => {
const nextCard = question.pivot([breakout], dimensions).card();
if (nextCard) {
onChangeCardAndRun({ nextCard });
}
......
......@@ -348,7 +348,7 @@ export default class AggregationPopover extends Component {
<FieldList
className={"text-green"}
maxHeight={this.props.maxHeight - (this.state.headerHeight || 0)}
tableMetadata={tableMetadata}
table={tableMetadata}
field={fieldId}
fieldOptions={query.aggregationFieldOptions(agg)}
customFieldOptions={customFields}
......
......@@ -26,22 +26,29 @@ const BreakoutPopover = ({
onClose,
maxHeight,
alwaysExpanded,
}: Props) => (
<FieldList
className="text-green"
maxHeight={maxHeight}
field={breakout}
fieldOptions={breakoutOptions || query.breakoutOptions()}
onFieldChange={field => {
onCommitBreakout(field);
if (onClose) {
onClose();
}
}}
tableMetadata={query.tableMetadata()}
enableSubDimensions
alwaysExpanded={alwaysExpanded}
/>
);
}: Props) => {
const table = query.table();
// FieldList requires table
if (!table) {
return null;
}
return (
<FieldList
className="text-green"
maxHeight={maxHeight}
field={breakout}
fieldOptions={breakoutOptions || query.breakoutOptions()}
onFieldChange={field => {
onCommitBreakout(field);
if (onClose) {
onClose();
}
}}
table={table}
enableSubDimensions
alwaysExpanded={alwaysExpanded}
/>
);
};
export default BreakoutPopover;
......@@ -58,7 +58,7 @@ export default class BreakoutWidget extends Component {
>
<FieldList
className={"text-green"}
tableMetadata={this.props.tableMetadata}
table={this.props.tableMetadata}
field={this.props.field}
fieldOptions={this.props.fieldOptions}
customFieldOptions={this.props.customFieldOptions}
......
......@@ -35,7 +35,7 @@ type Props = {
// HACK: for segments
onFilterChange?: (filter: any) => void,
tableMetadata: Table,
table: Table,
alwaysExpanded?: boolean,
enableSubDimensions?: boolean,
......@@ -61,13 +61,8 @@ export default class FieldList extends Component {
}
componentWillReceiveProps(newProps) {
let {
tableMetadata,
fieldOptions,
segmentOptions,
hideSectionHeader,
} = newProps;
let tableName = tableMetadata.display_name;
let { table, fieldOptions, segmentOptions, hideSectionHeader } = newProps;
let tableName = table.display_name;
let specialOptions = [];
if (segmentOptions) {
......@@ -110,11 +105,7 @@ export default class FieldList extends Component {
};
renderItemExtra = item => {
const {
field,
enableSubDimensions,
tableMetadata: { metadata },
} = this.props;
const { field, enableSubDimensions, table: { metadata } } = this.props;
return (
<div className="Field-extra flex align-center">
......@@ -167,7 +158,7 @@ export default class FieldList extends Component {
};
renderSubDimensionTrigger(dimension) {
const { field, tableMetadata: { metadata } } = this.props;
const { field, table: { metadata } } = this.props;
const subDimension = dimension.isSameBaseDimension(field)
? Dimension.parseMBQL(field, metadata)
: dimension.defaultDimension();
......@@ -181,16 +172,11 @@ export default class FieldList extends Component {
}
renderSegmentTooltip(segment) {
let { tableMetadata } = this.props;
let { table } = this.props;
return (
<div className="p1">
<Tooltip
tooltip={
<QueryDefinitionTooltip
object={segment}
tableMetadata={tableMetadata}
/>
}
tooltip={<QueryDefinitionTooltip object={segment} table={table} />}
>
<span className="QuestionTooltipTarget" />
</Tooltip>
......
......@@ -56,7 +56,7 @@ export default class FieldWidget extends Component {
<Popover ref="popover" className="FieldPopover" onClose={this.toggle}>
<FieldList
className={"text-" + this.props.color}
tableMetadata={this.props.tableMetadata}
table={this.props.tableMetadata}
field={this.props.field}
fieldOptions={this.props.fieldOptions}
customFieldOptions={this.props.customFieldOptions}
......
......@@ -319,7 +319,7 @@ export default class FilterPopover extends Component {
field={fieldRef}
fieldOptions={query.filterFieldOptions(filter)}
segmentOptions={query.filterSegmentOptions(filter)}
tableMetadata={query.table()}
table={query.table()}
onFieldChange={this.setField}
onFilterChange={this.commitFilter}
/>
......
......@@ -2,12 +2,7 @@
import React from "react";
import {
question,
questionNoFields,
ORDERS_TABLE_ID,
ORDERS_CREATED_DATE_FIELD_ID,
} from "__support__/sample_dataset_fixture";
import { question } from "__support__/sample_dataset_fixture";
import { mount } from "enzyme";
import { click } from "__support__/enzyme_utils";
......
......@@ -32,7 +32,7 @@ import Filter from "metabase/query_builder/components/Filter";
const getFieldList = (query, fieldOptions, segmentOptions) => (
<FieldList
tableMetadata={query.tableMetadata()}
table={query.table()}
fieldOptions={fieldOptions}
segmentOptions={segmentOptions}
customFieldOptions={query.expressions()}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment