-
Notifications
You must be signed in to change notification settings - Fork 14k
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.
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
feat: Implement drag and drop columns for filters #13340
Merged
Merged
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
6d74a2a
Implement DnD feature for filters
kgabryje ac3d7dc
minor refactor
kgabryje b3bdb81
Fix types
kgabryje 6448fe1
Fix undefined error
kgabryje b8abf78
Refactor
kgabryje 1e1b802
Fix ts errors
kgabryje 0bd133e
Fix conflicting dnd types
kgabryje 4a842e8
Bump superset-ui packages
kgabryje ce776bb
Change DndItemType case to PascalCase
kgabryje 852cad4
Remove redundant null check
kgabryje 9aaa98b
Fix
kgabryje b05b622
Fix csrf mock api call
kgabryje File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import React, { useState } from 'react'; | ||
| import { ColumnMeta, ColumnOption } from '@superset-ui/chart-controls'; | ||
| import { isEmpty } from 'lodash'; | ||
| import { LabelProps } from './types'; | ||
| import DndSelectLabel from './DndSelectLabel'; | ||
| import OptionWrapper from './components/OptionWrapper'; | ||
| import { OptionSelector } from './utils'; | ||
| import { DatasourcePanelDndItem } from '../../DatasourcePanel/types'; | ||
| import { DndItemType } from '../../DndItemType'; | ||
|
|
||
| export const DndColumnSelect = (props: LabelProps) => { | ||
| const { value, options } = props; | ||
| const optionSelector = new OptionSelector(options, value); | ||
| const [values, setValues] = useState<ColumnMeta[]>(optionSelector.values); | ||
|
|
||
| const onDrop = (item: DatasourcePanelDndItem) => { | ||
| const column = item.value as ColumnMeta; | ||
| if (!optionSelector.isArray && !isEmpty(optionSelector.values)) { | ||
| optionSelector.replace(0, column.column_name); | ||
| } else { | ||
| optionSelector.add(column.column_name); | ||
| } | ||
| setValues(optionSelector.values); | ||
| props.onChange(optionSelector.getValues()); | ||
| }; | ||
|
|
||
| const canDrop = (item: DatasourcePanelDndItem) => | ||
| !optionSelector.has((item.value as ColumnMeta).column_name); | ||
|
|
||
| const onClickClose = (index: number) => { | ||
| optionSelector.del(index); | ||
| setValues(optionSelector.values); | ||
| props.onChange(optionSelector.getValues()); | ||
| }; | ||
|
|
||
| const onShiftOptions = (dragIndex: number, hoverIndex: number) => { | ||
| optionSelector.swap(dragIndex, hoverIndex); | ||
| setValues(optionSelector.values); | ||
| props.onChange(optionSelector.getValues()); | ||
| }; | ||
|
|
||
| const valuesRenderer = () => | ||
| values.map((column, idx) => ( | ||
| <OptionWrapper | ||
| key={idx} | ||
| index={idx} | ||
| clickClose={onClickClose} | ||
| onShiftOptions={onShiftOptions} | ||
| type={DndItemType.columnOption} | ||
| > | ||
| <ColumnOption column={column} showType /> | ||
| </OptionWrapper> | ||
| )); | ||
|
|
||
| return ( | ||
| <DndSelectLabel<string | string[], ColumnMeta[]> | ||
| values={values} | ||
| onDrop={onDrop} | ||
| canDrop={canDrop} | ||
| valuesRenderer={valuesRenderer} | ||
| accept={DndItemType.column} | ||
| {...props} | ||
| /> | ||
| ); | ||
| }; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I believe the common convention is to use PascalCase for enum names:
https://www.typescriptlang.org/docs/handbook/enums.html
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍