From 6ac74314b2052955ffb106a5dcfb72b8bc946574 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Tue, 9 Oct 2018 17:43:41 -0700
Subject: [PATCH] Misc settings tweaks
---
.../settings/components/widgets/FormattingWidget.jsx | 2 +-
.../visualizations/components/ColumnSettings.jsx | 2 +-
.../visualizations/components/TableInteractive.jsx | 2 +-
.../metabase/visualizations/components/TableSimple.jsx | 2 +-
.../src/metabase/visualizations/lib/settings/column.js | 9 +++++++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
index 4247fed94de..8d7a82a62a3 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
@@ -12,7 +12,7 @@ const SETTING_TYPES = [
"date_style",
"date_separator",
"date_abbreviate",
- "time_enabled",
+ // "time_enabled",
"time_style",
],
column: {
diff --git a/frontend/src/metabase/visualizations/components/ColumnSettings.jsx b/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
index 64e7e6cc7e7..9a2c7855190 100644
--- a/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
+++ b/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
@@ -43,7 +43,7 @@ const ColumnSettings = ({
// add a "unit" to make certain settings work
if (column.unit == null) {
- column = { ...column, unit: "millisecond" };
+ column = { ...column, unit: "default" };
}
// $FlowFixMe
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive.jsx b/frontend/src/metabase/visualizations/components/TableInteractive.jsx
index 1f7b55bba30..823018cdcf7 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive.jsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive.jsx
@@ -448,7 +448,7 @@ export default class TableInteractive extends Component {
const column = cols[columnIndex];
let columnTitle =
- settings.column(column)._column_title_full || formatColumn(column);
+ settings.column(column)["_column_title_full"] || formatColumn(column);
if (!columnTitle && this.props.isPivoted && columnIndex !== 0) {
columnTitle = t`Unset`;
diff --git a/frontend/src/metabase/visualizations/components/TableSimple.jsx b/frontend/src/metabase/visualizations/components/TableSimple.jsx
index 2d1eacb0449..28f86d95cf2 100644
--- a/frontend/src/metabase/visualizations/components/TableSimple.jsx
+++ b/frontend/src/metabase/visualizations/components/TableSimple.jsx
@@ -154,7 +154,7 @@ export default class TableSimple extends Component {
}}
/>
<Ellipsified>
- {settings.column(col)._column_title_full ||
+ {settings.column(col)["_column_title_full"] ||
formatColumn(col)}
</Ellipsified>
</div>
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.js b/frontend/src/metabase/visualizations/lib/settings/column.js
index 25ef04006e3..c620c14ad39 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.js
+++ b/frontend/src/metabase/visualizations/lib/settings/column.js
@@ -228,10 +228,15 @@ export const DATE_COLUMN_SETTINGS = {
{ name: t`Off`, value: null },
{ name: t`HH:MM`, value: "minutes" },
];
- if (!unit || unit === "default" || unit === "second") {
+ if (
+ !unit ||
+ unit === "default" ||
+ unit === "second" ||
+ unit === "millisecond"
+ ) {
options.push({ name: t`HH:MM:SS`, value: "seconds" });
}
- if (!unit || unit === "default") {
+ if (!unit || unit === "default" || unit === "millisecond") {
options.push({ name: t`HH:MM:SS.MS`, value: "milliseconds" });
}
if (options.length === 2) {
--
GitLab