diff --git a/frontend/src/metabase/query_builder/actions.js b/frontend/src/metabase/query_builder/actions.js
index f3fb6713fdff149d0ee83e5d2bfbfff9c5c8b5e3..f3be5bd7898d29f8e5e123ff4118d888c3c58f97 100644
--- a/frontend/src/metabase/query_builder/actions.js
+++ b/frontend/src/metabase/query_builder/actions.js
@@ -33,7 +33,7 @@ import {
getIsEditing,
getIsShowingDataReference,
getTransformedSeries,
- getResultsMetadata
+ getResultsMetadata,
} from "./selectors";
import { getDatabases, getTables, getDatabasesList, getMetadata } from "metabase/selectors/metadata";
@@ -51,7 +51,6 @@ import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
import NativeQuery from "metabase-lib/lib/queries/NativeQuery";
import { getPersistableDefaultSettings } from "metabase/visualizations/lib/settings";
import { clearRequestState } from "metabase/redux/requests";
-import { getRawSeries, getVisualizationSettings } from "metabase/query_builder/selectors";
type UiControls = {
isEditing?: boolean,
@@ -1076,7 +1075,6 @@ export const queryCompleted = (card, queryResults) => {
cardDisplay: getDisplayTypeForCard(card, queryResults),
queryResults
})
- console.log(getRawSeries(getState()), getPersistableDefaultSettings(getTransformedSeries(getState())), getVisualizationSettings(getState()), )
};
};
diff --git a/frontend/src/metabase/xray/containers/CardXRay.jsx b/frontend/src/metabase/xray/containers/CardXRay.jsx
index 9fb0bf3a0e1db9c1c8f51eac3d2d3cd7b1972b84..25d2ae9e79f868eb74ddfc45f4108484322caeae 100644
--- a/frontend/src/metabase/xray/containers/CardXRay.jsx
+++ b/frontend/src/metabase/xray/containers/CardXRay.jsx
@@ -148,7 +148,7 @@ class CardXRay extends Component {
<div className="full">
<div className="bg-white bordered rounded shadowed" style={{ height: 220}}>
<Visualization
- series={[
+ rawSeries={[
{
card: {
display: 'line',
@@ -179,7 +179,7 @@ class CardXRay extends Component {
<div className="full">
<div className="bg-white bordered rounded shadowed" style={{ height: 220}}>
<Visualization
- series={[
+ rawSeries={[
{
card: {
display: 'line',
diff --git a/frontend/test/query_builder/qb_visualizations.integ.spec.js b/frontend/test/query_builder/qb_visualizations.integ.spec.js
index 37429ff7508756f5e4fe505d9b543188201de707..214526a514af74aec5ba242b888736a453f8b71a 100644
--- a/frontend/test/query_builder/qb_visualizations.integ.spec.js
+++ b/frontend/test/query_builder/qb_visualizations.integ.spec.js
@@ -69,7 +69,7 @@ describe("Query Builder visualization logic", () => {
questionId = getQuestion(store.getState()).id()
});
- fit("should save the default x axis and y axis to `visualization_settings` when saving a new question in QB", async () => {
+ it("should save the default x axis and y axis to `visualization_settings` when saving a new question in QB", async () => {
const store = await createTestStore()
store.pushPath(Urls.question(savedTimeBreakoutQuestion.id()));
const app = mount(store.connectContainer(<QueryBuilder />));
diff --git a/frontend/test/visualizations/components/Visualization.integ.spec.js b/frontend/test/visualizations/components/Visualization.integ.spec.js
index da9db7dbb7617bb67cbd6251cab4327e6e1d595b..5fec943175502b44bee22ab46600b39423289462 100644
--- a/frontend/test/visualizations/components/Visualization.integ.spec.js
+++ b/frontend/test/visualizations/components/Visualization.integ.spec.js
@@ -30,22 +30,22 @@ describe("Visualization", () => {
describe("not in dashboard", () => {
describe("scalar card", () => {
it("should not render title", () => {
- let viz = renderVisualization({ series: [ScalarCard("Foo")] });
+ let viz = renderVisualization({ rawSeries: [ScalarCard("Foo")] });
expect(getScalarTitles(viz)).toEqual([]);
});
});
describe("line card", () => {
it("should not render card title", () => {
- let viz = renderVisualization({ series: [LineCard("Foo")] });
+ let viz = renderVisualization({ rawSeries: [LineCard("Foo")] });
expect(getTitles(viz)).toEqual([]);
});
it("should not render setting title", () => {
- let viz = renderVisualization({ series: [LineCard("Foo", { card: { visualization_settings: { "card.title": "Foo_title" }}})] });
+ let viz = renderVisualization({ rawSeries: [LineCard("Foo", { card: { visualization_settings: { "card.title": "Foo_title" }}})] });
expect(getTitles(viz)).toEqual([]);
});
it("should render breakout multiseries titles", () => {
- let viz = renderVisualization({ series: [MultiseriesLineCard("Foo")] });
+ let viz = renderVisualization({ rawSeries: [MultiseriesLineCard("Foo")] });
expect(getTitles(viz)).toEqual([
["Foo_cat1", "Foo_cat2"]
]);
@@ -56,28 +56,28 @@ describe("Visualization", () => {
describe("in dashboard", () => {
describe("scalar card", () => {
it("should render a scalar title, not a legend title", () => {
- let viz = renderVisualization({ series: [ScalarCard("Foo")], showTitle: true, isDashboard: true });
+ let viz = renderVisualization({ rawSeries: [ScalarCard("Foo")], showTitle: true, isDashboard: true });
expect(getTitles(viz)).toEqual([]);
expect(getScalarTitles(viz).length).toEqual(1);
});
it("should render title when loading", () => {
- let viz = renderVisualization({ series: [ScalarCard("Foo", { data: null })], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [ScalarCard("Foo", { data: null })], showTitle: true });
expect(getTitles(viz)).toEqual([
["Foo_name"]
]);
});
it("should render title when there's an error", () => {
- let viz = renderVisualization({ series: [ScalarCard("Foo")], showTitle: true, error: "oops" });
+ let viz = renderVisualization({ rawSeries: [ScalarCard("Foo")], showTitle: true, error: "oops" });
expect(getTitles(viz)).toEqual([
["Foo_name"]
]);
});
it("should not render scalar title", () => {
- let viz = renderVisualization({ series: [ScalarCard("Foo")], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [ScalarCard("Foo")], showTitle: true });
expect(getTitles(viz)).toEqual([]);
});
it("should render multi scalar titles", () => {
- let viz = renderVisualization({ series: [ScalarCard("Foo"), ScalarCard("Bar")], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [ScalarCard("Foo"), ScalarCard("Bar")], showTitle: true });
expect(getTitles(viz)).toEqual([
["Foo_name", "Bar_name"]
]);
@@ -86,26 +86,26 @@ describe("Visualization", () => {
describe("line card", () => {
it("should render normal title", () => {
- let viz = renderVisualization({ series: [LineCard("Foo")], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [LineCard("Foo")], showTitle: true });
expect(getTitles(viz)).toEqual([
["Foo_name"]
]);
});
it("should render normal title and breakout multiseries titles", () => {
- let viz = renderVisualization({ series: [MultiseriesLineCard("Foo")], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [MultiseriesLineCard("Foo")], showTitle: true });
expect(getTitles(viz)).toEqual([
["Foo_name"],
["Foo_cat1", "Foo_cat2"]
]);
});
it("should render dashboard multiseries titles", () => {
- let viz = renderVisualization({ series: [LineCard("Foo"), LineCard("Bar")], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [LineCard("Foo"), LineCard("Bar")], showTitle: true });
expect(getTitles(viz)).toEqual([
["Foo_name", "Bar_name"]
]);
});
it("should render dashboard multiseries titles and chart setting title", () => {
- let viz = renderVisualization({ series: [
+ let viz = renderVisualization({ rawSeries: [
LineCard("Foo", { card: { visualization_settings: { "card.title": "Foo_title" }}}),
LineCard("Bar")
], showTitle: true });
@@ -115,7 +115,7 @@ describe("Visualization", () => {
]);
});
it("should render multiple breakout multiseries titles (with both card titles and breakout values)", () => {
- let viz = renderVisualization({ series: [MultiseriesLineCard("Foo"), MultiseriesLineCard("Bar")], showTitle: true });
+ let viz = renderVisualization({ rawSeries: [MultiseriesLineCard("Foo"), MultiseriesLineCard("Bar")], showTitle: true });
expect(getTitles(viz)).toEqual([
["Foo_name: Foo_cat1", "Foo_name: Foo_cat2", "Bar_name: Bar_cat1", "Bar_name: Bar_cat2"]
]);
@@ -125,7 +125,7 @@ describe("Visualization", () => {
describe("text card", () => {
describe("when not editing", () => {
it("should not render edit and preview actions", () => {
- let viz = renderVisualization({ series: [TextCard("Foo")], isEditing: false});
+ let viz = renderVisualization({ rawSeries: [TextCard("Foo")], isEditing: false});
expect(viz.find(".Icon-editdocument").length).toEqual(0);
expect(viz.find(".Icon-eye").length).toEqual(0);
});
@@ -139,7 +139,7 @@ describe("Visualization", () => {
}
},
});
- let viz = renderVisualization({ series: [textCard], isEditing: false});
+ let viz = renderVisualization({ rawSeries: [textCard], isEditing: false});
expect(viz.find("textarea").length).toEqual(0);
expect(viz.find(".text-card-markdown").find("h1").length).toEqual(1);
expect(viz.find(".text-card-markdown").text()).toEqual("Foobar");
@@ -148,19 +148,19 @@ describe("Visualization", () => {
describe("when editing", () => {
it("should render edit and preview actions", () => {
- let viz = renderVisualization({ series: [TextCard("Foo")], isEditing: true});
+ let viz = renderVisualization({ rawSeries: [TextCard("Foo")], isEditing: true});
expect(viz.find(".Icon-editdocument").length).toEqual(1);
expect(viz.find(".Icon-eye").length).toEqual(1);
});
it("should render in the edit mode", () => {
- let viz = renderVisualization({ series: [TextCard("Foo")], isEditing: true});
+ let viz = renderVisualization({ rawSeries: [TextCard("Foo")], isEditing: true});
expect(viz.find("textarea").length).toEqual(1);
});
describe("toggling edit/preview modes", () => {
it("should switch between rendered markdown and textarea input", () => {
- let viz = renderVisualization({ series: [TextCard("Foo")], isEditing: true});
+ let viz = renderVisualization({ rawSeries: [TextCard("Foo")], isEditing: true});
expect(viz.find("textarea").length).toEqual(1);
click(viz.find(".Icon-eye"));
expect(viz.find("textarea").length).toEqual(0);