Merge branch 'master' into your-project-stats-refactor

zooniverse · Dec 6, 2024 · 968154c · 968154c
2 parents 3f2b679 + 66566dc
commit 968154c
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 209 deletions.
diff --git a/packages/app-project/package.json b/packages/app-project/package.json
@@ -17,7 +17,7 @@
     "build-storybook": "storybook build"
   },
   "dependencies": {
-    "@sentry/nextjs": "~8.40.0",
+    "@sentry/nextjs": "~8.42.0",
     "@sindresorhus/string-hash": "~1.2.0",
     "@visx/axis": "~3.12.0",
     "@visx/group": "~3.12.0",
@@ -37,16 +37,16 @@
     "graphql-request": "~6.1.0",
     "grommet": "~2.41.0",
     "grommet-icons": "~4.12.0",
-    "i18next": "~23.16.5",
+    "i18next": "~24.0.2",
     "lodash": "~4.17.11",
     "million": "~3.1.11",
     "mobx": "~6.12.0",
     "mobx-react": "~9.1.0",
     "mobx-state-tree": "~5.4.0",
     "morgan": "^1.10.0",
-    "newrelic": "~12.3.1",
+    "newrelic": "~12.8.1",
     "next": "~14.2.7",
-    "next-i18next": "~15.3.1",
+    "next-i18next": "~15.4.0",
     "panoptes-client": "~5.6.0",
     "path-match": "~1.2.4",
     "polished": "~4.3.1",
@@ -68,7 +68,7 @@
     "@testing-library/react": "~14.2.0",
     "@testing-library/user-event": "~14.5.0",
     "@wojtekmaj/enzyme-adapter-react-17": "~0.8.0",
-    "babel-loader": "~9.1.0",
+    "babel-loader": "~9.2.1",
     "babel-plugin-webpack-alias": "~2.1.2",
     "chai": "~4.5.0",
     "chai-dom": "~1.12.0",

diff --git a/packages/app-root/package.json b/packages/app-root/package.json
@@ -21,13 +21,13 @@
     "@zooniverse/panoptes-js": "~0.5.0",
     "@zooniverse/react-components": "~1.13.0",
     "@zooniverse/user": "~0.1.0",
-    "contentful": "~10.10.0",
+    "contentful": "~11.2.5",
     "express": "~4.21.0",
     "grommet": "~2.41.0",
     "grommet-icons": "~4.12.0",
     "lodash": "~4.17.21",
     "morgan": "~1.10.0",
-    "newrelic": "~12.3.1",
+    "newrelic": "~12.8.1",
     "next": "~14.2.7",
     "panoptes-client": "~5.6.0",
     "react": "~18.2.0",

diff --git a/packages/lib-classifier/package.json b/packages/lib-classifier/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@babel/runtime": "~7.26.0",
-    "@sentry/browser": "~8.40.0",
+    "@sentry/browser": "~8.42.0",
     "@visx/axis": "~3.12.0",
     "@visx/brush": "~3.12.0",
     "@visx/event": "~3.12.0",
@@ -44,7 +44,7 @@
     "graphql": "~16.9.0",
     "graphql-request": "~6.1.0",
     "hash.js": "~1.1.7",
-    "i18next": "~23.16.5",
+    "i18next": "~24.0.2",
     "lodash": "~4.17.11",
     "react-i18next": "~14.1.0",
     "react-player": "~2.13.0",
@@ -82,7 +82,7 @@
     "@zooniverse/panoptes-js": "~0.5.0",
     "@zooniverse/react-components": "~1.13.0",
     "@zooniverse/standard": "~2.0.0",
-    "babel-loader": "~9.1.0",
+    "babel-loader": "~9.2.1",
     "babel-plugin-module-resolver": "~5.0.0",
     "babel-plugin-transform-imports": "~2.0.0",
     "chai": "~4.5.0",

diff --git a/...mponents/components/Chooser/components/CharacteristicsFilter/FilterStatus/FilterStatus.js b/...mponents/components/Chooser/components/CharacteristicsFilter/FilterStatus/FilterStatus.js
@@ -103,9 +103,9 @@ export default function FilterStatus ({
         onOpen={handleFilterDropOpen}
       />
       {selectedCharacteristicIds.map(characteristicId => {
-        const characteristic = characteristics?.[characteristicId] || {}
+        const characteristic = characteristics?.get(characteristicId) || {}
         const selectedValueId = filters?.[characteristicId] || ''
-        const value = characteristic.values?.[selectedValueId] || {}
+        const value = characteristic.values?.get(selectedValueId) || {}
         const valueImageSrc = images?.get(value.image) || ''
         const label = strings.get(`characteristics.${characteristicId}.values.${selectedValueId}.label`)
         function clearSelection() {

diff --git a/packages/lib-content/package.json b/packages/lib-content/package.json
@@ -34,7 +34,7 @@
     "@zooniverse/async-states": "~0.0.1",
     "@zooniverse/react-components": "~1.13.0",
     "dayjs": "~1.11.11",
-    "i18next": "~23.16.5",
+    "i18next": "~24.0.2",
     "panoptes-client": "~5.6.0",
     "prop-types": "~15.8.1",
     "react-i18next": "~14.1.3"

diff --git a/packages/lib-react-components/package.json b/packages/lib-react-components/package.json
@@ -44,7 +44,7 @@
     "@zooniverse/panoptes-js": "~0.5.0",
     "cuid": "~3.0.0",
     "formik": "~2.4.0",
-    "i18next": "~23.16.5",
+    "i18next": "~24.0.2",
     "markdownz": "~9.1.3",
     "mime": "~3.0.0",
     "panoptes-client": "~5.6.0",

diff --git a/packages/lib-user/package.json b/packages/lib-user/package.json
@@ -66,7 +66,7 @@
     "@testing-library/user-event": "~14.5.0",
     "@zooniverse/grommet-theme": "~3.2.0",
     "@zooniverse/react-components": "~1.13.0",
-    "babel-loader": "~9.1.0",
+    "babel-loader": "~9.2.1",
     "babel-plugin-module-resolver": "~5.0.0",
     "babel-plugin-transform-imports": "~2.0.0",
     "chai": "~4.5.0",