📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Remove dead code
Blue Moused5ecbc3a5b70
diff --git a/web/.env.example b/web/.env.exampleindex 4854db137..08d900b45 100644--- a/web/.env.example+++ b/web/.env.example@@ -1,6 +1,5 @@API_URL=https://backend.swetrix.com/API_STAGING_URL=http://localhost:5005/-CDN_URL=https://cdn.swetrix.com/COOKIE_DOMAIN=tonomo.swetrix.comDISABLE_MARKETING_PAGES=diff --git a/web/app/components/DangerouslySetInnerHTML.tsx b/web/app/components/DangerouslySetInnerHTML.tsxdeleted file mode 100644index 8d79f4be4..000000000--- a/web/app/components/DangerouslySetInnerHTML.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { useRef, useEffect, createElement } from 'react'--interface DangerouslySetHtmlContentProps extends React.HTMLAttributes<HTMLDivElement> {- html: string- allowRerender?: boolean-}--export const DangerouslySetHtmlContent = ({- html,- // eslint-disable-next-line unused-imports/no-unused-vars- dangerouslySetInnerHTML,- allowRerender,- ...rest-}: DangerouslySetHtmlContentProps) => {- // We remove 'dangerouslySetInnerHTML' from props passed to the div- const divRef = useRef<HTMLDivElement>(null)- const isFirstRender = useRef(true)-- useEffect(() => {- if (!html || !divRef.current) throw new Error("html prop can't be null")- if (!isFirstRender.current) return- isFirstRender.current = Boolean(allowRerender)-- const slotHtml = document.createRange().createContextualFragment(html) // Create a 'tiny' document and parse the html string- divRef.current.innerHTML = '' // Clear the container- divRef.current.appendChild(slotHtml) // Append the new content- }, [html, divRef, allowRerender])-- // eslint-disable-next-line react-hooks/refs -- Passing ref to DOM element is safe- return createElement('div', { ...rest, ref: divRef })-}diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex cbf744735..6d8ee53c3 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -139,14 +139,6 @@ export const tbPeriodPairs = (},]-export const FILTERS_PERIOD_PAIRS = ['1d', '7d', '4w', '3M', '12M', 'custom', 'compare']--// TODO: add 'custom' later after an issue with it is resolved-// currently if you select a date range - it will not display errors within the last day of the date range-export const ERROR_PERIOD_PAIRS = ['1h', '1d', '7d', '4w', '3M', '12M', 'all']--export const FUNNELS_PERIOD_PAIRS = ['1h', '1d', '7d', '4w', '3M', '12M', 'all', 'custom']-export const tbPeriodPairsCompare = (t: typeof i18nextT,dates?: Date[],@@ -292,7 +284,6 @@ export const LIVE_DEMO_URL = '/projects/STEzHcB1rALV'export const BOOK_A_CALL_URL = 'https://cal.com/swetrix'export const PERFORMANCE_LIVE_DEMO_URL = '/projects/STEzHcB1rALV?tab=performance'export const ERROR_TRACKING_LIVE_DEMO_URL = '/projects/STEzHcB1rALV?tab=errors'-export const MARKETPLACE_URL = 'https://marketplace.swetrix.com'export const DOCS_URL = 'https://docs.swetrix.com'export const INTEGRATIONS_URL = 'https://docs.swetrix.com/integrations'export const ERROR_TRACKING_DOCS_URL = 'https://docs.swetrix.com/error-tracking'@@ -331,12 +322,10 @@ export const isDisableMarketingPages =(isBrowser ? window.REMIX_ENV?.DISABLE_MARKETING_PAGES : process.env.DISABLE_MARKETING_PAGES) === 'true'export const apiUrlUnprocessed = isSelfhosted || !isStaging ? PRODUCTION_API_URL : STAGING_API_URL-const cdnUrlUnprocessed = isBrowser ? window.REMIX_ENV?.CDN_URL : process.env.CDN_URLexport const TITLE_SUFFIX = isSelfhosted ? '| Swetrix Community Edition' : '| Swetrix'export const API_URL = _endsWith(apiUrlUnprocessed, '/') ? apiUrlUnprocessed : `${apiUrlUnprocessed}/`-export const CDN_URL = _endsWith(cdnUrlUnprocessed, '/') ? cdnUrlUnprocessed : `${cdnUrlUnprocessed}/`const NODE_ENV = isBrowser ? window.REMIX_ENV?.NODE_ENV : process.env.NODE_ENVexport const isDevelopment = !NODE_ENV || NODE_ENV === 'development'diff --git a/web/app/pages/Project/Traffic/View/TrafficView.tsx b/web/app/pages/Project/Traffic/View/TrafficView.tsxindex acca2e71a..d5b85f1bc 100644--- a/web/app/pages/Project/Traffic/View/TrafficView.tsx+++ b/web/app/pages/Project/Traffic/View/TrafficView.tsx@@ -42,6 +42,7 @@ import {Customs,TrafficMeta,Params,+ ProjectView,ProjectViewCustomEvent,Properties,TrafficLogResponse,@@ -55,6 +56,7 @@ import {noRegionPeriods,CHART_METRICS_MAPPING,getDeviceRowMapper,+ onCSVExportClick,} from '~/pages/Project/View/ViewProject.helpers'import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'import { useTheme } from '~/providers/ThemeProvider'@@ -68,6 +70,7 @@ import { groupRefEntries } from '~/utils/referrers'import routes from '~/utils/routes'import CustomEventsSubmenu from '../../View/components/CustomEventsSubmenu'+import TrafficHeaderActions from '../../View/components/TrafficHeaderActions'const InteractiveMap = lazy(() => import('~/pages/Project/View/components/InteractiveMap'))@@ -87,8 +90,15 @@ interface TrafficViewProps {onRemoveCustomMetric: (metricId: string) => voidresetCustomMetrics: () => voidmode: 'periodical' | 'cumulative'- sdkInstance: any- headerRightContent?: React.ReactNode+ // Segment/View props+ projectViews: ProjectView[]+ projectViewsLoading: boolean | null+ projectViewDeleting: boolean+ loadProjectViews: () => Promise<void>+ onProjectViewDelete: (viewId: string) => Promise<void>+ setProjectViewToUpdate: (view: ProjectView | undefined) => void+ setIsAddAViewOpened: (value: boolean) => void+ onCustomMetric: (metrics: ProjectViewCustomEvent[]) => void}const TrafficView = ({@@ -97,8 +107,14 @@ const TrafficView = ({onRemoveCustomMetric,resetCustomMetrics,mode,- sdkInstance,- headerRightContent,+ projectViews,+ projectViewsLoading,+ projectViewDeleting,+ loadProjectViews,+ onProjectViewDelete,+ setProjectViewToUpdate,+ setIsAddAViewOpened,+ onCustomMetric,}: TrafficViewProps) => {const { id, project, allowedToManage } = useCurrentProject()const projectPassword = useProjectPassword(id)@@ -518,27 +534,15 @@ const TrafficView = ({data.overall = rawOverall[id]setOverall(rawOverall[id])- const sdkData = {- ...(data || {}),- filters,- timezone,- timeBucket,- period,- from,- to,- }-if (_keys(data).length < 2) {setAnalyticsLoading(false)setDataLoading(false)setIsPanelsDataEmpty(true)- sdkInstance?._emitEvent('load', sdkData)return}const { chart, params, customs, properties, meta } = datalet newTimebucket = timeBucket- sdkInstance?._emitEvent('load', sdkData)if (period === 'all' && !_isEmpty(data.timeBucket)) {newTimebucket = _includes(data.timeBucket, timeBucket) ? timeBucket : (data.timeBucket?.[0] as TimeBucket)@@ -711,6 +715,17 @@ const TrafficView = ({// eslint-disable-next-line react-hooks/exhaustive-deps}, [trafficRefreshTrigger])+ const exportTypes = useMemo(+ () => [+ {+ label: t('project.asCSV'),+ onClick: () =>+ onCSVExportClick({ data: panelsData.data, types: panelsData.types || [] }, id, tnMapping, language),+ },+ ],+ [t, panelsData, id, tnMapping, language],+ )+// Show waiting state if project has no traffic data yetif (!project?.isDataExists) {return <WaitingForAnEvent />@@ -726,6 +741,24 @@ const TrafficView = ({return <NoEvents filters={filters} />}+ const headerRightContent = (+ <TrafficHeaderActions+ projectViews={projectViews}+ projectViewsLoading={projectViewsLoading}+ projectViewDeleting={projectViewDeleting}+ loadProjectViews={loadProjectViews}+ onProjectViewDelete={onProjectViewDelete}+ setProjectViewToUpdate={setProjectViewToUpdate}+ setIsAddAViewOpened={setIsAddAViewOpened}+ onCustomMetric={onCustomMetric}+ filters={filters}+ allowedToManage={allowedToManage}+ dataLoading={dataLoading}+ exportTypes={exportTypes}+ panelsData={panelsData}+ />+ )+const ChartTypeSwitcher = ({ type, onSwitch }: { type: string; onSwitch: (type: 'line' | 'bar') => void }) => {if (type === chartTypes.bar) {return (diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex 8fa2b14fc..3a8b00577 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -4,7 +4,6 @@ import { ArrowLongRightIcon, ArrowLongLeftIcon } from '@heroicons/react/24/solidimport { useVirtualizer, type VirtualItem } from '@tanstack/react-virtual'import cx from 'clsx'import _ceil from 'lodash/ceil'-import _find from 'lodash/find'import _floor from 'lodash/floor'import _fromPairs from 'lodash/fromPairs'import _isEmpty from 'lodash/isEmpty'@@ -24,7 +23,6 @@ import React, { memo, useState, useEffect, useMemo, Fragment, useRef } from 'reaimport { useTranslation } from 'react-i18next'import { Link, LinkProps, useNavigate } from 'react-router'-import { DangerouslySetHtmlContent } from '~/components/DangerouslySetInnerHTML'import { PROJECT_TABS } from '~/lib/constants'import { Entry } from '~/lib/models/Entry'import Button from '~/ui/Button'@@ -33,7 +31,6 @@ import Sort from '~/ui/icons/Sort'import Spin from '~/ui/icons/Spin'import Modal from '~/ui/Modal'import { Text } from '~/ui/Text'-import { trackError } from '~/utils/analytics'import { nFormatter, getLocaleDisplayName } from '~/utils/generic'import countries from '~/utils/isoCountries'@@ -64,52 +61,6 @@ interface PanelContainerProps {onDetailsClick?: () => void}-class ExtensionErrorBoundary extends React.Component<- { children: React.ReactNode; extensionID: string },- { hasError: boolean }-> {- constructor(props: { children: React.ReactNode; extensionID: string }) {- super(props)- this.state = { hasError: false }- }-- static getDerivedStateFromError() {- return { hasError: true }- }-- componentDidCatch(error: Error, info: React.ErrorInfo) {- trackError({- name: `Extension Error: ${error.name}`,- message: error.message,- stackTrace: info.componentStack,- meta: {- extensionID: this.props?.extensionID || 'unknown',- },- })- }-- render() {- if (this.state.hasError) {- return (- <div>- <Text as='p' size='sm' colour='error'>- Something went wrong. Please try again later.- </Text>- <br />- <Text as='p' size='sm' colour='error'>- <span>Extension ID: </span>- <span>{this.props?.extensionID || 'unknown'}</span>- </Text>- <Text as='p' size='sm' colour='error'>- If the problem persists, please contact support.- </Text>- </div>- )- }- return this.props.children- }-}-const PanelContainer = ({name,children,@@ -120,52 +71,8 @@ const PanelContainer = ({activeTabId,onDetailsClick,}: PanelContainerProps) => {- const { customPanelTabs } = useViewProjectContext()const { t } = useTranslation('common')- const panelExtensions = useMemo(() => {- return customPanelTabs.filter((tab) => tab.panelID === type)- }, [customPanelTabs, type])-- const panelTabs = useMemo(() => {- if (panelExtensions.length === 0) {- return tabs- }-- const panelTabs = [...(tabs || [])]-- if (panelTabs.length === 0) {- panelTabs.push({- id: 'default',- label: 'Data',- })- }-- return [- ...panelTabs,- ...panelExtensions.map((tab) => ({- id: tab.extensionID,- label: 'Addon',- })),- ]- }, [panelExtensions, tabs])-- const contentRenderer = () => {- const { extensionID, tabContent } =- _find(panelExtensions, (tab) => tab.extensionID === activeTabId) || ({} as CustomTab)-- if (extensionID) {- // Using this instead of dangerouslySetInnerHTML to support script tags- return (- <ExtensionErrorBoundary extensionID={extensionID}>- <DangerouslySetHtmlContent className='absolute overflow-auto' html={tabContent || ''} />- </ExtensionErrorBoundary>- )- }-- return children- }-return (<divclassName={cx(@@ -181,9 +88,9 @@ const PanelContainer = ({{name}</Text><div className='scrollbar-thin flex items-center gap-2.5 overflow-x-auto'>- {panelTabs && onTabChange ? (+ {tabs && onTabChange ? (<>- {panelTabs.map((tab, index) => {+ {tabs.map((tab, index) => {if (Array.isArray(tab)) {const dropdownTabs = tabconst activeDropdownTab = dropdownTabs.find((t) => t.id === activeTabId)@@ -240,7 +147,7 @@ const PanelContainer = ({) : null}</div></div>- <div className='relative flex h-[19.6rem] flex-col overflow-x-auto'>{contentRenderer()}</div>+ <div className='relative flex h-[19.6rem] flex-col overflow-x-auto'>{children}</div>{onDetailsClick ? (<div className='mt-2 flex items-center justify-center'><Button@@ -257,13 +164,6 @@ const PanelContainer = ({)}-export type CustomTab = {- extensionID: string- panelID: string- onOpen?: () => void- tabContent?: string-}-interface MetadataProps {customs?: Customsproperties?: Propertiesdiff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 8a647020a..998be0daf 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -1,15 +1,10 @@-import SwetrixSDK from '@swetrix/sdk'import cx from 'clsx'import dayjs from 'dayjs'import { AnimatePresence, motion } from 'framer-motion'import _filter from 'lodash/filter'import _find from 'lodash/find'import _includes from 'lodash/includes'-import _isEmpty from 'lodash/isEmpty'-import _isString from 'lodash/isString'-import _map from 'lodash/map'import _replace from 'lodash/replace'-import _uniqBy from 'lodash/uniqBy'import {MoonIcon,SunIcon,@@ -44,21 +39,15 @@ import { changeLanguage } from '~/i18n'import {tbPeriodPairs,DEFAULT_TIMEZONE,- CDN_URL,- isDevelopment,timeBucketToDays,PROJECT_TABS,TimeFormat,chartTypes,isSelfhosted,tbPeriodPairsCompare,- PERIOD_PAIRS_COMPARE,- FILTERS_PERIOD_PAIRS,LS_IS_ACTIVE_COMPARE_KEY,TITLE_SUFFIX,TBPeriodPairsProps,- ERROR_PERIOD_PAIRS,- FUNNELS_PERIOD_PAIRS,type Period,type TimeBucket,VALID_PERIODS,@@ -73,8 +62,6 @@ import { useTheme } from '~/providers/ThemeProvider'import Dropdown from '~/ui/Dropdown'import Flag from '~/ui/Flag'import Loader from '~/ui/Loader'-import LoadingBar from '~/ui/LoadingBar'-import { removeDuplicates } from '~/utils/generic'import { getItem, setItem } from '~/utils/localstorage'import routes from '~/utils/routes'@@ -94,24 +81,12 @@ import TrafficView from '../Traffic/View/TrafficView'import AddAViewModal from './components/AddAViewModal'import { ChartManagerProvider } from './components/ChartManager'const CaptchaView = lazy(() => import('./components/CaptchaView'))-// Keywords list now reuses shared Panel UI; dedicated component removed from renderimport LockedDashboard from './components/LockedDashboard'import ProjectSidebar, { MobileSidebarTrigger } from './components/ProjectSidebar'import SearchFilters from './components/SearchFilters'-import TrafficHeaderActions from './components/TrafficHeaderActions'-import {- Customs,- Filter,- TrafficMeta,- Params,- ProjectView,- ProjectViewCustomEvent,- Properties,-} from './interfaces/traffic'-import { type CustomTab } from './Panels'+import { Filter, ProjectView, ProjectViewCustomEvent } from './interfaces/traffic'import { parseFilters } from './utils/filters'import {- onCSVExportClick,getFormatDate,typeNameMapping,CHART_METRICS_MAPPING,@@ -135,7 +110,6 @@ interface ViewProjectContextType {dataLoading: booleanactiveTab: keyof typeof PROJECT_TABSfilters: Filter[]- customPanelTabs: CustomTab[]captchaRefreshTrigger: numbergoalsRefreshTrigger: numberexperimentsRefreshTrigger: number@@ -196,7 +170,6 @@ const defaultViewProjectContext: ViewProjectContextType = {dataLoading: false,activeTab: PROJECT_TABS.traffic,filters: [],- customPanelTabs: [],captchaRefreshTrigger: 0,goalsRefreshTrigger: 0,experimentsRefreshTrigger: 0,@@ -249,7 +222,7 @@ export const useViewProjectContext = () => {}const ViewProjectContent = () => {- const { id, project, preferences, updatePreferences, extensions, allowedToManage, liveVisitors } = useCurrentProject()+ const { id, project, preferences, updatePreferences, allowedToManage, liveVisitors } = useCurrentProject()const projectPassword = useProjectPassword(id)const { theme, setTheme } = useTheme()@@ -263,9 +236,6 @@ const ViewProjectContent = () => {i18n: { language },} = useTranslation('common')- const [customPanelTabs, setCustomPanelTabs] = useState<CustomTab[]>([])- const [sdkInstance, setSdkInstance] = useState<SwetrixSDK | null>(null)-const dashboardRef = useRef<HTMLDivElement>(null)const navigate = useNavigate()@@ -283,23 +253,9 @@ const ViewProjectContent = () => {return tabs.split(',')}, [searchParams])- // Traffic data state - now handled by TrafficView, kept for export compatibility- const [_panelsData, _setPanelsData] = useState<{- types: (keyof Params)[]- data: Params- customs: Customs- properties: Properties- meta?: TrafficMeta[]- // @ts-expect-error- }>({})- const [customExportTypes, setCustomExportTypes] = useState<- { label: string; onClick: (data: typeof _panelsData, tFunction: typeof t) => void }[]- >([])const [isAddAViewOpened, setIsAddAViewOpened] = useState(false)- // prevY2NeededRef removed - no longer needed with new chart management- const [dataLoading, _setDataLoading] = useState(false)- const [isAutoRefreshing, setIsAutoRefreshing] = useState(false)+ const [dataLoading] = useState(false)const [captchaRefreshTrigger, setCaptchaRefreshTrigger] = useState(0)const [goalsRefreshTrigger, setGoalsRefreshTrigger] = useState(0)const [experimentsRefreshTrigger, setExperimentsRefreshTrigger] = useState(0)@@ -309,7 +265,7 @@ const ViewProjectContent = () => {const [trafficRefreshTrigger, setTrafficRefreshTrigger] = useState(0)const [funnelsRefreshTrigger, setFunnelsRefreshTrigger] = useState(0)const [profilesRefreshTrigger, setProfilesRefreshTrigger] = useState(0)- const [activeChartMetrics, _setActiveChartMetrics] = useState<Record<keyof typeof CHART_METRICS_MAPPING, boolean>>({+ const [activeChartMetrics] = useState<Record<keyof typeof CHART_METRICS_MAPPING, boolean>>({[CHART_METRICS_MAPPING.unique]: true,[CHART_METRICS_MAPPING.views]: false,[CHART_METRICS_MAPPING.sessionDuration]: false,@@ -428,11 +384,6 @@ const ViewProjectContent = () => {const [isHotkeysHelpOpened, setIsHotkeysHelpOpened] = useState(false)- // Check if we're viewing a specific session detail- const _activePSID = useMemo(() => {- return searchParams.get('psid')- }, [searchParams])-// null -> not loaded yetconst [projectViews, setProjectViews] = useState<ProjectView[]>([])const [projectViewsLoading, setProjectViewsLoading] = useState<boolean | null>(null) // // null - not loaded, true - loading, false - loaded@@ -544,34 +495,6 @@ const ViewProjectContent = () => {document.title = pageTitle}, [project, user, liveVisitors, t])- const _timeBucketSelectorItems = useMemo(() => {- if (activeTab === PROJECT_TABS.errors) {- return _filter(periodPairs, (el) => {- return _includes(ERROR_PERIOD_PAIRS, el.period)- })- }-- if (activeTab === PROJECT_TABS.funnels) {- return _filter(periodPairs, (el) => {- return _includes(FUNNELS_PERIOD_PAIRS, el.period)- })- }-- if (isActiveCompare) {- return _filter(periodPairs, (el) => {- return _includes(FILTERS_PERIOD_PAIRS, el.period)- })- }-- if (_includes(FILTERS_PERIOD_PAIRS, period)) {- return periodPairs- }-- return _filter(periodPairs, (el) => {- return el.period !== PERIOD_PAIRS_COMPARE.COMPARE- })- }, [activeTab, isActiveCompare, period, periodPairs])-const [showFiltersSearch, setShowFiltersSearch] = useState(false)const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false)@@ -715,11 +638,7 @@ const ViewProjectContent = () => {}const refreshStats = useCallback(- async (isManual = true) => {- if (!isManual) {- setIsAutoRefreshing(true)- }-+ async (_isManual = true) => {if (!authLoading && !dataLoading) {if (activeTab === PROJECT_TABS.funnels) {setFunnelsRefreshTrigger((prev) => prev + 1)@@ -770,146 +689,10 @@ const ViewProjectContent = () => {[authLoading, dataLoading, activeTab],)- useEffect(() => {- let sdk: SwetrixSDK | null = null-- const filteredExtensions = _filter(extensions, (ext) => _isString(ext.fileURL))-- if (!_isEmpty(filteredExtensions)) {- const processedExtensions = _map(filteredExtensions, (ext) => {- const { id: extId, fileURL } = ext- return {- id: extId,- cdnURL: `${CDN_URL}file/${fileURL}`,- }- })-- // temp fix until it's deployed so I could change it in SDK and extensions too- const processPanelId = (id: string) => {- if (id === 'ce') {- return 'metadata'- }- return id- }-- sdk = new SwetrixSDK(- processedExtensions,- {- debug: isDevelopment,- },- {- onAddExportDataRow: (label: any, onClick: (e: any) => void) => {- setCustomExportTypes((prev) => {- // TODO: Fix this- // A temporary measure to prevent duplicate items stored here (for some reason, SDK is initialised two times)- return _uniqBy(- [- {- label,- onClick,- },- ...prev,- ],- 'label',- )- })- },- onRemoveExportDataRow: (label: any) => {- setCustomExportTypes((prev) => _filter(prev, (row) => row.label !== label))- },- onAddPanelTab: (extensionID: string, panelID: string, tabContent?: string, onOpen?: () => void) => {- const processedPanelID = processPanelId(panelID)- setCustomPanelTabs((prev) =>- removeDuplicates(- [- ...prev,- {- extensionID,- panelID: processedPanelID,- tabContent,- onOpen,- },- ],- ['extensionID', 'panelID'],- ),- )- },- onUpdatePanelTab: (extensionID: string, panelID: string, tabContent: any) => {- const processedPanelID = processPanelId(panelID)- setCustomPanelTabs((prev) =>- _map(prev, (row) => {- if (row.extensionID === extensionID && row.panelID === processedPanelID) {- return {- ...row,- tabContent,- }- }-- return row- }),- )- },- onRemovePanelTab: (extensionID: string, panelID: string) => {- const processedPanelID = processPanelId(panelID)- setCustomPanelTabs((prev) =>- _filter(prev, (row) => row.extensionID !== extensionID && row.panelID !== processedPanelID),- )- },- },- )- setSdkInstance(sdk)- }-- return () => {- if (sdk) {- sdk._destroy()- }- }- }, [extensions])-- useEffect(() => {- sdkInstance?._emitEvent('timeupdate', {- period,- timeBucket,- dateRange: period === 'custom' ? dateRange : null,- })- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [sdkInstance])-- useEffect(() => {- sdkInstance?._emitEvent('clientinfo', {- language,- theme,- })- }, [sdkInstance, language, theme])-- useEffect(() => {- if (_isEmpty(project)) {- return- }-- const { active: isActive, created, public: isPublic, name } = project-- sdkInstance?._emitEvent('projectinfo', {- id: project.id,- name,- isActive,- created,- isPublic,- })- }, [sdkInstance, project])-useEffect(() => {setPeriodPairsCompare(tbPeriodPairsCompare(t, undefined, language))}, [t, language])- // Reset isAutoRefreshing when loading completes- useEffect(() => {- if (!dataLoading) {- setIsAutoRefreshing(false)- }- }, [dataLoading])-// We can assume period provided is never custom, as it's handled separately in the Datepicker callback functionconst updatePeriod = useCallback(({ period: newPeriod }: { period: Period }) => {@@ -927,14 +710,9 @@ const ViewProjectContent = () => {rangeDate: undefined,})- sdkInstance?._emitEvent('timeupdate', {- period: newPeriod,- dateRange: null,- })-setSearchParams(newSearchParams)},- [period, searchParams, setSearchParams, sdkInstance, updatePreferences],+ [period, searchParams, setSearchParams, updatePreferences],)const updateTimebucket = useCallback(@@ -950,13 +728,8 @@ const ViewProjectContent = () => {updatePreferences({timeBucket: newTimebucket,})- sdkInstance?._emitEvent('timeupdate', {- period,- timeBucket: newTimebucket,- dateRange,- })},- [dataLoading, searchParams, setSearchParams, sdkInstance, period, dateRange, updatePreferences],+ [dataLoading, searchParams, setSearchParams, updatePreferences],)const openSettingsHandler = () => {@@ -1032,15 +805,6 @@ const ViewProjectContent = () => {[filters, searchParams],)- const exportTypes = [- {- label: t('project.asCSV'),- onClick: () => {- return onCSVExportClick(_panelsData, id, tnMapping, language)- },- },- ]-const setChartTypeOnClick = useCallback((type: keyof typeof chartTypes) => {setItem('chartType', type)setChartType(type)@@ -1161,7 +925,6 @@ const ViewProjectContent = () => {dataLoading,activeTab,filters,- customPanelTabs,captchaRefreshTrigger,goalsRefreshTrigger,experimentsRefreshTrigger,@@ -1221,7 +984,6 @@ const ViewProjectContent = () => {dataLoading,activeTab,filters,- customPanelTabs,captchaRefreshTrigger,goalsRefreshTrigger,experimentsRefreshTrigger,@@ -1332,7 +1094,6 @@ const ViewProjectContent = () => {{() => (<ViewProjectContext.Provider value={contextValue}><>- {dataLoading && !isAutoRefreshing ? <LoadingBar /> : null}<divclassName={cx('flex min-h-screen flex-col bg-gray-50 dark:bg-slate-900', {'min-h-including-header': !isEmbedded,@@ -1387,25 +1148,14 @@ const ViewProjectContent = () => {onRemoveCustomMetric={onRemoveCustomMetric}resetCustomMetrics={resetCustomMetrics}mode={mode}- sdkInstance={sdkInstance}- headerRightContent={- <TrafficHeaderActions- projectViews={projectViews}- projectViewsLoading={projectViewsLoading}- projectViewDeleting={projectViewDeleting}- loadProjectViews={loadProjectViews}- onProjectViewDelete={onProjectViewDelete}- setProjectViewToUpdate={setProjectViewToUpdate}- setIsAddAViewOpened={setIsAddAViewOpened}- onCustomMetric={onCustomMetric}- filters={filters}- allowedToManage={allowedToManage}- dataLoading={dataLoading}- exportTypes={exportTypes}- customExportTypes={customExportTypes}- panelsData={_panelsData}- />- }+ projectViews={projectViews}+ projectViewsLoading={projectViewsLoading}+ projectViewDeleting={projectViewDeleting}+ loadProjectViews={loadProjectViews}+ onProjectViewDelete={onProjectViewDelete}+ setProjectViewToUpdate={setProjectViewToUpdate}+ setIsAddAViewOpened={setIsAddAViewOpened}+ onCustomMetric={onCustomMetric}/>) : null}{activeTab === PROJECT_TABS.performance ? <PerformanceView tnMapping={tnMapping} /> : null}diff --git a/web/app/pages/Project/View/components/TrafficHeaderActions.tsx b/web/app/pages/Project/View/components/TrafficHeaderActions.tsxindex 9abd1411f..8142755b1 100644--- a/web/app/pages/Project/View/components/TrafficHeaderActions.tsx+++ b/web/app/pages/Project/View/components/TrafficHeaderActions.tsx@@ -6,7 +6,6 @@ import React from 'react'import { useTranslation } from 'react-i18next'import { useSearchParams } from 'react-router'-import { isSelfhosted, MARKETPLACE_URL } from '~/lib/constants'import Dropdown from '~/ui/Dropdown'import { Text } from '~/ui/Text'import { trackCustom } from '~/utils/analytics'@@ -17,7 +16,7 @@ import { getFiltersUrlParams } from './SearchFilters'interface ExportType {label: string- onClick: (data: any, tFunction: any) => void+ onClick: () => void}interface TrafficHeaderActionsProps {@@ -36,7 +35,6 @@ interface TrafficHeaderActionsProps {// Export dropdown propsexportTypes: ExportType[]- customExportTypes: ExportType[]panelsData: any}@@ -53,8 +51,6 @@ const TrafficHeaderActions = ({allowedToManage,dataLoading,exportTypes,- customExportTypes,- panelsData,}: TrafficHeaderActionsProps) => {const { t } = useTranslation('common')const [searchParams, setSearchParams] = useSearchParams()@@ -163,35 +159,16 @@ const TrafficHeaderActions = ({{/* Export Dropdown */}<Dropdownheader={t('project.exportData')}- items={_filter(- [- ...exportTypes,- ...customExportTypes,- !isSelfhosted && {- label: t('project.lookingForMore'),- lookingForMore: true,- onClick: () => {},- },- ],- (el) => !!el,- )}+ items={exportTypes}title={[<DownloadIcon key='download-icon' className='h-5 w-5' />]}labelExtractor={(item) => item.label}keyExtractor={(item) => item.label}- onSelect={(item, e) => {- // @ts-expect-error lookingForMore is defined as an exception above- if (item.lookingForMore) {- e?.stopPropagation()- window.open(MARKETPLACE_URL, '_blank')-- return- }-+ onSelect={(item) => {trackCustom('DASHBOARD_EXPORT', {- type: item.label === t('project.asCSV') ? 'csv' : 'extension',+ type: 'csv',})- item.onClick(panelsData, t)+ item.onClick()}}chevron='mini'buttonClassName='!p-2 rounded-md hover:bg-white border border-gray-50/0 hover:border-gray-300 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:z-10 focus:outline-hidden focus:ring-1 focus:ring-indigo-500 focus:dark:ring-gray-200'diff --git a/web/app/utils/generic.ts b/web/app/utils/generic.tsindex e38afc4ce..343c025ec 100644--- a/web/app/utils/generic.ts+++ b/web/app/utils/generic.ts@@ -150,32 +150,3 @@ export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolveexport const cn = (...args: ClassValue[]) => {return twMerge(clsx(args))}--export const removeDuplicates = (arr: any[], keys: string[]) => {- const uniqueObjects: any[] = []-- const isDuplicate = (obj: any) => {- for (const uniqueObj of uniqueObjects) {- let isMatch = true-- for (const key of keys) {- if (uniqueObj[key] !== obj[key]) {- isMatch = false- break- }- }- if (isMatch) {- return true- }- }- return false- }-- for (const obj of arr) {- if (!isDuplicate(obj)) {- uniqueObjects.push(obj)- }- }-- return uniqueObjects-}diff --git a/web/package-lock.json b/web/package-lock.jsonindex 49b5d549f..45154d262 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -14,7 +14,6 @@"@react-router/fs-routes": "^7.9.6","@react-router/node": "^7.9.6","@react-router/serve": "^7.9.6",- "@swetrix/sdk": "^1.2.0","@tailwindcss/vite": "^4.1.17","@tanstack/react-virtual": "^3.13.12","@types/leaflet": "^1.9.21",@@ -1380,16 +1379,6 @@"node": ">=6.0.0"}},- "node_modules/@jridgewell/source-map": {- "version": "0.3.6",- "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",- "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",- "license": "MIT",- "dependencies": {- "@jridgewell/gen-mapping": "^0.3.5",- "@jridgewell/trace-mapping": "^0.3.25"- }- },"node_modules/@jridgewell/sourcemap-codec": {"version": "1.5.5","resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",@@ -2716,76 +2705,6 @@}}},- "node_modules/@rollup/plugin-terser": {- "version": "0.4.4",- "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",- "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",- "license": "MIT",- "dependencies": {- "serialize-javascript": "^6.0.1",- "smob": "^1.0.0",- "terser": "^5.17.4"- },- "engines": {- "node": ">=14.0.0"- },- "peerDependencies": {- "rollup": "^2.0.0||^3.0.0||^4.0.0"- },- "peerDependenciesMeta": {- "rollup": {- "optional": true- }- }- },- "node_modules/@rollup/plugin-typescript": {- "version": "12.1.2",- "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",- "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",- "license": "MIT",- "dependencies": {- "@rollup/pluginutils": "^5.1.0",- "resolve": "^1.22.1"- },- "engines": {- "node": ">=14.0.0"- },- "peerDependencies": {- "rollup": "^2.14.0||^3.0.0||^4.0.0",- "tslib": "*",- "typescript": ">=3.7.0"- },- "peerDependenciesMeta": {- "rollup": {- "optional": true- },- "tslib": {- "optional": true- }- }- },- "node_modules/@rollup/pluginutils": {- "version": "5.1.4",- "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",- "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",- "license": "MIT",- "dependencies": {- "@types/estree": "^1.0.0",- "estree-walker": "^2.0.2",- "picomatch": "^4.0.2"- },- "engines": {- "node": ">=14.0.0"- },- "peerDependencies": {- "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"- },- "peerDependenciesMeta": {- "rollup": {- "optional": true- }- }- },"node_modules/@rollup/rollup-android-arm-eabi": {"version": "4.46.2","resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",@@ -3060,16 +2979,6 @@"tslib": "^2.8.0"}},- "node_modules/@swetrix/sdk": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/@swetrix/sdk/-/sdk-1.2.0.tgz",- "integrity": "sha512-zVOV/XV+AAA8HeoXGcj41Pc6A2ZP3YqWPN1r/nJvBQiftAeptLkRFnDcgPNw2QAHkhHTy7IP0WYMNcuBDeBlJg==",- "license": "AGPL-3.0",- "dependencies": {- "@rollup/plugin-terser": "^0.4.4",- "@rollup/plugin-typescript": "^12.1.2"- }- },"node_modules/@tailwindcss/forms": {"version": "0.5.10","resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.10.tgz",@@ -7033,12 +6942,6 @@"node": ">=4.0"}},- "node_modules/estree-walker": {- "version": "2.0.2",- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",- "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",- "license": "MIT"- },"node_modules/esutils": {"version": "2.0.3","resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",@@ -9625,7 +9528,8 @@"node_modules/path-parse": {"version": "1.0.7","resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",+ "devOptional": true},"node_modules/path-scurry": {"version": "1.11.1",@@ -9933,15 +9837,6 @@}]},- "node_modules/randombytes": {- "version": "2.1.0",- "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",- "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",- "license": "MIT",- "dependencies": {- "safe-buffer": "^5.1.0"- }- },"node_modules/range-parser": {"version": "1.2.1","resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",@@ -10298,6 +10193,7 @@"version": "1.22.10","resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz","integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",+ "devOptional": true,"dependencies": {"is-core-module": "^2.16.0","path-parse": "^1.0.7",@@ -10587,15 +10483,6 @@"node": ">= 0.8"}},- "node_modules/serialize-javascript": {- "version": "6.0.2",- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",- "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",- "license": "BSD-3-Clause",- "dependencies": {- "randombytes": "^2.1.0"- }- },"node_modules/serve-static": {"version": "1.16.2","resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",@@ -10771,12 +10658,6 @@"url": "https://github.com/sponsors/isaacs"}},- "node_modules/smob": {- "version": "1.5.0",- "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",- "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",- "license": "MIT"- },"node_modules/smol-toml": {"version": "1.5.2","resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",@@ -11151,6 +11032,7 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz","integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",+ "devOptional": true,"engines": {"node": ">= 0.4"},@@ -11202,30 +11084,6 @@"url": "https://opencollective.com/webpack"}},- "node_modules/terser": {- "version": "5.39.2",- "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.2.tgz",- "integrity": "sha512-yEPUmWve+VA78bI71BW70Dh0TuV4HHd+I5SHOAfS1+QBOmvmCiiffgjR8ryyEd3KIfvPGFqoADt8LdQ6XpXIvg==",- "license": "BSD-2-Clause",- "dependencies": {- "@jridgewell/source-map": "^0.3.3",- "acorn": "^8.14.0",- "commander": "^2.20.0",- "source-map-support": "~0.5.20"- },- "bin": {- "terser": "bin/terser"- },- "engines": {- "node": ">=10"- }- },- "node_modules/terser/node_modules/commander": {- "version": "2.20.3",- "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",- "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",- "license": "MIT"- },"node_modules/timezone-soft": {"version": "1.5.2","resolved": "https://registry.npmjs.org/timezone-soft/-/timezone-soft-1.5.2.tgz",diff --git a/web/package.json b/web/package.jsonindex 56653122d..2a547d353 100644--- a/web/package.json+++ b/web/package.json@@ -28,7 +28,6 @@"@react-router/fs-routes": "^7.9.6","@react-router/node": "^7.9.6","@react-router/serve": "^7.9.6",- "@swetrix/sdk": "^1.2.0","@tailwindcss/vite": "^4.1.17","@tanstack/react-virtual": "^3.13.12","@types/leaflet": "^1.9.21",diff --git a/web/vite.config.ts b/web/vite.config.tsindex ab0551735..d4c5d7d78 100644--- a/web/vite.config.ts+++ b/web/vite.config.ts@@ -8,13 +8,12 @@ export default defineConfig({port: 3000,},optimizeDeps: {- include: ['axios-auth-refresh', '@swetrix/sdk'],+ include: ['axios-auth-refresh'],},ssr: {noExternal: ['axios','axios-auth-refresh',- '@swetrix/sdk','d3',/^d3-*/,'nivo',@@ -30,7 +29,7 @@ export default defineConfig({'lucide-react',],optimizeDeps: {- include: ['axios-auth-refresh', '@swetrix/sdk'],+ include: ['axios-auth-refresh'],},},plugins: [reactRouter(), tsconfigPaths(), tailwindcss()],