Skip to content

Web-console: remove specific column filters #8343

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
fjy merged 5 commits into from
Aug 20, 2019
Merged

Web-console: remove specific column filters #8343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7433dc4
add clear filter
mcbrewster Aug 19, 2019
e916cc6
update tool kit
mcbrewster Aug 20, 2019
03a76ad
remove usless check
mcbrewster Aug 20, 2019
d0a32c6
auto run
mcbrewster Aug 20, 2019
706b4d7
add %
mcbrewster Aug 20, 2019
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
6 changes: 3 additions & 3 deletions web-console/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web-console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"d3": "^5.9.7",
"d3-array": "^2.2.0",
"druid-console": "^0.0.2",
"druid-query-toolkit": "^0.3.20",
"druid-query-toolkit": "^0.3.21",
"file-saver": "^2.0.2",
"has-own-prop": "^2.0.0",
"hjson": "^3.1.2",
Expand Down
1 change: 1 addition & 0 deletions web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ exports[`sql view matches snapshot 1`] = `
addToGroupBy={[Function]}
clear={[Function]}
columnMetadataLoading={true}
currentFilters={[Function]}
defaultSchema="druid"
filterByRow={[Function]}
hasGroupBy={[Function]}
Expand Down
4 changes: 3 additions & 1 deletion ...src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ export class StringMenuItems extends React.PureComponent<StringMenuItemsProps> {
/>
<MenuItem
text={`"${columnName}" LIKE '%xxx%'`}
onClick={() => filterByRow([{ row: 'xxx', header: columnName, operator: 'LIKE' }], false)}
onClick={() =>
filterByRow([{ row: '%xxx%', header: columnName, operator: 'LIKE' }], false)
}
/>
</MenuItem>
);
Expand Down
20 changes: 10 additions & 10 deletions ...ole/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export interface TimeMenuItemsProps {
filterByRow: (filters: RowFilter[], preferablyRun: boolean) => void;
queryAst?: SqlQuery;
columnName: string;
clear: () => void;
clear: (column: string, preferablyRun: boolean) => void;
}

export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
Expand Down Expand Up @@ -146,7 +146,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
ex: [refExpressionFactory('CURRENT_TIMESTAMP'), intervalFactory('HOUR', '1')],
spacing: [' ', ' '],
});
clear();
clear(columnName, false);
filterByRow([{ row: additiveExpression, header: columnName, operator: '>=' }], true);
}}
/>
Expand All @@ -159,7 +159,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
ex: [refExpressionFactory('CURRENT_TIMESTAMP'), intervalFactory('DAY', '1')],
spacing: [' ', ' '],
});
clear();
clear(columnName, false);
filterByRow([{ row: additiveExpression, header: columnName, operator: '>=' }], true);
}}
/>
Expand All @@ -172,7 +172,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
ex: [refExpressionFactory('CURRENT_TIMESTAMP'), intervalFactory('DAY', '7')],
spacing: [' ', ' '],
});
clear();
clear(columnName, false);
filterByRow([{ row: additiveExpression, header: columnName, operator: '>=' }], true);
}}
/>
Expand All @@ -185,7 +185,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
ex: [refExpressionFactory('CURRENT_TIMESTAMP'), intervalFactory('MONTH', '1')],
spacing: [' ', ' '],
});
clear();
clear(columnName, false);
filterByRow([{ row: additiveExpression, header: columnName, operator: '>=' }], true);
}}
/>
Expand All @@ -198,7 +198,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
ex: [refExpressionFactory('CURRENT_TIMESTAMP'), intervalFactory('YEAR', '1')],
spacing: [' ', ' '],
});
clear();
clear(columnName, false);
filterByRow([{ row: additiveExpression, header: columnName, operator: '>=' }], true);
}}
/>
Expand All @@ -207,7 +207,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
text={`Current hour`}
onClick={() => {
const next = this.getNextHour(hour, day, month, year);
clear();
clear(columnName, false);
filterByRow(
[
{
Expand All @@ -233,7 +233,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
text={`Current day`}
onClick={() => {
const next = this.getNextDay(day, month, year);
clear();
clear(columnName, false);
filterByRow(
[
{
Expand All @@ -255,7 +255,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
text={`Current month`}
onClick={() => {
const next = this.getNextMonth(month, year);
clear();
clear(columnName, false);
filterByRow(
[
{
Expand All @@ -276,7 +276,7 @@ export class TimeMenuItems extends React.PureComponent<TimeMenuItemsProps> {
<MenuItem
text={`Current year`}
onClick={() => {
clear();
clear(columnName, false);
filterByRow(
[
{
Expand Down
1 change: 1 addition & 0 deletions web-console/src/views/query-view/column-tree/column-tree.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ describe('column tree', () => {
it('matches snapshot', () => {
const columnTree = (
<ColumnTree
currentFilters={() => []}
queryAst={() => undefined}
hasGroupBy={() => false}
clear={() => null}
Expand Down
13 changes: 12 additions & 1 deletion web-console/src/views/query-view/column-tree/column-tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export interface ColumnTreeProps {
onQueryStringChange: (queryString: string, run: boolean) => void;
defaultSchema?: string;
defaultTable?: string;
currentFilters: () => string[];
addFunctionToGroupBy: (
functionName: string,
spacing: string[],
Expand All @@ -137,7 +138,7 @@ export interface ColumnTreeProps {
filterByRow: (filters: RowFilter[], preferablyRun: boolean) => void;
hasGroupBy: () => boolean;
queryAst: () => SqlQuery | undefined;
clear: () => void;
clear: (column: string, preferablyRun: boolean) => void;
}

export interface ColumnTreeState {
Expand Down Expand Up @@ -263,6 +264,16 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
queryAst={props.queryAst()}
/>
)}
{props.currentFilters() &&
props.currentFilters().includes(columnData.COLUMN_NAME) && (
<MenuItem
icon={IconNames.FILTER_REMOVE}
text={`Remove filter`}
onClick={() => {
props.clear(columnData.COLUMN_NAME, true);
}}
/>
)}
<MenuItem
icon={IconNames.CLIPBOARD}
text={`Copy: ${columnData.COLUMN_NAME}`}
Expand Down
12 changes: 8 additions & 4 deletions web-console/src/views/query-view/query-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,13 +603,11 @@ export class QueryView extends React.PureComponent<QueryViewProps, QueryViewStat
this.handleQueryStringChange(modifiedAst.toString(), preferablyRun);
};

private sqlClearWhere = (): void => {
private sqlClearWhere = (column: string, preferablyRun: boolean): void => {
const { queryAst } = this.state;

if (!queryAst) return;
if (queryAst.whereClause) {
queryAst.whereClause = undefined;
}
this.handleQueryStringChange(queryAst.removeFilter(column).toString(), preferablyRun);
};

private handleQueryStringChange = (queryString: string, preferablyRun?: boolean): void => {
Expand Down Expand Up @@ -689,6 +687,11 @@ export class QueryView extends React.PureComponent<QueryViewProps, QueryViewStat
return queryAst;
};

private getCurrentFilters = () => {
const { queryAst } = this.state;
return queryAst.getCurrentFilters();
};

render(): JSX.Element {
const { columnMetadata, columnMetadataLoading, columnMetadataError, queryAst } = this.state;

Expand Down Expand Up @@ -717,6 +720,7 @@ export class QueryView extends React.PureComponent<QueryViewProps, QueryViewStat
onQueryStringChange={this.handleQueryStringChange}
defaultSchema={defaultSchema ? defaultSchema : 'druid'}
defaultTable={defaultTable}
currentFilters={this.getCurrentFilters}
/>
)}
{this.renderMainArea()}
Expand Down