-
Notifications
You must be signed in to change notification settings - Fork 14.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(filter-set): Update existing filter set (#13545)
* refactor(native-filters): move data mask to root reducer * refactor: update rest stuff for dataMask * refactor: add ownCrrentState to explore * fix: fix immer reducer * fix: merge with master * refactor: support explore dataMask * refactor: support explore dataMask * docs: add comment * refactor: remove json stringify * fix: fix failed cases * feat: filter bat buttons start * fix: fix CR notes * fix: fix cascade filters * fix: fix CR notes * refactor: add clear all * fix: fix CR notes * fix: fix CR notes * fix: fix CR notes * feat: buttons in filter bar * lint: update imports * feat: add tabs for filter sets * feat: add buttons to filter set * feat: first phase add filter sets * fix: undo FF * refactor: continue filter sets * fix: fix CR notes * refactor: header * fix: fix CR notes * fix: fix CR notes * refactor: continue filter sets * lint: fix lint * refactor: continue filter sets * fix: fix filter bar opening * refactor: continue filter sets * refactor: continue filter sets * refactor: continue filter sets * feat: filters sets history * feat: filters sets history * fix: filter set name * refactor: fix expand filters case * fix: fix CR notes * refactor: filter sets * refactor: filter sets * refactor: filter sets * refactor: filter sets * refactor: update sets * feat: edit filter set * refactor: add warning icon * fix: fix CR notes * Update superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.tsx Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com> * fix: fix CR notes Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
- Loading branch information
Showing
9 changed files
with
241 additions
and
41 deletions.
There are no files selected for viewing
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
150 changes: 150 additions & 0 deletions
150
...rset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/EditSection.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,150 @@ | ||
| /** | ||
| * 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, { FC, useMemo } from 'react'; | ||
| import { HandlerFunction, styled, t } from '@superset-ui/core'; | ||
| import { Typography, Tooltip } from 'src/common/components'; | ||
| import { useDispatch } from 'react-redux'; | ||
| import Button from 'src/components/Button'; | ||
| import { setFilterSetsConfiguration } from 'src/dashboard/actions/nativeFilters'; | ||
| import { DataMaskUnit } from 'src/dataMask/types'; | ||
| import { WarningOutlined } from '@ant-design/icons'; | ||
| import { ActionButtons } from './Footer'; | ||
| import { useDataMask, useFilterSets } from '../state'; | ||
| import { APPLY_FILTERS_HINT, findExistingFilterSet } from './utils'; | ||
|
|
||
| const Wrapper = styled.div` | ||
| display: grid; | ||
| grid-template-columns: 1fr; | ||
| align-items: flex-start; | ||
| justify-content: flex-start; | ||
| grid-gap: ${({ theme }) => theme.gridUnit}px; | ||
| background: ${({ theme }) => theme.colors.primary.light4}; | ||
| padding: ${({ theme }) => theme.gridUnit * 2}px; | ||
| `; | ||
|
|
||
| const Title = styled(Typography.Text)` | ||
| color: ${({ theme }) => theme.colors.primary.dark2}; | ||
| `; | ||
|
|
||
| const Warning = styled(Typography.Text)` | ||
| font-size: ${({ theme }) => theme.typography.sizes.s}px; | ||
| & .anticon { | ||
| padding: ${({ theme }) => theme.gridUnit}px; | ||
| } | ||
| `; | ||
|
|
||
| const ActionButton = styled.div<{ disabled?: boolean }>` | ||
| display: flex; | ||
| & button { | ||
| ${({ disabled }) => `pointer-events: ${disabled ? 'none' : 'all'}`}; | ||
| flex: 1; | ||
| } | ||
| `; | ||
|
|
||
| type EditSectionProps = { | ||
| filterSetId: string; | ||
| dataMaskSelected: DataMaskUnit; | ||
| onCancel: HandlerFunction; | ||
| disabled: boolean; | ||
| }; | ||
|
|
||
| const EditSection: FC<EditSectionProps> = ({ | ||
| filterSetId, | ||
| onCancel, | ||
| dataMaskSelected, | ||
| disabled, | ||
| }) => { | ||
| const dataMaskApplied = useDataMask(); | ||
| const dispatch = useDispatch(); | ||
| const filterSets = useFilterSets(); | ||
| const filterSetFilterValues = Object.values(filterSets); | ||
| const handleSave = () => { | ||
| dispatch( | ||
| setFilterSetsConfiguration( | ||
| filterSetFilterValues.map(filterSet => { | ||
| const newFilterSet = { | ||
| ...filterSet, | ||
| dataMask: { nativeFilters: { ...dataMaskApplied } }, | ||
| }; | ||
| return filterSetId === filterSet.id ? newFilterSet : filterSet; | ||
| }), | ||
| ), | ||
| ); | ||
| onCancel(); | ||
| }; | ||
|
|
||
| const foundFilterSet = useMemo( | ||
| () => | ||
| findExistingFilterSet({ | ||
| dataMaskApplied, | ||
| dataMaskSelected, | ||
| filterSetFilterValues, | ||
| }), | ||
| [dataMaskApplied, dataMaskSelected, filterSetFilterValues], | ||
| ); | ||
|
|
||
| const isDuplicateFilterSet = | ||
| foundFilterSet && foundFilterSet.id !== filterSetId; | ||
|
|
||
| return ( | ||
| <Wrapper> | ||
| <Title strong>{t('Editing filter set:')}</Title> | ||
| <Title>{filterSets[filterSetId].name}</Title> | ||
| <ActionButtons> | ||
| <Button | ||
| ghost | ||
| buttonStyle="tertiary" | ||
| buttonSize="small" | ||
| onClick={onCancel} | ||
| data-test="filter-set-edit-cancel" | ||
| > | ||
| {t('Cancel')} | ||
| </Button> | ||
| <Tooltip | ||
| placement="top" | ||
| title={ | ||
| (isDuplicateFilterSet && t('Filter set already exists')) || | ||
| (disabled && APPLY_FILTERS_HINT) | ||
| } | ||
| > | ||
| <ActionButton disabled={disabled || isDuplicateFilterSet}> | ||
| <Button | ||
| disabled={disabled || isDuplicateFilterSet} | ||
| buttonStyle="primary" | ||
| htmlType="submit" | ||
| buttonSize="small" | ||
| onClick={handleSave} | ||
| data-test="filter-set-edit-save" | ||
| > | ||
| {t('Save')} | ||
| </Button> | ||
| </ActionButton> | ||
| </Tooltip> | ||
| </ActionButtons> | ||
| {isDuplicateFilterSet && ( | ||
| <Warning mark> | ||
| <WarningOutlined /> | ||
| {t('This filter set is identical to: "%s"', foundFilterSet?.name)} | ||
| </Warning> | ||
| )} | ||
| </Wrapper> | ||
| ); | ||
| }; | ||
|
|
||
| export default EditSection; |
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
Oops, something went wrong.