From 1681a720452ce9bd42ddd5f53703bbdcffb2ef6e Mon Sep 17 00:00:00 2001
From: Vim <86254807+vim-usds@users.noreply.github.com>
Date: Mon, 6 Jun 2022 13:52:37 -0400
Subject: [PATCH] Remove threshold line in side panel (#1666)

* Remove categories

* Remove disadvantaged in sidepanel

* Add comment
---
 .github/workflows/deploy_fe_staging.yml       | 14 +++++++-------
 .../src/components/AreaDetail/AreaDetail.tsx  |  4 ++--
 .../AreaDetail/areaDetail.module.scss         |  9 ++++-----
 .../__snapshots__/areaDetail.test.tsx.snap    | 15 +++------------
 client/src/data/copy/explore.tsx              | 19 ++++++++++---------
 client/src/intl/en.json                       |  6 +-----
 client/src/intl/es.json                       |  2 +-
 7 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/deploy_fe_staging.yml b/.github/workflows/deploy_fe_staging.yml
index 54e8492c..58d8ea9d 100644
--- a/.github/workflows/deploy_fe_staging.yml
+++ b/.github/workflows/deploy_fe_staging.yml
@@ -49,13 +49,13 @@ jobs:
         run: npm test
       - name: Check for security vulnerabilities
         run: npm audit --production
-      # - name: Cypress / Gherkin integration tests 🌃
-      #   uses: cypress-io/github-action@v2
-      #   with:
-      #     working-directory: ${{env.WORKING_DIRECTORY}}
-      #     browser: chrome
-      #     start: npm start
-      #     wait-on: "http://localhost:8000/en"
+      - name: Cypress / Gherkin integration tests 🌃
+        uses: cypress-io/github-action@v2
+        with:
+          working-directory: ${{env.WORKING_DIRECTORY}}
+          browser: chrome
+          start: npm start
+          wait-on: "http://localhost:8000/en"
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 2e6669d5..82bacb05 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -599,9 +599,9 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => {
         </div>
 
         {/* Number of thresholds exceeded */}
-        <div className={styles.showThresholdExceed}>
+        {/* <div className={styles.showThresholdExceed}>
           {EXPLORE_COPY.numberOfThresholdsExceeded(properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS])}
-        </div>
+        </div> */}
         {/* Send Feedback button */}
         <a
           className={styles.sendFeedbackLink}
diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss
index 70106e23..ec54a155 100644
--- a/client/src/components/AreaDetail/areaDetail.module.scss
+++ b/client/src/components/AreaDetail/areaDetail.module.scss
@@ -47,11 +47,10 @@ $sidePanelLabelFontColor: #171716;
     @include u-margin-top('05');
   }
 
-  .showThresholdExceed {
-    font-size: small;
-    @include u-margin-top('05');
-    
-  }
+  // .showThresholdExceed {
+  //   font-size: small;
+  //   @include u-margin-top('05');
+  // }
 
   .sendFeedbackLink {
     @include u-margin-top(2);
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index 588e572a..6d67a4e4 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -53,10 +53,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         <div />
       </div>
       <div>
-        Disadvantaged in 5 categories
-      </div>
-      <div>
-        At or above 3 thresholds
+        in 5 categories
       </div>
       <a
         href="
@@ -417,10 +414,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         <div />
       </div>
       <div>
-        Disadvantaged in 5 categories
-      </div>
-      <div>
-        At or above 3 thresholds
+        in 5 categories
       </div>
       <a
         href="
@@ -2156,10 +2150,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         <div />
       </div>
       <div>
-        Disadvantaged in 5 categories
-      </div>
-      <div>
-        At or above 3 thresholds
+        in 5 categories
       </div>
       <a
         href="
diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx
index 5f1aab38..f6e58b54 100644
--- a/client/src/data/copy/explore.tsx
+++ b/client/src/data/copy/explore.tsx
@@ -314,21 +314,22 @@ export const COMMUNITY = {
 
 export const numberOfCategoriesExceeded = (categoryCount:number) => <FormattedMessage
   id={'explore.map.page.side.panel.num.categories.exceeded'}
-  defaultMessage={`Disadvantaged in {numberOfDisCategories, plural, one {# category} other {# categories}}`}
+  defaultMessage={`in {numberOfDisCategories, plural, one {# category} other {# categories}}`}
   description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show how many categories are exceeded`}
   values={{
     numberOfDisCategories: categoryCount,
   }}
 />;
 
-export const numberOfThresholdsExceeded = (thresholds:number) => <FormattedMessage
-  id={'explore.map.page.side.panel.num.thresholds.exceeded'}
-  defaultMessage={`At or above {numberOfThresholdExceed, plural, one {# threshold} other {# thresholds}}`}
-  description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show how many thresholds are exceeded`}
-  values={{
-    numberOfThresholdExceed: thresholds,
-  }}
-/>;
+// Temporarily commenting out as it may be needed again:
+// export const numberOfThresholdsExceeded = (thresholds:number) => <FormattedMessage
+//   id={'explore.map.page.side.panel.num.thresholds.exceeded'}
+//   defaultMessage={`At or above {numberOfThresholdExceed, plural, one {# threshold} other {# thresholds}}`}
+//   description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show how many thresholds are exceeded`}
+//   values={{
+//     numberOfThresholdExceed: thresholds,
+//   }}
+// />;
 
 export const SEND_FEEDBACK = defineMessages({
   EMAIL_BODY: {
diff --git a/client/src/intl/en.json b/client/src/intl/en.json
index 2a08f30d..45e1f5e7 100644
--- a/client/src/intl/en.json
+++ b/client/src/intl/en.json
@@ -784,13 +784,9 @@
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the communities the score currently is not focused on"
   },
   "explore.map.page.side.panel.num.categories.exceeded": {
-    "defaultMessage": "Disadvantaged in {numberOfDisCategories, plural, one {# category} other {# categories}}",
+    "defaultMessage": "in {numberOfDisCategories, plural, one {# category} other {# categories}}",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show how many categories are exceeded"
   },
-  "explore.map.page.side.panel.num.thresholds.exceeded": {
-    "defaultMessage": "At or above {numberOfThresholdExceed, plural, one {# threshold} other {# thresholds}}",
-    "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show how many thresholds are exceeded"
-  },
   "explore.map.page.side.panel.send.feedback.alt.img": {
     "defaultMessage": "Send feedback",
     "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a send feedback icon, this is the images alt tag"
diff --git a/client/src/intl/es.json b/client/src/intl/es.json
index ee15798b..adbca8e5 100644
--- a/client/src/intl/es.json
+++ b/client/src/intl/es.json
@@ -199,7 +199,7 @@
     "explore.map.page.side.panel.info.title": "Lo que debe saber",
     "explore.map.page.side.panel.is.community.of.focus": "¿Está identificada como desfavorecida?",
     "explore.map.page.side.panel.not.community.of.focus": "No",
-    "explore.map.page.side.panel.num.categories.exceeded": "Desfavorecida en {numberOfDisCategories, plural, one {# categoría} other {# categorías}}",
+    "explore.map.page.side.panel.num.categories.exceeded": "en {numberOfDisCategories, plural, one {# categoría} other {# categorías}}",
     "explore.map.page.side.panel.num.thresholds.exceeded": "Al umbral o lo supera en {numberOfThresholdExceed, plural, one {# umbral} other {# umbrales}}",
     "explore.map.page.side.panel.send.feedback.alt.img": "Enviar comentarios",
     "explore.map.page.side.panel.send.feedback.email.body": "Aporte comentarios acerca de este grupo de bloques del censo, incluidos los conjuntos de datos, las categorías de datos proporcionadas para este grupo de bloques del censo, las comunidades que viven en este grupo de bloques del censo y toda la información pertinente que el Consejo sobre la Calidad del Medio Ambiente (CEQ, por sus siglas en inglés) debe saber acerca de este grupo de bloques del censo.",