📈 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
(feature) project search (#366)
Maksim Mrugd679d7bab62f
diff --git a/app/api/index.ts b/app/api/index.tsindex d3092f605..52e54aea6 100644--- a/app/api/index.ts+++ b/app/api/index.ts@@ -291,9 +291,9 @@ export const verifyShare = ({ path, id }: { path: string, id: string }) =>: error.response.data.message})-export const getProjects = (take: number = 0, skip: number = 0, isCaptcha: boolean = false) =>+export const getProjects = (take: number = 0, skip: number = 0, isCaptcha: boolean = false, search?: string) =>api- .get(`/project?take=${take}&skip=${skip}&isCaptcha=${isCaptcha}`)+ .get(`/project?take=${take}&skip=${skip}&isCaptcha=${isCaptcha}&search=${search}`).then((response): {results: IProject[]total: number@@ -307,9 +307,9 @@ export const getProjects = (take: number = 0, skip: number = 0, isCaptcha: boole: error.response.data.message})-export const getSharedProjects = (take: number = 0, skip: number = 0) =>+export const getSharedProjects = (take: number = 0, skip: number = 0, search?: string) =>api- .get(`/project/shared?take=${take}&skip=${skip}`)+ .get(`/project/shared?take=${take}&skip=${skip}&search=${search}`).then((response): {results: ISharedProject[]total: numberdiff --git a/app/hooks/useDebounce.ts b/app/hooks/useDebounce.tsnew file mode 100644index 000000000..5e0b900d3--- /dev/null+++ b/app/hooks/useDebounce.ts@@ -0,0 +1,17 @@+import { useEffect, useState } from 'react'++const useDebounce = <T>(value: T, delay?: number): T => {+ const [debouncedValue, setDebouncedValue] = useState<T>(value)++ useEffect(() => {+ const timer = setTimeout(() => setDebouncedValue(value), delay || 500)++ return () => {+ clearTimeout(timer)+ }+ }, [value, delay])++ return debouncedValue+}++export default useDebouncediff --git a/app/pages/Captcha/View/ViewCaptcha.tsx b/app/pages/Captcha/View/ViewCaptcha.tsxindex b2ac79739..0908579cd 100644--- a/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/app/pages/Captcha/View/ViewCaptcha.tsx@@ -278,7 +278,7 @@ const ViewProject = ({columns: getColumns({ ...chartData }, activeChartMetrics),})}- }, [chartData])+ }, [chartData, mainChart, activeChartMetrics])// this funtion is used for requesting the data from the API when the filter is changedconst filterHandler = (column: any, filter: any, isExclusive: boolean = false) => {diff --git a/app/pages/Dashboard/Dashboard.container.tsx b/app/pages/Dashboard/Dashboard.container.tsxindex 6edbb07d4..67ebd7c19 100644--- a/app/pages/Dashboard/Dashboard.container.tsx+++ b/app/pages/Dashboard/Dashboard.container.tsx@@ -55,11 +55,11 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({message,}))},- loadProjects: (take: number, skip: number) => {- dispatch(sagaActions.loadProjects(take, skip))+ loadProjects: (take: number, skip: number, search: string) => {+ dispatch(sagaActions.loadProjects(take, skip, search))},- loadSharedProjects: (take: number, skip: number) => {- dispatch(sagaActions.loadSharedProjects(take, skip))+ loadSharedProjects: (take: number, skip: number, search: string) => {+ dispatch(sagaActions.loadSharedProjects(take, skip, search))},setDashboardPaginationPage: (page: number) => {dispatch(UIActions.setDashboardPaginationPage(page))@@ -70,8 +70,8 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({setDashboardTabs: (tab: string) => {dispatch(UIActions.setDashboardTabs(tab))},- loadProjectsCaptcha: (take: number, skip: number) => {- dispatch(sagaActions.loadProjectsCaptcha(take, skip))+ loadProjectsCaptcha: (take: number, skip: number, search: string) => {+ dispatch(sagaActions.loadProjectsCaptcha(take, skip, search))},setDashboardPaginationPageCaptcha: (page: number) => {dispatch(UIActions.setDashboardPaginationPageCaptcha(page))diff --git a/app/pages/Dashboard/Dashboard.tsx b/app/pages/Dashboard/Dashboard.tsxindex c96388399..952dcef61 100644--- a/app/pages/Dashboard/Dashboard.tsx+++ b/app/pages/Dashboard/Dashboard.tsx@@ -15,7 +15,7 @@ import _filter from 'lodash/filter'import _find from 'lodash/find'import { useTranslation } from 'react-i18next'import {- FolderPlusIcon, AdjustmentsVerticalIcon, ArrowTopRightOnSquareIcon,+ FolderPlusIcon, AdjustmentsVerticalIcon, ArrowTopRightOnSquareIcon, MagnifyingGlassIcon, XMarkIcon,} from '@heroicons/react/24/outline'import { XCircleIcon } from '@heroicons/react/24/solid'import { ChevronUpIcon, ChevronDownIcon } from '@heroicons/react/20/solid'@@ -34,6 +34,7 @@ import {tabForCaptchaProject, DASHBOARD_TABS, tabsForDashboard, roleViewer,} from 'redux/constants'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'+import useDebounce from 'hooks/useDebounce'import { acceptShareProject } from 'api'@@ -314,8 +315,8 @@ interface DashboardProps {setUserShareData: (data: Partial<ISharedProject>) => voiduserSharedUpdate: (message: string) => voidsharedProjectError: (error: string) => void- loadProjects: (take: number, skip: number) => void- loadSharedProjects: (take: number, skip: number) => void+ loadProjects: (take: number, skip: number, search: string) => void+ loadSharedProjects: (take: number, skip: number, search: string) => voidtotal: numbersetDashboardPaginationPage: (page: number) => voiddashboardPaginationPage: number@@ -329,8 +330,7 @@ interface DashboardProps {captchaTotal: numberdashboardPaginationPageCaptcha: numbersetDashboardPaginationPageCaptcha: (page: number) => void- loadProjectsCaptcha: (take: number, skip: number) => void- projectTab: string+ loadProjectsCaptcha: (take: number, skip: number, search: string) => voidliveStats: ILiveStats}@@ -339,13 +339,14 @@ const Dashboard = ({setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, loadSharedProjects,total, setDashboardPaginationPage, dashboardPaginationPage, sharedProjects, dashboardTabs,setDashboardTabs, sharedTotal, setDashboardPaginationPageShared, dashboardPaginationPageShared, captchaProjects, captchaTotal, dashboardPaginationPageCaptcha, setDashboardPaginationPageCaptcha,- loadProjectsCaptcha, projectTab, liveStats,+ loadProjectsCaptcha, liveStats,}: DashboardProps): JSX.Element => {const { t }: {t: (key: string, options?: {[key: string]: string | number | null | undefined}) => string} = useTranslation('common')+ const [isSearchActive, setIsSearchActive] = useState<boolean>(false)const [showActivateEmailModal, setShowActivateEmailModal] = useState<boolean>(false)const navigate = useNavigate()const [tabProjects, setTabProjects] = useState<string>(dashboardTabs)@@ -353,6 +354,9 @@ const Dashboard = ({const pageAmount: number = Math.ceil(total / ENTRIES_PER_PAGE_DASHBOARD)const pageAmountCaptcha: number = Math.ceil(captchaTotal / ENTRIES_PER_PAGE_DASHBOARD)const getRole = (pid: string): string | null => (_find([..._map(sharedProjects, (item) => ({ ...item.project, role: item.role }))], p => p.id === pid)?.role || null)+ // This search represents what's inside the search input+ const [search, setSearch] = useState<string>('')+ const debouncedSearch = useDebounce<string>(search, 500)const onNewProject = () => {if (user.isActive || isSelfhosted) {@@ -372,21 +376,23 @@ const Dashboard = ({setTabProjects(tabForOwnedProject)}+ setSearch('')+setDashboardTabs(tabProjects)}, [tabProjects, setDashboardTabs, sharedTotal])useEffect(() => {if (tabProjects === tabForOwnedProject) {- loadProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD)+ loadProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD, debouncedSearch)}if (tabProjects === tabForSharedProject) {- loadSharedProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPageShared - 1) * ENTRIES_PER_PAGE_DASHBOARD)+ loadSharedProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPageShared - 1) * ENTRIES_PER_PAGE_DASHBOARD, debouncedSearch)}if (tabProjects === tabForCaptchaProject) {- loadProjectsCaptcha(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPageCaptcha - 1) * ENTRIES_PER_PAGE_DASHBOARD)+ loadProjectsCaptcha(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPageCaptcha - 1) * ENTRIES_PER_PAGE_DASHBOARD, debouncedSearch)}// eslint-disable-next-line react-hooks/exhaustive-deps- }, [dashboardPaginationPage, dashboardPaginationPageShared])+ }, [dashboardPaginationPage, dashboardPaginationPageShared, debouncedSearch])const dashboardLocTabs = useMemo(() => {if (sharedTotal <= 0) {@@ -422,7 +428,7 @@ const Dashboard = ({label: t('profileSettings.captcha'),},]- }, [t])+ }, [t, sharedTotal])const activeTabLabel = useMemo(() => {return _find(dashboardLocTabs, (tab) => tab.name === tabProjects)?.label@@ -445,6 +451,10 @@ const Dashboard = ({)}+ const onSearch = (e: React.ChangeEvent<HTMLInputElement>) => {+ setSearch(e.target.value)+ }+return (<><div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>@@ -452,9 +462,46 @@ const Dashboard = ({<div className='flex flex-col py-6 px-4 sm:px-6 lg:px-8'><div className='max-w-7xl w-full mx-auto'><div className='flex justify-between mb-6'>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>- {t('titles.dashboard')}- </h2>+ <div className='flex items-end justify-between'>+ <h2 className='flex items-baseline mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ {t('titles.dashboard')}+ {isSearchActive ? (+ <XMarkIcon+ className='ml-2 w-5 h-5 text-gray-900 dark:text-gray-50 cursor-pointer hover:opacity-80'+ onClick={() => {+ setSearch('')+ setIsSearchActive(false)+ }}+ />+ ) : (+ <MagnifyingGlassIcon+ className='ml-2 w-5 h-5 text-gray-900 dark:text-gray-50 cursor-pointer hover:opacity-80'+ onClick={() => {+ setIsSearchActive(true)+ }}+ />+ )}+ </h2>+ {isSearchActive && (+ <div className='hidden sm:flex items-center pb-1 w-full max-w-md px-2 sm:ml-5'>+ <label htmlFor='simple-search' className='sr-only'>Search</label>+ <div className='relative w-full'>+ <div className='absolute sm:flex hidden inset-y-0 left-0 items-center pointer-events-none'>+ <MagnifyingGlassIcon+ className='ml-2 w-5 h-5 text-gray-900 dark:text-gray-50 cursor-pointer hover:opacity-80'+ />+ </div>+ <input+ type='text'+ onChange={onSearch}+ value={search}+ className='bg-gray-50 border h-7 border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-indigo-500 dark:focus:border-indigo-500'+ placeholder={t('project.search')}+ />+ </div>+ </div>+ )}+ </div><spanonClick={onNewProject}className='!pl-2 inline-flex justify-center items-center cursor-pointer text-center border border-transparent leading-4 font-medium rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500 shadow-sm text-white bg-slate-900 hover:bg-slate-700 dark:text-gray-50 dark:border-gray-800 dark:bg-slate-800 dark:hover:bg-slate-700 px-3 py-2 text-sm'@@ -463,6 +510,25 @@ const Dashboard = ({{tabProjects === tabForCaptchaProject ? t('dashboard.newCaptchaProject') : t('dashboard.newProject')}</span></div>+ {isSearchActive && (+ <div className='flex sm:hidden items-center mb-2 w-full'>+ <label htmlFor='simple-search' className='sr-only'>Search</label>+ <div className='relative w-full'>+ <div className='absolute flex inset-y-0 left-0 items-center pointer-events-none'>+ <MagnifyingGlassIcon+ className='ml-2 w-5 h-5 text-gray-900 dark:text-gray-50 cursor-pointer hover:opacity-80'+ />+ </div>+ <input+ type='text'+ onChange={onSearch}+ value={search}+ className='bg-gray-50 border h-7 border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-indigo-500 focus:border-indigo-500 block w-full pl-10 p-2.5 py-5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-indigo-500 dark:focus:border-indigo-500'+ placeholder={t('project.search')}+ />+ </div>+ </div>+ )}{!isSelfhosted && (<div className='mb-2'>{/* Dashboard tabs selector */}diff --git a/app/redux/sagas/actions/index.ts b/app/redux/sagas/actions/index.tsindex 65acbf92e..093f8d7e6 100644--- a/app/redux/sagas/actions/index.ts+++ b/app/redux/sagas/actions/index.ts@@ -5,9 +5,9 @@ import { removeItem } from 'utils/localstorage'import { LS_VIEW_PREFS_SETTING, LS_CAPTCHA_VIEW_PREFS_SETTING } from 'redux/constants'import { IUser } from '../../models/IUser'-const loadProjects = (take?: number, skip?: number) => ({+const loadProjects = (take?: number, skip?: number, search?: string) => ({type: types.LOAD_PROJECTS,- payload: { take, skip },+ payload: { take, skip, search },})const loadMetainfo = () => ({@@ -18,14 +18,14 @@ const loadUsageinfo = () => ({type: types.LOAD_USAGEINFO,})-const loadSharedProjects = (take?: number, skip?: number) => ({+const loadSharedProjects = (take?: number, skip?: number, search?: string) => ({type: types.LOAD_SHARED_PROJECTS,- payload: { take, skip },+ payload: { take, skip, search },})-const loadProjectsCaptcha = (take?: number, skip?: number) => ({+const loadProjectsCaptcha = (take?: number, skip?: number, search?: string) => ({type: types.LOAD_PROJECTS,- payload: { take, skip, isCaptcha: true },+ payload: { take, skip, isCaptcha: true, search },})const loadExtensions = () => ({diff --git a/app/redux/sagas/ui/load_projects.ts b/app/redux/sagas/ui/load_projects.tsindex 1ad5840af..6bdb9fe2e 100644--- a/app/redux/sagas/ui/load_projects.ts+++ b/app/redux/sagas/ui/load_projects.ts@@ -13,7 +13,7 @@ const {const debug = Debug('swetrix:rx:s:load-projects')-export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, isCaptcha = false } }) {+export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, isCaptcha = false, search = '' } }) {try {if (isCaptcha) {yield put(UIActions.setCaptchaLoading(true))@@ -27,7 +27,7 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBlet {// eslint-disable-next-line prefer-const, camelcaseresults, totalMonthlyEvents, total,- } = yield call(getProjects, take, skip, isCaptcha)+ } = yield call(getProjects, take, skip, isCaptcha, search)const pids = _map(results, result => result.id)diff --git a/app/redux/sagas/ui/load_shared_projects.ts b/app/redux/sagas/ui/load_shared_projects.tsindex 0ef734c08..9d1f5e9f9 100644--- a/app/redux/sagas/ui/load_shared_projects.ts+++ b/app/redux/sagas/ui/load_shared_projects.ts@@ -13,7 +13,7 @@ const {const debug = Debug('swetrix:rx:s:load-projects')-export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0 } }) {+export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, search = '' } }) {if (isSelfhosted) {return}@@ -27,7 +27,7 @@ export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGElet {// eslint-disable-next-line prefer-constresults, total,- } = yield call(getSharedProjects, take, skip)+ } = yield call(getSharedProjects, take, skip, search)if (total === 0) {return