Merge branch 'master' into ian/252-chart-polish

Recidiviz · Nov 17, 2020 · c846614 · c846614
2 parents 7e0217a + 35b171e
commit c846614
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
         working-directory: public-dashboard-client
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1.1.0
+      - uses: actions/setup-node@v1
         with:
           node-version: "12.x"
       - uses: c-hive/gha-yarn-cache@v1
@@ -27,7 +27,7 @@ jobs:
         working-directory: public-dashboard-client
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1.1.0
+      - uses: actions/setup-node@v1
         with:
           node-version: "12.x"
       - uses: c-hive/gha-yarn-cache@v1
@@ -48,7 +48,7 @@ jobs:
         working-directory: spotlight-client
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1.1.0
+      - uses: actions/setup-node@v1
         with:
           node-version: "12.x"
       - uses: c-hive/gha-yarn-cache@v1
@@ -62,7 +62,7 @@ jobs:
         working-directory: spotlight-client
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1.1.0
+      - uses: actions/setup-node@v1
         with:
           node-version: "12.x"
       - uses: c-hive/gha-yarn-cache@v1
@@ -83,7 +83,7 @@ jobs:
         working-directory: spotlight-api
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1.1.0
+      - uses: actions/setup-node@v1
         with:
           node-version: "12.x"
       - uses: c-hive/gha-yarn-cache@v1

diff --git a/public-dashboard-client/src/controls/CohortSelect.js b/public-dashboard-client/src/controls/CohortSelect.js
@@ -225,7 +225,7 @@ function CustomSelect({
               >
                 <MenuItemContents>
                   {opt.label}
-                  <MenuItemCheckMark src={checkMarkPath} />
+                  <MenuItemCheckMark alt="" src={checkMarkPath} />
                 </MenuItemContents>
               </DropdownMenuItem>
             );

diff --git a/public-dashboard-client/src/disclaimer/Disclaimer.js b/public-dashboard-client/src/disclaimer/Disclaimer.js
@@ -8,8 +8,8 @@ const SMALL_DATA = (
   <>
     * Please always take note of the number of people associated with each
     proportion presented here; in cases where the counts are especially low, the
-    proportion may not be statistically significant and therefore are not
-    indicative of long-term trends.
+    proportion may not be statistically significant and therefore not indicative
+    of long-term trends.
   </>
 );
 

diff --git a/public-dashboard-client/src/page-prison/PagePrison.js b/public-dashboard-client/src/page-prison/PagePrison.js
@@ -202,10 +202,15 @@ export default function PagePrison() {
       description: (
         <>
           After release from prison, a significant proportion of formerly
-          incarcerated folks end up back in prison. This is typically termed
-          “recidivism.” The below graph shows recidivism as reincarceration;
-          that is, the proportion of individuals who are incarcerated again at
-          some point after their release.
+          incarcerated folks return to prison; this is typically termed
+          “recidivism,” and typically includes all forms of reincarceration.
+          Here, we can visualize the proportion of individuals released in a
+          given year (i.e. a “cohort”) that return to prison up to ten years
+          post-release.
+          <p>
+            <strong>Note:</strong> Race, Age, and Gender views are disabled
+            unless a single Cohort is selected.
+          </p>
         </>
       ),
       otherControls: (
@@ -234,8 +239,10 @@ export default function PagePrison() {
       title: SECTION_TITLES[PATHS.prison].recidivismSingleFollowup,
       description: (
         <>
-          We can also observe the recidivism rate over time for a given number
-          of years after original release.
+          We can also observe how the recidivism rate for a given follow-up
+          period changes over time. Typically, recidivism rates are calculated
+          using a three year follow-up period (in other words, the proportion of
+          individuals that return to prison within three years).
         </>
       ),
       otherControls: (