📈 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
View project helpers to ts
kruzhambus63a4e0b24065
diff --git a/src/pages/Project/View/ViewProject.container.jsx b/src/pages/Project/View/ViewProject.container.jsxdeleted file mode 100644index aec33d273..000000000--- a/src/pages/Project/View/ViewProject.container.jsx+++ /dev/null@@ -1,76 +0,0 @@-import { connect } from 'react-redux'-import { errorsActions } from 'redux/reducers/errors'-import UIActions from 'redux/reducers/ui'-import { tabForSharedProject } from 'redux/constants'-import { alertsActions } from 'redux/reducers/alerts'--import ViewProject from './ViewProject'--const mapStateToProps = (state) => {- if (state.ui.projects.dashboardTabs === tabForSharedProject) {- return {- projects: state.ui.projects.projects,- sharedProjects: state.ui.projects.sharedProjects,- isLoading: state.ui.projects.isLoadingShared,- cache: state.ui.cache.analytics,- cachePerf: state.ui.cache.analyticsPerf,- projectViewPrefs: state.ui.cache.projectViewPrefs,- authenticated: state.auth.authenticated,- timezone: state.auth.user.timezone,- isPaidTierUsed: state.auth.isPaidTierUsed,- extensions: state.ui.misc.extensions,- user: state.auth.user,- projectTab: state.ui.projects.projectTab,- }- }-- return {- projects: state.ui.projects.projects,- sharedProjects: state.ui.projects.sharedProjects,- isLoading: state.ui.projects.isLoading,- cache: state.ui.cache.analytics,- cachePerf: state.ui.cache.analyticsPerf,- projectViewPrefs: state.ui.cache.projectViewPrefs,- authenticated: state.auth.authenticated,- timezone: state.auth.user.timezone,- isPaidTierUsed: state.auth.isPaidTierUsed,- extensions: state.ui.misc.extensions,- user: state.auth.user,- projectTab: state.ui.projects.projectTab,- }-}--const mapDispatchToProps = (dispatch) => ({- showError: (message) => {- dispatch(errorsActions.genericError(message))- },- setProjectCache: (pid, data, key) => {- dispatch(UIActions.setProjectCache(pid, data, key))- },- setProjectViewPrefs: (pid, period, timeBucket, rangeDate) => {- dispatch(UIActions.setProjectViewPrefs(pid, period, timeBucket, rangeDate))- },- setProjectCachePerf: (pid, data, key) => {- dispatch(UIActions.setProjectCachePerf(pid, data, key))- },- setPublicProject: (project) => {- dispatch(UIActions.setPublicProject(project))- },- setProjects: (project, shared) => {- dispatch(UIActions.setProjects(project, shared))- },- setLiveStatsForProject: (id, count) => {- dispatch(UIActions.setLiveStatsForProject(id, count))- },- generateAlert: (message, type) => {- dispatch(alertsActions.generateAlerts(message, type))- },- setProjectTab: (tabs) => {- dispatch(UIActions.setProjectTab(tabs))- },- setProjectForcastCache: (pid, data, key) => {- dispatch(UIActions.setProjectForcastCache(pid, data, key))- },-})--export default connect(mapStateToProps, mapDispatchToProps)(ViewProject)diff --git a/src/pages/Project/View/ViewProject.container.tsx b/src/pages/Project/View/ViewProject.container.tsxnew file mode 100644index 000000000..b73234b1c--- /dev/null+++ b/src/pages/Project/View/ViewProject.container.tsx@@ -0,0 +1,109 @@+import { connect } from 'react-redux'+import { errorsActions } from 'redux/reducers/errors'+import UIActions from 'redux/reducers/ui'+import { tabForSharedProject } from 'redux/constants'+import { alertsActions } from 'redux/reducers/alerts'+import { StateType, AppDispatch } from 'redux/store'+import { IProject } from 'redux/models/IProject'+import { ISharedProject } from 'redux/models/ISharedProject'++import ViewProject from './ViewProject'++const mapStateToProps = (state: StateType) => {+ if (state.ui.projects.dashboardTabs === tabForSharedProject) {+ return {+ projects: state.ui.projects.projects,+ sharedProjects: state.ui.projects.sharedProjects,+ isLoading: state.ui.projects.isLoadingShared,+ cache: state.ui.cache.analytics,+ cachePerf: state.ui.cache.analyticsPerf,+ projectViewPrefs: state.ui.cache.projectViewPrefs,+ authenticated: state.auth.authenticated,+ timezone: state.auth.user.timezone,+ isPaidTierUsed: state.auth.isPaidTierUsed,+ extensions: state.ui.misc.extensions,+ user: state.auth.user,+ projectTab: state.ui.projects.projectTab,+ }+ }++ return {+ projects: state.ui.projects.projects,+ sharedProjects: state.ui.projects.sharedProjects,+ isLoading: state.ui.projects.isLoading,+ cache: state.ui.cache.analytics,+ cachePerf: state.ui.cache.analyticsPerf,+ projectViewPrefs: state.ui.cache.projectViewPrefs,+ authenticated: state.auth.authenticated,+ timezone: state.auth.user.timezone,+ isPaidTierUsed: state.auth.isPaidTierUsed,+ extensions: state.ui.misc.extensions,+ user: state.auth.user,+ projectTab: state.ui.projects.projectTab,+ }+}++const mapDispatchToProps = (dispatch: AppDispatch) => ({+ showError: (message: string) => {+ dispatch(errorsActions.genericError({+ message,+ }))+ },+ setProjectCache: (pid: string, data: any, key: string) => {+ dispatch(UIActions.setProjectCache({+ pid,+ data,+ key,+ }))+ },+ setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate: string) => {+ dispatch(UIActions.setProjectViewPrefs({+ pid,+ period,+ timeBucket,+ rangeDate,+ }))+ },+ setProjectCachePerf: (pid: string, data: any, key: string) => {+ dispatch(UIActions.setProjectCachePerf({+ pid,+ data,+ key,+ }))+ },+ setPublicProject: (project: Partial<IProject | ISharedProject>) => {+ dispatch(UIActions.setPublicProject({+ project,+ }))+ },+ setProjects: (project: Partial<IProject | ISharedProject>[], shared: boolean) => {+ dispatch(UIActions.setProjects({+ projects: project,+ shared,+ }))+ },+ setLiveStatsForProject: (id: string, count: number) => {+ dispatch(UIActions.setLiveStatsProject({+ id,+ count,+ }))+ },+ generateAlert: (message: string, type: string) => {+ dispatch(alertsActions.generateAlerts({+ message,+ type,+ }))+ },+ setProjectTab: (tabs: string) => {+ dispatch(UIActions.setProjectTab(tabs))+ },+ setProjectForcastCache: (pid: string, data: any, key: string) => {+ dispatch(UIActions.setProjectForecastCache({+ pid,+ data,+ key,+ }))+ },+})++export default connect(mapStateToProps, mapDispatchToProps)(ViewProject)diff --git a/src/pages/Project/View/ViewProject.helpers.jsx b/src/pages/Project/View/ViewProject.helpers.tsxsimilarity index 86%rename from src/pages/Project/View/ViewProject.helpers.jsxrename to src/pages/Project/View/ViewProject.helpers.tsxindex 289c76708..dba5b7f8c 100644--- a/src/pages/Project/View/ViewProject.helpers.jsx+++ b/src/pages/Project/View/ViewProject.helpers.tsx@@ -1,8 +1,10 @@+// @ts-ignoreimport { saveAs } from 'file-saver'import {GlobeEuropeAfricaIcon, LanguageIcon, DocumentTextIcon, DeviceTabletIcon,ArrowRightCircleIcon, MagnifyingGlassIcon, ServerIcon,} from '@heroicons/react/24/outline'+// @ts-ignoreimport * as d3 from 'd3'import dayjs from 'dayjs'import {@@ -26,17 +28,21 @@ import {} from 'redux/constants'import { getTimeFromSeconds, getStringFromTime, sumArrays } from 'utils/generic'import countries from 'utils/isoCountries'+import _toNumber from 'lodash/toNumber'+import _toString from 'lodash/toString'-const getAvg = (arr) => {+const getAvg = (arr: any) => {const total = _reduce(arr, (acc, c) => acc + c, 0)return total / _size(arr)}-const getSum = (arr) => {+const getSum = (arr: any) => {return _reduce(arr, (acc, c) => acc + c, 0)}-const transformAIChartData = (data) => {+const transformAIChartData = (data: {+ [key: string]: any,+}) => {const transformedData = {x: [],sdur: [],@@ -62,7 +68,7 @@ const transformAIChartData = (data) => {return transformedData}-const trendline = (data) => {+const trendline = (data: any[]): string[] => {const xData = _map(_fill(new Array(_size(data)), 0), (_, i) => i + 1)const yData = data@@ -89,22 +95,22 @@ const trendline = (data) => {for (let x = 0; x < _size(data); ++x) {const y = _round(b0 + b1 * x, 2)if (y < 0) {- trendData.push(0)+ trendData.push(_toString(0))} else {- trendData.push(y)+ trendData.push(_toString(y))}}return trendData}-const getExportFilename = (prefix) => {+const getExportFilename = (prefix: string) => {// turn something like 2022-03-02T19:31:00.100Z into 2022-03-02const date = _split(_replace(_split(new Date().toISOString(), '.')[0], /:/g, '-'), 'T')[0]return `${prefix}-${date}.zip`}-const convertToCSV = (array) => {+const convertToCSV = (array: any[]) => {let str = 'name,value,perc\r\n'for (let i = 0; i < _size(array); ++i) {@@ -121,7 +127,12 @@ const convertToCSV = (array) => {return str}-const onCSVExportClick = (data, pid, tnMapping, language) => {+const onCSVExportClick = (data: {+ data: any,+ types: any,+}, pid: string, tnMapping: {+ [key: string]: string,+}, language: string) => {const { data: rowData, types } = dataconst zip = new JSZip()@@ -174,12 +185,16 @@ const CHART_METRICS_MAPPING_PERF = {}// function to filter the data for the chart-const getColumns = (chart, activeChartMetrics) => {+const getColumns = (chart: {+ [key: string]: string[],+}, activeChartMetrics: {+ [key: string]: boolean,+}) => {const {views, bounce, viewsPerUnique, unique, trendlines, sessionDuration,} = activeChartMetrics- const columns = [+ const columns: any[] = [['x', ..._map(chart.x, el => dayjs(el).toDate())],]@@ -199,7 +214,7 @@ const getColumns = (chart, activeChartMetrics) => {if (bounce) {const bounceArray = _map(chart.uniques, (el, i) => {- return _round((el * 100) / chart.visits[i], 1) || 0+ return _round((_toNumber(el) * 100) / _toNumber(chart.visits[i]), 1) || 0})columns.push(['bounce', ...bounceArray],@@ -208,10 +223,10 @@ const getColumns = (chart, activeChartMetrics) => {if (viewsPerUnique) {const viewsPerUniqueArray = _map(chart.visits, (el, i) => {- if (chart.uniques[i] === 0 || chart.uniques[i] === undefined) {+ if (chart.uniques[i] === '0' || chart.uniques[i] === undefined) {return 0}- return _round(el / chart.uniques[i], 1)+ return _round(_toNumber(el) / _toNumber(chart.uniques[i]), 1)})columns.push(['viewsPerUnique', ...viewsPerUniqueArray])}@@ -223,8 +238,10 @@ const getColumns = (chart, activeChartMetrics) => {return columns}-const getColumnsPerf = (chart, activeChartMetrics) => {- const columns = [+const getColumnsPerf = (chart: {+ [key: string]: string[],+}, activeChartMetrics: keyof typeof CHART_METRICS_MAPPING_PERF) => {+ const columns: any[] = [['x', ..._map(chart.x, el => dayjs(el).toDate())],]@@ -267,7 +284,20 @@ const getColumnsPerf = (chart, activeChartMetrics) => {const noRegionPeriods = ['custom', 'yesterday']// function to get the settings and data for the chart(main diagram)-const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData, rotateXAxias, chartType) => {+const getSettings = (+ chart: any,+ timeBucket: string,+ activeChartMetrics: {+ [key: string]: boolean,+ },+ applyRegions: boolean,+ timeFormat: string,+ forecasedChartData: {+ [key: string]: string[],+ },+ rotateXAxias: boolean,+ chartType: string,+) => {const xAxisSize = _size(chart.x)const lines = []const modifiedChart = { ...chart }@@ -368,7 +398,7 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFotick: {fit: true,rotate: rotateXAxias ? 45 : 0,- format: timeFormat === TimeFormat['24-hour'] ? (x) => d3.timeFormat(tbsFormatMapper24h[timeBucket])(x) : null,+ format: timeFormat === TimeFormat['24-hour'] ? (x: string) => d3.timeFormat(tbsFormatMapper24h[timeBucket])(x) : null,},localtime: timeFormat === TimeFormat['24-hour'],type: 'timeseries',@@ -376,7 +406,7 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFoy2: {show: activeChartMetrics.bounce || activeChartMetrics.sessionDuration,tick: {- format: activeChartMetrics.bounce ? (d) => `${d}%` : (d) => getStringFromTime(getTimeFromSeconds(d)),+ format: activeChartMetrics.bounce ? (d: string) => `${d}%` : (d: string) => getStringFromTime(getTimeFromSeconds(d)),},min: activeChartMetrics.bounce ? 10 : null,max: activeChartMetrics.bounce ? 100 : null,@@ -385,7 +415,7 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFo},tooltip: {format: {- title: (x) => d3.timeFormat(tbsFormatMapper[timeBucket])(x),+ title: (x: string) => d3.timeFormat(tbsFormatMapper[timeBucket])(x),},contents: {template: `@@ -432,7 +462,15 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFo}}-const getSettingsPerf = (chart, timeBucket, activeChartMetrics, rotateXAxias, chartType) => {+const getSettingsPerf = (+ chart: {+ [key: string]: string[]+},+ timeBucket: string,+ activeChartMetrics: keyof typeof CHART_METRICS_MAPPING_PERF,+ rotateXAxias: boolean,+ chartType: string,+) => {const xAxisSize = _size(chart.x)return {@@ -478,13 +516,13 @@ const getSettingsPerf = (chart, timeBucket, activeChartMetrics, rotateXAxias, ch},y: {tick: {- format: (d) => getStringFromTime(getTimeFromSeconds(d), true),+ format: (d: string) => getStringFromTime(getTimeFromSeconds(d), true),},},},tooltip: {format: {- title: (x) => d3.timeFormat(tbsFormatMapper[timeBucket])(x),+ title: (x: string) => d3.timeFormat(tbsFormatMapper[timeBucket])(x),},contents: {template: `@@ -535,7 +573,7 @@ const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '1const paidPeriods = ['12M', '24M']const validFilters = ['cc', 'pg', 'lc', 'ref', 'dv', 'br', 'os', 'so', 'me', 'ca', 'lt', 'ev']-const typeNameMapping = (t) => ({+const typeNameMapping = (t: (str: string) => string) => ({cc: t('project.mapping.cc'),pg: t('project.mapping.pg'),lc: t('project.mapping.lc'),@@ -562,10 +600,10 @@ const panelIconMapping = {}// This function return date using the same format as the backend-const getFormatDate = (date) => {+const getFormatDate = (date: Date) => {const yyyy = date.getFullYear()- let mm = date.getMonth() + 1- let dd = date.getDate()+ let mm: string | number = date.getMonth() + 1+ let dd: string | number = date.getDate()if (dd < 10) dd = `0${dd}`if (mm < 10) mm = `0${mm}`return `${yyyy}-${mm}-${dd}`diff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.tsindex 350df4422..6234c51f2 100644--- a/src/redux/reducers/ui/projects.ts+++ b/src/redux/reducers/ui/projects.ts@@ -56,7 +56,7 @@ const projectsSlice = createSlice({initialState,reducers: {setProjects(state, { payload }: PayloadAction<{- projects: IProject[] | ISharedProject[]+ projects: Partial<IProject | ISharedProject>[]shared?: boolean}>) {if (payload.shared) {@@ -117,7 +117,7 @@ const projectsSlice = createSlice({}))}},- setLiveStatsProject(state, { payload }: PayloadAction<{ id: string, count: number, shared: boolean }>) {+ setLiveStatsProject(state, { payload }: PayloadAction<{ id: string, count: number, shared?: boolean }>) {const { id, count, shared = false } = payloadif (shared) {@@ -142,7 +142,7 @@ const projectsSlice = createSlice({})}},- setPublicProject(state, { payload }: PayloadAction<{ project: IProject | ISharedProject, shared: boolean }>) {+ setPublicProject(state, { payload }: PayloadAction<{ project: Partial<IProject | ISharedProject>, shared?: boolean }>) {const { project, shared = false } = payloadif (shared) {diff --git a/src/utils/generic.ts b/src/utils/generic.tsindex b608cfef5..f47cd544b 100644--- a/src/utils/generic.ts+++ b/src/utils/generic.ts@@ -69,7 +69,7 @@ export const getStringFromTime = (time: any, showMS?: boolean) => {return `${h ? `${h}h ` : ''}${m ? `${m}m ` : ''}${s || (showMS && ms > 0) ? `${showMS ? _round(s + ms / 1000, 2) : s}s` : ''}`}-export const sumArrays = (...arrays: any) => {+export const sumArrays = (...arrays: any): number[] => {return _map(arrays[0], (_, index) => {return _reduce(arrays, (sum, array) => sum + array[index], 0)})