Skip to content
Snippets Groups Projects
Unverified Commit 51174e4a authored by Dalton's avatar Dalton Committed by GitHub
Browse files

move dashboard parameter utils (#18694)

* move dashboard parameter utils

* Move the ParameterSection type to type/Parameter.js
parent c911db30
No related branches found
No related tags found
No related merge requests found
......@@ -50,6 +50,13 @@ export type ParameterOption = {
type: ParameterType,
};
export type ParameterSection = {
id: string,
name: string,
description: string,
options: ParameterOption[],
};
export type ParameterInstance = {
type: ParameterType,
target: ParameterTarget,
......
......@@ -17,7 +17,7 @@ import {
setParameterDefaultValue as setParamDefaultValue,
getMappingsByParameter,
getDashboardParametersWithFieldMetadata,
} from "metabase/meta/Dashboard";
} from "metabase/parameters/utils/dashboards";
import { applyParameters, questionUrlWithParameters } from "metabase/meta/Card";
import {
getParameterValuesBySlug,
......
......@@ -8,12 +8,11 @@ import styled from "styled-components";
import type {
Parameter,
ParameterOption,
ParameterSection,
} from "metabase-types/types/Parameter";
import _ from "underscore";
import type { ParameterSection } from "metabase/meta/Dashboard";
const PopoverBody = styled.div`
max-width: 300px;
`;
......
......@@ -7,7 +7,7 @@ import { getMetadata } from "metabase/selectors/metadata";
import {
getMappingsByParameter as _getMappingsByParameter,
getDashboardParametersWithFieldMetadata,
} from "metabase/meta/Dashboard";
} from "metabase/parameters/utils/dashboards";
import { getParameterMappingOptions as _getParameterMappingOptions } from "metabase/parameters/utils/mapping-options";
import { SIDEBAR_NAME } from "metabase/dashboard/constants";
......
......@@ -25,7 +25,7 @@ import {
import { getParameterIconName } from "metabase/parameters/utils/ui";
import { deriveFieldOperatorFromParameter } from "metabase/parameters/utils/operators";
import { isDashboardParameterWithoutMapping } from "metabase/meta/Dashboard";
import { isDashboardParameterWithoutMapping } from "metabase/parameters/utils/dashboards";
import S from "./ParameterWidget.css";
......
......@@ -2,25 +2,10 @@ import _ from "underscore";
import { setIn } from "icepick";
import Question from "metabase-lib/lib/Question";
import type {
ParameterOption,
Parameter,
} from "metabase-types/types/Parameter";
import { getParameterTargetField } from "metabase/parameters/utils/targets";
import { slugify } from "metabase/lib/formatting";
export type ParameterSection = {
id: string,
name: string,
description: string,
options: ParameterOption[],
};
export function createParameter(
option: ParameterOption,
parameters: Parameter[] = [],
): Parameter {
export function createParameter(option, parameters = []) {
let name = option.combinedName || option.name;
let nameIndex = 0;
// get a unique name
......@@ -38,10 +23,7 @@ export function createParameter(
return setParameterName(parameter, name);
}
export function setParameterName(
parameter: Parameter,
name: string,
): Parameter {
export function setParameterName(parameter, name: string) {
if (!name) {
name = "unnamed";
}
......@@ -53,10 +35,7 @@ export function setParameterName(
};
}
export function setParameterDefaultValue(
parameter: Parameter,
value: string,
): Parameter {
export function setParameterDefaultValue(parameter, value: string) {
return {
...parameter,
default: value,
......
......@@ -5,8 +5,8 @@ import {
hasMapping,
isDashboardParameterWithoutMapping,
getMappingsByParameter,
} from "metabase/meta/Dashboard";
import DASHBOARD_WITH_BOOLEAN_PARAMETER from "./dashboard-with-boolean-parameter.json";
} from "metabase/parameters/utils/dashboards";
import DASHBOARD_WITH_BOOLEAN_PARAMETER from "./fixtures/dashboard-with-boolean-parameter.json";
import Field from "metabase-lib/lib/metadata/Field";
......
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