Skip to content

Commit

Permalink
fix(explore): disable resize bar when the results area is collapsed (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenLYZ committed Sep 12, 2022
1 parent cf7c420 commit d28909d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
10 changes: 9 additions & 1 deletion superset-frontend/src/explore/components/ExploreChartPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const Styles = styled.div`
}
.gutter.gutter-vertical {
display: ${({ showSplite }) => (showSplite ? 'block' : 'none')};
cursor: row-resize;
}
Expand Down Expand Up @@ -149,6 +150,9 @@ const ExploreChartPanel = ({
const [splitSizes, setSplitSizes] = useState(
getItem(LocalStorageKeys.chart_split_sizes, INITIAL_SIZES),
);
const [showSplite, setShowSplit] = useState(
getItem(LocalStorageKeys.is_datapanel_open, false),
);

const [showDatasetModal, setShowDatasetModal] = useState(false);

Expand Down Expand Up @@ -225,6 +229,7 @@ const ExploreChartPanel = ({
];
}
setSplitSizes(splitSizes);
setShowSplit(isOpen);
}, []);

const renderChart = useCallback(
Expand Down Expand Up @@ -411,7 +416,10 @@ const ExploreChartPanel = ({
}

return (
<Styles className="panel panel-default chart-container">
<Styles
className="panel panel-default chart-container"
showSplite={showSplite}
>
{vizType === 'filter_box' ? (
panelBody
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import userEvent from '@testing-library/user-event';
import { render, screen } from 'spec/helpers/testing-library';
import { getChartMetadataRegistry, ChartMetadata } from '@superset-ui/core';
import ChartContainer from 'src/explore/components/ExploreChartPanel';
import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';

const createProps = (overrides = {}) => ({
sliceName: 'Trend Line',
Expand Down Expand Up @@ -150,4 +151,16 @@ describe('ChartContainer', () => {
expect(await screen.findByRole('timer')).toBeInTheDocument();
expect(screen.queryByText(/cached/i)).not.toBeInTheDocument();
});

it('hides gutter when collapsing data panel', async () => {
const props = createProps();
setItem(LocalStorageKeys.is_datapanel_open, true);
const { container } = render(<ChartContainer {...props} />, {
useRedux: true,
});
const gutter = container.querySelector('.gutter');
expect(window.getComputedStyle(gutter).display).toBe('block');
userEvent.click(screen.getByLabelText('Collapse data panel'));
expect(window.getComputedStyle(gutter).display).toBe('none');
});
});

0 comments on commit d28909d

Please sign in to comment.