📈 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 support for project password for /log/filters request
Blue Mousef5494ff6153b
diff --git a/app/api/index.ts b/app/api/index.tsindex 6b49b318a..b7489edbf 100644--- a/app/api/index.ts+++ b/app/api/index.ts@@ -1200,9 +1200,13 @@ export const getUsageInfo = () =>: error.response.data.message})-export const getFilters = (pid: string, type: string) =>+export const getFilters = (pid: string, type: string, password = '') =>api- .get(`log/filters?pid=${pid}&type=${type}`)+ .get(`log/filters?pid=${pid}&type=${type}`, {+ headers: {+ 'x-password': password,+ },+ }).then((response): string[] => response.data).catch((error) => {debug('%s', error)diff --git a/app/modals/NewFunnel.tsx b/app/modals/NewFunnel.tsxindex 7a57585ac..f2c3b86b0 100644--- a/app/modals/NewFunnel.tsx+++ b/app/modals/NewFunnel.tsx@@ -22,12 +22,13 @@ interface INewFunnel {pid: string,loading: boolean,funnel?: IFunnel,+ projectPassword?: string,}const INITIAL_FUNNEL_STEPS = [null, null]const NewFunnel = ({- onClose, onSubmit, isOpened, pid, funnel, loading, project,+ onClose, onSubmit, isOpened, pid, funnel, loading, project, projectPassword,}: INewFunnel): JSX.Element => {const { t } = useTranslation('common')const [name, setName] = useState<string>(funnel?.name || '')@@ -57,10 +58,10 @@ const NewFunnel = ({const promises = [(async () => {- pgFilters = await getFilters(pid, 'pg')+ pgFilters = await getFilters(pid, 'pg', projectPassword)})(),(async () => {- ceFilters = await getFilters(pid, 'ev')+ ceFilters = await getFilters(pid, 'ev', projectPassword)})(),]@@ -74,7 +75,7 @@ const NewFunnel = ({}getFiltersData()- }, [pid, project, isOpened])+ }, [pid, project, isOpened, projectPassword])const _onClose = () => {setTimeout(() => {diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsxindex b2986988f..8547d90b7 100644--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@ -2981,6 +2981,7 @@ const ViewProject = ({/><NewFunnelproject={project}+ projectPassword={projectPassword}pid={id}funnel={funnelToEdit}isOpened={isNewFunnelOpened}@@ -2999,6 +3000,7 @@ const ViewProject = ({loading={funnelActionLoading}/><SearchFilters+ projectPassword={projectPassword}showModal={showFiltersSearch}setShowModal={setShowFiltersSearch}setProjectFilter={onFilterSearch}diff --git a/app/pages/Project/View/components/SearchFilters.tsx b/app/pages/Project/View/components/SearchFilters.tsxindex b78660a60..655dab970 100644--- a/app/pages/Project/View/components/SearchFilters.tsx+++ b/app/pages/Project/View/components/SearchFilters.tsx@@ -15,6 +15,7 @@ import { getFilters } from 'api'import { Filter } from './Filters'interface ISearchFilters {+ projectPassword?: stringsetProjectFilter: (filter: {column: stringfilter: string[]@@ -51,7 +52,7 @@ const formatFilters = (filters: any): IActiveFilter[] => {}const SearchFilters = ({- setProjectFilter, pid, showModal, setShowModal, tnMapping, filters,+ setProjectFilter, pid, showModal, setShowModal, tnMapping, filters, projectPassword,}: ISearchFilters) => {const { t, i18n: { language } } = useTranslation('common')const [filterType, setFilterType] = useState<string>('')@@ -62,9 +63,9 @@ const SearchFilters = ({const labelToTypeMap = useMemo(() => getLabelToTypeMap(t), [t])const getFiltersList = useCallback(async (type: string) => {- const res = await getFilters(pid, type)+ const res = await getFilters(pid, type, projectPassword)setSearchList(res)- }, [pid])+ }, [pid, projectPassword])useEffect(() => {if (!showModal || _isEmpty(filterType)) {