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
Add website/reports to top nav.
Brian Caof7eeaa622b39
diff --git a/components/layout/NavBar.js b/components/layout/NavBar.jsindex 97eaa46c3..e896b4046 100644--- a/components/layout/NavBar.js+++ b/components/layout/NavBar.js@@ -18,6 +18,8 @@ export function NavBar() {const links = [{ label: formatMessage(labels.dashboard), url: '/dashboard' },+ { label: formatMessage(labels.websites), url: '/websites' },+ { label: formatMessage(labels.reports), url: '/reports' },!cloudMode && { label: formatMessage(labels.settings), url: '/settings' },].filter(n => n);diff --git a/components/messages.js b/components/messages.jsindex f47513e8c..c00248107 100644--- a/components/messages.js+++ b/components/messages.js@@ -21,6 +21,8 @@ export const labels = defineMessages({details: { id: 'label.details', defaultMessage: 'Details' },website: { id: 'label.website', defaultMessage: 'Website' },websites: { id: 'label.websites', defaultMessage: 'Websites' },+ myWebsites: { id: 'label.my-websites', defaultMessage: 'My Websites' },+ teamWebsites: { id: 'label.team-websites', defaultMessage: 'Team Websites' },created: { id: 'label.created', defaultMessage: 'Created' },edit: { id: 'label.edit', defaultMessage: 'Edit' },name: { id: 'label.name', defaultMessage: 'Name' },@@ -28,6 +30,7 @@ export const labels = defineMessages({accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },teamId: { id: 'label.team-id', defaultMessage: 'Team ID' },team: { id: 'label.team', defaultMessage: 'Team' },+ teamName: { id: 'label.team-name', defaultMessage: 'Team Name' },regenerate: { id: 'label.regenerate', defaultMessage: 'Regenerate' },remove: { id: 'label.remove', defaultMessage: 'Remove' },join: { id: 'label.join', defaultMessage: 'Join' },diff --git a/components/pages/reports/ReportsPage.js b/components/pages/reports/ReportsPage.jsindex 470e1b08d..d63fc77fa 100644--- a/components/pages/reports/ReportsPage.js+++ b/components/pages/reports/ReportsPage.js@@ -1,13 +1,24 @@+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import Link from 'next/link';-import { Button, Icon, Icons, Text } from 'react-basics';import { useMessages, useReports } from 'hooks';+import Link from 'next/link';+import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';import ReportsTable from './ReportsTable';export function ReportsPage() {- const { formatMessage, labels } = useMessages();- const { reports, error, isLoading } = useReports();+ const { formatMessage, labels, messages } = useMessages();+ const {+ reports,+ error,+ isLoading,+ filter,+ handleFilterChange,+ handlePageChange,+ handlePageSizeChange,+ } = useReports();++ const hasData = (reports && reports?.data.length !== 0) || filter;return (<Page loading={isLoading} error={error}>@@ -21,7 +32,22 @@ export function ReportsPage() {</Button></Link></PageHeader>- <ReportsTable data={reports} />++ {hasData && (+ <ReportsTable+ data={reports}+ showSearch={true}+ showPaging={true}+ onFilterChange={handleFilterChange}+ onPageChange={handlePageChange}+ onPageSizeChange={handlePageSizeChange}+ filterValue={filter}+ showDomain={true}+ />+ )}+ {!hasData && (+ <EmptyPlaceholder message={formatMessage(messages.noReportsConfigured)}></EmptyPlaceholder>+ )}</Page>);}diff --git a/components/pages/reports/ReportsTable.js b/components/pages/reports/ReportsTable.jsindex 529f53599..e59e4069a 100644--- a/components/pages/reports/ReportsTable.js+++ b/components/pages/reports/ReportsTable.js@@ -12,14 +12,23 @@ export function ReportsTable({onFilterChange,onPageChange,onPageSizeChange,+ showDomain,}) {const [report, setReport] = useState(null);const { formatMessage, labels } = useMessages();+ const domainColumn = [+ {+ name: 'domain',+ label: formatMessage(labels.domain),+ },+ ];+const columns = [{ name: 'name', label: formatMessage(labels.name) },{ name: 'description', label: formatMessage(labels.description) },{ name: 'type', label: formatMessage(labels.type) },+ ...(showDomain ? domainColumn : []),{ name: 'action', label: ' ' },];@@ -41,6 +50,9 @@ export function ReportsTable({>{row => {const { id } = row;+ if (showDomain) {+ row.domain = row.website.domain;+ }return (<Flexbox gap={10}>diff --git a/components/pages/settings/websites/WebsitesList.js b/components/pages/settings/websites/WebsitesList.jsindex 310b481f7..f99b2d6ec 100644--- a/components/pages/settings/websites/WebsitesList.js+++ b/components/pages/settings/websites/WebsitesList.js@@ -10,19 +10,21 @@ import useMessages from 'hooks/useMessages';import { ROLES } from 'lib/constants';import useApiFilter from 'hooks/useApiFilter';-export function WebsitesList() {+export function WebsitesList({ showTeam, showHeader = true, includeTeams, onlyTeams, fetch }) {const { formatMessage, labels, messages } = useMessages();const { user } = useUser();const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =useApiFilter();const { get, useQuery } = useApi();const { data, isLoading, error, refetch } = useQuery(- ['websites', user?.id, filter, page, pageSize],+ ['websites', fetch, user?.id, filter, page, pageSize, includeTeams, onlyTeams],() =>get(`/users/${user?.id}/websites`, {filter,page,pageSize,+ includeTeams,+ onlyTeams,}),{ enabled: !!user },);@@ -54,10 +56,11 @@ export function WebsitesList() {return (<Page loading={isLoading} error={error}>- <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>+ {showHeader && <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>}{hasData && (<WebsitesTabledata={data}+ showTeam={showTeam}onFilterChange={handleFilterChange}onPageChange={handlePageChange}onPageSizeChange={handlePageSizeChange}diff --git a/components/pages/settings/websites/WebsitesTable.js b/components/pages/settings/websites/WebsitesTable.jsindex aa8cbe8a9..614b33418 100644--- a/components/pages/settings/websites/WebsitesTable.js+++ b/components/pages/settings/websites/WebsitesTable.js@@ -10,13 +10,20 @@ export function WebsitesTable({onFilterChange,onPageChange,onPageSizeChange,+ showTeam,}) {const { formatMessage, labels } = useMessages();const { openExternal } = useConfig();+ const teamColumns = [+ { name: 'teamName', label: formatMessage(labels.teamName) },+ { name: 'owner', label: formatMessage(labels.owner) },+ ];+const columns = [{ name: 'name', label: formatMessage(labels.name) },{ name: 'domain', label: formatMessage(labels.domain) },+ ...(showTeam ? teamColumns : []),{ name: 'action', label: ' ' },];@@ -32,7 +39,15 @@ export function WebsitesTable({filterValue={filterValue}>{row => {- const { id } = row;+ const {+ id,+ teamWebsite,+ user: { username },+ } = row;+ if (showTeam) {+ row.teamName = teamWebsite[0]?.team.name;+ row.owner = username;+ }return (<>diff --git a/components/pages/websites/WebsiteReportsPage.js b/components/pages/websites/WebsiteReportsPage.jsindex beb9bc4f0..85a002e69 100644--- a/components/pages/websites/WebsiteReportsPage.js+++ b/components/pages/websites/WebsiteReportsPage.js@@ -1,7 +1,7 @@import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import Page from 'components/layout/Page';import ReportsTable from 'components/pages/reports/ReportsTable';-import { useMessages, useReports } from 'hooks';+import { useMessages, useWebsiteReports } from 'hooks';import Link from 'next/link';import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';import WebsiteHeader from './WebsiteHeader';@@ -17,9 +17,9 @@ export function WebsiteReportsPage({ websiteId }) {handleFilterChange,handlePageChange,handlePageSizeChange,- } = useReports(websiteId);+ } = useWebsiteReports(websiteId);- const hasData = reports && reports.data.length !== 0;+ const hasData = (reports && reports.data.length !== 0) || filter;const handleDelete = async id => {await deleteReport(id);@@ -48,11 +48,7 @@ export function WebsiteReportsPage({ websiteId }) {filterValue={filter}/>)}- {!hasData && (- <EmptyPlaceholder message={formatMessage(messages.noReportsConfigured)}>- {/* {addButton} */}- </EmptyPlaceholder>- )}+ {!hasData && <EmptyPlaceholder message={formatMessage(messages.noReportsConfigured)} />}</Page>);}diff --git a/components/pages/websites/WebsitesPage.js b/components/pages/websites/WebsitesPage.jsnew file mode 100644index 000000000..4fdd025de--- /dev/null+++ b/components/pages/websites/WebsitesPage.js@@ -0,0 +1,67 @@+import Page from 'components/layout/Page';+import PageHeader from 'components/layout/PageHeader';+import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';+import WebsiteList from 'components/pages/settings/websites/WebsitesList';+import { useMessages } from 'hooks';+import useUser from 'hooks/useUser';+import { ROLES } from 'lib/constants';+import { useState } from 'react';+import {+ Button,+ Icon,+ Icons,+ Item,+ Modal,+ ModalTrigger,+ Tabs,+ Text,+ useToasts,+} from 'react-basics';++export function WebsitesPage() {+ const { formatMessage, labels, messages } = useMessages();+ const [tab, setTab] = useState('my-websites');+ const [fetch, setFetch] = useState(1);+ const { user } = useUser();+ const { showToast } = useToasts();++ const handleSave = async () => {+ setFetch(fetch + 1);+ showToast({ message: formatMessage(messages.saved), variant: 'success' });+ };++ const addButton = (+ <>+ {user.role !== ROLES.viewOnly && (+ <ModalTrigger>+ <Button variant="primary">+ <Icon>+ <Icons.Plus />+ </Icon>+ <Text>{formatMessage(labels.addWebsite)}</Text>+ </Button>+ <Modal title={formatMessage(labels.addWebsite)}>+ {close => <WebsiteAddForm onSave={handleSave} onClose={close} />}+ </Modal>+ </ModalTrigger>+ )}+ </>+ );++ return (+ <Page>+ <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>+ <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>+ <Item key="my-websites">{formatMessage(labels.myWebsites)}</Item>+ <Item key="team-webaites">{formatMessage(labels.teamWebsites)}</Item>+ </Tabs>++ {tab === 'my-websites' && <WebsiteList showHeader={false} fetch={fetch} />}+ {tab === 'team-webaites' && (+ <WebsiteList showHeader={false} fetch={fetch} showTeam={true} onlyTeams={true} />+ )}+ </Page>+ );+}++export default WebsitesPage;diff --git a/hooks/index.js b/hooks/index.jsindex 004260b0d..2596ba57e 100644--- a/hooks/index.js+++ b/hooks/index.js@@ -20,3 +20,4 @@ export * from './useTheme';export * from './useTimezone';export * from './useUser';export * from './useWebsite';+export * from './useWebsiteReports';diff --git a/hooks/useReports.js b/hooks/useReports.jsindex 57d76492b..932fa6dc4 100644--- a/hooks/useReports.js+++ b/hooks/useReports.js@@ -2,15 +2,15 @@ import { useState } from 'react';import useApi from './useApi';import useApiFilter from 'hooks/useApiFilter';-export function useReports(websiteId) {+export function useReports() {const [modified, setModified] = useState(Date.now());const { get, useQuery, del, useMutation } = useApi();const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =useApiFilter();const { data, error, isLoading } = useQuery(- ['reports:website', { websiteId, modified, filter, page, pageSize }],- () => get(`/reports`, { websiteId, filter, page, pageSize }),+ ['reports', { modified, filter, page, pageSize }],+ () => get(`/reports`, { filter, page, pageSize }),);const deleteReport = id => {diff --git a/hooks/useWebsiteReports.js b/hooks/useWebsiteReports.jsnew file mode 100644index 000000000..3b7ec4155--- /dev/null+++ b/hooks/useWebsiteReports.js@@ -0,0 +1,38 @@+import { useState } from 'react';+import useApi from './useApi';+import useApiFilter from 'hooks/useApiFilter';++export function useWebsiteReports(websiteId) {+ const [modified, setModified] = useState(Date.now());+ const { get, useQuery, del, useMutation } = useApi();+ const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));+ const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =+ useApiFilter();+ const { data, error, isLoading } = useQuery(+ ['reports:website', { websiteId, modified, filter, page, pageSize }],+ () => get(`/websites/${websiteId}/reports`, { websiteId, filter, page, pageSize }),+ );++ const deleteReport = id => {+ mutate(id, {+ onSuccess: () => {+ setModified(Date.now());+ },+ });+ };++ return {+ reports: data,+ error,+ isLoading,+ deleteReport,+ filter,+ page,+ pageSize,+ handleFilterChange,+ handlePageChange,+ handlePageSizeChange,+ };+}++export default useWebsiteReports;diff --git a/lib/types.ts b/lib/types.tsindex 5a25169a9..65bef8fb9 100644--- a/lib/types.ts+++ b/lib/types.ts@@ -27,6 +27,7 @@ export interface WebsiteSearchFilter extends SearchFilter<WebsiteSearchFilterTypuserId?: string;teamId?: string;includeTeams?: boolean;+ onlyTeams?: boolean;}export interface UserSearchFilter extends SearchFilter<UserSearchFilterType> {@@ -40,6 +41,7 @@ export interface TeamSearchFilter extends SearchFilter<TeamSearchFilterType> {export interface ReportSearchFilter extends SearchFilter<ReportSearchFilterType> {userId?: string;websiteId?: string;+ includeTeams?: boolean;}export interface SearchFilter<T> {diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.tsindex 8c6825f15..db83e6edc 100644--- a/pages/api/reports/index.ts+++ b/pages/api/reports/index.ts@@ -4,7 +4,7 @@ import { useAuth, useCors } from 'lib/middleware';import { NextApiRequestQueryBody, ReportSearchFilterType, SearchFilter } from 'lib/types';import { NextApiResponse } from 'next';import { methodNotAllowed, ok, unauthorized } from 'next-basics';-import { createReport, getReportsByWebsiteId } from 'queries';+import { createReport, getReportsByUserId, getReportsByWebsiteId } from 'queries';export interface ReportsRequestQuery extends SearchFilter<ReportSearchFilterType> {}@@ -26,20 +26,14 @@ export default async (await useCors(req, res);await useAuth(req, res);- const { websiteId } = req.query;-const {user: { id: userId },} = req.auth;if (req.method === 'GET') {- if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) {- return unauthorized(res);- }-const { page, filter, pageSize } = req.query;- const data = await getReportsByWebsiteId(websiteId, {+ const data = await getReportsByUserId(userId, {page,filter,pageSize: +pageSize || null,diff --git a/pages/api/users/[id]/websites.ts b/pages/api/users/[id]/websites.tsindex 72d793d1f..0e9231f73 100644--- a/pages/api/users/[id]/websites.ts+++ b/pages/api/users/[id]/websites.ts@@ -21,7 +21,7 @@ export default async (await useAuth(req, res);const { user } = req.auth;- const { id: userId, page, filter, pageSize, includeTeams } = req.query;+ const { id: userId, page, filter, pageSize, includeTeams, onlyTeams } = req.query;if (req.method === 'GET') {if (!user.isAdmin && user.id !== userId) {@@ -33,6 +33,7 @@ export default async (filter,pageSize: +pageSize || null,includeTeams,+ onlyTeams,});return ok(res, websites);diff --git a/pages/api/websites/[id]/reports.ts b/pages/api/websites/[id]/reports.tsnew file mode 100644index 000000000..60c6f7140--- /dev/null+++ b/pages/api/websites/[id]/reports.ts@@ -0,0 +1,38 @@+import { canViewWebsite } from 'lib/auth';+import { useAuth, useCors } from 'lib/middleware';+import { NextApiRequestQueryBody, ReportSearchFilterType, SearchFilter } from 'lib/types';+import { NextApiResponse } from 'next';+import { methodNotAllowed, ok, unauthorized } from 'next-basics';+import { getReportsByWebsiteId } from 'queries';++export interface ReportsRequestQuery extends SearchFilter<ReportSearchFilterType> {+ id: string;+}++export default async (+ req: NextApiRequestQueryBody<ReportsRequestQuery, any>,+ res: NextApiResponse,+) => {+ await useCors(req, res);+ await useAuth(req, res);++ const { id: websiteId } = req.query;++ if (req.method === 'GET') {+ if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) {+ return unauthorized(res);+ }++ const { page, filter, pageSize } = req.query;++ const data = await getReportsByWebsiteId(websiteId, {+ page,+ filter,+ pageSize: +pageSize || null,+ });++ return ok(res, data);+ }++ return methodNotAllowed(res);+};diff --git a/pages/reports/index.js b/pages/reports/index.jsnew file mode 100644index 000000000..ff3b4e862--- /dev/null+++ b/pages/reports/index.js@@ -0,0 +1,13 @@+import AppLayout from 'components/layout/AppLayout';+import ReportsPage from 'components/pages/reports/ReportsPage';+import { useMessages } from 'hooks';++export default function () {+ const { formatMessage, labels } = useMessages();++ return (+ <AppLayout title={formatMessage(labels.reports)}>+ <ReportsPage />+ </AppLayout>+ );+}diff --git a/pages/websites/index.js b/pages/websites/index.jsnew file mode 100644index 000000000..42a327bcc--- /dev/null+++ b/pages/websites/index.js@@ -0,0 +1,13 @@+import AppLayout from 'components/layout/AppLayout';+import WebsitesPage from 'components/pages/websites/WebsitesPage';+import useMessages from 'hooks/useMessages';++export default function () {+ const { formatMessage, labels } = useMessages();++ return (+ <AppLayout title={formatMessage(labels.websites)}>+ <WebsitesPage />+ </AppLayout>+ );+}diff --git a/queries/admin/report.ts b/queries/admin/report.tsindex 7ca2f2b29..3c50c2cb3 100644--- a/queries/admin/report.ts+++ b/queries/admin/report.ts@@ -28,13 +28,45 @@ export async function deleteReport(reportId: string): Promise<Report> {export async function getReports(ReportSearchFilter: ReportSearchFilter,+ options?: { include?: Prisma.ReportInclude },): Promise<FilterResult<Report[]>> {- const { userId, websiteId, filter, filterType = REPORT_FILTER_TYPES.all } = ReportSearchFilter;+ const {+ userId,+ websiteId,+ includeTeams,+ filter,+ filterType = REPORT_FILTER_TYPES.all,+ } = ReportSearchFilter;+const where: Prisma.ReportWhereInput = {...(userId && { userId: userId }),...(websiteId && { websiteId: websiteId }),- ...(filter && {- AND: {+ AND: [+ {+ OR: [+ {+ ...(userId && { userId: userId }),+ },+ {+ ...(includeTeams && {+ website: {+ teamWebsite: {+ some: {+ team: {+ teamUser: {+ some: {+ userId,+ },+ },+ },+ },+ },+ },+ }),+ },+ ],+ },+ {OR: [{...((filterType === REPORT_FILTER_TYPES.all ||@@ -98,7 +130,7 @@ export async function getReports(},],},- }),+ ],};const [pageFilters, getParameters] = prisma.getPageFilters(ReportSearchFilter);@@ -106,6 +138,7 @@ export async function getReports(const reports = await prisma.client.report.findMany({where,...pageFilters,+ ...(options?.include && { include: options.include }),});const count = await prisma.client.report.count({where,@@ -122,7 +155,18 @@ export async function getReportsByUserId(userId: string,filter: SearchFilter<ReportSearchFilterType>,): Promise<FilterResult<Report[]>> {- return getReports({ userId, ...filter });+ return getReports(+ { userId, ...filter },+ {+ include: {+ website: {+ select: {+ domain: true,+ },+ },+ },+ },+ );}export async function getReportsByWebsiteId(diff --git a/queries/admin/website.ts b/queries/admin/website.tsindex a55db8140..d7b98b45a 100644--- a/queries/admin/website.ts+++ b/queries/admin/website.ts@@ -26,29 +26,11 @@ export async function getWebsites(userId,teamId,includeTeams,+ onlyTeams,filter,filterType = WEBSITE_FILTER_TYPES.all,} = WebsiteSearchFilter;- const filterQuery = {- AND: {- OR: [- {- ...((filterType === WEBSITE_FILTER_TYPES.all ||- filterType === WEBSITE_FILTER_TYPES.name) && {- name: { startsWith: filter, mode: 'insensitive' },- }),- },- {- ...((filterType === WEBSITE_FILTER_TYPES.all ||- filterType === WEBSITE_FILTER_TYPES.domain) && {- domain: { startsWith: filter, mode: 'insensitive' },- }),- },- ],- },- };-const where: Prisma.WebsiteWhereInput = {...(teamId && {teamWebsite: {@@ -61,28 +43,53 @@ export async function getWebsites({OR: [{- ...(userId && {- userId,- }),+ ...(userId &&+ !onlyTeams && {+ userId,+ }),},{- ...(includeTeams && {- teamWebsite: {- some: {- team: {- teamUser: {- some: {- userId,+ ...((includeTeams || onlyTeams) && {+ AND: [+ {+ teamWebsite: {+ some: {+ team: {+ teamUser: {+ some: {+ userId,+ },+ },},},},},- },+ {+ userId: {+ not: userId,+ },+ },+ ],+ }),+ },+ ],+ },+ {+ OR: [+ {+ ...((filterType === WEBSITE_FILTER_TYPES.all ||+ filterType === WEBSITE_FILTER_TYPES.name) && {+ name: { startsWith: filter, mode: 'insensitive' },+ }),+ },+ {+ ...((filterType === WEBSITE_FILTER_TYPES.all ||+ filterType === WEBSITE_FILTER_TYPES.domain) && {+ domain: { startsWith: filter, mode: 'insensitive' },}),},],},- { ...(filter && filterQuery) },],};@@ -108,7 +115,27 @@ export async function getWebsitesByUserId(userId: string,filter?: WebsiteSearchFilter,): Promise<FilterResult<Website[]>> {- return getWebsites({ userId, ...filter });+ return getWebsites(+ { userId, ...filter },+ {+ include: {+ teamWebsite: {+ include: {+ team: {+ select: {+ name: true,+ },+ },+ },+ },+ user: {+ select: {+ username: true,+ },+ },+ },+ },+ );}export async function getWebsitesByTeamId(