Merge pull request #1037 from Eastern-Research-Group/feature/849_alga…

…l-toxins Feature/849 algal toxins
Eastern-Research-Group · Nov 21, 2024 · 1826dbe · 1826dbe
2 parents 928f5d1 + f642412
commit 1826dbe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/app/client/src/components/shared/PastWaterConditionsFilters.tsx b/app/client/src/components/shared/PastWaterConditionsFilters.tsx
@@ -3,7 +3,6 @@
 import { css } from '@emotion/react';
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
-import { GlossaryTerm } from 'components/shared/GlossaryPanel';
 import { HelpTooltip } from 'components/shared/HelpTooltip';
 import LoadingSpinner from 'components/shared/LoadingSpinner';
 import Slider from 'components/shared/Slider';
@@ -446,30 +445,17 @@ export function PastWaterConditionsFilters({
                   locationCount++;
                 }
               });
-              const mapping = configFiles.data.characteristicGroupMappings.find(
-                (mapping) => mapping.label === group.label,
-              );
-              const groupLabelId = `${group.label.replaceAll(' ', '-')}-label`;
 
               return (
                 <tr key={group.label}>
                   <td>
-                    <div css={toggleStyles}>
+                    <label css={toggleStyles}>
                       <Switch
                         checked={group.toggled}
                         onChange={groupToggleHandlers?.[group.label]}
-                        ariaLabelledBy={groupLabelId}
                       />
-                      <span id={groupLabelId}>
-                        {mapping?.glossaryTerm ? (
-                          <GlossaryTerm term={mapping.glossaryTerm}>
-                            {group.label}
-                          </GlossaryTerm>
-                        ) : (
-                          group.label
-                        )}
-                      </span>
-                    </div>
+                      <span>{group.label}</span>
+                    </label>
                   </td>
                   <td colSpan={2}>{locationCount.toLocaleString()}</td>
                   <td>{measurementCount.toLocaleString()}</td>

diff --git a/app/client/src/types/index.ts b/app/client/src/types/index.ts
@@ -148,7 +148,6 @@ export interface ChangeLocationAttributes {
 
 export type CharacteristicGroupMappings = {
   label: string;
-  glossaryTerm?: string;
   groupNames: string[];
 }[];
 

diff --git a/app/server/app/public/data/community/characteristicGroupMappings.json b/app/server/app/public/data/community/characteristicGroupMappings.json
@@ -5,8 +5,7 @@
   },
   {
     "label": "Algal Toxins",
-    "groupNames": ["Cyanotoxins, Phytotoxins"],
-    "glossaryTerm": "Algal Toxins"
+    "groupNames": ["Cyanotoxins, Phytotoxins"]
   },
   {
     "label": "Nutrients",