Skip to content

Commit

Permalink
Merge branch 'main' into Add-user-custom-setting-time-date-format
Browse files Browse the repository at this point in the history
  • Loading branch information
daniele-mng authored Sep 11, 2024
2 parents 0cc0aa8 + 39e821a commit 7f7850b
Show file tree
Hide file tree
Showing 7 changed files with 778 additions and 849 deletions.
1,315 changes: 652 additions & 663 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@reduxjs/toolkit": "^2.2.7",
"@sentry/react": "^8.22.0",
"@sentry/react": "^8.28.0",
"@visx/axis": "^3.10.1",
"@visx/gradient": "^3.3.0",
"@visx/shape": "^3.5.0",
Expand All @@ -47,13 +47,13 @@
"d3-interpolate": "^3.0.1",
"d3-scale": "^4.0.2",
"d3-shape": "^3.2.0",
"downshift": "^9.0.7",
"downshift": "^9.0.8",
"fast-deep-equal": "^3.1.3",
"fast-xml-parser": "^4.4.1",
"history": "^4.10.1",
"hoist-non-react-statics": "^3.3.2",
"i18next": "^23.12.2",
"i18next-http-backend": "^2.5.2",
"i18next": "^23.14.0",
"i18next-http-backend": "^2.6.1",
"ical.js": "^2.0.0",
"memoize-one": "^6.0.0",
"moment": "^2.30.1",
Expand All @@ -69,31 +69,31 @@
"react-router-dom": "^5.2.0",
"redux": "^5.0.1",
"redux-logger": "^3.0.6",
"styled-components": "^6.1.12",
"styled-components": "^6.1.13",
"uuid": "^10.0.0",
"whatwg-fetch": "^3.6.20"
},
"devDependencies": {
"@babel/cli": "^7.25.6",
"@pandatix/js-cvss": "^0.4.4",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.0",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^13.5.0",
"@types/react": "^18.3.3",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitejs/plugin-legacy": "^5.4.1",
"@vitejs/plugin-legacy": "^5.4.2",
"@vitejs/plugin-react": "^4.3.1",
"@vitest/coverage-v8": "^2.0.5",
"@vitest/ui": "^2.0.5",
"babel-plugin-i18next-extract": "^0.10.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react": "^7.35.2",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-react-refresh": "^0.4.11",
"eslint-plugin-vitest": "^0.5.4",
"eslint-plugin-vitest-globals": "^1.5.0",
"husky": "^2.7.0",
Expand All @@ -102,7 +102,7 @@
"lint-staged": "^13.1.0",
"prettier": "^3.3.3",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vite": "^5.4.3",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-eslint2": "^4.4.0",
"vite-plugin-svgr": "^4.2.0",
Expand Down
3 changes: 1 addition & 2 deletions src/web/entities/filterprovider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


import React from 'react';

import Loading from 'web/components/loading/loading';
Expand All @@ -18,7 +17,7 @@ const FilterProvider = ({
pageName = gmpname,
locationQuery = {},
}) => {
const [returnedFilter, isLoadingFilter] = usePageFilter(pageName, {
const [returnedFilter, isLoadingFilter] = usePageFilter(pageName, gmpname, {
fallbackFilter,
locationQueryFilterString: locationQuery?.filter,
});
Expand Down
Loading

0 comments on commit 7f7850b

Please sign in to comment.