Merge branch 'main' of https://github.com/Recidiviz/public-dashboard …

…into nasaownsky/518-riders-narrative
Recidiviz · Jul 21, 2022 · d7c742c · d7c742c
2 parents 678e734 + 1a8a1be
commit d7c742c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/spotlight-client/src/LocalityFilterSelect/LocalityFilterSelect.tsx b/spotlight-client/src/LocalityFilterSelect/LocalityFilterSelect.tsx
@@ -38,6 +38,11 @@ const LocalityFilterSelect: React.FC<LocalityFilterSelectProps> = ({
     metric.localityId = newFilter;
   });
 
+  // if there are no locality entries, don't display the dropdown. We are skipping this for Idaho launch. See https://github.com/Recidiviz/public-dashboard/issues/582
+  if (metric.localityLabels.entries.length === 0) {
+    return null;
+  }
+
   return (
     <Dropdown
       label={metric.localityLabels.label}

diff --git a/spotlight-client/src/VizControls/VizControls.tsx b/spotlight-client/src/VizControls/VizControls.tsx
@@ -51,6 +51,10 @@ const FilterWrapper = styled.div`
   &:last-child {
     margin-right: 0;
   }
+
+  &:empty {
+    margin-right: 0;
+  }
 `;
 
 const Button = styled.button`

diff --git a/spotlight-client/src/contentApi/sources/us_id.ts b/spotlight-client/src/contentApi/sources/us_id.ts
@@ -391,12 +391,6 @@ const content: TenantContent = {
             "Broadly speaking, increased activity in earlier parts of the criminal justice system (such as arrests and sentencing) will result in increases in the probation population. Changes in probation sentence lengths, etc. may also contribute to the rise and fall of this number.",
           metricTypeId: "ProbationPopulationHistorical",
         },
-        {
-          title: "What happens after probation?",
-          body:
-            "After probation, a person may be successfully discharged or revoked to prison. Take a look at how the rate of successful probation completion has changed over time, and how the overall rate of successful probation completion varies by demographic.",
-          metricTypeId: "ProbationSuccessHistorical",
-        },
         {
           title: "Why do revocations happen?",
           body:
@@ -424,12 +418,6 @@ const content: TenantContent = {
             "Broadly speaking, increased activity in earlier parts of the criminal justice system (such as arrests and sentencing) will result in increases in the parole population. Changes in parole sentence lengths, earlier releases from prison, etc. may also contribute to the rise and fall of this number.",
           metricTypeId: "ParolePopulationHistorical",
         },
-        {
-          title: "What happens after parole?",
-          body:
-            "After parole, a person may be successfully discharged or revoked to prison. Take a look at how the rate of successful parole completion has changed over time, and how the overall rate of successful parole completion varies by demographic.",
-          metricTypeId: "ParoleSuccessHistorical",
-        },
         {
           title: "Why do revocations happen?",
           body: