From 3f7d7253a1cf081dd4811a6dcc768408f5cc41bd Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Sat, 8 Oct 2016 18:28:32 -0700
Subject: [PATCH] Fix GSG crash, misc formatting issues. Resolves #3472
---
frontend/src/metabase/reference/components/GuideDetail.jsx | 2 +-
.../metabase/reference/components/GuideDetailEditor.jsx | 6 ++----
.../reference/containers/ReferenceGettingStartedGuide.jsx | 4 ++--
src/metabase/api/getting_started.clj | 7 +++----
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/frontend/src/metabase/reference/components/GuideDetail.jsx b/frontend/src/metabase/reference/components/GuideDetail.jsx
index 8a944134cdc..bf9dd273c51 100644
--- a/frontend/src/metabase/reference/components/GuideDetail.jsx
+++ b/frontend/src/metabase/reference/components/GuideDetail.jsx
@@ -84,7 +84,7 @@ const GuideDetail = ({
{ exploreLinks && exploreLinks.length > 0 && [
<div className="mt2">
- <ContextHeading key="detailLabel">Explore this metric</ContextHeading>,
+ <ContextHeading key="detailLabel">Explore this metric</ContextHeading>
<div key="detailLinks">
<Link className="text-brand inline-block mr2 link text-bold" to={link}>View this metric</Link>
{ exploreLinks.map(link =>
diff --git a/frontend/src/metabase/reference/components/GuideDetailEditor.jsx b/frontend/src/metabase/reference/components/GuideDetailEditor.jsx
index 86936f2993d..0ab8c750606 100644
--- a/frontend/src/metabase/reference/components/GuideDetailEditor.jsx
+++ b/frontend/src/metabase/reference/components/GuideDetailEditor.jsx
@@ -179,10 +179,8 @@ const GuideDetailEditor = ({
Which 2-3 fields do you usually group this metric by?
</EditLabel>
<Select
- className={cx(selectClasses, 'inline-block')}
- key="metricFieldsSelect"
- triggerClasses={cx('px2', S.guideDetailEditorSelect)}
- options={fieldsByMetric}
+ className={selectClasses}
+ options={fieldsByMetric}
optionNameFn={option => option.display_name || option.name}
placeholder="Select..."
values={formField.important_fields.value || []}
diff --git a/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx b/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx
index 8e403c24d2c..b260e0d60e8 100644
--- a/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx
+++ b/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx
@@ -501,8 +501,8 @@ export default class ReferenceGettingStartedGuide extends Component {
}))
}
/>
- )} ,
- <div key={'metricsSeeAll'}>
+ )}
+ <div>
<Link className="Button Button--primary" to={'/reference/metrics'}>
See all metrics
</Link>
diff --git a/src/metabase/api/getting_started.clj b/src/metabase/api/getting_started.clj
index 9306119dce4..7600a1f2af1 100644
--- a/src/metabase/api/getting_started.clj
+++ b/src/metabase/api/getting_started.clj
@@ -32,9 +32,8 @@
:important_tables table-ids
:important_segments segment-ids
;; A map of metric_id -> sequence of important field_ids
- :metric_important_fields (when (seq metric-ids)
- (m/map-vals (partial map :field_id)
- (group-by :metric_id (db/select ['MetricImportantField :field_id :metric_id]
- :metric_id [:in metric-ids]))))}))
+ :metric_important_fields (m/map-vals (partial map :field_id)
+ (group-by :metric_id (db/select ['MetricImportantField :field_id :metric_id]
+ :metric_id [:in metric-ids])))}))
(define-routes)
--
GitLab