From 9be96da94638595843b70687a6feef863e0532df Mon Sep 17 00:00:00 2001
From: Alexander Polyankin <alexander.polyankin@metabase.com>
Date: Mon, 4 Mar 2024 17:58:22 +0200
Subject: [PATCH] Prevent custom expressions from being removed from the query
(#39518)
---
.../table-column-settings.cy.spec.js | 4 ----
.../FieldPanel/FieldPanel.unit.spec.tsx | 18 +++++++++++++++++-
.../querying/components/FieldPanel/utils.ts | 5 ++++-
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/e2e/test/scenarios/visualizations-tabular/table-column-settings.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/table-column-settings.cy.spec.js
index 0177561c7ef..65f9966f5bb 100644
--- a/e2e/test/scenarios/visualizations-tabular/table-column-settings.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-tabular/table-column-settings.cy.spec.js
@@ -496,8 +496,6 @@ describe("scenarios > visualizations > table column settings", () => {
_hideColumn(testData);
_showColumn(testData);
- _removeColumn(testData);
- _addColumn(testData);
});
it("should be able to show and hide custom expressions for a table with selected fields", () => {
@@ -515,8 +513,6 @@ describe("scenarios > visualizations > table column settings", () => {
_hideColumn(testData);
_showColumn(testData);
- _removeColumn(testData);
- _addColumn(testData);
});
it("should be able to show and hide columns from aggregations", () => {
diff --git a/frontend/src/metabase/querying/components/FieldPanel/FieldPanel.unit.spec.tsx b/frontend/src/metabase/querying/components/FieldPanel/FieldPanel.unit.spec.tsx
index b47cc14092b..cdf62381e21 100644
--- a/frontend/src/metabase/querying/components/FieldPanel/FieldPanel.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/FieldPanel/FieldPanel.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import { useState } from "react";
import { renderWithProviders, screen } from "__support__/ui";
-import type * as Lib from "metabase-lib";
+import * as Lib from "metabase-lib";
import { createQuery } from "metabase-lib/test-helpers";
import { FieldPanel } from "./FieldPanel";
@@ -116,6 +116,22 @@ describe("QueryColumnPicker", () => {
expect(firstColumn).toBeEnabled();
});
+ it("should not allow to remove custom columns", () => {
+ const query = Lib.expression(
+ createQuery(),
+ -1,
+ "Custom",
+ Lib.expressionClause("+", [1, 2]),
+ );
+ setup({ query });
+ const [orderGroup] = screen.getAllByRole("checkbox");
+ const customColumn = screen.getByRole("checkbox", { name: "Custom" });
+ expect(orderGroup).toBeChecked();
+ expect(orderGroup).toBeDisabled();
+ expect(customColumn).toBeChecked();
+ expect(customColumn).toBeDisabled();
+ });
+
it("should allow to search for columns", () => {
setup();
userEvent.type(screen.getByPlaceholderText("Search for a column…"), "a");
diff --git a/frontend/src/metabase/querying/components/FieldPanel/utils.ts b/frontend/src/metabase/querying/components/FieldPanel/utils.ts
index 03c7bed4153..f312bd0608a 100644
--- a/frontend/src/metabase/querying/components/FieldPanel/utils.ts
+++ b/frontend/src/metabase/querying/components/FieldPanel/utils.ts
@@ -24,7 +24,10 @@ function getColumnItems(
column,
displayName: columnInfo.displayName,
isSelected: columnInfo.selected ?? false,
- isDisabled: columnInfo.isAggregation || columnInfo.isBreakout,
+ isDisabled:
+ columnInfo.isAggregation ||
+ columnInfo.isBreakout ||
+ columnInfo.isCalculated,
};
});
}
--
GitLab