Skip to content

📈 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!

use regular UI to display keywords

Blue Mouse35e487d41a1b
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsx
index a3f1e51d0..09195ae98 100644
--- a/web/app/pages/Project/View/Panels.tsx
+++ b/web/app/pages/Project/View/Panels.tsx
@@ -879,6 +879,8 @@ interface PanelProps {
getVersionFilterLink?: (parent: string, version: string) => LinkProps['to']
valuesHeaderName?: string
highlightColour?: 'blue' | 'red' | 'orange'
+ // When true, rows are non-interactive (no hover state, no filter link/navigation)
+ disableRowClick?: boolean
}
interface DetailsTableProps
@@ -896,6 +898,7 @@ interface DetailsTableProps
> {
total: number
closeDetails: () => void
+ disableRowClick?: boolean
}
const DetailsTable = ({
@@ -910,6 +913,7 @@ const DetailsTable = ({
valuesHeaderName,
activeTabId,
closeDetails,
+ disableRowClick,
}: DetailsTableProps) => {
const {
t,
@@ -1073,8 +1077,15 @@ const DetailsTable = ({
width: '100%',
display: 'flex',
}}
- className='group cursor-pointer text-base text-gray-900 even:bg-gray-50 hover:bg-gray-100 dark:text-gray-50 dark:even:bg-slate-800 hover:dark:bg-slate-700'
+ className={cx(
+ 'text-base text-gray-900 even:bg-gray-50 dark:text-gray-50 dark:even:bg-slate-800',
+ {
+ 'group cursor-pointer hover:bg-gray-100 hover:dark:bg-slate-700': !disableRowClick,
+ 'cursor-default': !!disableRowClick,
+ },
+ )}
onClick={() => {
+ if (disableRowClick) return
const link = getFilterLink(id, entryName)
if (link) {
navigate(link)
@@ -1102,11 +1113,15 @@ const DetailsTable = ({
rowData
)}
</span>
- <FilterIcon
- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'
- strokeWidth={1.5}
- />
- <div className='ml-2 h-4 w-4 group-hover:hidden' />
+ {!disableRowClick ? (
+ <>
+ <FilterIcon
+ className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'
+ strokeWidth={1.5}
+ />
+ <div className='ml-2 h-4 w-4 group-hover:hidden' />
+ </>
+ ) : null}
</td>
<td className='w-[30%] py-1 text-right sm:w-1/6'>
{activeTab === PROJECT_TABS.traffic ? nFormatter(valueData, 1) : valueData}
@@ -1142,6 +1157,7 @@ const Panel = ({
getVersionFilterLink = () => '',
valuesHeaderName,
highlightColour = 'blue',
+ disableRowClick = false,
}: PanelProps) => {
const { dataLoading, activeTab } = useViewProjectContext()
const { t } = useTranslation('common')
@@ -1216,7 +1232,7 @@ const Panel = ({
'relative flex items-center justify-between rounded-sm px-1 py-1.5 dark:text-gray-50',
{
'group hover:bg-gray-50 hover:dark:bg-slate-800':
- !hideFilters && !dataLoading && (link || hasVersionsForItem),
+ !disableRowClick && !hideFilters && !dataLoading && (link || hasVersionsForItem),
'cursor-wait': dataLoading,
},
)}
@@ -1251,10 +1267,10 @@ const Panel = ({
) : null}
<FilterWrapper
- as={link ? 'Link' : 'div'}
+ as={!disableRowClick && link ? 'Link' : 'div'}
to={link}
className={cx('flex min-w-0 flex-1 items-center', {
- 'cursor-pointer': !hideFilters && !dataLoading && link,
+ 'cursor-pointer': !disableRowClick && !hideFilters && !dataLoading && link,
'cursor-wait': dataLoading,
})}
>
@@ -1302,18 +1318,18 @@ const Panel = ({
{_map(versions, (versionEntry) => {
const versionPerc = _round((versionEntry.count / total) * 100, 2)
const versionValueData = valueMapper(versionEntry.count)
- const versionLink = getVersionFilterLink?.(entryName, versionEntry.name)
+ const versionLink = disableRowClick ? undefined : getVersionFilterLink?.(entryName, versionEntry.name)
return (
<FilterWrapper
key={`${id}-${entryName}-${versionEntry.name}`}
- as={versionLink ? 'Link' : 'div'}
+ as={!disableRowClick && versionLink ? 'Link' : 'div'}
to={versionLink}
className={cx(
'relative flex items-center justify-between rounded-sm px-1 py-1.5 dark:text-gray-50',
{
'group cursor-pointer hover:bg-gray-50 hover:dark:bg-slate-800':
- !hideFilters && !dataLoading && versionLink,
+ !disableRowClick && !hideFilters && !dataLoading && versionLink,
'cursor-wait': dataLoading,
},
)}
@@ -1383,7 +1399,10 @@ const Panel = ({
valueMapper={valueMapper}
capitalize={capitalize || false}
linkContent={linkContent || false}
- getFilterLink={getFilterLink as (id: string, name: string) => string}
+ getFilterLink={(
+ disableRowClick ? (() => '') : (getFilterLink as (id: string, name: string) => string)
+ )}
+ disableRowClick={disableRowClick}
/>
}
size='large'
diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsx
index 639eb02d2..18ec032b2 100644
--- a/web/app/pages/Project/View/ViewProject.helpers.tsx
+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx
@@ -1559,6 +1559,7 @@ const typeNameMapping = (t: typeof i18next.t) => ({
exitPage: t('project.exitPages'),
lc: t('project.mapping.lc'),
ref: t('project.mapping.ref'),
+ keywords: t('project.mapping.keyword'),
dv: t('project.mapping.dv'),
br: t('project.mapping.br'),
brv: t('project.mapping.brv'),
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index b39a763ff..a0f4ec673 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -78,6 +78,7 @@ import {
getProjectViews,
deleteProjectView,
getFunnels,
+ getGSCKeywords,
} from '~/api'
import EventsRunningOutBanner from '~/components/EventsRunningOutBanner'
import Footer from '~/components/Footer'
@@ -164,7 +165,7 @@ import Filters from './components/Filters'
import { FunnelChart } from './components/FunnelChart'
import FunnelsList from './components/FunnelsList'
const InteractiveMap = lazy(() => import('./components/InteractiveMap'))
-import Keywords from './components/Keywords'
+// Keywords list now reuses shared Panel UI; dedicated component removed from render
import LiveVisitorsDropdown from './components/LiveVisitorsDropdown'
import LockedDashboard from './components/LockedDashboard'
import { MetricCard, MetricCards, PerformanceMetricCards } from './components/MetricCards'
@@ -755,6 +756,11 @@ const ViewProjectContent = () => {
const [isPanelsDataEmptyPerf, setIsPanelsDataEmptyPerf] = useState(false)
const [panelsDataPerf, setPanelsDataPerf] = useState<any>({})
+ // GSC Keywords state
+ const [keywordsLoading, setKeywordsLoading] = useState<boolean>(false)
+ const [keywordsNotConnected, setKeywordsNotConnected] = useState<boolean>(false)
+ const [keywords, setKeywords] = useState<Entry[]>([])
+
const timeFormat = useMemo<'12-hour' | '24-hour'>(() => user?.timeFormat || TimeFormat['12-hour'], [user])
const [ref, size] = useSize()
const rotateXAxis = useMemo(() => size.width > 0 && size.width < 500, [size])
@@ -2110,6 +2116,47 @@ const ViewProjectContent = () => {
timeBucket,
])
+ // Load GSC Keywords when the traffic sources panel switches to 'keywords'
+ useEffect(() => {
+ const loadKeywords = async () => {
+ if (authLoading || !project) return
+ if (activeTab !== PROJECT_TABS.traffic) return
+ if (panelsActiveTabs.source !== 'keywords') return
+ if (keywordsLoading) return
+
+ setKeywordsLoading(true)
+ setKeywordsNotConnected(false)
+
+ try {
+ let from: string | undefined
+ let to: string | undefined
+ if (dateRange) {
+ from = getFormatDate(dateRange[0])
+ to = getFormatDate(dateRange[1])
+ }
+
+ const res = await getGSCKeywords(id, period, from, to, timezone, projectPassword)
+ const list = (res?.keywords || []).map((k: { name: string; count: number }) => ({
+ name: k.name,
+ count: k.count,
+ }))
+ setKeywords(list)
+ } catch (error: any) {
+ const message = typeof error === 'string' ? error : error?.message
+ if (message && (message as string).toLowerCase().includes('search console')) {
+ setKeywordsNotConnected(true)
+ } else {
+ toast.error(typeof error === 'string' ? error : t('apiNotifications.somethingWentWrong'))
+ }
+ } finally {
+ setKeywordsLoading(false)
+ }
+ }
+
+ loadKeywords()
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [activeTab, panelsActiveTabs.source, period, dateRange, timezone, id, project, authLoading])
+
useEffect(() => {
if (activeTab !== PROJECT_TABS.funnels || authLoading || !project) return
@@ -3913,12 +3960,38 @@ const ViewProjectContent = () => {
activeTabId={panelsActiveTabs.source}
data={
panelsActiveTabs.source === 'keywords'
- ? []
+ ? keywords
: panelsData.data[panelsActiveTabs.source]
}
+ valuesHeaderName={
+ panelsActiveTabs.source === 'keywords' ? t('project.clicks') : undefined
+ }
rowMapper={getTrafficSourcesRowMapper(panelsActiveTabs.source)}
+ disableRowClick={panelsActiveTabs.source === 'keywords'}
customRenderer={
- panelsActiveTabs.source === 'keywords' ? () => <Keywords /> : undefined
+ panelsActiveTabs.source === 'keywords'
+ ? keywordsLoading
+ ? () => <Loader />
+ : keywordsNotConnected
+ ? () => (
+ <div className='mt-4 text-center'>
+ <p className='text-sm text-gray-800 dark:text-gray-200'>
+ {['owner', 'admin'].includes(project?.role || '')
+ ? t('project.connectGsc')
+ : t('project.gscConnectionRequired')}
+ </p>
+ {['owner', 'admin'].includes(project?.role || '') ? (
+ <Link
+ to={`${routes.project_settings.replace(':id', id)}?tab=integrations`}
+ className='mt-2 inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-1 text-sm text-gray-800 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ >
+ {t('project.goToProjectSettings')}
+ </Link>
+ ) : null}
+ </div>
+ )
+ : undefined
+ : undefined
}
/>
)
diff --git a/web/app/pages/Project/View/components/Keywords.tsx b/web/app/pages/Project/View/components/Keywords.tsx
deleted file mode 100644
index bf0a040b4..000000000
--- a/web/app/pages/Project/View/components/Keywords.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import _isEmpty from 'lodash/isEmpty'
-import _map from 'lodash/map'
-import { useEffect, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Link } from 'react-router'
-import { toast } from 'sonner'
-
-import { getGSCKeywords } from '~/api'
-import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'
-import Loader from '~/ui/Loader'
-import routes from '~/utils/routes'
-
-import { useViewProjectContext } from '../ViewProject'
-import { getFormatDate } from '../ViewProject.helpers'
-
-const Keywords = () => {
- const { id, project } = useCurrentProject()
- const projectPassword = useProjectPassword(id)
- const { t } = useTranslation('common')
- const { dateRange, period, timezone } = useViewProjectContext()
-
- const [isLoading, setIsLoading] = useState<boolean | null>(null)
- const [keywords, setKeywords] = useState<{ name: string; count: number }[]>([])
- const [notConnected, setNotConnected] = useState(false)
-
- const [from, to] = useMemo(() => {
- if (!dateRange) {
- return [undefined, undefined]
- }
- return [getFormatDate(dateRange[0]), getFormatDate(dateRange[1])]
- }, [dateRange])
-
- const fetchKeywords = async () => {
- if (isLoading) return
- setIsLoading(true)
- setNotConnected(false)
- try {
- const res = await getGSCKeywords(id, period, from, to, timezone, projectPassword)
- setKeywords(res.keywords || [])
- } catch (error: any) {
- const message = typeof error === 'string' ? error : error?.message
- if (message && (message as string).toLowerCase().includes('search console')) {
- setNotConnected(true)
- } else {
- toast.error(typeof error === 'string' ? error : t('apiNotifications.somethingWentWrong'))
- }
- } finally {
- setIsLoading(false)
- }
- }
-
- useEffect(() => {
- fetchKeywords()
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [period, from, to, timezone, id])
-
- if (isLoading || isLoading === null) {
- return <Loader />
- }
-
- if (notConnected) {
- return (
- <div className='mt-4 text-center'>
- <p className='text-sm text-gray-800 dark:text-gray-200'>
- {['owner', 'admin'].includes(project?.role || '')
- ? t('project.connectGsc')
- : t('project.gscConnectionRequired')}
- </p>
- {['owner', 'admin'].includes(project?.role || '') ? (
- <Link
- to={`${routes.project_settings.replace(':id', id)}?tab=integrations`}
- className='mt-2 inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-1 text-sm text-gray-800 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- >
- {t('project.goToProjectSettings')}
- </Link>
- ) : null}
- </div>
- )
- }
-
- if (_isEmpty(keywords)) {
- return (
- <p className='mt-4 text-center text-sm text-gray-800 italic dark:text-gray-200'>{t('project.noKeywordsFound')}</p>
- )
- }
-
- return (
- <div className='max-h-[500px] overflow-y-auto'>
- <table className='w-full border-separate border-spacing-y-1'>
- <thead className='sticky top-0 z-10 bg-white dark:bg-slate-900'>
- <tr className='text-base text-gray-900 dark:text-gray-50'>
- <th className='w-2/3 pl-2 text-left'>{t('project.keyword')}</th>
- <th className='w-1/3 pr-2 text-right'>{t('project.clicks')}</th>
- </tr>
- </thead>
- <tbody>
- {_map(keywords, (k) => (
- <tr key={`${k.name}-${k.count}`}>
- <td className='rounded-l-md bg-gray-50 p-2 text-sm text-gray-900 dark:bg-slate-800 dark:text-gray-50'>
- {k.name || t('common.notSet')}
- </td>
- <td className='rounded-r-md bg-gray-50 p-2 text-right text-sm text-gray-900 dark:bg-slate-800 dark:text-gray-50'>
- {k.count}
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
- )
-}
-
-export default Keywords
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index 0aa1fe3f8..e9063996d 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -1049,7 +1049,8 @@
"userFlow": "User flow",
"entryPage": "Entry page",
"exitPage": "Exit page",
- "keywords": "Keywords"
+ "keywords": "Keywords",
+ "keyword": "Keyword"
},
"connectGsc": "Connect Google Search Console to see keywords for this project.",
"gscConnectionRequired": "Google Search Console connection is required to view keywords for this project. Ask the project administrator to connect it first.",
@@ -1057,7 +1058,6 @@
"noKeywordsFound": "No keywords found for the selected period.",
"entryPages": "Entry pages",
"exitPages": "Exit pages",
- "keyword": "Keyword",
"clicks": "Clicks",
"metamapping": {
"ev": {