Skip to content
Snippets Groups Projects
Unverified Commit b5da00bb authored by Cal Herries's avatar Cal Herries Committed by GitHub
Browse files

Remove hasParameterValue (#33223)

parent 35653d30
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,6 @@ import { ...@@ -17,7 +17,6 @@ import {
deriveFieldOperatorFromParameter, deriveFieldOperatorFromParameter,
getParameterOperatorName, getParameterOperatorName,
} from "metabase-lib/parameters/utils/operators"; } from "metabase-lib/parameters/utils/operators";
import { hasParameterValue } from "metabase-lib/parameters/utils/parameter-values";
const withTemporalUnit = (fieldRef, unit) => { const withTemporalUnit = (fieldRef, unit) => {
const dimension = const dimension =
...@@ -169,7 +168,7 @@ export function numberParameterValueToMBQL(parameter, fieldRef) { ...@@ -169,7 +168,7 @@ export function numberParameterValueToMBQL(parameter, fieldRef) {
function isFieldFilterParameterConveratableToMBQL(parameter) { function isFieldFilterParameterConveratableToMBQL(parameter) {
const { value, target } = parameter; const { value, target } = parameter;
const hasValue = hasParameterValue(value); const hasValue = value != null;
const hasWellFormedTarget = Array.isArray(target?.[1]); const hasWellFormedTarget = Array.isArray(target?.[1]);
const hasFieldDimensionTarget = const hasFieldDimensionTarget =
isDimensionTarget(target) && !isTemplateTagReference(target[1]); isDimensionTarget(target) && !isTemplateTagReference(target[1]);
......
...@@ -23,10 +23,6 @@ export function hasDefaultParameterValue(parameter) { ...@@ -23,10 +23,6 @@ export function hasDefaultParameterValue(parameter) {
return parameter.default != null; return parameter.default != null;
} }
export function hasParameterValue(value) {
return value != null;
}
export function normalizeParameter(parameter) { export function normalizeParameter(parameter) {
return { return {
id: parameter.id, id: parameter.id,
...@@ -64,13 +60,13 @@ export function normalizeParameterValue(type, value) { ...@@ -64,13 +60,13 @@ export function normalizeParameterValue(type, value) {
} }
function removeNilValuedPairs(pairs) { function removeNilValuedPairs(pairs) {
return pairs.filter(([, value]) => hasParameterValue(value)); return pairs.filter(([, value]) => value != null);
} }
function removeUndefaultedNilValuedPairs(pairs) { function removeUndefaultedNilValuedPairs(pairs) {
return pairs.filter( return pairs.filter(
([parameter, value]) => ([parameter, value]) =>
hasDefaultParameterValue(parameter) || hasParameterValue(value), hasDefaultParameterValue(parameter) || value != null,
); );
} }
...@@ -86,9 +82,7 @@ export function getParameterValuesBySlug( ...@@ -86,9 +82,7 @@ export function getParameterValuesBySlug(
parameterValuesById = parameterValuesById || {}; parameterValuesById = parameterValuesById || {};
const parameterValuePairs = parameters.map(parameter => [ const parameterValuePairs = parameters.map(parameter => [
parameter, parameter,
hasParameterValue(parameter.value) parameter.value ?? parameterValuesById[parameter.id],
? parameter.value
: parameterValuesById[parameter.id],
]); ]);
const transformedPairs = preserveDefaultedParameters const transformedPairs = preserveDefaultedParameters
......
...@@ -9,7 +9,6 @@ import { ...@@ -9,7 +9,6 @@ import {
} from "metabase-types/api"; } from "metabase-types/api";
import type { ParameterWithTarget } from "metabase-lib/parameters/types"; import type { ParameterWithTarget } from "metabase-lib/parameters/types";
import { getTemplateTagFromTarget } from "metabase-lib/parameters/utils/targets"; import { getTemplateTagFromTarget } from "metabase-lib/parameters/utils/targets";
import { hasParameterValue } from "metabase-lib/parameters/utils/parameter-values";
function getTemplateTagType(tag: TemplateTag) { function getTemplateTagType(tag: TemplateTag) {
const { type } = tag; const { type } = tag;
...@@ -124,7 +123,7 @@ export function remapParameterValuesToTemplateTags( ...@@ -124,7 +123,7 @@ export function remapParameterValuesToTemplateTags(
const templateTagParameter = templateTagParametersByName[tag]; const templateTagParameter = templateTagParametersByName[tag];
const parameterValue = const parameterValue =
parameterValuesByDashboardParameterId[dashboardParameter.id]; parameterValuesByDashboardParameterId[dashboardParameter.id];
if (hasParameterValue(parameterValue)) { if (parameterValue != null) {
parameterValues[templateTagParameter.name] = parameterValue; parameterValues[templateTagParameter.name] = parameterValue;
} }
} }
......
...@@ -12,7 +12,6 @@ import { ...@@ -12,7 +12,6 @@ import {
import { isNotNull } from "metabase/core/utils/types"; import { isNotNull } from "metabase/core/utils/types";
import { import {
hasDefaultParameterValue, hasDefaultParameterValue,
hasParameterValue,
normalizeParameterValue, normalizeParameterValue,
} from "metabase-lib/parameters/utils/parameter-values"; } from "metabase-lib/parameters/utils/parameter-values";
...@@ -217,9 +216,7 @@ export function getActivePulseParameters( ...@@ -217,9 +216,7 @@ export function getActivePulseParameters(
return { return {
...parameter, ...parameter,
value: hasParameterValue(pulseParameter?.value) value: pulseParameter?.value ?? parameter.default,
? pulseParameter.value
: parameter.default,
}; };
}) })
.filter(isNotNull); .filter(isNotNull);
......
import { getParameterType } from "metabase-lib/parameters/utils/parameter-type"; import { getParameterType } from "metabase-lib/parameters/utils/parameter-type";
import { hasParameterValue } from "metabase-lib/parameters/utils/parameter-values";
export function getParameterValueFromQueryParams(parameter, queryParams) { export function getParameterValueFromQueryParams(parameter, queryParams) {
queryParams = queryParams || {}; queryParams = queryParams || {};
...@@ -9,11 +8,11 @@ export function getParameterValueFromQueryParams(parameter, queryParams) { ...@@ -9,11 +8,11 @@ export function getParameterValueFromQueryParams(parameter, queryParams) {
// skip parsing "" because it indicates a forcefully unset parameter // skip parsing "" because it indicates a forcefully unset parameter
if (maybeParameterValue === "") { if (maybeParameterValue === "") {
return ""; return "";
} else if (hasParameterValue(maybeParameterValue)) { } else if (maybeParameterValue == null) {
return parameter.default;
} else {
const parsedValue = parseParameterValue(maybeParameterValue, parameter); const parsedValue = parseParameterValue(maybeParameterValue, parameter);
return normalizeParameterValueForWidget(parsedValue, parameter); return normalizeParameterValueForWidget(parsedValue, parameter);
} else {
return parameter.default;
} }
} }
...@@ -90,7 +89,7 @@ function normalizeParameterValueForWidget(value, parameter) { ...@@ -90,7 +89,7 @@ function normalizeParameterValueForWidget(value, parameter) {
function removeAllEmptyStringParameters(pairs) { function removeAllEmptyStringParameters(pairs) {
return pairs return pairs
.map(([parameter, value]) => [parameter, value === "" ? undefined : value]) .map(([parameter, value]) => [parameter, value === "" ? undefined : value])
.filter(([parameter, value]) => hasParameterValue(value)); .filter(([parameter, value]) => value != null);
} }
function removeUndefaultedEmptyStringParameters(pairs) { function removeUndefaultedEmptyStringParameters(pairs) {
...@@ -99,7 +98,7 @@ function removeUndefaultedEmptyStringParameters(pairs) { ...@@ -99,7 +98,7 @@ function removeUndefaultedEmptyStringParameters(pairs) {
parameter, parameter,
value === "" ? parameter.default : value, value === "" ? parameter.default : value,
]) ])
.filter(([, value]) => hasParameterValue(value)); .filter(([, value]) => value != null);
} }
// when `forcefullyUnsetDefaultedParametersWithEmptyStringValue` is true, we treat defaulted parameters with an empty string value as explecitly unset. // when `forcefullyUnsetDefaultedParametersWithEmptyStringValue` is true, we treat defaulted parameters with an empty string value as explecitly unset.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment