From 8ffd45f3b56ffd5518552cfa4bb659a2962e5fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atte=20Kein=C3=A4nen?= <atte.keinanen@gmail.com>
Date: Thu, 1 Feb 2018 17:48:33 +0200
Subject: [PATCH] Fix bug in getPersistableDefaultSettings
---
frontend/src/metabase/query_builder/actions.js | 2 ++
frontend/src/metabase/visualizations/lib/settings.js | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/frontend/src/metabase/query_builder/actions.js b/frontend/src/metabase/query_builder/actions.js
index 2a64ffd0d30..f3fb6713fdf 100644
--- a/frontend/src/metabase/query_builder/actions.js
+++ b/frontend/src/metabase/query_builder/actions.js
@@ -51,6 +51,7 @@ 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,
@@ -1075,6 +1076,7 @@ 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/visualizations/lib/settings.js b/frontend/src/metabase/visualizations/lib/settings.js
index 07a6ecc18ab..93a10b8d7fa 100644
--- a/frontend/src/metabase/visualizations/lib/settings.js
+++ b/frontend/src/metabase/visualizations/lib/settings.js
@@ -226,8 +226,10 @@ export function getPersistableDefaultSettings(series) {
for (let id in settingsDefs) {
const settingDef = settingsDefs[id]
+ const seriesForSettingsDef = settingDef.useRawSeries && series._raw ? series._raw : series
+
if (settingDef.persistDefault) {
- persistableDefaultSettings[id] = settingDef.getDefault(series, completeSettings)
+ persistableDefaultSettings[id] = settingDef.getDefault(seriesForSettingsDef, completeSettings)
}
}
--
GitLab