From 2b973c79d2090db2d47cfc08da8c2ccca579e1a1 Mon Sep 17 00:00:00 2001
From: Ryan Laurie <30528226+iethree@users.noreply.github.com>
Date: Wed, 8 Jun 2022 09:34:58 -0600
Subject: [PATCH] Update filter modal tab metrics (#23215)
* update modal tab names
---
.../src/metabase-lib/lib/queries/StructuredQuery.ts | 11 ++++++++---
.../modals/BulkFilterModal/BulkFilterModal.tsx | 6 +-----
.../metabase/scenarios/filters/filter-bulk.cy.spec.js | 1 +
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts b/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts
index 9eea3aff8fe..ce58bc93da1 100644
--- a/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts
+++ b/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts
@@ -903,10 +903,13 @@ class StructuredQueryInner extends AtomicQuery {
// special logic to only show aggregation dimensions for post-aggregation dimensions
if (queries.length > 1) {
- // set the section title to `Metrics`
- sections[0].name = t`Metrics`;
+ const summarySection = {
+ name: t`Summaries`,
+ icon: "sum",
+ items: [],
+ };
// only include aggregation dimensions
- sections[0].items = sections[0].items.filter(item => {
+ summarySection.items = sections[0].items.filter(item => {
if (item.dimension) {
const sourceDimension = queries[0].dimensionForSourceQuery(
item.dimension,
@@ -919,6 +922,8 @@ class StructuredQueryInner extends AtomicQuery {
return true;
});
+ sections.shift();
+ sections.push(summarySection);
}
return sections;
diff --git a/frontend/src/metabase/query_builder/components/filters/modals/BulkFilterModal/BulkFilterModal.tsx b/frontend/src/metabase/query_builder/components/filters/modals/BulkFilterModal/BulkFilterModal.tsx
index cd148b25a42..357ba6a56f3 100644
--- a/frontend/src/metabase/query_builder/components/filters/modals/BulkFilterModal/BulkFilterModal.tsx
+++ b/frontend/src/metabase/query_builder/components/filters/modals/BulkFilterModal/BulkFilterModal.tsx
@@ -171,11 +171,7 @@ const BulkFilterModalSectionList = ({
<TabContent value={tab} onChange={setTab}>
<ModalTabList>
{sections.map((section, index) => (
- <Tab
- key={index}
- value={index}
- icon={index > 0 ? section.icon : undefined}
- >
+ <Tab key={index} value={index} icon={section.icon}>
{section.name}
</Tab>
))}
diff --git a/frontend/test/metabase/scenarios/filters/filter-bulk.cy.spec.js b/frontend/test/metabase/scenarios/filters/filter-bulk.cy.spec.js
index e937dbd020e..66f65bfcd12 100644
--- a/frontend/test/metabase/scenarios/filters/filter-bulk.cy.spec.js
+++ b/frontend/test/metabase/scenarios/filters/filter-bulk.cy.spec.js
@@ -104,6 +104,7 @@ describe("scenarios > filters > bulk filtering", () => {
openFilterModal();
modal().within(() => {
+ cy.findByText("Summaries").click();
cy.findByLabelText("Count").click();
});
--
GitLab