📈 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
(improvments) tab to query (#381)
Maksim Mruge2f45328e14d
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsxindex a3a5b12f5..517f11baa 100644--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@ -144,13 +144,14 @@ interface IViewProject {cacheFunnels: any,setFunnelsCache: (pid: string, data: any, key: string) => void,updateProject: (pid: string, project: Partial<IProject | ISharedProject>) => void,+ projectQueryTabs: string[],}const ViewProject = ({projects, isLoading: _isLoading, showError, cache, cachePerf, setProjectCache, projectViewPrefs, setProjectViewPrefs, setPublicProject,setLiveStatsForProject, authenticated: csrAuthenticated, timezone, user, sharedProjects, extensions, generateAlert, setProjectCachePerf,projectTab, setProjectTab, setProjects, setProjectForcastCache, customEventsPrefs, setCustomEventsPrefs, liveStats, password, theme,- ssrTheme, embedded, ssrAuthenticated, queryPassword, authLoading, cacheFunnels, setFunnelsCache, updateProject,+ ssrTheme, embedded, ssrAuthenticated, queryPassword, authLoading, cacheFunnels, setFunnelsCache, updateProject, projectQueryTabs,}: IViewProject) => {const authenticated = isBrowser? authLoading@@ -656,7 +657,7 @@ const ViewProject = ({]}- return [+ const newTabs = [...selfhostedOnly,{id: PROJECT_TABS.funnels,@@ -670,7 +671,13 @@ const ViewProject = ({},...adminTabs,]- }, [t, sharedRoles, project])++ if (projectQueryTabs && projectQueryTabs.length) {+ return _filter(newTabs, (tab) => _includes(projectQueryTabs, tab.id))+ }++ return newTabs+ }, [t, sharedRoles, project, projectQueryTabs])// activeTabLabel is a label for active tab. Using for title in dropdownconst activeTabLabel = useMemo(() => _find(tabs, tab => tab.id === activeTab)?.label, [tabs, activeTab])diff --git a/app/routes/projects.$id.tsx b/app/routes/projects.$id.tsxindex 054f4733e..fd416a1b2 100644--- a/app/routes/projects.$id.tsx+++ b/app/routes/projects.$id.tsx@@ -6,7 +6,7 @@ import _split from 'lodash/split'import { API_URL } from 'redux/constants'import {- detectTheme, isEmbedded, isAuthenticated, getProjectPassword,+ detectTheme, isEmbedded, isAuthenticated, getProjectPassword, getProjectTabs,} from 'utils/server'import ProjectViewStyle from 'styles/ProjectViewStyle.css'@@ -30,16 +30,17 @@ export async function loader({ request }: LoaderArgs) {const queryPassword = getProjectPassword(request)const [theme] = detectTheme(request)const isAuth = isAuthenticated(request)+ const tabs = getProjectTabs(request)return json({- theme, embedded, isAuth, queryPassword,+ theme, embedded, isAuth, queryPassword, tabs,})}export default function Index() {const {- theme, embedded, isAuth, queryPassword,+ theme, embedded, isAuth, queryPassword, tabs,} = useLoaderData<typeof loader>()- return <ViewProject ssrTheme={theme} ssrAuthenticated={isAuth} embedded={embedded} queryPassword={queryPassword} />+ return <ViewProject ssrTheme={theme} ssrAuthenticated={isAuth} embedded={embedded} queryPassword={queryPassword} projectQueryTabs={tabs} />}diff --git a/app/utils/server.ts b/app/utils/server.tsindex 752e575e0..903eb5703 100644--- a/app/utils/server.ts+++ b/app/utils/server.ts@@ -1,5 +1,6 @@import routes from 'routesPath'import _includes from 'lodash/includes'+import _split from 'lodash/split'import _startsWith from 'lodash/startsWith'import { TITLE_SUFFIX, SUPPORTED_THEMES, ThemeType } from 'redux/constants'@@ -55,6 +56,22 @@ export function isEmbedded(request: Request): boolean {return new URL(request.url).searchParams.get('embedded') === 'true'}+/**+ * Function returns project tabs from query+ *+ * @param request+ * @returns string[]+ */+export function getProjectTabs(request: Request): string[] {+ const tabs = new URL(request.url).searchParams.get('tabs')++ if (!tabs) {+ return []+ }++ return _split(tabs, ',')+}+/*** Function returns password from query*