Merge pull request #2246 from Plant-for-the-Planet-org/hotfix/minor-b…

…ugs-and-cleanup Fix tooltip translation bug and update package-lock
Plant-for-the-Planet-org · Sep 30, 2024 · f3d67f4 · f3d67f4
2 parents 28ca413 + 938244a
commit f3d67f4
Show file tree

Hide file tree

Showing 6 changed files with 785 additions and 734 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/api/data-explorer/map/plant-location/index.ts b/pages/api/data-explorer/map/plant-location/index.ts
@@ -54,7 +54,6 @@ handler.post(async (req, response) => {
     }
 
     const qRes = await db.query<UncleanPlantLocations[]>(query, values);
-    console.log('qRes:', qRes);
 
     const plantLocations: SinglePlantLocationApiResponse[] = qRes.map(
       (plantLocation) => ({

diff --git a/src/features/user/TreeMapper/Analytics/components/SpeciesPlanted/Tooltip/index.tsx b/src/features/user/TreeMapper/Analytics/components/SpeciesPlanted/Tooltip/index.tsx
@@ -1,16 +1,14 @@
-import { useLocale } from 'next-intl';
 import { getFormattedNumber } from '../../../../../../../utils/getFormattedNumber';
 import styles from './index.module.scss';
 
 interface Props {
   headerTitle: string;
   bodyTitle: string;
   value: string;
+  locale: string;
 }
 
-export const Tooltip = ({ headerTitle, bodyTitle, value }: Props) => {
-  const locale = useLocale();
-
+export const Tooltip = ({ headerTitle, bodyTitle, value, locale }: Props) => {
   return (
     <div className={styles.container}>
       <div className={styles.header}>

diff --git a/src/features/user/TreeMapper/Analytics/components/SpeciesPlanted/index.tsx b/src/features/user/TreeMapper/Analytics/components/SpeciesPlanted/index.tsx
@@ -98,6 +98,7 @@ export const SpeciesPlanted = () => {
               headerTitle={w.globals.categoryLabels[dataPointIndex]}
               bodyTitle={'Planted Species'}
               value={s[0][dataPointIndex]}
+              locale={locale}
             />
           );
         };

diff --git a/src/features/user/TreeMapper/Analytics/components/TreePlanted/Tooltip/index.tsx b/src/features/user/TreeMapper/Analytics/components/TreePlanted/Tooltip/index.tsx
@@ -1,16 +1,14 @@
-import { useLocale } from 'next-intl';
 import { getFormattedNumber } from '../../../../../../../utils/getFormattedNumber';
 import styles from './index.module.scss';
 
 interface Props {
   headerTitle: string;
   bodyTitle: string;
   value: string;
+  locale: string;
 }
 
-export const Tooltip = ({ headerTitle, bodyTitle, value }: Props) => {
-  const locale = useLocale();
-
+export const Tooltip = ({ headerTitle, bodyTitle, value, locale }: Props) => {
   return (
     <div className={styles.container}>
       <div className={styles.header}>

diff --git a/src/features/user/TreeMapper/Analytics/components/TreePlanted/index.tsx b/src/features/user/TreeMapper/Analytics/components/TreePlanted/index.tsx
@@ -438,6 +438,7 @@ export const TreePlanted = () => {
             headerTitle={(categories as DaysCategories[])[dataPointIndex].label}
             bodyTitle={t('treesPlanted')}
             value={`${seriesData[dataPointIndex]}`}
+            locale={locale}
           />
         );
       case TIME_FRAME.WEEKS:
@@ -450,6 +451,7 @@ export const TreePlanted = () => {
             }`}
             bodyTitle={t('treesPlanted')}
             value={`${seriesData[dataPointIndex]}`}
+            locale={locale}
           />
         );
       case TIME_FRAME.MONTHS:
@@ -460,6 +462,7 @@ export const TreePlanted = () => {
             } ${(categories as MonthsCategories[])[dataPointIndex].year}`}
             bodyTitle={t('treesPlanted')}
             value={`${seriesData[dataPointIndex]}`}
+            locale={locale}
           />
         );
       case TIME_FRAME.YEARS:
@@ -468,6 +471,7 @@ export const TreePlanted = () => {
             headerTitle={(categories as DaysCategories[])[dataPointIndex].label}
             bodyTitle={t('treesPlanted')}
             value={`${seriesData[dataPointIndex]}`}
+            locale={locale}
           />
         );
       default: