diff --git a/frontend/src/metabase-lib/queries/utils/breakout.js b/frontend/src/metabase-lib/queries/utils/breakout.js index fa384c7bc639a9440febd1ed110af90e73e71809..26501c1710dc8c17a8db3ecfdf197d1008e1377d 100644 --- a/frontend/src/metabase-lib/queries/utils/breakout.js +++ b/frontend/src/metabase-lib/queries/utils/breakout.js @@ -1,4 +1,4 @@ -import { add, update, remove, clear } from "./util"; +import { add, update, remove } from "./util"; /** * Returns canonical list of Breakouts, with nulls removed @@ -42,10 +42,3 @@ export function updateBreakout(breakout, index, updatedBreakout) { export function removeBreakout(breakout, index) { return getBreakoutClause(remove(getBreakouts(breakout), index)); } - -/** - * @deprecated use MLv2 - */ -export function clearBreakouts(breakout) { - return getBreakoutClause(clear()); -} diff --git a/frontend/src/metabase-lib/queries/utils/field.js b/frontend/src/metabase-lib/queries/utils/field.js index 3dbe845df20bdaee8c060f1685503b33298daf91..3d6fb51ed5667755cb847d1e0577c85d0e93868b 100644 --- a/frontend/src/metabase-lib/queries/utils/field.js +++ b/frontend/src/metabase-lib/queries/utils/field.js @@ -1,6 +1,6 @@ import _ from "underscore"; -import { add, update, remove, clear } from "./util"; +import { add, update, remove } from "./util"; // returns canonical list of Fields, with nulls removed function getFields(fields) { @@ -26,9 +26,6 @@ export function updateField(fields, index, updatedField) { export function removeField(fields, index) { return getFieldClause(remove(getFields(fields), index)); } -export function clearFields(fields) { - return getFieldClause(clear()); -} // Metadata field "values" type is inconsistent // https://github.com/metabase/metabase/issues/3417 diff --git a/frontend/src/metabase-lib/queries/utils/order-by.js b/frontend/src/metabase-lib/queries/utils/order-by.js index 540eddb0707025cdf5832d85532298c2d5c8e070..f8bb316ad9df713969a3c9ad84434a84d36e668d 100644 --- a/frontend/src/metabase-lib/queries/utils/order-by.js +++ b/frontend/src/metabase-lib/queries/utils/order-by.js @@ -1,4 +1,4 @@ -import { update, remove, clear } from "./util"; +import { update, remove } from "./util"; // returns canonical list of OrderBys, with nulls removed export function getOrderBys(breakout) { @@ -21,6 +21,3 @@ export function updateOrderBy(breakout, index, updatedOrderBy) { export function removeOrderBy(breakout, index) { return getOrderByClause(remove(getOrderBys(breakout), index)); } -export function clearOrderBy(breakout) { - return getOrderByClause(clear()); -} diff --git a/frontend/src/metabase-lib/queries/utils/query.js b/frontend/src/metabase-lib/queries/utils/query.js index 80dd155ad5a806e5e87cf13cf059960e7d113800..d8154ed2fbf5ced6d156a0b79c81a0a3392c4213 100644 --- a/frontend/src/metabase-lib/queries/utils/query.js +++ b/frontend/src/metabase-lib/queries/utils/query.js @@ -66,8 +66,7 @@ export const removeBreakout = (query, index) => /** * @deprecated use MLv2 */ -export const clearBreakouts = query => - setBreakoutClause(query, B.clearBreakouts(query.breakout)); +const clearBreakouts = query => setBreakoutClause(query); // FILTER @@ -96,8 +95,7 @@ const updateOrderBy = (query, index, orderBy) => setOrderByClause(query, O.updateOrderBy(query["order-by"], index, orderBy)); const removeOrderBy = (query, index) => setOrderByClause(query, O.removeOrderBy(query["order-by"], index)); -const clearOrderBy = query => - setOrderByClause(query, O.clearOrderBy(query["order-by"])); +const clearOrderBy = query => setOrderByClause(query); // FIELD export const addField = (query, field) => @@ -106,8 +104,7 @@ export const updateField = (query, index, field) => setFieldsClause(query, FIELD.updateField(query.fields, index, field)); export const removeField = (query, index) => setFieldsClause(query, FIELD.removeField(query.fields, index)); -export const clearFields = query => - setFieldsClause(query, FIELD.clearFields(query.fields)); +const clearFields = query => setFieldsClause(query); // EXPRESSIONS diff --git a/frontend/src/metabase-lib/queries/utils/util.js b/frontend/src/metabase-lib/queries/utils/util.js index 0c902b09d620e9dc68687ccb5a6804b4dcfb70f3..253673a24db83bcd6efa62f0dd7c265d9c645861 100644 --- a/frontend/src/metabase-lib/queries/utils/util.js +++ b/frontend/src/metabase-lib/queries/utils/util.js @@ -16,4 +16,3 @@ export const remove = (items, index) => [ ...items.slice(0, index), ...items.slice(index + 1), ]; -export const clear = () => [];