Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Retention report UI updates.
Mike Cao2c8996b68f8c
diff --git a/components/input/MonthSelect.js b/components/input/MonthSelect.jsindex bb0544468..a20890ad9 100644--- a/components/input/MonthSelect.js+++ b/components/input/MonthSelect.js@@ -1,5 +1,13 @@-import { useRef, useState } from 'react';-import { Text, Icon, CalendarMonthSelect, CalendarYearSelect, Button } from 'react-basics';+import { useRef } from 'react';+import {+ Text,+ Icon,+ CalendarMonthSelect,+ CalendarYearSelect,+ Button,+ PopupTrigger,+ Popup,+} from 'react-basics';import { startOfMonth, endOfMonth } from 'date-fns';import Icons from 'components/icons';import { useLocale } from 'hooks';@@ -7,43 +15,50 @@ import { formatDate } from 'lib/date';import { getDateLocale } from 'lib/lang';import styles from './MonthSelect.module.css';-const MONTH = 'month';-const YEAR = 'year';-export function MonthSelect({ date = new Date(), onChange }) {const { locale } = useLocale();- const [select, setSelect] = useState(null);const month = formatDate(date, 'MMMM', locale);const year = date.getFullYear();const ref = useRef();- const handleSelect = value => {- setSelect(state => (state !== value ? value : null));- };-const handleChange = date => {onChange(`range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`);- setSelect(null);};return (<><div ref={ref} className={styles.container}>- <Button className={styles.input} variant="quiet" onClick={() => handleSelect(MONTH)}>- <Text>{month}</Text>- <Icon size="sm">{select === MONTH ? <Icons.Close /> : <Icons.ChevronDown />}</Icon>- </Button>- <Button className={styles.input} variant="quiet" onClick={() => handleSelect(YEAR)}>- <Text>{year}</Text>- <Icon size="sm">{select === YEAR ? <Icons.Close /> : <Icons.ChevronDown />}</Icon>- </Button>+ <PopupTrigger>+ <Button className={styles.input} variant="quiet">+ <Text>{month}</Text>+ <Icon size="sm">+ <Icons.ChevronDown />+ </Icon>+ </Button>+ <Popup className={styles.popup} alignment="start">+ <CalendarMonthSelect+ date={date}+ locale={getDateLocale(locale)}+ onSelect={handleChange}+ />+ </Popup>+ </PopupTrigger>+ <PopupTrigger>+ <Button className={styles.input} variant="quiet">+ <Text>{year}</Text>+ <Icon size="sm">+ <Icons.ChevronDown />+ </Icon>+ </Button>+ <Popup className={styles.popup} alignment="start">+ <CalendarYearSelect+ date={date}+ locale={getDateLocale(locale)}+ onSelect={handleChange}+ />+ </Popup>+ </PopupTrigger></div>- {select === MONTH && (- <CalendarMonthSelect date={date} locale={getDateLocale(locale)} onSelect={handleChange} />- )}- {select === YEAR && (- <CalendarYearSelect date={date} locale={getDateLocale(locale)} onSelect={handleChange} />- )}</>);}diff --git a/components/input/MonthSelect.module.css b/components/input/MonthSelect.module.cssindex 04cf575c3..3b13bcc18 100644--- a/components/input/MonthSelect.module.css+++ b/components/input/MonthSelect.module.css@@ -2,6 +2,8 @@display: flex;align-items: center;justify-content: center;+ border: 1px solid var(--base400);+ border-radius: var(--border-radius);}.input {@@ -10,3 +12,11 @@gap: 10px;cursor: pointer;}++.popup {+ border: 1px solid var(--base400);+ background: var(--base50);+ border-radius: var(--border-radius);+ padding: 20px;+ margin-top: 5px;+}diff --git a/components/pages/reports/PopupForm.js b/components/pages/reports/PopupForm.jsindex 0f0ead369..0e825a267 100644--- a/components/pages/reports/PopupForm.js+++ b/components/pages/reports/PopupForm.js@@ -1,29 +1,11 @@-import { createPortal } from 'react-dom';-import { useDocumentClick, useKeyDown } from 'react-basics';import classNames from 'classnames';import styles from './PopupForm.module.css';-export function PopupForm({ element, className, children, onClose }) {- const { right, top } = element.getBoundingClientRect();- const style = { position: 'absolute', left: right, top };-- useKeyDown('Escape', onClose);-- useDocumentClick(e => {- if (e.target !== element && !element?.parentElement?.contains(e.target)) {- onClose();- }- });-- const handleClick = e => {- e.stopPropagation();- };-- return createPortal(- <div className={classNames(styles.form, className)} style={style} onClick={handleClick}>+export function PopupForm({ className, style, children }) {+ return (+ <div className={classNames(styles.form, className)} style={style}>{children}- </div>,- document.body,+ </div>);}diff --git a/components/pages/reports/PopupForm.module.css b/components/pages/reports/PopupForm.module.cssindex 4daf199ac..94d98b38c 100644--- a/components/pages/reports/PopupForm.module.css+++ b/components/pages/reports/PopupForm.module.css@@ -3,8 +3,8 @@background: var(--base50);min-width: 300px;padding: 20px;- margin-left: 30px;border: 1px solid var(--base400);border-radius: var(--border-radius);box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);+ z-index: 1000;}diff --git a/components/pages/reports/insights/InsightsParameters.js b/components/pages/reports/insights/InsightsParameters.jsindex 6de4b838e..9f3571e6d 100644--- a/components/pages/reports/insights/InsightsParameters.js+++ b/components/pages/reports/insights/InsightsParameters.js@@ -80,10 +80,10 @@ export function InsightsParameters() {<Icons.Plus /></Icon></TooltipPopup>- <Popup position="bottom" alignment="start">- {(close, element) => {+ <Popup position="bottom" alignment="start" className={styles.popup}>+ {close => {return (- <PopupForm element={element} onClose={close}>+ <PopupForm onClose={close}>{id === 'fields' && (<FieldSelectFormitems={fieldOptions}@@ -114,7 +114,7 @@ export function InsightsParameters() {return (<FormRow key={label} label={label} action={<AddButton id={id} onAdd={handleAdd} />}><ParameterList items={parameterData[id]} onRemove={index => handleRemove(id, index)}>- {({ name, filter, value, label }) => {+ {({ name, filter, value }) => {return (<div className={styles.parameter}>{id === 'fields' && (diff --git a/components/pages/reports/insights/InsightsParameters.module.css b/components/pages/reports/insights/InsightsParameters.module.cssindex 06b624149..c84f8a9e9 100644--- a/components/pages/reports/insights/InsightsParameters.module.css+++ b/components/pages/reports/insights/InsightsParameters.module.css@@ -10,3 +10,8 @@.op {font-weight: bold;}++.popup {+ margin-top: -10px;+ margin-left: 30px;+}diff --git a/components/pages/reports/retention/RetentionParameters.js b/components/pages/reports/retention/RetentionParameters.jsindex 1eee6bf27..d98608ae7 100644--- a/components/pages/reports/retention/RetentionParameters.js+++ b/components/pages/reports/retention/RetentionParameters.js@@ -31,7 +31,7 @@ export function RetentionParameters() {return (<Form ref={ref} values={parameters} onSubmit={handleSubmit} preventSubmit={true}><BaseParameters showDateSelect={false} />- <FormRow label={formatMessage(labels.dateRange)}>+ <FormRow label={formatMessage(labels.date)}><MonthSelect date={startDate} onChange={handleDateChange} /></FormRow><FormButtons>diff --git a/components/pages/reports/retention/RetentionReport.js b/components/pages/reports/retention/RetentionReport.jsindex 63eea44c7..a9aaeb3e7 100644--- a/components/pages/reports/retention/RetentionReport.js+++ b/components/pages/reports/retention/RetentionReport.js@@ -6,10 +6,16 @@ import ReportMenu from '../ReportMenu';import ReportBody from '../ReportBody';import Magnet from 'assets/magnet.svg';import { REPORT_TYPES } from 'lib/constants';+import { parseDateRange } from 'lib/date';+import { endOfMonth, startOfMonth } from 'date-fns';const defaultParameters = {type: REPORT_TYPES.retention,- parameters: {},+ parameters: {+ dateRange: parseDateRange(+ `range:${startOfMonth(new Date()).getTime()}:${endOfMonth(new Date()).getTime()}`,+ ),+ },};export default function RetentionReport({ reportId }) {diff --git a/components/pages/reports/retention/RetentionTable.js b/components/pages/reports/retention/RetentionTable.jsindex f7d8c4bb9..df0b0f99f 100644--- a/components/pages/reports/retention/RetentionTable.js+++ b/components/pages/reports/retention/RetentionTable.js@@ -1,5 +1,4 @@import { useContext } from 'react';-import { GridTable, GridColumn } from 'react-basics';import classNames from 'classnames';import { ReportContext } from '../Report';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';@@ -16,14 +15,26 @@ export function RetentionTable() {return <EmptyPlaceholder />;}- const rows = data.reduce((arr, { date, visitors }) => {- if (!arr.find(a => a.date === date)) {- return arr.concat({ date, visitors });+ const days = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];++ const rows = data.reduce((arr, row) => {+ const { date, visitors, day } = row;+ if (day === 0) {+ return arr.concat({+ date,+ visitors,+ records: days+ .reduce((arr, day) => {+ arr[day] = data.find(x => x.date === date && x.day === day);+ return arr;+ }, [])+ .filter(n => n),+ });}return arr;}, []);- const days = [1, 2, 3, 4, 5, 6, 7, 14, 21, 30];+ const totalDays = rows.length;return (<>@@ -37,15 +48,22 @@ export function RetentionTable() {</div>))}</div>- {rows.map(({ date, visitors }, i) => {+ {rows.map(({ date, visitors, records }, rowIndex) => {return (- <div key={i} className={styles.row}>+ <div key={rowIndex} className={styles.row}><div className={styles.date}>{formatDate(`${date} 00:00:00`, 'PP')}</div><div className={styles.visitors}>{visitors}</div>- {days.map((n, day) => {+ {days.map(day => {+ if (totalDays - rowIndex < day) {+ return null;+ }+ const percentage = records[day]?.percentage;return (- <div key={day} className={styles.cell}>- {data.find(row => row.date === date && row.day === day)?.percentage.toFixed(2)}+ <div+ key={day}+ className={classNames(styles.cell, { [styles.empty]: !percentage })}+ >+ {percentage ? `${percentage.toFixed(2)}%` : ''}</div>);})}@@ -53,31 +71,8 @@ export function RetentionTable() {);})}</div>- <DataTable data={data} /></>);}-function DataTable({ data }) {- return (- <GridTable data={data || []}>- <GridColumn name="date" label={'Date'}>- {row => row.date}- </GridColumn>- <GridColumn name="day" label={'Day'}>- {row => row.day}- </GridColumn>- <GridColumn name="visitors" label={'Visitors'}>- {row => row.visitors}- </GridColumn>- <GridColumn name="returnVisitors" label={'Return Visitors'}>- {row => row.returnVisitors}- </GridColumn>- <GridColumn name="percentage" label={'Percentage'}>- {row => row.percentage}- </GridColumn>- </GridTable>- );-}-export default RetentionTable;diff --git a/components/pages/reports/retention/RetentionTable.module.css b/components/pages/reports/retention/RetentionTable.module.cssindex 79cbbc5fa..bfe3ac1c4 100644--- a/components/pages/reports/retention/RetentionTable.module.css+++ b/components/pages/reports/retention/RetentionTable.module.css@@ -20,7 +20,7 @@justify-content: center;width: 60px;height: 60px;- background: var(--blue100);+ background: var(--blue200);border-radius: var(--border-radius);}@@ -46,3 +46,7 @@font-size: var(--font-size-sm);font-weight: 400;}++.empty {+ background: var(--blue100);+}diff --git a/package.json b/package.jsonindex 46ad4d2d4..9d2de0936 100644--- a/package.json+++ b/package.json@@ -94,7 +94,7 @@"node-fetch": "^3.2.8","npm-run-all": "^4.1.5","react": "^18.2.0",- "react-basics": "^0.94.0",+ "react-basics": "^0.96.0","react-beautiful-dnd": "^13.1.0","react-dom": "^18.2.0","react-error-boundary": "^4.0.4",diff --git a/yarn.lock b/yarn.lockindex e67cc4130..350e483fe 100644--- a/yarn.lock+++ b/yarn.lock@@ -7557,10 +7557,10 @@ rc@^1.2.7:minimist "^1.2.0"strip-json-comments "~2.0.1"-react-basics@^0.94.0:- version "0.94.0"- resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.94.0.tgz#c15698148b959f40c6b451088f36f5735eb82815"- integrity sha512-OlUHWrGRctRGEm+yL9iWSC9HRnxZhlm3enP2iCKytVmt7LvaPtsK4RtZ27qp4irNvuzg79aqF+h5IFnG+Vi7WA==+react-basics@^0.96.0:+ version "0.96.0"+ resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.96.0.tgz#e5e72201abdccdda94b952ef605163ca11772d8f"+ integrity sha512-WNAxP+0xBtUNgEXrL8aW6UQMmD6WoX9My0VW6uq+Q262DOPTU3zPtWl+9vvES4pF3tPJCFvmFAlK/Alw9+XKVQ==dependencies:classnames "^2.3.1"date-fns "^2.29.3"