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

fix(dashboard): Include dashboard filters in widget viewer #45106

Merged
merged 2 commits into from
Feb 28, 2023
Merged

fix(dashboard): Include dashboard filters in widget viewer #45106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39fe08b
fix(dashboard): Include dashboard filters in widget viewer
wmak Feb 24, 2023
afc66a7
Merge branch 'master' into wmak/fix/include-dashboard-filters-in-widg…
wmak Feb 28, 2023
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
17 changes: 16 additions & 1 deletion static/app/components/modals/widgetViewerModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ import useRouter from 'sentry/utils/useRouter';
import withPageFilters from 'sentry/utils/withPageFilters';
import {DisplayType, Widget, WidgetType} from 'sentry/views/dashboards/types';
import {
dashboardFiltersToString,
eventViewFromWidget,
getDashboardFiltersFromURL,
getFieldsFromEquations,
getNumEquations,
getWidgetDiscoverUrl,
Expand Down Expand Up @@ -244,6 +246,7 @@ function WidgetViewerModal(props: Props) {

// Get table sort settings from location
const sort = decodeScalar(location.query[WidgetViewerQueryField.SORT]);

const sortedQueries = cloneDeep(
sort ? widget.queries.map(query => ({...query, orderby: sort})) : widget.queries
);
Expand Down Expand Up @@ -385,7 +388,15 @@ function WidgetViewerModal(props: Props) {

const queryOptions = sortedQueries.map(({name, conditions}, index) => {
// Creates the highlighted query elements to be used in the Query Select
const parsedQuery = !name && !!conditions ? parseSearch(conditions) : null;
const dashboardFilters = dashboardFiltersToString(
getDashboardFiltersFromURL(location)
);
const parsedQuery =
!name && !!conditions
? parseSearch(
conditions + (dashboardFilters === '' ? '' : ` ${dashboardFilters}`)
)
: null;
const getHighlightedQuery = (
highlightedContainerProps: React.ComponentProps<typeof HighlightContainer>
) => {
Expand Down Expand Up @@ -728,6 +739,7 @@ function WidgetViewerModal(props: Props) {
: HALF_TABLE_ITEM_LIMIT
}
cursor={cursor}
dashboardFilters={getDashboardFiltersFromURL(location) ?? undefined}
>
{renderIssuesTable}
</IssueWidgetQueries>
Expand All @@ -752,6 +764,7 @@ function WidgetViewerModal(props: Props) {
: HALF_TABLE_ITEM_LIMIT
}
cursor={cursor}
dashboardFilters={getDashboardFiltersFromURL(location) ?? undefined}
>
{renderReleaseTable}
</ReleaseWidgetQueries>
Expand Down Expand Up @@ -779,6 +792,7 @@ function WidgetViewerModal(props: Props) {
: HALF_TABLE_ITEM_LIMIT
}
cursor={cursor}
dashboardFilters={getDashboardFiltersFromURL(location) ?? undefined}
>
{({tableResults, loading, pageLinks}) => (
<DiscoverTable
Expand Down Expand Up @@ -839,6 +853,7 @@ function WidgetViewerModal(props: Props) {
api={api}
organization={organization}
selection={modalChartSelection.current}
dashboardFilters={getDashboardFiltersFromURL(location) ?? undefined}
// Top N charts rely on the orderby of the table
widget={primaryWidget}
onZoom={onZoom}
Expand Down
16 changes: 16 additions & 0 deletions static/app/views/dashboards/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,3 +537,19 @@ export function getDashboardFiltersFromURL(location: Location): DashboardFilters
});
return !isEmpty(dashboardFilters) ? dashboardFilters : null;
}

export function dashboardFiltersToString(
dashboardFilters: DashboardFilters | null | undefined
): string {
let dashboardFilterConditions = '';
if (dashboardFilters) {
for (const [key, activeFilters] of Object.entries(dashboardFilters)) {
if (activeFilters.length === 1) {
dashboardFilterConditions += `${key}:${activeFilters[0]} `;
} else if (activeFilters.length > 1) {
dashboardFilterConditions += `${key}:[${activeFilters.join(',')}] `;
}
}
}
return dashboardFilterConditions;
}
Comment on lines +541 to +555
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy pasta from static/app/views/dashboards/widgetCard/genericWidgetQueries.tsx so it can be reused to change the query display

13 changes: 2 additions & 11 deletions static/app/views/dashboards/widgetCard/genericWidgetQueries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {Series} from 'sentry/types/echarts';
import {TableDataWithTitle} from 'sentry/utils/discover/discoverQuery';
import {AggregationOutputType} from 'sentry/utils/discover/fields';
import {MEPState} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
import {dashboardFiltersToString} from 'sentry/views/dashboards/utils';

import {DatasetConfig} from '../datasetConfig/base';
import {
Expand Down Expand Up @@ -210,17 +211,7 @@ class GenericWidgetQueries<SeriesResponse, TableResponse> extends Component<
applyDashboardFilters(widget: Widget): Widget {
const {dashboardFilters} = this.props;

let dashboardFilterConditions = '';
if (dashboardFilters) {
for (const [key, activeFilters] of Object.entries(dashboardFilters)) {
if (activeFilters.length === 1) {
dashboardFilterConditions += `${key}:${activeFilters[0]} `;
} else if (activeFilters.length > 1) {
dashboardFilterConditions += `${key}:[${activeFilters.join(',')}] `;
}
}
}

const dashboardFilterConditions = dashboardFiltersToString(dashboardFilters);
widget.queries.forEach(query => {
query.conditions =
query.conditions +
Expand Down