Skip to content
Snippets Groups Projects
Commit 84107867 authored by Atte Keinänen's avatar Atte Keinänen
Browse files

Fix Flow, Jest and ESLint

parent c99b558f
No related branches found
No related tags found
No related merge requests found
import * as Card from "./Card";
import { assocIn } from "icepick";
import { assocIn, dissoc } from "icepick";
describe("metabase/meta/Card", () => {
describe("questionUrlWithParameters", () => {
......@@ -59,7 +59,7 @@ describe("metabase/meta/Card", () => {
expect(parseUrl(url)).toEqual({
pathname: "/question",
query: {},
card: card,
card: dissoc(card, "id")
});
});
it("should return question URL with query string parameter", () => {
......@@ -73,7 +73,7 @@ describe("metabase/meta/Card", () => {
expect(parseUrl(url)).toEqual({
pathname: "/question",
query: { baz: "bar" },
card: card,
card: dissoc(card, "id")
});
});
});
......@@ -114,7 +114,7 @@ describe("metabase/meta/Card", () => {
expect(parseUrl(url)).toEqual({
pathname: "/question",
query: {},
card
card: dissoc(card, "id")
});
});
it("should return question URL with string MBQL filter added", () => {
......@@ -129,7 +129,7 @@ describe("metabase/meta/Card", () => {
pathname: "/question",
query: {},
card: assocIn(
card,
dissoc(card, "id"),
["dataset_query", "query", "filter"],
["AND", ["=", ["field-id", 1], "bar"]]
)
......@@ -147,7 +147,7 @@ describe("metabase/meta/Card", () => {
pathname: "/question",
query: {},
card: assocIn(
card,
dissoc(card, "id"),
["dataset_query", "query", "filter"],
["AND", ["=", ["field-id", 2], 123]]
)
......@@ -166,7 +166,7 @@ describe("metabase/meta/Card", () => {
pathname: "/question",
query: {},
card: assocIn(
card,
dissoc(card, "id"),
["dataset_query", "query", "filter"],
["AND", ["=", ["datetime-field", ["field-id", 3], "month"], "2017-05-01"]]
)
......@@ -184,7 +184,7 @@ describe("metabase/meta/Card", () => {
pathname: "/question",
query: {},
card: assocIn(
card,
dissoc(card, "id"),
["dataset_query", "query", "filter"],
["AND", ["=", ["datetime-field", ["fk->", 4, 5], "month"], "2017-05-01"]]
)
......
......@@ -21,7 +21,8 @@ export type Card = {
dataset_query: DatasetQuery,
display: string,
visualization_settings: VisualizationSettings,
parameters?: Array<Parameter>
parameters?: Array<Parameter>,
original_card_id?: CardId
};
export type StructuredDatasetQuery = {
......
......@@ -10,7 +10,7 @@ import { getModeActions } from "metabase/qb/lib/modes";
import cx from "classnames";
import _ from "underscore";
import type { Card } from "metabase/meta/types/Card";
import type { Card, UnsavedCard } from "metabase/meta/types/Card";
import type { QueryMode, ClickAction } from "metabase/meta/types/Visualization";
import type { TableMetadata } from "metabase/meta/types/Metadata";
......@@ -66,7 +66,7 @@ export default class ActionsWidget extends Component<*, Props, *> {
});
};
handleOnChangeCardAndRun(nextCard) {
handleOnChangeCardAndRun(nextCard: UnsavedCard|Card) {
const { card } = this.props;
// Include the original card id if present for showing the lineage next to title
......
......@@ -30,7 +30,7 @@ import cx from "classnames";
export const ERROR_MESSAGE_GENERIC = "There was a problem displaying this chart.";
export const ERROR_MESSAGE_PERMISSION = "Sorry, you don't have permission to see this card."
import type {Card as CardObject, UnsavedCard, VisualizationSettings} from "metabase/meta/types/Card";
import type { UnsavedCard, VisualizationSettings} from "metabase/meta/types/Card";
import type { HoverObject, ClickObject, Series } from "metabase/meta/types/Visualization";
import type { Metadata } from "metabase/meta/types/Metadata";
......
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