Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Merge branch 'main' into feature/extensions

Andrii Rba62275533b7
diff --cc package.json
index 610553011,ec11a6c54..9991e867e
--- a/package.json
+++ b/package.json
@@@ -5,14 -5,13 +5,14 @@@
"dependencies": {
"@blaumaus/react-alert": "^7.0.5",
"@headlessui/react": "^1.7.3",
- "@heroicons/react": "^2.0.11",
+ "@heroicons/react": "^2.0.12",
+ "@swetrix/sdk": "^1.0.0",
"@tailwindcss/forms": "^0.5.3",
- "axios": "^1.0.0",
- "billboard.js": "^3.6.0",
+ "axios": "^1.1.3",
+ "billboard.js": "^3.6.2",
"clsx": "^1.2.1",
"d3": "^7.6.1",
- "dayjs": "^1.11.5",
+ "dayjs": "^1.11.6",
"debug": "^4.3.4",
"dom-to-image": "^2.6.0",
"file-saver": "^2.0.5",
diff --cc src/pages/Project/View/ViewProject.jsx
index e9682eecc,00ae9304d..f8803c9b1
--- a/src/pages/Project/View/ViewProject.jsx
+++ b/src/pages/Project/View/ViewProject.jsx
@@@ -23,12 -19,10 +19,11 @@@ import _last from 'lodash/last
import _isEmpty from 'lodash/isEmpty'
import _replace from 'lodash/replace'
import _find from 'lodash/find'
- import _size from 'lodash/size'
import _filter from 'lodash/filter'
- import _truncate from 'lodash/truncate'
import _startsWith from 'lodash/startsWith'
+ import _isEqual from 'lodash/isEqual'
import PropTypes from 'prop-types'
+import * as SwetrixSDK from '@swetrix/sdk'
import { SWETRIX_PID } from 'utils/analytics'
import Title from 'components/Title'
@@@ -447,9 -142,20 +157,21 @@@ const ViewProject = (
return
}
- const { chart, params, customs } = data
+ const {
+ chart, params, customs, appliedFilters,
+ } = data
+ sdkInstance?._emitEvent('load', sdkData)
+ const convertApliedFilters = JSON.parse(appliedFilters)
+
+ if (!_isEmpty(convertApliedFilters)) {
+ if (_isEmpty(filters) || !_isEqual(filters, appliedFilters)) {
+ setFilters(convertApliedFilters)
+ } else {
+ setFilters((filter) => [...filter, ...convertApliedFilters])
+ }
+ }
+
if (_isEmpty(params)) {
setIsPanelsDataEmpty(true)
} else {