Merge pull request #703 from UKHSA-Internal/sandbox

Sandbox -> development
UKHSA-Internal · Nov 16, 2023 · 662c778 · 662c778
2 parents 5724221 + f5d6566
commit 662c778
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/MetricView/MetricView.js b/src/components/MetricView/MetricView.js
@@ -32,7 +32,7 @@ const Metrics: ComponentType<*> = ({ data, filter }) => {
  <Content>
  <Link className={ "govuk-link govuk-link--no-underline govuk-link--no-visited-state govuk-!-font-weight-bold" }
  to={ `/metrics/doc/${metric.metric}` }
- dangerouslySetInnerHTML={ markedContent(metric.metric_name, filter) }/>
+ dangerouslySetInnerHTML={ markedContent(metric.metric_name ?? metric.metric, filter) }/>
  <HeadingLabels>
  { metric.deprecated ? <Deprecated>DEPRECATED</Deprecated> : null }
  <Category>{ metric.category }</Category>

diff --git a/src/pages/MetricDocs/Sections/MetricName.js b/src/pages/MetricDocs/Sections/MetricName.js
@@ -70,13 +70,18 @@ const Metrics: ComponentType<*> = ({ metrics, setUri }) => {
  userInput
  ? (
  item.metric.toLowerCase().indexOf(userInput.replace(/[^a-z6028\s]/gi, "")) > -1 ||
- item.metric_name.toLowerCase().indexOf(userInput.replace(/[^a-z6028\s]/gi, "")) > -1
+ // metric_name can be null, in that case don't use it in search
+ (
+ item.metric_name == null
+ ? false
+ : item.metric_name.toLowerCase().indexOf(userInput.replace(/[^a-z6028\s]/gi, "")) > -1
+ )
  )
  : true
  ) &&
  (
  categories
- ? item.category.toLowerCase() === categories.toLowerCase()
+ ? (item.category != null ? item.category.toLowerCase() === categories.toLowerCase() : false)
  : true
  ) &&
  (