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!

(feature) Session analysis: add "open in a new tab" (#390)

Andrii Romasiunad32061cf1df
diff --git a/app/pages/Project/View/components/Sessions.tsx b/app/pages/Project/View/components/Sessions.tsx
index a24865ffb..c6280eb1b 100644
--- a/app/pages/Project/View/components/Sessions.tsx
+++ b/app/pages/Project/View/components/Sessions.tsx
@@ -1,10 +1,13 @@
import React from 'react'
+import { Link } from '@remix-run/react'
+import { ClientOnly } from 'remix-utils'
+import { useTranslation } from 'react-i18next'
import _map from 'lodash/map'
import cx from 'clsx'
import { ChevronRightIcon } from '@heroicons/react/24/outline'
+import Loader from 'ui/Loader'
import { ISession } from '../interfaces/session'
import { Badge } from 'ui/Badge'
-import { useTranslation } from 'react-i18next'
import CCRow from './CCRow'
interface ISessions {
@@ -31,62 +34,80 @@ const Session = ({ session, onClick, className }: ISessionComponent) => {
minute: 'numeric',
})
+ const psidUrl = new URL(window.location.href)
+ psidUrl.searchParams.set('psid', session.psid)
+ const stringifiedUrl = psidUrl.toString()
+
return (
- <li
- className={cx(
- 'relative flex justify-between gap-x-6 py-5 bg-gray-50 hover:bg-gray-200 dark:bg-slate-900 dark:hover:bg-slate-800 cursor-pointer px-4 sm:px-6 lg:px-8',
- className,
- )}
- onClick={() => {
- const url = new URL(window.location.href)
- url.searchParams.set('psid', session.psid)
- window.history.pushState({}, '', url.toString())
+ <Link
+ onClick={(e: React.MouseEvent<HTMLAnchorElement>) => {
+ e.preventDefault()
+ e.stopPropagation()
+ window.history.pushState({}, '', stringifiedUrl)
onClick(session.psid)
}}
+ to={stringifiedUrl}
>
- <div className='flex min-w-0 gap-x-4'>
- <div className='min-w-0 flex-auto'>
- <p className='text-sm font-semibold leading-6 text-gray-900 dark:text-gray-50'>
- {session.psid}
- <span className='text-gray-400 mx-1'>|</span>
- {date}
- </p>
- <p className='mt-1 flex text-xs leading-5 text-gray-500 dark:text-gray-300'>
- {session.cc ? <CCRow size={18} cc={session.cc} language={language} /> : t('project.unknownCountry')}
- <span className='text-gray-400 mx-1'>|</span>
- {session.os}
- <span className='text-gray-400 mx-1'>|</span>
- {session.br}
- </p>
+ <li
+ className={cx(
+ 'relative flex justify-between gap-x-6 py-5 bg-gray-50 hover:bg-gray-200 dark:bg-slate-900 dark:hover:bg-slate-800 cursor-pointer px-4 sm:px-6 lg:px-8',
+ className,
+ )}
+ >
+ <div className='flex min-w-0 gap-x-4'>
+ <div className='min-w-0 flex-auto'>
+ <p className='text-sm font-semibold leading-6 text-gray-900 dark:text-gray-50'>
+ {session.psid}
+ <span className='text-gray-400 mx-1'>|</span>
+ {date}
+ </p>
+ <p className='mt-1 flex text-xs leading-5 text-gray-500 dark:text-gray-300'>
+ {session.cc ? <CCRow size={18} cc={session.cc} language={language} /> : t('project.unknownCountry')}
+ <span className='text-gray-400 mx-1'>|</span>
+ {session.os}
+ <span className='text-gray-400 mx-1'>|</span>
+ {session.br}
+ </p>
+ </div>
</div>
- </div>
- <div className='flex shrink-0 items-center gap-x-4'>
- <div className='hidden sm:flex sm:flex-col sm:items-end'>
- <p className='text-sm leading-6 text-gray-900 dark:text-gray-50'>{`${session.pageviews} pageviews`}</p>
- {session.active ? (
- <Badge label={t('dashboard.active')} colour='green' />
- ) : (
- <Badge label={t('billing.inactive')} colour='yellow' />
- )}
+ <div className='flex shrink-0 items-center gap-x-4'>
+ <div className='hidden sm:flex sm:flex-col sm:items-end'>
+ <p className='text-sm leading-6 text-gray-900 dark:text-gray-50'>{`${session.pageviews} pageviews`}</p>
+ {session.active ? (
+ <Badge label={t('dashboard.active')} colour='green' />
+ ) : (
+ <Badge label={t('billing.inactive')} colour='yellow' />
+ )}
+ </div>
+ <ChevronRightIcon className='h-5 w-5 flex-none text-gray-400' aria-hidden='true' />
</div>
- <ChevronRightIcon className='h-5 w-5 flex-none text-gray-400' aria-hidden='true' />
- </div>
- </li>
+ </li>
+ </Link>
)
}
export const Sessions: React.FC<ISessions> = ({ sessions, onClick }) => {
return (
- <ul className='divide-y divide-gray-100 dark:divide-slate-700 mt-2'>
- {_map(sessions, (session, index) => (
- <Session
- key={session.psid}
- session={session}
- onClick={onClick}
- className={`${index === 0 && 'rounded-t-md'} ${index === sessions.length - 1 && 'rounded-b-md'}`}
- />
- ))}
- </ul>
+ <ClientOnly
+ fallback={
+ <div className='bg-gray-50 dark:bg-slate-900'>
+ <Loader />
+ </div>
+ }
+ >
+ {() => (
+ <ul className='divide-y divide-gray-100 dark:divide-slate-700 mt-2'>
+ {_map(sessions, (session, index) => (
+ <Session
+ key={session.psid}
+ session={session}
+ onClick={onClick}
+ className={`${index === 0 && 'rounded-t-md'} ${index === sessions.length - 1 && 'rounded-b-md'}`}
+ />
+ ))}
+ </ul>
+ )}
+ </ClientOnly>
)
}