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(dashboard): Highlight tabs that contain a chart in scope of focused native filter #14865

Merged
merged 5 commits into from
May 28, 2021
Merged

feat(dashboard): Highlight tabs that contain a chart in scope of focused native filter #14865

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
fd1599b
feat(dashboard): Highlight tabs that contain a chart in scope of focu…
kgabryje May 27, 2021
9b44197
Optimizations and improvements
kgabryje May 27, 2021
07009b1
Use Set instead of array
kgabryje May 27, 2021
c52b485
Simplify logic
kgabryje May 27, 2021
e818930
Change variable name
kgabryje May 27, 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
21 changes: 19 additions & 2 deletions superset-frontend/src/dashboard/components/gridComponents/Tab.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { styled } from '@superset-ui/core';

import DashboardComponent from '../../containers/DashboardComponent';
import DragDroppable from '../dnd/DragDroppable';
Expand Down Expand Up @@ -62,6 +63,17 @@ const defaultProps = {
onResizeStop() {},
};

const TabTitleContainer = styled.div`
${({ isHighlighted, theme: { gridUnit, colors } }) => `
padding: ${gridUnit}px ${gridUnit * 2}px;
margin: ${-gridUnit}px ${gridUnit * -2}px;
transition: box-shadow 0.2s ease-in-out;
${
isHighlighted && `box-shadow: 0 0 ${gridUnit}px ${colors.primary.light1};`
}
`}
`;

export default class Tab extends React.PureComponent {
constructor(props) {
super(props);
Expand Down Expand Up @@ -192,6 +204,7 @@ export default class Tab extends React.PureComponent {
editMode,
filters,
isFocused,
isHighlighted,
} = this.props;

return (
Expand All @@ -205,7 +218,11 @@ export default class Tab extends React.PureComponent {
editMode={editMode}
>
{({ dropIndicatorProps, dragSourceRef }) => (
<div className="dragdroppable-tab" ref={dragSourceRef}>
<TabTitleContainer
isHighlighted={isHighlighted}
className="dragdroppable-tab"
ref={dragSourceRef}
>
<EditableTitle
title={component.meta.text}
defaultTitle={component.meta.defaultText}
Expand All @@ -225,7 +242,7 @@ export default class Tab extends React.PureComponent {
)}

{dropIndicatorProps && <div {...dropIndicatorProps} />}
</div>
</TabTitleContainer>
)}
</DragDroppable>
);
Expand Down
55 changes: 54 additions & 1 deletion superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,38 @@ import getLeafComponentIdFromPath from '../../util/getLeafComponentIdFromPath';
import { componentShape } from '../../util/propShapes';
import { NEW_TAB_ID, DASHBOARD_ROOT_ID } from '../../util/constants';
import { RENDER_TAB, RENDER_TAB_CONTENT } from './Tab';
import { TAB_TYPE } from '../../util/componentTypes';
import { CHART_TYPE, TAB_TYPE } from '../../util/componentTypes';
import { getChartIdsInFilterScope } from '../../util/activeDashboardFilters';

const findTabsWithChartsInScope = (
dashboardLayout,
chartsInScope,
childId,
tabId,
tabsToHighlight,
) => {
if (
dashboardLayout[childId].type === CHART_TYPE &&
chartsInScope.includes(dashboardLayout[childId].meta.chartId)
) {
tabsToHighlight.add(tabId);
}
if (
dashboardLayout[childId].children.length === 0 ||
(dashboardLayout[childId].type === TAB_TYPE && tabsToHighlight.has(childId))
) {
return;
}
dashboardLayout[childId].children.forEach(subChildId =>
findTabsWithChartsInScope(
dashboardLayout,
chartsInScope,
subChildId,
tabId,
tabsToHighlight,
),
);
};

const propTypes = {
id: PropTypes.string.isRequired,
Expand Down Expand Up @@ -268,11 +299,30 @@ class Tabs extends React.PureComponent {
renderHoverMenu,
isComponentVisible: isCurrentTabVisible,
editMode,
focusedFilterScope,
dashboardLayout,
} = this.props;

const { children: tabIds } = tabsComponent;
const { tabIndex: selectedTabIndex, activeKey } = this.state;

const tabsToHighlight = new Set();
if (focusedFilterScope) {
const chartsInScope = getChartIdsInFilterScope({
filterScope: focusedFilterScope.scope,
});
tabIds.forEach(tabId => {
if (!tabsToHighlight.has(tabId)) {
findTabsWithChartsInScope(
dashboardLayout,
chartsInScope,
tabId,
tabId,
tabsToHighlight,
);
}
});
}
return (
<DragDroppable
component={tabsComponent}
Expand Down Expand Up @@ -322,6 +372,9 @@ class Tabs extends React.PureComponent {
columnWidth={columnWidth}
onDropOnTab={this.handleDropOnTab}
isFocused={activeKey === tabId}
isHighlighted={
activeKey !== tabId && tabsToHighlight.has(tabId)
}
/>
}
>
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/dashboard/containers/DashboardComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ function mapStateToProps(
const component = dashboardLayout[id];
const props = {
component,
dashboardLayout,
parentComponent: dashboardLayout[parentId],
editMode: dashboardState.editMode,
undoLength: undoableLayout.past.length,
Expand Down