Skip to content
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

Jump to bottom

feat(native-filters): hide filterBar and toggle icon when in editMode #13108

Merged
merged 2 commits into from
Feb 14, 2021
Merged

feat(native-filters): hide filterBar and toggle icon when in editMode #13108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c645256
feat(native-filters): hide filterBar and toggle icon when in editMode
Feb 13, 2021
6de74e0
fix: change implementation to avoid empty space
Feb 14, 2021
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
1 change: 1 addition & 0 deletions superset-frontend/spec/javascripts/dashboard/components/nativeFilters/FilterBar_spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { mockStore } from 'spec/fixtures/mockStore';
describe('FilterBar', () => {
const props = {
filtersOpen: false,
editMode: false,
toggleFiltersBar: jest.fn(),
};

Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/dashboard/components/DashboardBuilder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ class DashboardBuilder extends React.Component {
<ErrorBoundary>
<FilterBar
filtersOpen={this.state.dashboardFiltersOpen}
editMode={editMode}
toggleFiltersBar={this.toggleDashboardFiltersOpen}
directPathToChild={directPathToChild}
/>
Expand Down
22 changes: 13 additions & 9 deletions superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ const FilterControls = styled.div`

interface FiltersBarProps {
filtersOpen: boolean;
editMode: boolean;
toggleFiltersBar: any;
directPathToChild?: string[];
}

const FilterBar: React.FC<FiltersBarProps> = ({
filtersOpen,
editMode,
toggleFiltersBar,
directPathToChild,
}) => {
Expand All @@ -161,7 +163,7 @@ const FilterBar: React.FC<FiltersBarProps> = ({
const [visiblePopoverId, setVisiblePopoverId] = useState<string | null>(null);

useEffect(() => {
if (filterConfigs.length === 0 && filtersOpen) {
if ((filterConfigs.length === 0 && filtersOpen) || editMode) {
amitmiran137 marked this conversation as resolved.
Show resolved Hide resolved
toggleFiltersBar(false);
}
}, [filterConfigs]);
Expand Down Expand Up @@ -229,14 +231,16 @@ const FilterBar: React.FC<FiltersBarProps> = ({

return (
<BarWrapper data-test="filter-bar" className={cx({ open: filtersOpen })}>
<CollapsedBar
className={cx({ open: !filtersOpen })}
onClick={() => toggleFiltersBar(true)}
>
<StyledCollapseIcon name="collapse" />
<Icon name="filter" />
</CollapsedBar>
<Bar className={cx({ open: filtersOpen })}>
{!editMode && (
<CollapsedBar
className={cx({ open: !filtersOpen })}
onClick={() => toggleFiltersBar(true)}
>
<StyledCollapseIcon name="collapse" />
<Icon name="filter" />
</CollapsedBar>
)}
<Bar className={cx({ open: !editMode && filtersOpen })}>
<TitleArea>
<span>
{t('Filters')} ({filterConfigs.length})
Expand Down