📈 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
Added project view selector & CRUD modal
Blue Mouse20b6518fff87
diff --git a/app/pages/Project/View/Panels.tsx b/app/pages/Project/View/Panels.tsxindex b0586c1b4..6e6f9fb45 100644--- a/app/pages/Project/View/Panels.tsx+++ b/app/pages/Project/View/Panels.tsx@@ -48,7 +48,7 @@ import { iconClassName } from './ViewProject.helpers'import Spin from 'ui/icons/Spin'import { useTranslation } from 'react-i18next'import CustomEventsDropdown from './components/CustomEventsDropdown'-import { ICustoms, IProperties } from './interfaces/traffic'+import { ICustoms, IFilter, IProperties } from './interfaces/traffic'const ENTRIES_PER_PANEL = 5const ENTRIES_PER_CUSTOM_EVENTS_PANEL = 6@@ -306,7 +306,7 @@ interface IMetadata {customs: ICustomsproperties: IPropertieschartData: any- filters: any[]+ filters: IFilter[]onFilter: (column: string, filter: any, isExclusive?: boolean) => Promise<void>getCustomEventMetadata: (event: string) => Promise<any>getPropertyMetadata: (property: string) => Promise<any>@@ -1313,7 +1313,7 @@ interface IPanel {timezone?: string | nullactiveTab?: stringonFragmentChange?: (arg: number) => void- filters?: string[]+ filters?: IFilter[]projectPassword?: string}diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsxindex e755196c7..ea62cd55e 100644--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@ -18,6 +18,9 @@ import {GlobeAltIcon,UsersIcon,BugAntIcon,+ BookmarkIcon,+ TrashIcon,+ PencilIcon,} from '@heroicons/react/24/outline'import cx from 'clsx'import dayjs from 'dayjs'@@ -138,6 +141,8 @@ import {getError,updateErrorStatus,getPropertyMetadata,+ getProjectViews,+ deleteProjectView,} from 'api'import { getChartPrediction } from 'api/ai'import { Panel, Metadata } from './Panels'@@ -193,8 +198,9 @@ import { IError } from './interfaces/error'import NoErrorDetails from './components/NoErrorDetails'import WaitingForAnError from './components/WaitingForAnError'import NoSessionDetails from './components/NoSessionDetails'-import { ICustoms, IParams, IProperties, ITrafficLogResponse } from './interfaces/traffic'+import { ICustoms, IFilter, IParams, IProjectView, IProperties, ITrafficLogResponse } from './interfaces/traffic'import { trackCustom } from 'utils/analytics'+import AddAViewModal from './components/AddAViewModal'const SwetrixSDK = require('@swetrix/sdk')const CUSTOM_EV_DROPDOWN_MAX_VISIBLE_LENGTH = 32@@ -346,13 +352,13 @@ const ViewProject = ({// areFiltersParsed used for check filters is parsed from url. If we have query params in url, we parse it and set to state// when areFiltersParsed and areFiltersPerfParsed changed we call loadAnalytics or loadAnalyticsPerf and other func for load data// all state with Parsed in name is used for parse query params from url- const [areFiltersParsed, setAreFiltersParsed] = useState<boolean>(false)+ const [areFiltersParsed, setAreFiltersParsed] = useState(false)// similar areFiltersParsed but using for activeTab === 'performance'- const [areFiltersPerfParsed, setAreFiltersPerfParsed] = useState<boolean>(false)+ const [areFiltersPerfParsed, setAreFiltersPerfParsed] = useState(false)// similar areFiltersParsed and areFiltersPerfParsed but using for period- const [arePeriodParsed, setArePeriodParsed] = useState<boolean>(false)+ const [arePeriodParsed, setArePeriodParsed] = useState(false)// similar areFiltersParsed and areFiltersPerfParsed but using for timeBucket- const [areTimeBucketParsed, setAreTimeBucketParsed] = useState<boolean>(false)+ const [areTimeBucketParsed, setAreTimeBucketParsed] = useState(false)// panelsData is a data used for components <Panels /> and <Metadata />,// also using for logic with custom events on chart and export data like csv@@ -366,11 +372,12 @@ const ViewProject = ({const [overall, setOverall] = useState<Partial<IOverallObject>>({})const [overallPerformance, setOverallPerformance] = useState<Partial<IOverallPerformanceObject>>({})// isPanelsDataEmpty is a true we are display components <NoEvents /> and do not show dropdowns with activeChartMetrics- const [isPanelsDataEmpty, setIsPanelsDataEmpty] = useState<boolean>(false)- const [isForecastOpened, setIsForecastOpened] = useState<boolean>(false)- const [isNewFunnelOpened, setIsNewFunnelOpened] = useState<boolean>(false)+ const [isPanelsDataEmpty, setIsPanelsDataEmpty] = useState(false)+ const [isForecastOpened, setIsForecastOpened] = useState(false)+ const [isNewFunnelOpened, setIsNewFunnelOpened] = useState(false)+ const [isAddAViewOpened, setIsAddAViewOpened] = useState(false)// analyticsLoading is a boolean for show loader on chart- const [analyticsLoading, setAnalyticsLoading] = useState<boolean>(true)+ const [analyticsLoading, setAnalyticsLoading] = useState(true)// period using for logic with update data on chart. Set when user change period in dropdown and when we parse query params from urlconst [period, setPeriod] = useState<string>(projectViewPrefs ? projectViewPrefs[id]?.period || periodPairs[4].period : periodPairs[4].period,@@ -413,14 +420,11 @@ const ViewProject = ({() => !_some({ ...activeChartMetrics, ...activeChartMetricsCustomEvents }, (value) => value),[activeChartMetrics, activeChartMetricsCustomEvents],)- // filters - when we change filters we loading new data from api, update query url and update chart- const [filters, setFilters] = useState<any[]>([])- // similar filters but using for performance tab- const [filtersPerf, setFiltersPerf] = useState<any[]>([])- // similar filters but using for the sessions tab- const [filtersSessions, setFiltersSessions] = useState<any[]>([])+ const [filters, setFilters] = useState<IFilter[]>([])+ const [filtersPerf, setFiltersPerf] = useState<IFilter[]>([])+ const [filtersSessions, setFiltersSessions] = useState<IFilter[]>([])const [areFiltersSessionsParsed, setAreFiltersSessionsParsed] = useState<boolean>(false)- const [filtersErrors, setFiltersErrors] = useState<any[]>([])+ const [filtersErrors, setFiltersErrors] = useState<IFilter[]>([])const [areFiltersErrorsParsed, setAreFiltersErrorsParsed] = useState<boolean>(false)// isLoading is a true when we loading data from api@@ -470,8 +474,53 @@ const ViewProject = ({const [funnelToEdit, setFunnelToEdit] = useState<IFunnel | undefined>(undefined)const [funnelActionLoading, setFunnelActionLoading] = useState<boolean>(false)+ // null -> not loaded yet+ const [projectViews, setProjectViews] = useState<IProjectView[]>([])+ const [projectViewsLoading, setProjectViewsLoading] = useState<boolean | null>(null) // // null - not loaded, true - loading, false - loaded+ const [projectViewDeleting, setProjectViewDeleting] = useState(false)+ const [projectViewToUpdate, setProjectViewToUpdate] = useState<IProjectView | undefined>()+const mode = activeChartMetrics[CHART_METRICS_MAPPING.cumulativeMode] ? 'cumulative' : 'periodical'+ const loadProjectViews = async (forced?: boolean) => {+ if (!forced && projectViewsLoading !== null) {+ return+ }++ setProjectViewsLoading(true)++ try {+ const views = await getProjectViews(id, projectPassword)+ setProjectViews(views)+ } catch (reason: any) {+ console.error('[ERROR] (loadProjectViews)', reason)+ showError(reason)+ }++ setProjectViewsLoading(false)+ }++ const onProjectViewDelete = async (viewId: string) => {+ if (projectViewDeleting) {+ return+ }++ setProjectViewDeleting(true)++ try {+ await deleteProjectView(id, viewId)+ } catch (reason: any) {+ console.error('[ERROR] (deleteProjectView)', reason)+ showError(reason)+ setProjectViewDeleting(false)+ return+ }++ generateAlert(t('apiNotifications.viewDeleted'), 'success')+ await loadProjectViews(true)+ setProjectViewDeleting(false)+ }+const onFunnelCreate = async (name: string, steps: string[]) => {if (funnelActionLoading) {return@@ -949,7 +998,7 @@ const ViewProject = ({// activeTabLabel is a label for active tab. Using for title in dropdownconst activeTabLabel = useMemo(() => _find(tabs, (tab) => tab.id === activeTab)?.label, [tabs, activeTab])- const switchTrafficChartMetric = (pairID: string, conflicts: string[]) => {+ const switchTrafficChartMetric = (pairID: string, conflicts?: string[]) => {if (isConflicted(conflicts)) {generateAlert(t('project.conflictMetric'), 'error')return@@ -2209,17 +2258,11 @@ const ViewProject = ({}}- const onFilterSearch = (- items: {- column: string- filter: string[]- }[],- override: boolean,- ) => {+ const onFilterSearch = (items: IFilter[], override: boolean) => {const newFilters = _filter(items, (item) => {return !_isEmpty(item.filter)})- // @ts-ignore+ // @ts-expect-errorconst url = new URL(window.location)if (activeTab === PROJECT_TABS.performance) {@@ -3242,14 +3285,15 @@ const ViewProject = ({}, [])// check for conflicts in chart metrics in dropdown if conflicted disable some column of dropdown- const isConflicted = (conflicts: string[]) => {- const conflicted =- conflicts &&- _some(conflicts, (conflict) => {- const conflictPair = _find(chartMetrics, (metric) => metric.id === conflict)- return conflictPair && conflictPair.active- })- return conflicted+ const isConflicted = (conflicts?: string[]) => {+ if (!conflicts) {+ return false+ }++ return _some(conflicts, (conflict) => {+ const conflictPair = _find(chartMetrics, (metric) => metric.id === conflict)+ return conflictPair && conflictPair.active+ })}const cleanURLFilters = () => {@@ -3686,6 +3730,72 @@ const ViewProject = ({<MagnifyingGlassIcon className='h-5 w-5 stroke-2 text-gray-700 dark:text-gray-50' /></button></div>+ {activeTab === PROJECT_TABS.traffic && (+ <Dropdown+ header={t('project.views')}+ onClick={() => loadProjectViews()}+ loading={projectViewsLoading || projectViewsLoading === null}+ items={[+ ...projectViews,+ {+ id: 'add-a-view',+ name: t('project.addAView'),+ createView: true,+ },+ ]}+ title={[<BookmarkIcon key='bookmark-icon' className='h-5 w-5 stroke-2' />]}+ labelExtractor={(item, close) => {+ // @ts-expect-error+ if (item.createView) {+ return item.name+ }++ return (+ <span className='flex items-center justify-between space-x-4'>+ <span>{item.name}</span>+ <span className='flex space-x-2'>+ <PencilIcon+ className='size-4 hover:text-gray-900 dark:hover:text-gray-50'+ onClick={(e) => {+ e.stopPropagation()+ setProjectViewToUpdate(item)+ close()+ setIsAddAViewOpened(true)+ }}+ />+ <TrashIcon+ className={cx('size-4 hover:text-gray-900 dark:hover:text-gray-50', {+ 'cursor-not-allowed': projectViewDeleting,+ })}+ onClick={(e) => {+ e.stopPropagation()+ close()+ onProjectViewDelete(item.id)+ }}+ />+ </span>+ </span>+ )+ }}+ keyExtractor={(item) => item.id}+ onSelect={(item: IProjectView, e) => {+ // @ts-expect-error+ if (item.createView) {+ e?.stopPropagation()+ setIsAddAViewOpened(true)++ return+ }++ if (item.filters && !_isEmpty(item.filters)) {+ onFilterSearch(item.filters, true)+ }+ }}+ chevron='mini'+ buttonClassName='!p-2 rounded-md hover:bg-white hover:shadow-sm dark:hover:bg-slate-800 focus:z-10 focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 focus:dark:ring-gray-200 focus:dark:border-gray-200'+ headless+ />+ )}{activeTab !== PROJECT_TABS.funnels &&activeTab !== PROJECT_TABS.sessions &&activeTab !== PROJECT_TABS.errors && (@@ -3703,12 +3813,8 @@ const ViewProject = ({],(el) => !!el,)}- title={[<ArrowDownTrayIcon key='download-icon' className='h-5 w-5' />]}- labelExtractor={(item) => {- const { label } = item-- return label- }}+ title={[<ArrowDownTrayIcon key='download-icon' className='h-5 w-5 stroke-2' />]}+ labelExtractor={(item) => item.label}keyExtractor={(item) => item.label}onSelect={(item, e) => {if (item.lookingForMore) {@@ -3853,6 +3959,7 @@ const ViewProject = ({/>)}}+ buttonClassName='!px-2.5'selectItemClassName='group text-gray-700 dark:text-gray-50 dark:border-gray-800 dark:bg-slate-800 block text-sm cursor-pointer hover:bg-gray-200 dark:hover:bg-slate-700'keyExtractor={(pair) => pair.id}onSelect={({ id: pairID, conflicts }) => {@@ -3912,6 +4019,7 @@ const ViewProject = ({/>)}}+ buttonClassName='!px-2.5'selectItemClassName='group text-gray-700 dark:text-gray-50 dark:border-gray-800 dark:bg-slate-800 block text-sm cursor-pointer hover:bg-gray-200 dark:hover:bg-slate-700'keyExtractor={(pair) => pair.id}onSelect={({ id: pairID }) => {@@ -3953,6 +4061,7 @@ const ViewProject = ({onSelect={({ id: pairID }) => {setActiveChartMetricsPerf(pairID)}}+ buttonClassName='!px-2.5'chevron='mini'headless/>@@ -3972,6 +4081,7 @@ const ViewProject = ({onSelect={({ id: pairID }) => {onMeasureChange(pairID)}}+ buttonClassName='!px-2.5'chevron='mini'headless/>@@ -5037,6 +5147,23 @@ const ViewProject = ({: filters}/>+ <AddAViewModal+ projectPassword={projectPassword}+ showModal={isAddAViewOpened}+ setShowModal={(show) => {+ setIsAddAViewOpened(show)+ setProjectViewToUpdate(undefined)+ }}+ onSubmit={() => {+ setProjectViews([])+ setProjectViewsLoading(null)+ setProjectViewToUpdate(undefined)+ }}+ defaultView={projectViewToUpdate}+ showError={showError}+ pid={id}+ tnMapping={tnMapping}+ />{!embedded && <Footer authenticated={authenticated} minimal showDBIPMessage />}</>)}diff --git a/app/pages/Project/View/components/AddAViewModal.tsx b/app/pages/Project/View/components/AddAViewModal.tsxnew file mode 100644index 000000000..e97703700--- /dev/null+++ b/app/pages/Project/View/components/AddAViewModal.tsx@@ -0,0 +1,404 @@+import React, { useState, useEffect, useMemo, useCallback } from 'react'+import { useTranslation } from 'react-i18next'+import _isEmpty from 'lodash/isEmpty'+import _reduce from 'lodash/reduce'+import _filter from 'lodash/filter'+import _map from 'lodash/map'+import _find from 'lodash/find'++import Modal from 'ui/Modal'+import Select from 'ui/Select'+import Combobox from 'ui/Combobox'+import { FILTERS_PANELS_ORDER } from 'redux/constants'+import countries from 'utils/isoCountries'+import { getFilters, createProjectView, updateProjectView } from 'api'+import { Filter } from './Filters'+import Input from 'ui/Input'+import {+ IFilter,+ IProjectView,+ IProjectViewCustomEvent,+ ProjectViewCustomEventMetaValueType,+} from '../interfaces/traffic'+import { XMarkIcon } from '@heroicons/react/24/outline'++interface IAddAViewModal {+ projectPassword?: string+ onSubmit: () => void+ pid: string+ showModal: boolean+ setShowModal: (show: boolean) => void+ tnMapping: Record<string, string>+ showError: (message: string) => void+ defaultView?: IProjectView+}++const getLabelToTypeMap = (t: any): Record<string, string> =>+ _reduce(+ FILTERS_PANELS_ORDER,+ (acc, curr) => ({+ ...acc,+ [t(`project.mapping.${curr}`)]: curr,+ }),+ {},+ )++const InlineButton = ({ text, onClick }: { text: string; onClick: () => void }) => (+ <button+ type='button'+ onClick={onClick}+ className='mt-2 text-sm font-medium text-indigo-600 underline decoration-dashed hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500'+ >+ {text}+ </button>+)++interface IEditMetric {+ metric: Partial<IProjectViewCustomEvent>+ onChange: (key: keyof IProjectViewCustomEvent, value: any) => void+ onDelete: () => void+}++const EditMetric = ({ metric, onChange, onDelete }: IEditMetric) => {+ const { t } = useTranslation('common')++ const customEventTypes = useMemo(+ () => [+ {+ key: ProjectViewCustomEventMetaValueType.FLOAT,+ label: t('project.metaValueType.decimal'),+ },+ {+ key: ProjectViewCustomEventMetaValueType.INTEGER,+ label: t('project.metaValueType.integer'),+ },+ {+ key: ProjectViewCustomEventMetaValueType.STRING,+ label: t('project.metaValueType.text'),+ },+ ],+ [t],+ )++ const activeCustomEventType = useMemo(+ () => _find(customEventTypes, ({ key }) => key === metric.metaValueType)?.label,+ [customEventTypes, metric.metaValueType],+ )++ return (+ <div className='py-4'>+ <Input+ label={+ <p className='flex w-full items-center justify-between'>+ <span>{t('project.customEvent')}</span>+ <XMarkIcon+ role='button'+ aria-label='Delete custom event'+ className='size-5 w-full max-w-max cursor-pointer hover:text-gray-900 dark:hover:text-gray-50'+ onClick={onDelete}+ />+ </p>+ }+ value={metric.customEventName}+ onChange={({ target }) => {+ onChange('customEventName', target.value)+ }}+ // error={errors.name}+ />+ <div className='mt-2 flex items-center justify-between'>+ <Input+ label={t('project.metamapping.ev.key')}+ value={metric.metaKey}+ onChange={({ target }) => {+ onChange('metaKey', target.value)+ }}+ />+ <Input+ label={t('project.metamapping.ev.value')}+ value={metric.metaValue}+ onChange={({ target }) => {+ onChange('metaValue', target.value)+ }}+ />+ </div>+ <div className='mt-2'>+ <Select+ items={customEventTypes}+ keyExtractor={(item) => item.key}+ labelExtractor={(item) => item.label}+ onSelect={(selectedLabel) => {+ const key = _find(customEventTypes, ({ label }) => label === selectedLabel)?.key++ onChange('metaValueType', key)+ }}+ label={t('project.customMetricType')}+ title={activeCustomEventType}+ capitalise+ />+ </div>+ </div>+ )+}++const EMPTY_CUSTOM_EVENT: Partial<IProjectViewCustomEvent> = {+ customEventName: '',+ metaKey: '',+ metaValue: '',+ metaValueType: ProjectViewCustomEventMetaValueType.FLOAT,+}++const AddAViewModal = ({+ onSubmit,+ pid,+ showModal,+ setShowModal,+ tnMapping,+ projectPassword,+ showError,+ defaultView,+}: IAddAViewModal) => {+ const {+ t,+ i18n: { language },+ } = useTranslation('common')+ const [name, setName] = useState(defaultView?.name || '')+ const [filterType, setFilterType] = useState('')+ const [searchList, setSearchList] = useState<any[]>([])+ const [activeFilters, setActiveFilters] = useState<IFilter[]>(defaultView?.filters || [])+ const [customEvents, setCustomEvents] = useState<Partial<IProjectViewCustomEvent>[]>(defaultView?.customEvents || [])+ const [isViewSubmitting, setIsViewSubmitting] = useState(false)+ const [errors, setErrors] = useState<{+ name?: string+ }>({})++ const labelToTypeMap = useMemo(() => getLabelToTypeMap(t), [t])++ const getFiltersList = useCallback(+ async (category: string) => {+ let result = await getFilters(pid, category, projectPassword)++ setSearchList(result)+ },+ [pid, projectPassword],+ )++ useEffect(() => {+ if (!defaultView) {+ return+ }++ if (defaultView.filters) {+ setActiveFilters(defaultView.filters)+ }++ setName(defaultView.name)+ }, [defaultView])++ useEffect(() => {+ if (!showModal || _isEmpty(filterType)) {+ return+ }++ getFiltersList(filterType)+ }, [filterType, showModal, getFiltersList])++ const closeModal = () => {+ setShowModal(false)+ setTimeout(() => {+ setName('')+ setFilterType('')+ setActiveFilters([])+ setCustomEvents([])+ setErrors({})+ }, 300)+ }++ const onItemSelect = (item: string) => {+ let processedItem = item++ if (filterType === 'cc') {+ processedItem = countries.getAlpha2Code(item, language) as string+ }++ const itemExists = _find(activeFilters, ({ column, filter }) => filter === processedItem && column === filterType)++ if (itemExists) {+ return+ }++ setActiveFilters((prevFilters: any) => [+ ...prevFilters,+ {+ column: filterType,+ filter: processedItem,+ isExclusive: false,+ },+ ])+ }++ const onViewCreate = async () => {+ if (isViewSubmitting) {+ return+ }++ if (!name) {+ setErrors((prev) => ({+ ...prev,+ name: t('apiNotifications.enterViewName'),+ }))+ return+ }++ setIsViewSubmitting(true)++ try {+ // updating an existing view+ if (defaultView?.id) {+ await updateProjectView(pid, defaultView?.id, name, activeFilters)+ } else {+ // crating a new one+ await createProjectView(pid, name, 'traffic', activeFilters)+ }+ } catch (reason) {+ console.error('[ERROR] onViewCreate:', reason)+ showError(t('apiNotifications.somethingWentWrong'))+ }++ setIsViewSubmitting(false)+ onSubmit()+ closeModal()+ }++ return (+ <Modal+ onClose={() => {+ if (isViewSubmitting) {+ return+ }++ closeModal()+ }}+ onSubmit={onViewCreate}+ submitText={t('common.confirm')}+ title={t('project.addAView')}+ isLoading={isViewSubmitting}+ message={+ <div className='min-h-[410px]'>+ <Input+ label={t('project.viewName')}+ value={name}+ onChange={({ target }) => {+ setName(target.value)+ setErrors((prev) => ({+ ...prev,+ name: '',+ }))+ }}+ error={errors.name}+ maxLength={20}+ />+ <hr className='my-4' />+ <Select+ label={t('project.selectCategoryOptional')}+ items={FILTERS_PANELS_ORDER}+ labelExtractor={(item) => t(`project.mapping.${item}`)}+ onSelect={(item: string) => setFilterType(labelToTypeMap[item])}+ title={+ _isEmpty(filterType) ? t('project.settings.reseted.selectFilters') : t(`project.mapping.${filterType}`)+ }+ />+ {filterType && !_isEmpty(searchList) && (+ <>+ <p className='mt-5 text-sm font-medium text-gray-700 dark:text-gray-200'>{t('project.filters')}</p>+ <Combobox+ items={searchList}+ labelExtractor={(item) => {+ if (filterType === 'cc') {+ return countries.getName(item, language)+ }++ return item+ }}+ onSelect={onItemSelect}+ placeholder={t('project.settings.reseted.filtersPlaceholder')}+ />+ </>+ )}+ <div className='mt-2'>+ {_map(activeFilters, ({ filter, column, isExclusive }) => (+ <Filter+ key={`${column}-${filter}`}+ onRemoveFilter={(removeColumn, removeFilter) => {+ setActiveFilters((prevFilters: any) => {+ return _filter(+ prevFilters,+ ({ column, filter }) => filter !== removeFilter || column !== removeColumn,+ )+ })+ }}+ onChangeExclusive={(columnToChange: string, filterToChange: string, isExclusive: boolean) => {+ setActiveFilters((prevFilters: any) => {+ return _map(prevFilters, (item) => {+ if (item.column === columnToChange && item.filter === filterToChange) {+ return {+ column: columnToChange,+ filter: filterToChange,+ isExclusive,+ }+ }++ return item+ })+ })+ }}+ isExclusive={isExclusive}+ column={column}+ filter={filter}+ tnMapping={tnMapping}+ canChangeExclusive+ removable+ />+ ))}+ </div>+ <hr className='my-4' />+ <p className='text-sm font-medium text-gray-700 dark:text-gray-100'>{t('project.customEventsAndMetrics')}</p>+ <div className='divide-y divide-gray-300/80 dark:divide-slate-900/60'>+ {_map(customEvents, (ev) => (+ <EditMetric+ key={ev.id}+ metric={ev}+ 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>+ <InlineButton+ text={t('project.addAMetric')}+ onClick={() => {+ setCustomEvents((prev) => [...prev, { ...EMPTY_CUSTOM_EVENT, id: Math.random().toString() }])+ }}+ />+ </div>+ }+ submitType='regular'+ isOpened={showModal}+ />+ )+}++export default AddAViewModaldiff --git a/public/locales/en.json b/public/locales/en.jsonindex 5d9c5ac61..d7fc47490 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -41,7 +41,9 @@"funnelDeleted": "The funnel has been deleted","errorCode": "Error code: {{error}}","updateErrorStatusFailed": "Error occured while updating error status",- "errorStatusUpdated": "Error status has been updated"+ "errorStatusUpdated": "Error status has been updated",+ "enterViewName": "Please enter a view name",+ "viewDeleted": "View has been deleted"},"common": {"features": "Features",@@ -772,11 +774,23 @@"project": {"metadata": "Metadata","search": "Search",+ "views": "Views",+ "viewName": "View name",+ "addAView": "Add a view","loadMore": "Load more","unknownCountry": "Unknown country","selectCategory": "Select category to filter",+ "selectCategoryOptional": "Select category to filter (optional)",+ "customEventsAndMetrics": "Custom events and metrics (optional)",+ "addAMetric": "Add a metric",+ "customEvent": "Custom event",+ "customMetricType": "Custom metric type",+ "metaValueType": {+ "decimal": "Decimal",+ "integer": "Integer",+ "text": "Text"+ },"currentFilters": "Currently applied filters",- "newFilters": "New filters","advancedFilters": "Advanced filters","applyFilters": "Apply filters","lookingForMore": "Looking for more?",