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!

Unify saved segments / filters across tabs

Blue Mouse25ca90cba16e
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 64063a15a..039d0188f 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -111,6 +111,10 @@ import {
ProjectViewCustomEvent,
} from './interfaces/traffic'
import { parseFilters } from './utils/filters'
+import {
+ getProjectViewCreateType,
+ getProjectViewFilterOptions,
+} from './utils/projectViewSegments'
import {
getFormatDate,
typeNameMapping,
@@ -134,6 +138,11 @@ interface ViewProjectContextType {
dataLoading: boolean
activeTab: keyof typeof PROJECT_TABS
filters: Filter[]
+ projectViews: ProjectView[]
+ projectViewsLoading: boolean | null
+ loadProjectViews: (forced?: boolean) => void
+ setProjectViewToUpdate: (view: ProjectView | undefined) => void
+ setIsAddAViewOpened: (value: boolean) => void
isActiveCompare: boolean
dateRangeCompare: Date[] | null
@@ -201,6 +210,11 @@ const defaultViewProjectContext: ViewProjectContextType = {
dataLoading: false,
activeTab: PROJECT_TABS.traffic,
filters: [],
+ projectViews: [],
+ projectViewsLoading: null,
+ loadProjectViews: () => {},
+ setProjectViewToUpdate: () => {},
+ setIsAddAViewOpened: () => {},
isActiveCompare: false,
dateRangeCompare: null,
@@ -373,6 +387,14 @@ const ViewProjectContent = () => {
return PROJECT_TABS.traffic
}, [searchParams])
+ const projectViewFilterOptions = useMemo(
+ () => getProjectViewFilterOptions(activeTab),
+ [activeTab],
+ )
+ const projectViewCreateType = useMemo(
+ () => getProjectViewCreateType(activeTab),
+ [activeTab],
+ )
const period = useMemo<Period>(() => {
const urlPeriod = searchParams.get('period') as Period
@@ -1175,6 +1197,11 @@ const ViewProjectContent = () => {
dataLoading,
activeTab,
filters,
+ projectViews,
+ projectViewsLoading,
+ loadProjectViews,
+ setProjectViewToUpdate,
+ setIsAddAViewOpened,
isActiveCompare,
dateRangeCompare,
@@ -1222,6 +1249,9 @@ const ViewProjectContent = () => {
dataLoading,
activeTab,
filters,
+ projectViews,
+ projectViewsLoading,
+ loadProjectViews,
isActiveCompare,
dateRangeCompare,
activePeriodCompare,
@@ -1542,11 +1572,6 @@ const ViewProjectContent = () => {
onRemoveCustomMetric={onRemoveCustomMetric}
resetCustomMetrics={resetCustomMetrics}
mode={mode}
- projectViews={projectViews}
- projectViewsLoading={projectViewsLoading}
- loadProjectViews={loadProjectViews}
- setProjectViewToUpdate={setProjectViewToUpdate}
- setIsAddAViewOpened={setIsAddAViewOpened}
/>
) : null}
{activeTab === PROJECT_TABS.performance ? (
@@ -1743,6 +1768,7 @@ const ViewProjectContent = () => {
setShowModal={setShowFiltersSearch}
tnMapping={tnMapping}
filters={filters}
+ filterOptions={projectViewFilterOptions}
/>
<AddAViewModal
showModal={isAddAViewOpened}
@@ -1757,6 +1783,12 @@ const ViewProjectContent = () => {
}}
defaultView={projectViewToUpdate}
tnMapping={tnMapping}
+ filterOptions={projectViewFilterOptions}
+ filterDataType={
+ activeTab === PROJECT_TABS.errors ? 'errors' : 'traffic'
+ }
+ supportsCustomMetrics={activeTab === PROJECT_TABS.traffic}
+ viewType={projectViewCreateType}
/>
</>
</RefreshTriggersContext.Provider>
diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsx
index 390ab2b4a..eba53cd29 100644
--- a/web/app/pages/Project/View/components/AddAViewModal.tsx
+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx
@@ -9,7 +9,6 @@ import { useFetcher } from 'react-router'
import { toast } from 'sonner'
import { useFiltersProxy } from '~/hooks/useAnalyticsProxy'
-import { FILTERS_PANELS_ORDER } from '~/lib/constants'
import { useCurrentProject } from '~/providers/CurrentProjectProvider'
import { ProjectViewActionData } from '~/routes/projects.$id'
import Combobox from '~/ui/Combobox'
@@ -34,6 +33,10 @@ interface AddAViewModalProps {
setShowModal: (show: boolean) => void
tnMapping: Record<string, string>
defaultView?: ProjectView
+ filterOptions: string[]
+ filterDataType: 'traffic' | 'errors'
+ supportsCustomMetrics: boolean
+ viewType: 'traffic' | 'performance'
}
const InlineButton = ({
@@ -205,6 +208,10 @@ const AddAViewModal = ({
setShowModal,
tnMapping,
defaultView,
+ filterOptions,
+ filterDataType,
+ supportsCustomMetrics,
+ viewType,
}: AddAViewModalProps) => {
const { id } = useCurrentProject()
const {
@@ -222,15 +229,18 @@ const AddAViewModal = ({
Partial<ProjectViewCustomEvent>[]
>(defaultView?.customEvents || [])
const [errors, setErrors] = useState<AddAViewModalErrors>({})
- const { fetchFilters } = useFiltersProxy()
+ const { fetchFilters, fetchErrorsFilters } = useFiltersProxy()
const getFiltersList = useCallback(
async (category: string) => {
- const result = await fetchFilters(id, category)
+ const result =
+ filterDataType === 'errors'
+ ? await fetchErrorsFilters(id, category)
+ : await fetchFilters(id, category)
setSearchList(result || [])
},
- [id, fetchFilters],
+ [id, filterDataType, fetchErrorsFilters, fetchFilters],
)
useEffect(() => {
@@ -309,21 +319,23 @@ const AddAViewModal = ({
valid = false
}
- for (let i = 0; i < _size(customEvents); ++i) {
- const { id, customEventName, metricKey } = customEvents[i]
+ if (supportsCustomMetrics) {
+ for (let i = 0; i < _size(customEvents); ++i) {
+ const { id, customEventName, metricKey } = customEvents[i]
- if (!customEventName) {
- metricErrors[`${id}_customEventName`] = t(
- 'apiNotifications.inputCannotBeEmpty',
- )
- valid = false
- }
+ if (!customEventName) {
+ metricErrors[`${id}_customEventName`] = t(
+ 'apiNotifications.inputCannotBeEmpty',
+ )
+ valid = false
+ }
- if (!metricKey) {
- metricErrors[`${id}_metricKey`] = t(
- 'apiNotifications.inputCannotBeEmpty',
- )
- valid = false
+ if (!metricKey) {
+ metricErrors[`${id}_metricKey`] = t(
+ 'apiNotifications.inputCannotBeEmpty',
+ )
+ valid = false
+ }
}
}
@@ -374,8 +386,11 @@ const AddAViewModal = ({
}
const formData = new FormData()
+ const metricsToSubmit = supportsCustomMetrics
+ ? customEvents
+ : defaultView?.customEvents || []
formData.append('filters', JSON.stringify(activeFilters))
- formData.append('customEvents', JSON.stringify(customEvents))
+ formData.append('customEvents', JSON.stringify(metricsToSubmit))
formData.append('name', name)
if (defaultView?.id) {
@@ -383,7 +398,7 @@ const AddAViewModal = ({
formData.append('viewId', defaultView.id)
} else {
formData.append('intent', 'create-project-view')
- formData.append('type', 'traffic')
+ formData.append('type', viewType)
}
fetcher.submit(formData, { method: 'POST' })
@@ -420,7 +435,7 @@ const AddAViewModal = ({
<hr className='my-4' />
<Select
label={t('project.selectCategoryOptional')}
- items={FILTERS_PANELS_ORDER}
+ items={filterOptions}
labelExtractor={(item) => t(`project.mapping.${item}`)}
onSelect={(item) => setFilterType(item)}
title={
@@ -517,54 +532,62 @@ const AddAViewModal = ({
),
)}
</div>
- <hr className='my-4' />
- <Text
- as='p'
- size='sm'
- weight='medium'
- className='text-gray-700 dark:text-gray-100'
- >
- {t('project.customEventsAndMetrics')}
- </Text>
- <div className='divide-y divide-gray-300/80 dark:divide-slate-900/60'>
- {_map(customEvents, (ev) => (
- <EditMetric
- key={ev.id}
- metric={ev}
- setErrors={setErrors}
- errors={errors}
- onChange={(key, value) => {
- setCustomEvents((prev) =>
- _map(prev, (item) => {
- if (item.id !== ev.id) {
- return item
- }
-
- return {
- ...item,
- [key]: value,
- }
- }),
- )
- }}
- onDelete={() => {
- setCustomEvents((prev) =>
- _filter(prev, ({ id }) => id !== ev.id),
- )
- }}
- />
- ))}
- </div>
- {customEvents.length < MAX_METRICS_IN_VIEW ? (
- <InlineButton
- text={t('project.addAMetric')}
- onClick={() => {
- setCustomEvents((prev) => [
- ...prev,
- { ...EMPTY_CUSTOM_EVENT, id: Math.random().toString() },
- ])
- }}
- />
+ {supportsCustomMetrics ? (
+ <>
+ <hr className='my-4' />
+ <Text
+ as='p'
+ size='sm'
+ weight='medium'
+ className='text-gray-700 dark:text-gray-100'
+ >
+ {t('project.customEventsAndMetrics')}
+ </Text>
+ <div className='divide-y divide-gray-300/80 dark:divide-slate-900/60'>
+ {_map(customEvents, (ev) => (
+ <EditMetric
+ key={ev.id}
+ metric={ev}
+ setErrors={setErrors}
+ errors={errors}
+ onChange={(key, value) => {
+ setCustomEvents((prev) =>
+ _map(prev, (item) => {
+ if (item.id !== ev.id) {
+ return item
+ }
+
+ return {
+ ...item,
+ [key]: value,
+ }
+ }),
+ )
+ }}
+ onDelete={() => {
+ setCustomEvents((prev) =>
+ _filter(prev, ({ id }) => id !== ev.id),
+ )
+ }}
+ />
+ ))}
+ </div>
+ {customEvents.length < MAX_METRICS_IN_VIEW ? (
+ <InlineButton
+ text={t('project.addAMetric')}
+ onClick={() => {
+ setCustomEvents((prev) => [
+ ...prev,
+ { ...EMPTY_CUSTOM_EVENT, id: Math.random().toString() },
+ ])
+ }}
+ />
+ ) : null}
+ </>
+ ) : customEvents.length > 0 ? (
+ <Text as='p' size='xs' colour='secondary' className='mt-4'>
+ {t('project.segmentTrafficMetricsOnly')}
+ </Text>
) : null}
</div>
}
diff --git a/web/app/pages/Project/View/components/Filters.tsx b/web/app/pages/Project/View/components/Filters.tsx
index e6ad25983..6dfe51609 100644
--- a/web/app/pages/Project/View/components/Filters.tsx
+++ b/web/app/pages/Project/View/components/Filters.tsx
@@ -13,6 +13,7 @@ import { getLocaleDisplayName, cn } from '~/utils/generic'
import countries from '~/utils/isoCountries'
import { isFilterValid } from '../utils/filters'
+import { splitProjectViewFiltersByTab } from '../utils/projectViewSegments'
import { useViewProjectContext } from '../ViewProject'
interface FilterProps {
@@ -268,9 +269,13 @@ interface FiltersProps {
}
const Filters = ({ tnMapping, className }: FiltersProps) => {
- const { dataLoading, filters } = useViewProjectContext()
+ const { activeTab, dataLoading, filters } = useViewProjectContext()
const { t } = useTranslation('common')
const [searchParams] = useSearchParams()
+ const { supported, unsupported } = useMemo(
+ () => splitProjectViewFiltersByTab(filters, activeTab),
+ [activeTab, filters],
+ )
const filterlessSearch = useMemo(() => {
const newSearchParams = new URLSearchParams(searchParams.toString())
@@ -307,9 +312,9 @@ const Filters = ({ tnMapping, className }: FiltersProps) => {
<div className='flex min-w-0 flex-1 items-center gap-1'>
<FunnelIcon className='size-5 shrink-0 text-gray-500 dark:text-gray-400' />
<div className='flex flex-wrap'>
- {_map(filters, (props) => {
- const { column, filter } = props
- const key = `${column}${filter}`
+ {_map(supported, (props) => {
+ const { column, filter, isExclusive, isContains } = props
+ const key = `${column}-${filter}-${isExclusive}-${isContains}`
return (
<Filter
@@ -321,7 +326,24 @@ const Filters = ({ tnMapping, className }: FiltersProps) => {
/>
)
})}
+ {_map(unsupported, (props) => {
+ const { column, filter, isExclusive, isContains } = props
+ const key = `unsupported-${column}-${filter}-${isExclusive}-${isContains}`
+
+ return (
+ <span key={key} className='opacity-60'>
+ <Filter tnMapping={tnMapping} removable {...props} />
+ </span>
+ )
+ })}
</div>
+ {unsupported.length > 0 ? (
+ <span className='ml-1 shrink-0 rounded-md bg-amber-50 px-1.5 py-0.5 text-[11px] font-medium text-amber-700 ring-1 ring-amber-200 ring-inset dark:bg-amber-500/10 dark:text-amber-300 dark:ring-amber-400/20'>
+ {t('project.segmentUnsupportedFilters', {
+ count: unsupported.length,
+ })}
+ </span>
+ ) : null}
</div>
<Link
title={t('project.resetFilters')}
diff --git a/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx b/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
new file mode 100644
index 000000000..79ee0a085
--- /dev/null
+++ b/web/app/pages/Project/View/components/ProjectViewHeaderActions.tsx
@@ -0,0 +1,325 @@
+import cx from 'clsx'
+import {
+ BookmarkSimpleIcon,
+ DownloadSimpleIcon,
+ PencilIcon,
+ TrashIcon,
+} from '@phosphor-icons/react'
+import React, { useEffect, useMemo, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useFetcher, useSearchParams } from 'react-router'
+import { toast } from 'sonner'
+
+import { PROJECT_TABS } from '~/lib/constants'
+import { useCurrentProject } from '~/providers/CurrentProjectProvider'
+import { ProjectViewActionData } from '~/routes/projects.$id'
+import Dropdown from '~/ui/Dropdown'
+import { Text } from '~/ui/Text'
+import { trackCustom } from '~/utils/analytics'
+
+import { ProjectView } from '../interfaces/traffic'
+import {
+ splitProjectViewFiltersByTab,
+ supportsProjectViewSegments,
+} from '../utils/projectViewSegments'
+import { useViewProjectContext } from '../ViewProject'
+
+import { getFiltersUrlParams } from './SearchFilters'
+
+export interface ExportType {
+ label: string
+ onClick: () => void
+}
+
+interface ProjectViewHeaderActionsProps {
+ tnMapping: Record<string, string>
+ exportTypes?: ExportType[]
+ extraActions?: React.ReactNode
+}
+
+type AddViewItem = {
+ id: 'add-a-view'
+ name: string
+ createView: true
+}
+
+type EmptyViewItem = {
+ id: 'no-views'
+ name: string
+ notClickable: true
+}
+
+type ProjectViewMenuItem = ProjectView | AddViewItem | EmptyViewItem
+
+const isAddViewItem = (item: ProjectViewMenuItem): item is AddViewItem =>
+ 'createView' in item
+
+const isEmptyViewItem = (item: ProjectViewMenuItem): item is EmptyViewItem =>
+ 'notClickable' in item
+
+const iconButtonClassName =
+ 'rounded-md p-1 hover:bg-gray-50 hover:text-gray-900 dark:hover:bg-slate-900 dark:hover:text-slate-200'
+
+const dropdownButtonClassName =
+ '!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-900 focus:z-10 focus:outline-hidden focus:ring-1 focus:ring-slate-900 dark:focus:ring-slate-300'
+
+const ProjectViewHeaderActions = ({
+ tnMapping,
+ exportTypes = [],
+ extraActions,
+}: ProjectViewHeaderActionsProps) => {
+ const { allowedToManage } = useCurrentProject()
+ const {
+ activeTab,
+ dataLoading,
+ filters,
+ projectViews,
+ projectViewsLoading,
+ loadProjectViews,
+ setProjectViewToUpdate,
+ setIsAddAViewOpened,
+ } = useViewProjectContext()
+ const { t } = useTranslation('common')
+ const [searchParams, setSearchParams] = useSearchParams()
+ const deleteFetcher = useFetcher<ProjectViewActionData>()
+ const hasHandledDelete = useRef(false)
+ const showSegments = supportsProjectViewSegments(activeTab)
+ const isDeleting = deleteFetcher.state !== 'idle'
+
+ const segmentItems = useMemo<ProjectViewMenuItem[]>(() => {
+ const items: ProjectViewMenuItem[] = [...projectViews]
+
+ if (allowedToManage) {
+ items.push({
+ id: 'add-a-view',
+ name: t('project.addASegment'),
+ createView: true,
+ })
+ } else if (projectViews.length === 0) {
+ items.push({
+ id: 'no-views',
+ name: t('project.noSegmentsYet'),
+ notClickable: true,
+ })
+ }
+
+ return items
+ }, [allowedToManage, projectViews, t])
+
+ useEffect(() => {
+ if (deleteFetcher.state === 'submitting') {
+ hasHandledDelete.current = false
+ }
+ }, [deleteFetcher.state])
+
+ useEffect(() => {
+ if (
+ deleteFetcher.state === 'idle' &&
+ deleteFetcher.data?.intent === 'delete-project-view' &&
+ !hasHandledDelete.current
+ ) {
+ hasHandledDelete.current = true
+
+ if (deleteFetcher.data.success) {
+ toast.success(t('apiNotifications.segmentDeleted'))
+ loadProjectViews(true)
+ } else if (deleteFetcher.data.error) {
+ toast.error(deleteFetcher.data.error)
+ }
+ }
+ }, [deleteFetcher.state, deleteFetcher.data, loadProjectViews, t])
+
+ const getFilterColumnLabel = (column: string) => {
+ return (
+ tnMapping[column] ||
+ t(`project.mapping.${column}`, {
+ defaultValue: column,
+ })
+ )
+ }
+
+ return (
+ <>
+ {showSegments ? (
+ <Dropdown
+ header={t('project.segments')}
+ onClick={() => loadProjectViews()}
+ loading={projectViewsLoading || projectViewsLoading === null}
+ items={segmentItems}
+ title={[
+ <BookmarkSimpleIcon key='bookmark-icon' className='h-5 w-5' />,
+ ]}
+ labelExtractor={(item, close) => {
+ if (isAddViewItem(item)) {
+ return item.name
+ }
+
+ if (isEmptyViewItem(item)) {
+ return <Text colour='secondary'>{item.name}</Text>
+ }
+
+ const { supported, unsupported } = splitProjectViewFiltersByTab(
+ item.filters || [],
+ activeTab,
+ )
+ const hasTrafficMetrics = (item.customEvents?.length || 0) > 0
+ const trafficMetricsSkipped =
+ activeTab !== PROJECT_TABS.traffic && hasTrafficMetrics
+ const canApply =
+ supported.length > 0 ||
+ (activeTab === PROJECT_TABS.traffic && hasTrafficMetrics)
+ const unsupportedTitle = unsupported
+ .map(({ column }) => getFilterColumnLabel(column))
+ .join(', ')
+
+ return (
+ <div
+ className={cx(
+ 'flex min-w-[230px] items-center justify-between gap-4',
+ {
+ 'cursor-wait': dataLoading,
+ },
+ )}
+ >
+ <div
+ className={cx('min-w-0', {
+ 'opacity-60': !canApply,
+ })}
+ >
+ <span className='block truncate'>{item.name}</span>
+ {unsupported.length > 0 || trafficMetricsSkipped ? (
+ <div className='mt-1 flex flex-wrap gap-1'>
+ {unsupported.length > 0 ? (
+ <span
+ title={unsupportedTitle}
+ className='rounded-md bg-amber-50 px-1.5 py-0.5 text-[11px] font-medium text-amber-700 ring-1 ring-amber-200 ring-inset dark:bg-amber-500/10 dark:text-amber-300 dark:ring-amber-400/20'
+ >
+ {t('project.segmentUnsupportedFilters', {
+ count: unsupported.length,
+ })}
+ </span>
+ ) : null}
+ {trafficMetricsSkipped ? (
+ <span className='rounded-md bg-gray-50 px-1.5 py-0.5 text-[11px] font-medium text-gray-600 ring-1 ring-gray-200 ring-inset dark:bg-slate-800/60 dark:text-gray-300 dark:ring-slate-700/60'>
+ {t('project.segmentTrafficMetricsOnly')}
+ </span>
+ ) : null}
+ </div>
+ ) : null}
+ {!canApply && (item.filters?.length || 0) > 0 ? (
+ <span className='mt-1 block text-[11px] font-medium text-gray-500 dark:text-gray-400'>
+ {t('project.segmentNoCompatibleFilters')}
+ </span>
+ ) : null}
+ </div>
+ {allowedToManage ? (
+ <div className='flex shrink-0 cursor-pointer space-x-1'>
+ <button
+ onClick={(e) => {
+ e.stopPropagation()
+ setProjectViewToUpdate(item)
+ close()
+ setIsAddAViewOpened(true)
+ }}
+ aria-label={t('common.settings')}
+ className={iconButtonClassName}
+ >
+ <PencilIcon className='size-3' />
+ </button>
+ <deleteFetcher.Form method='post' className='inline'>
+ <input
+ type='hidden'
+ name='intent'
+ value='delete-project-view'
+ />
+ <input type='hidden' name='viewId' value={item.id} />
+ <button
+ type='submit'
+ onClick={(e) => {
+ e.stopPropagation()
+ close()
+ }}
+ disabled={isDeleting}
+ aria-label={t('common.delete')}
+ className={cx(iconButtonClassName, {
+ 'cursor-not-allowed opacity-50': isDeleting,
+ })}
+ >
+ <TrashIcon className='size-3' />
+ </button>
+ </deleteFetcher.Form>
+ </div>
+ ) : null}
+ </div>
+ )
+ }}
+ keyExtractor={(item) => item.id}
+ onSelect={(item, e) => {
+ if (isAddViewItem(item)) {
+ e?.stopPropagation()
+ setIsAddAViewOpened(true)
+ return
+ }
+
+ if (isEmptyViewItem(item)) {
+ return
+ }
+
+ const { supported } = splitProjectViewFiltersByTab(
+ item.filters || [],
+ activeTab,
+ )
+ const hasSupportedFilters = supported.length > 0
+ const hasTrafficMetrics =
+ activeTab === PROJECT_TABS.traffic &&
+ (item.customEvents?.length || 0) > 0
+
+ if (!hasSupportedFilters && !hasTrafficMetrics) {
+ e?.preventDefault()
+ return
+ }
+
+ const newParams = hasSupportedFilters
+ ? getFiltersUrlParams(filters, supported, true, searchParams)
+ : new URLSearchParams(searchParams)
+
+ if (hasTrafficMetrics) {
+ newParams.set('metrics', JSON.stringify(item.customEvents))
+ }
+
+ setSearchParams(newParams)
+ }}
+ chevron='mini'
+ buttonClassName={dropdownButtonClassName}
+ headless
+ />
+ ) : null}
+
+ {extraActions}
+
+ {exportTypes.length > 0 ? (
+ <Dropdown
+ header={t('project.exportData')}
+ items={exportTypes}
+ title={[
+ <DownloadSimpleIcon key='download-icon' className='h-5 w-5' />,
+ ]}
+ labelExtractor={(item) => item.label}
+ keyExtractor={(item) => item.label}
+ onSelect={(item) => {
+ trackCustom('DASHBOARD_EXPORT', {
+ type: 'csv',
+ })
+
+ item.onClick()
+ }}
+ chevron='mini'
+ buttonClassName={dropdownButtonClassName}
+ headless
+ />
+ ) : null}
+ </>
+ )
+}
+
+export default ProjectViewHeaderActions
diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsx
index cea36d383..19ce47fe7 100644
--- a/web/app/pages/Project/View/components/SearchFilters.tsx
+++ b/web/app/pages/Project/View/components/SearchFilters.tsx
@@ -126,6 +126,7 @@ interface SearchFiltersProps {
tnMapping: Record<string, string>
filters: FilterType[]
type: 'traffic' | 'errors'
+ filterOptions?: string[]
}
const SearchFilters = ({
@@ -134,6 +135,7 @@ const SearchFilters = ({
tnMapping,
filters,
type,
+ filterOptions,
}: SearchFiltersProps) => {
const { id } = useCurrentProject()
const { theme } = useTheme()
@@ -151,8 +153,11 @@ const SearchFilters = ({
const { fetchFilters, fetchErrorsFilters, fetchVersionFilters } =
useFiltersProxy()
- const panelOptions =
- type === 'traffic' ? FILTERS_PANELS_ORDER : ERRORS_FILTERS_PANELS_ORDER
+ const panelOptions = filterOptions?.length
+ ? filterOptions
+ : type === 'traffic'
+ ? FILTERS_PANELS_ORDER
+ : ERRORS_FILTERS_PANELS_ORDER
const fetchFilterValues = useCallback(
async (column: string) => {
diff --git a/web/app/pages/Project/View/utils/projectViewSegments.ts b/web/app/pages/Project/View/utils/projectViewSegments.ts
new file mode 100644
index 000000000..dc51ae4a0
--- /dev/null
+++ b/web/app/pages/Project/View/utils/projectViewSegments.ts
@@ -0,0 +1,139 @@
+import {
+ ERRORS_FILTERS_PANELS_ORDER,
+ FILTERS_PANELS_ORDER,
+ PROJECT_TABS,
+} from '~/lib/constants'
+
+import { Filter } from '../interfaces/traffic'
+
+export type ProjectTab = keyof typeof PROJECT_TABS
+
+const TRAFFIC_FILTER_COLUMNS = [
+ ...FILTERS_PANELS_ORDER,
+ 'refn',
+ 'ev',
+ 'ev:key',
+ 'tag:key',
+ 'tag:value',
+]
+
+const PERFORMANCE_FILTER_COLUMNS = [
+ 'pg',
+ 'host',
+ 'cc',
+ 'rg',
+ 'ct',
+ 'dv',
+ 'br',
+ 'brv',
+ 'isp',
+ 'og',
+ 'ut',
+ 'ctp',
+]
+
+const ERRORS_FILTER_COLUMNS = [
+ 'host',
+ ...ERRORS_FILTERS_PANELS_ORDER,
+ 'entryPage',
+ 'exitPage',
+ 'tag:key',
+ 'tag:value',
+]
+
+const CAPTCHA_FILTER_COLUMNS = ['cc', 'br', 'os', 'dv']
+
+const SEO_FILTER_COLUMNS = ['pg', 'keywords', 'cc', 'dv']
+
+const ANALYTICS_TABS = new Set<ProjectTab>([
+ PROJECT_TABS.traffic,
+ PROJECT_TABS.sessions,
+ PROJECT_TABS.profiles,
+])
+
+const FILTER_OPTIONS_BY_TAB: Partial<Record<ProjectTab, string[]>> = {
+ [PROJECT_TABS.traffic]: FILTERS_PANELS_ORDER,
+ [PROJECT_TABS.performance]: PERFORMANCE_FILTER_COLUMNS,
+ [PROJECT_TABS.seo]: ['pg', 'cc', 'dv'],
+ [PROJECT_TABS.sessions]: FILTERS_PANELS_ORDER,
+ [PROJECT_TABS.profiles]: FILTERS_PANELS_ORDER,
+ [PROJECT_TABS.errors]: ['host', ...ERRORS_FILTERS_PANELS_ORDER],
+ [PROJECT_TABS.captcha]: CAPTCHA_FILTER_COLUMNS,
+}
+
+const supportsDynamicFilter = (column: string, tab: ProjectTab) => {
+ if (column.startsWith('ev:key:')) {
+ return ANALYTICS_TABS.has(tab)
+ }
+
+ if (column.startsWith('tag:key:')) {
+ return ANALYTICS_TABS.has(tab) || tab === PROJECT_TABS.errors
+ }
+
+ return false
+}
+
+const getSupportedColumns = (tab: ProjectTab) => {
+ if (ANALYTICS_TABS.has(tab)) {
+ return TRAFFIC_FILTER_COLUMNS
+ }
+
+ if (tab === PROJECT_TABS.performance) {
+ return PERFORMANCE_FILTER_COLUMNS
+ }
+
+ if (tab === PROJECT_TABS.errors) {
+ return ERRORS_FILTER_COLUMNS
+ }
+
+ if (tab === PROJECT_TABS.captcha) {
+ return CAPTCHA_FILTER_COLUMNS
+ }
+
+ if (tab === PROJECT_TABS.seo) {
+ return SEO_FILTER_COLUMNS
+ }
+
+ return []
+}
+
+export const isProjectTabFilterSupported = (
+ filter: Pick<Filter, 'column'>,
+ tab: ProjectTab,
+) => {
+ if (supportsDynamicFilter(filter.column, tab)) {
+ return true
+ }
+
+ return getSupportedColumns(tab).includes(filter.column)
+}
+
+export const splitProjectViewFiltersByTab = (
+ filters: Filter[] = [],
+ tab: ProjectTab,
+) => {
+ const supported: Filter[] = []
+ const unsupported: Filter[] = []
+
+ filters.forEach((filter) => {
+ if (isProjectTabFilterSupported(filter, tab)) {
+ supported.push(filter)
+ } else {
+ unsupported.push(filter)
+ }
+ })
+
+ return { supported, unsupported }
+}
+
+export const getProjectViewFilterOptions = (tab: ProjectTab) => {
+ return FILTER_OPTIONS_BY_TAB[tab] || []
+}
+
+export const supportsProjectViewSegments = (tab: ProjectTab) => {
+ return getSupportedColumns(tab).length > 0
+}
+
+export const getProjectViewCreateType = (tab: ProjectTab) => {
+ return tab === PROJECT_TABS.performance ? 'performance' : 'traffic'
+}
diff --git a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx
index ccbee6fb7..e48d0546b 100644
--- a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx
+++ b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx
@@ -29,6 +29,7 @@ import LoadingBar from '~/ui/LoadingBar'
import CCRow from '../../View/components/CCRow'
import DashboardHeader from '../../View/components/DashboardHeader'
import Filters from '../../View/components/Filters'
+import ProjectViewHeaderActions from '../../View/components/ProjectViewHeaderActions'
import { Filter } from '../../View/interfaces/traffic'
import { Panel } from '../../View/Panels'
import { parseFilters } from '../../View/utils/filters'
@@ -234,7 +235,10 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {
if (isPanelsDataEmpty && !dataLoading) {
return (
<>
- <DashboardHeader showLiveVisitors={false} />
+ <DashboardHeader
+ showLiveVisitors={false}
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
+ />
<NoCaptchaEvents filters={filters} />
</>
)
@@ -242,7 +246,10 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {
return (
<>
- <DashboardHeader showLiveVisitors={false} />
+ <DashboardHeader
+ showLiveVisitors={false}
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
+ />
<div ref={ref}>
{dataLoading && hasExistingData ? <LoadingBar /> : null}
<div>
diff --git a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
index 1f21b5645..07d736d21 100644
--- a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
+++ b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
@@ -66,6 +66,7 @@ import CCRow from '~/pages/Project/View/components/CCRow'
import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
import Filters from '~/pages/Project/View/components/Filters'
import NoEvents from '~/pages/Project/View/components/NoEvents'
+import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
import { Panel, MetadataPanel } from '~/pages/Project/View/Panels'
import { ERROR_FILTERS_MAPPING } from '~/pages/Project/View/utils/filters'
import {
@@ -1324,7 +1325,12 @@ const ErrorsViewInner = ({ deferredData }: ErrorsViewInnerProps) => {
showLiveVisitors
showSearchButton={false}
hideTimeBucket
- rightContent={filtersDropdown}
+ rightContent={
+ <ProjectViewHeaderActions
+ tnMapping={tnMapping}
+ extraActions={filtersDropdown}
+ />
+ }
/>
{(overviewLoading || errorsLoading) && (overview || !_isEmpty(errors)) ? (
diff --git a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
index 3f162948c..6a3c1dd76 100644
--- a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
+++ b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
@@ -40,6 +40,7 @@ import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
import Filters from '~/pages/Project/View/components/Filters'
import { MapLoader } from '~/pages/Project/View/components/MapLoader'
import NoEvents from '~/pages/Project/View/components/NoEvents'
+import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
import { Panel } from '~/pages/Project/View/Panels'
import {
useViewProjectContext,
@@ -389,7 +390,9 @@ const PerformanceViewInner = ({
if (isPanelsDataEmpty) {
return (
<>
- <DashboardHeader />
+ <DashboardHeader
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
+ />
<NoEvents filters={filters} />
</>
)
@@ -435,7 +438,9 @@ const PerformanceViewInner = ({
return (
<>
- <DashboardHeader />
+ <DashboardHeader
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
+ />
{dataLoading && !isPanelsDataEmpty ? <LoadingBar /> : null}
<div className={cx({ hidden: isPanelsDataEmpty })}>
{!isPanelsDataEmpty ? (
diff --git a/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx b/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx
index dcb801917..5fb203404 100644
--- a/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx
+++ b/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx
@@ -20,6 +20,7 @@ import NoProfiles from '~/pages/Project/tabs/Profiles/components/NoProfiles'
import { ProfileDetails } from '~/pages/Project/tabs/Profiles/ProfileDetails'
import { Profiles } from '~/pages/Project/tabs/Profiles/Profiles'
import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
+import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
import {
useViewProjectContext,
useRefreshTriggers,
@@ -416,6 +417,7 @@ const ProfilesView = ({ tnMapping }: ProfilesViewProps) => {
<>
<DashboardHeader
showLiveVisitors
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
profileTypeFilter={profileTypeFilter}
onProfileTypeFilterChange={(type) => {
setProfileTypeFilter(type)
diff --git a/web/app/pages/Project/tabs/SEO/SEOView.tsx b/web/app/pages/Project/tabs/SEO/SEOView.tsx
index b9b0a2dcb..a494f7e55 100644
--- a/web/app/pages/Project/tabs/SEO/SEOView.tsx
+++ b/web/app/pages/Project/tabs/SEO/SEOView.tsx
@@ -30,6 +30,7 @@ import BillboardChart from '~/ui/BillboardChart'
import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
import { MainChart } from '~/pages/Project/View/components/MainChart'
import Filters from '~/pages/Project/View/components/Filters'
+import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
import {
Panel,
PanelContainer,
@@ -511,7 +512,12 @@ const SEOViewInner = ({ projectId, tnMapping }: SEOViewProps) => {
<DashboardHeader
showSearchButton={false}
showRefreshButton={false}
- rightContent={manualRefreshButton}
+ rightContent={
+ <ProjectViewHeaderActions
+ tnMapping={tnMapping}
+ extraActions={manualRefreshButton}
+ />
+ }
timeBucketSelectorItems={seoPeriodPairs}
/>
<div className='flex min-h-[400px] items-center justify-center'>
@@ -527,7 +533,12 @@ const SEOViewInner = ({ projectId, tnMapping }: SEOViewProps) => {
<DashboardHeader
showSearchButton={false}
showRefreshButton={false}
- rightContent={manualRefreshButton}
+ rightContent={
+ <ProjectViewHeaderActions
+ tnMapping={tnMapping}
+ extraActions={manualRefreshButton}
+ />
+ }
timeBucketSelectorItems={seoPeriodPairs}
/>
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
@@ -574,7 +585,12 @@ const SEOViewInner = ({ projectId, tnMapping }: SEOViewProps) => {
<DashboardHeader
showSearchButton={false}
showRefreshButton={false}
- rightContent={manualRefreshButton}
+ rightContent={
+ <ProjectViewHeaderActions
+ tnMapping={tnMapping}
+ extraActions={manualRefreshButton}
+ />
+ }
timeBucketSelectorItems={seoPeriodPairs}
/>
{filters.length > 0 ? (
diff --git a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
index e43ad3018..e75c3eff3 100644
--- a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
+++ b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
@@ -25,6 +25,7 @@ import { SessionDetailView } from '~/pages/Project/tabs/Sessions/SessionDetailVi
import { Sessions } from '~/pages/Project/tabs/Sessions/Sessions'
import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
import Filters from '~/pages/Project/View/components/Filters'
+import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
import {
useViewProjectContext,
useRefreshTriggers,
@@ -385,7 +386,10 @@ const SessionsViewInner = ({
// Sessions List View
return (
<>
- <DashboardHeader showLiveVisitors />
+ <DashboardHeader
+ showLiveVisitors
+ rightContent={<ProjectViewHeaderActions tnMapping={tnMapping} />}
+ />
{sessionsLoading && !_isEmpty(sessions) ? <LoadingBar /> : null}
<div>
{!_isEmpty(sessions) ? (
diff --git a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx
index cee690f76..ac3483364 100644
--- a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx
+++ b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx
@@ -1,221 +1,13 @@
-import cx from 'clsx'
-import _filter from 'lodash/filter'
-import _isEmpty from 'lodash/isEmpty'
-import {
- BookmarkSimpleIcon,
- DownloadSimpleIcon,
- PencilIcon,
- TrashIcon,
-} from '@phosphor-icons/react'
-import React, { useEffect, useRef } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useSearchParams, useFetcher } from 'react-router'
-import { toast } from 'sonner'
-
-import { ProjectViewActionData } from '~/routes/projects.$id'
-import Dropdown from '~/ui/Dropdown'
-import { Text } from '~/ui/Text'
-import { trackCustom } from '~/utils/analytics'
-
-import { getFiltersUrlParams } from '../../View/components/SearchFilters'
-import { Filter, ProjectView } from '../../View/interfaces/traffic'
-
-interface ExportType {
- label: string
- onClick: () => void
-}
+import ProjectViewHeaderActions, {
+ ExportType,
+} from '../../View/components/ProjectViewHeaderActions'
interface TrafficHeaderActionsProps {
- // Segments dropdown props
- projectViews: ProjectView[]
- projectViewsLoading: boolean | null
- loadProjectViews: (forced?: boolean) => void
- setProjectViewToUpdate: (view: ProjectView | undefined) => void
- setIsAddAViewOpened: (value: boolean) => void
- filters: Filter[]
- allowedToManage: boolean
- dataLoading: boolean
-
- // Export dropdown props
exportTypes: ExportType[]
- panelsData: any
}
-const TrafficHeaderActions = ({
- projectViews,
- projectViewsLoading,
- loadProjectViews,
- setProjectViewToUpdate,
- setIsAddAViewOpened,
- filters,
- allowedToManage,
- dataLoading,
- exportTypes,
-}: TrafficHeaderActionsProps) => {
- const { t } = useTranslation('common')
- const [searchParams, setSearchParams] = useSearchParams()
- const deleteFetcher = useFetcher<ProjectViewActionData>()
- const isDeleting = deleteFetcher.state !== 'idle'
- const hasHandledDelete = useRef(false)
-
- useEffect(() => {
- if (deleteFetcher.state === 'submitting') {
- hasHandledDelete.current = false
- }
- }, [deleteFetcher.state])
-
- useEffect(() => {
- if (
- deleteFetcher.state === 'idle' &&
- deleteFetcher.data?.intent === 'delete-project-view' &&
- !hasHandledDelete.current
- ) {
- hasHandledDelete.current = true
- if (deleteFetcher.data.success) {
- toast.success(t('apiNotifications.segmentDeleted'))
- loadProjectViews(true)
- } else if (deleteFetcher.data.error) {
- toast.error(deleteFetcher.data.error)
- }
- }
- }, [deleteFetcher.state, deleteFetcher.data, loadProjectViews, t])
-
- return (
- <>
- {/* Segments Dropdown */}
- <Dropdown
- header={t('project.segments')}
- onClick={() => loadProjectViews()}
- loading={projectViewsLoading || projectViewsLoading === null}
- items={_filter(
- [
- ...projectViews,
- allowedToManage && {
- id: 'add-a-view',
- name: t('project.addASegment'),
- createView: true,
- },
- !allowedToManage &&
- _isEmpty(projectViews) && {
- id: 'no-views',
- name: t('project.noSegmentsYet'),
- notClickable: true,
- },
- ],
- (x) => !!x,
- )}
- title={[<BookmarkSimpleIcon key='bookmark-icon' className='h-5 w-5' />]}
- labelExtractor={(item, close) => {
- // @ts-expect-error
- if (item.createView) {
- return item.name
- }
-
- if (item.id === 'no-views') {
- return <Text colour='secondary'>{item.name}</Text>
- }
-
- return (
- <div
- className={cx('flex items-center justify-between space-x-4', {
- 'cursor-wait': dataLoading,
- })}
- >
- <span>{item.name}</span>
- {allowedToManage ? (
- <div className='flex cursor-pointer space-x-1'>
- <button
- onClick={(e) => {
- e.stopPropagation()
- setProjectViewToUpdate(item)
- close()
- setIsAddAViewOpened(true)
- }}
- aria-label={t('common.settings')}
- className='rounded-md p-1 hover:bg-gray-50 hover:text-gray-900 dark:hover:bg-slate-900 dark:hover:text-slate-200'
- >
- <PencilIcon className='size-3' />
- </button>
- <deleteFetcher.Form method='post' className='inline'>
- <input
- type='hidden'
- name='intent'
- value='delete-project-view'
- />
- <input type='hidden' name='viewId' value={item.id} />
- <button
- type='submit'
- onClick={(e) => {
- e.stopPropagation()
- close()
- }}
- disabled={isDeleting}
- aria-label={t('common.delete')}
- className={cx(
- 'rounded-md p-1 hover:bg-gray-50 hover:text-gray-900 dark:hover:bg-slate-900 dark:hover:text-slate-200',
- {
- 'cursor-not-allowed opacity-50': isDeleting,
- },
- )}
- >
- <TrashIcon className='size-3' />
- </button>
- </deleteFetcher.Form>
- </div>
- ) : null}
- </div>
- )
- }}
- keyExtractor={(item) => item.id}
- onSelect={(item: ProjectView, e) => {
- // @ts-expect-error
- if (item.createView) {
- e?.stopPropagation()
- setIsAddAViewOpened(true)
-
- return
- }
-
- const hasFilters = item.filters && !_isEmpty(item.filters)
- const hasMetrics = item.customEvents && !_isEmpty(item.customEvents)
-
- if (hasFilters || hasMetrics) {
- let newParams = hasFilters
- ? getFiltersUrlParams(filters, item.filters!, true, searchParams)
- : new URLSearchParams(searchParams)
-
- if (hasMetrics) {
- newParams.set('metrics', JSON.stringify(item.customEvents))
- }
-
- setSearchParams(newParams)
- }
- }}
- 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-900 focus:z-10 focus:outline-hidden focus:ring-1 focus:ring-slate-900 dark:focus:ring-slate-300'
- headless
- />
-
- {/* Export Dropdown */}
- <Dropdown
- header={t('project.exportData')}
- items={exportTypes}
- title={[<DownloadSimpleIcon key='download-icon' className='h-5 w-5' />]}
- labelExtractor={(item) => item.label}
- keyExtractor={(item) => item.label}
- onSelect={(item) => {
- trackCustom('DASHBOARD_EXPORT', {
- type: 'csv',
- })
-
- 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-900 focus:z-10 focus:outline-hidden focus:ring-1 focus:ring-slate-900 dark:focus:ring-slate-300'
- headless
- />
- </>
- )
+const TrafficHeaderActions = ({ exportTypes }: TrafficHeaderActionsProps) => {
+ return <ProjectViewHeaderActions tnMapping={{}} exportTypes={exportTypes} />
}
export default TrafficHeaderActions
diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
index 863434212..c1ed00c3b 100644
--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
@@ -56,19 +56,18 @@ import PageLinkRow from '~/pages/Project/tabs/Traffic/PageLinkRow'
import RefRow from '~/pages/Project/tabs/Traffic/RefRow'
import { SessionsDrawer } from '~/pages/Project/tabs/Traffic/SessionsDrawer'
import { TrafficChart } from '~/pages/Project/tabs/Traffic/TrafficChart'
-import TrafficHeaderActions from '~/pages/Project/tabs/Traffic/TrafficHeaderActions'
import UserFlow from '~/pages/Project/tabs/Traffic/UserFlow'
import CCRow from '~/pages/Project/View/components/CCRow'
import { ChartContextMenu } from '~/pages/Project/View/components/ChartContextMenu'
import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
import Filters from '~/pages/Project/View/components/Filters'
import NoEvents from '~/pages/Project/View/components/NoEvents'
+import ProjectViewHeaderActions from '~/pages/Project/View/components/ProjectViewHeaderActions'
import WaitingForAnEvent from '~/pages/Project/View/components/WaitingForAnEvent'
import {
Customs,
TrafficMeta,
Params,
- ProjectView,
ProjectViewCustomEvent,
Properties,
} from '~/pages/Project/View/interfaces/traffic'
@@ -126,12 +125,6 @@ interface TrafficViewProps {
onRemoveCustomMetric: (metricId: string) => void
resetCustomMetrics: () => void
mode: 'periodical' | 'cumulative'
- // Segment/View props
- projectViews: ProjectView[]
- projectViewsLoading: boolean | null
- loadProjectViews: (forced?: boolean) => void
- setProjectViewToUpdate: (view: ProjectView | undefined) => void
- setIsAddAViewOpened: (value: boolean) => void
}
interface DeferredTrafficData {
@@ -278,11 +271,6 @@ const TrafficViewInner = ({
onRemoveCustomMetric,
resetCustomMetrics,
mode: _mode,
- projectViews,
- projectViewsLoading,
- loadProjectViews,
- setProjectViewToUpdate,
- setIsAddAViewOpened,
deferredData,
}: TrafficViewInnerProps) => {
const { id, project, allowedToManage } = useCurrentProject()
@@ -922,17 +910,9 @@ const TrafficViewInner = ({
}
const headerRightContent = (
- <TrafficHeaderActions
- projectViews={projectViews}
- projectViewsLoading={projectViewsLoading}
- loadProjectViews={loadProjectViews}
- setProjectViewToUpdate={setProjectViewToUpdate}
- setIsAddAViewOpened={setIsAddAViewOpened}
- filters={filters}
- allowedToManage={allowedToManage}
- dataLoading={dataLoading}
+ <ProjectViewHeaderActions
+ tnMapping={tnMapping}
exportTypes={exportTypes}
- panelsData={panelsData}
/>
)
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index c777d194e..3edb50e55 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -1068,11 +1068,13 @@ export async function action({ request, params }: ActionFunctionArgs) {
case 'create-project-view': {
const name = formData.get('name')?.toString() || ''
- const type = formData.get('type')?.toString() || 'traffic'
+ const requestedType = formData.get('type')?.toString()
+ const type = requestedType === 'performance' ? 'performance' : 'traffic'
const filters = JSON.parse(formData.get('filters')?.toString() || '[]')
- const customEvents = JSON.parse(
- formData.get('customEvents')?.toString() || '[]',
- )
+ const customEvents =
+ type === 'traffic'
+ ? JSON.parse(formData.get('customEvents')?.toString() || '[]')
+ : []
const result = await serverFetch(request, `project/${projectId}/views`, {
method: 'POST',
diff --git a/web/public/locales/de.json b/web/public/locales/de.json
index 563d3cb7b..b8cfbc0fd 100644
--- a/web/public/locales/de.json
+++ b/web/public/locales/de.json
@@ -1566,6 +1566,9 @@
"segments": "Segmente",
"segmentName": "Segmentname",
"addASegment": "Segment hinzufügen",
+ "segmentUnsupportedFilters": "{{count}} hier übersprungen",
+ "segmentNoCompatibleFilters": "Keine kompatiblen Filter",
+ "segmentTrafficMetricsOnly": "Metriken: nur Traffic",
"loadMore": "Mehr laden",
"unknownCountry": "Unbekanntes Land",
"unknownUser": "Unbekannter Benutzer",
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index 5252730d0..f010dbfce 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -1566,6 +1566,9 @@
"segments": "Segments",
"segmentName": "Segment name",
"addASegment": "Add a segment",
+ "segmentUnsupportedFilters": "{{count}} skipped here",
+ "segmentNoCompatibleFilters": "No compatible filters",
+ "segmentTrafficMetricsOnly": "Metrics: Traffic only",
"loadMore": "Load more",
"unknownCountry": "Unknown country",
"unknownUser": "Unknown user",
diff --git a/web/public/locales/fr.json b/web/public/locales/fr.json
index 3fb50643d..6cc940d17 100644
--- a/web/public/locales/fr.json
+++ b/web/public/locales/fr.json
@@ -1566,6 +1566,9 @@
"segments": "Segments",
"segmentName": "Nom du segment",
"addASegment": "Ajouter un segment",
+ "segmentUnsupportedFilters": "{{count}} ignoré(s) ici",
+ "segmentNoCompatibleFilters": "Aucun filtre compatible",
+ "segmentTrafficMetricsOnly": "Métriques : Trafic uniquement",
"loadMore": "Afficher plus",
"unknownCountry": "Pays inconnu",
"unknownUser": "Utilisateur inconnu",
diff --git a/web/public/locales/pl.json b/web/public/locales/pl.json
index 14fa0469a..a6d5c5a33 100644
--- a/web/public/locales/pl.json
+++ b/web/public/locales/pl.json
@@ -1566,6 +1566,9 @@
"segments": "Segmenty",
"segmentName": "Nazwa segmentu",
"addASegment": "Dodaj segment",
+ "segmentUnsupportedFilters": "{{count}} pominięto tutaj",
+ "segmentNoCompatibleFilters": "Brak zgodnych filtrów",
+ "segmentTrafficMetricsOnly": "Metryki: tylko Ruch",
"loadMore": "Załaduj więcej",
"unknownCountry": "Nieznany kraj",
"unknownUser": "Nieznany użytkownik",
diff --git a/web/public/locales/uk.json b/web/public/locales/uk.json
index 4f0ddca17..7ae86152c 100644
--- a/web/public/locales/uk.json
+++ b/web/public/locales/uk.json
@@ -1566,6 +1566,9 @@
"segments": "Сегменти",
"segmentName": "Назва сегмента",
"addASegment": "Додати сегмент",
+ "segmentUnsupportedFilters": "{{count}} пропущено тут",
+ "segmentNoCompatibleFilters": "Немає сумісних фільтрів",
+ "segmentTrafficMetricsOnly": "Метрики: лише Трафік",
"loadMore": "Завантажити ще",
"unknownCountry": "Невідома країна",
"unknownUser": "Невідомий користувач",