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
Added website and team providers.
Mike Caocc273092d511
diff --git a/src/app/(main)/reports/ReportDeleteButton.tsx b/src/app/(main)/reports/ReportDeleteButton.tsxindex ce3958e50..c0f164694 100644--- a/src/app/(main)/reports/ReportDeleteButton.tsx+++ b/src/app/(main)/reports/ReportDeleteButton.tsx@@ -1,7 +1,7 @@'use client';import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';import { useApi, useMessages } from 'components/hooks';-import { touch } from 'store/cache';+import { touch } from 'store/modified';import ConfirmationForm from 'components/common/ConfirmationForm';export function ReportDeleteButton({diff --git a/src/app/(main)/settings/teams/TeamAddForm.tsx b/src/app/(main)/settings/teams/TeamAddForm.tsxindex 53220b8fd..a3caf25f8 100644--- a/src/app/(main)/settings/teams/TeamAddForm.tsx+++ b/src/app/(main)/settings/teams/TeamAddForm.tsx@@ -8,7 +8,7 @@ import {Button,SubmitButton,} from 'react-basics';-import { touch } from 'store/cache';+import { touch } from 'store/modified';import { useApi, useMessages } from 'components/hooks';export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {diff --git a/src/app/(main)/settings/teams/TeamDeleteForm.tsx b/src/app/(main)/settings/teams/TeamDeleteForm.tsxindex f6f405572..aa2b1d3f8 100644--- a/src/app/(main)/settings/teams/TeamDeleteForm.tsx+++ b/src/app/(main)/settings/teams/TeamDeleteForm.tsx@@ -1,6 +1,6 @@'use client';import { useApi, useMessages } from 'components/hooks';-import { touch } from 'store/cache';+import { touch } from 'store/modified';import TypeConfirmationForm from 'components/common/TypeConfirmationForm';const CONFIRM_VALUE = 'DELETE';diff --git a/src/app/(main)/settings/teams/TeamJoinForm.tsx b/src/app/(main)/settings/teams/TeamJoinForm.tsxindex 1510b6eff..b448a3687 100644--- a/src/app/(main)/settings/teams/TeamJoinForm.tsx+++ b/src/app/(main)/settings/teams/TeamJoinForm.tsx@@ -10,7 +10,7 @@ import {SubmitButton,} from 'react-basics';import { useApi, useMessages } from 'components/hooks';-import { touch } from 'store/cache';+import { touch } from 'store/modified';export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {const { formatMessage, labels, getMessage } = useMessages();diff --git a/src/app/(main)/settings/teams/TeamLeaveForm.tsx b/src/app/(main)/settings/teams/TeamLeaveForm.tsxindex 4e8537026..eba448f1e 100644--- a/src/app/(main)/settings/teams/TeamLeaveForm.tsx+++ b/src/app/(main)/settings/teams/TeamLeaveForm.tsx@@ -1,6 +1,6 @@'use client';import { useApi, useMessages } from 'components/hooks';-import { touch } from 'store/cache';+import { touch } from 'store/modified';import ConfirmationForm from 'components/common/ConfirmationForm';export function TeamLeaveForm({diff --git a/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsxindex 581b97a2b..bae0e7236 100644--- a/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx+++ b/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx@@ -1,7 +1,7 @@'use client';import { useApi, useMessages } from 'components/hooks';import { Icon, Icons, LoadingButton, Text } from 'react-basics';-import { touch } from 'store/cache';+import { touch } from 'store/modified';export function TeamMemberRemoveButton({teamId,diff --git a/src/app/(main)/settings/users/UserAddButton.tsx b/src/app/(main)/settings/users/UserAddButton.tsxindex b97571c17..57f2ebc5a 100644--- a/src/app/(main)/settings/users/UserAddButton.tsx+++ b/src/app/(main)/settings/users/UserAddButton.tsx@@ -2,7 +2,7 @@import { Button, Icon, Text, Modal, Icons, ModalTrigger, useToasts } from 'react-basics';import UserAddForm from './UserAddForm';import { useMessages } from 'components/hooks';-import { touch } from 'store/cache';+import { touch } from 'store/modified';export function UserAddButton({ onSave }: { onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/users/UserDeleteForm.tsx b/src/app/(main)/settings/users/UserDeleteForm.tsxindex 5fed5fbbc..0cce8d6de 100644--- a/src/app/(main)/settings/users/UserDeleteForm.tsx+++ b/src/app/(main)/settings/users/UserDeleteForm.tsx@@ -1,7 +1,7 @@'use client';import { useApi, useMessages } from 'components/hooks';import ConfirmationForm from 'components/common/ConfirmationForm';-import { touch } from 'store/cache';+import { touch } from 'store/modified';export function UserDeleteForm({ userId, username, onSave, onClose }) {const { FormattedMessage, messages, labels, formatMessage } = useMessages();diff --git a/src/app/(main)/settings/websites/WebsiteAddButton.tsx b/src/app/(main)/settings/websites/WebsiteAddButton.tsxindex 9fd06a1aa..90fc15b14 100644--- a/src/app/(main)/settings/websites/WebsiteAddButton.tsx+++ b/src/app/(main)/settings/websites/WebsiteAddButton.tsx@@ -2,7 +2,7 @@import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';import WebsiteAddForm from './WebsiteAddForm';import { useMessages } from 'components/hooks';-import { touch } from 'store/cache';+import { touch } from 'store/modified';export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsxindex 50e1ad1d8..13c07dd11 100644--- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx@@ -1,5 +1,4 @@'use client';-import { Website } from '@prisma/client';import {Form,FormRow,@@ -11,21 +10,22 @@ import {LoadingButton,useToasts,} from 'react-basics';-import { useState } from 'react';+import { useContext, useState } from 'react';import { getRandomChars } from 'next-basics';import { useApi, useMessages } from 'components/hooks';+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';+import { touch } from 'store/modified';const generateId = () => getRandomChars(16);export function ShareUrl({- website,hostUrl,- onSave,}: {- website: Website;+ websiteId: string;hostUrl?: string;onSave?: () => void;}) {+ const website = useContext(WebsiteContext);const { domain, shareId } = website;const { formatMessage, labels, messages } = useMessages();const [id, setId] = useState(shareId);@@ -47,7 +47,6 @@ export function ShareUrl({const data = { shareId: checked ? generateId() : null };mutate(data, {onSuccess: async () => {- onSave?.();showToast({ message: formatMessage(messages.saved), variant: 'success' });},});@@ -60,7 +59,7 @@ export function ShareUrl({{onSuccess: async () => {showToast({ message: formatMessage(messages.saved), variant: 'success' });- onSave?.();+ touch(`website:${website?.id}`);},},);diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsxindex 5607ad23d..d22c06084 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx@@ -4,7 +4,7 @@ import { useRouter } from 'next/navigation';import { useMessages } from 'components/hooks';import WebsiteDeleteForm from './WebsiteDeleteForm';import WebsiteResetForm from './WebsiteResetForm';-import { touch } from 'store/cache';+import { touch } from 'store/modified';export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsxindex 838a6cd6f..cd4fb5d78 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx@@ -1,6 +1,5 @@'use client';-import { Website } from '@prisma/client';-import { useRef } from 'react';+import { useContext, useRef } from 'react';import {SubmitButton,Form,@@ -12,18 +11,20 @@ import {} from 'react-basics';import { useApi, useMessages } from 'components/hooks';import { DOMAIN_REGEX } from 'lib/constants';+import { touch } from 'store/modified';+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';export function WebsiteEditForm({- website,- onSave,+ websiteId,}: {- website: Website;+ websiteId: string;onSave?: (data: any) => void;}) {+ const website = useContext(WebsiteContext);const { formatMessage, labels, messages } = useMessages();const { post, useMutation } = useApi();const { mutate, error } = useMutation({- mutationFn: (data: any) => post(`/websites/${website.id}`, data),+ mutationFn: (data: any) => post(`/websites/${websiteId}`, data),});const ref = useRef(null);const { showToast } = useToasts();@@ -33,7 +34,7 @@ export function WebsiteEditForm({onSuccess: async () => {showToast({ message: formatMessage(messages.saved), variant: 'success' });ref.current.reset(data);- onSave?.(data);+ touch(`website:${website?.id}`);},});};@@ -41,7 +42,7 @@ export function WebsiteEditForm({return (<Form ref={ref} onSubmit={handleSubmit} error={error} values={website}><FormRow label={formatMessage(labels.websiteId)}>- <TextField value={website.id} readOnly allowCopy />+ <TextField value={website?.id} readOnly allowCopy /></FormRow><FormRow label={formatMessage(labels.name)}><FormInput name="name" rules={{ required: formatMessage(labels.required) }}>diff --git a/src/app/(main)/settings/websites/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsxsimilarity index 57%rename from src/app/(main)/settings/websites/WebsiteSettings.tsxrename to src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsxindex 271ff5d21..fcb6316b9 100644--- a/src/app/(main)/settings/websites/WebsiteSettings.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx@@ -1,31 +1,23 @@'use client';-import { useState, Key } from 'react';-import { Item, Tabs, Button, Text, Icon, Loading } from 'react-basics';+import { useState, Key, useContext } from 'react';+import { Item, Tabs, Button, Text, Icon } from 'react-basics';import Link from 'next/link';import Icons from 'components/icons';import PageHeader from 'components/layout/PageHeader';-import WebsiteContext from 'app/(main)/websites/[websiteId]/WebsiteContext';-import WebsiteEditForm from './[websiteId]/WebsiteEditForm';-import WebsiteData from './[websiteId]/WebsiteData';-import TrackingCode from './[websiteId]/TrackingCode';-import ShareUrl from './[websiteId]/ShareUrl';-import { useWebsite, useMessages } from 'components/hooks';+import WebsiteEditForm from './WebsiteEditForm';+import WebsiteData from './WebsiteData';+import TrackingCode from './TrackingCode';+import ShareUrl from './ShareUrl';+import { useMessages } from 'components/hooks';+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';export function WebsiteSettings({ websiteId, openExternal = false }) {+ const website = useContext(WebsiteContext);const { formatMessage, labels } = useMessages();- const { data: website, isLoading, refetch } = useWebsite(websiteId);const [tab, setTab] = useState<Key>('details');- const handleSave = () => {- refetch();- };-- if (isLoading) {- return <Loading position="page" />;- }-return (- <WebsiteContext.Provider value={website}>+ <><PageHeader title={website?.name} icon={<Icons.Globe />}><Link href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}><Button variant="primary">@@ -42,11 +34,11 @@ export function WebsiteSettings({ websiteId, openExternal = false }) {<Item key="share">{formatMessage(labels.shareUrl)}</Item><Item key="data">{formatMessage(labels.data)}</Item></Tabs>- {tab === 'details' && <WebsiteEditForm website={website} onSave={handleSave} />}+ {tab === 'details' && <WebsiteEditForm websiteId={websiteId} />}{tab === 'tracking' && <TrackingCode websiteId={websiteId} />}- {tab === 'share' && <ShareUrl website={website} onSave={handleSave} />}+ {tab === 'share' && <ShareUrl websiteId={websiteId} />}{tab === 'data' && <WebsiteData websiteId={websiteId} />}- </WebsiteContext.Provider>+ </>);}diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsxindex 6f4cc0e79..fe6fc69de 100644--- a/src/app/(main)/settings/websites/[websiteId]/page.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx@@ -1,5 +1,10 @@-import WebsiteSettings from '../WebsiteSettings';+import WebsiteProvider from 'app/(main)/websites/[websiteId]/WebsiteProvider';+import WebsiteSettings from './WebsiteSettings';export default async function WebsiteSettingsPage({ params: { websiteId } }) {- return <WebsiteSettings websiteId={websiteId} />;+ return (+ <WebsiteProvider websiteId={websiteId}>+ <WebsiteSettings websiteId={websiteId} />+ </WebsiteProvider>+ );}diff --git a/src/app/(main)/teams/[teamId]/Team.tsx b/src/app/(main)/teams/[teamId]/Team.tsxdeleted file mode 100644index 3e0ae8521..000000000--- a/src/app/(main)/teams/[teamId]/Team.tsx+++ /dev/null@@ -1,21 +0,0 @@-'use client';-import { useTeam, useTeamUrl } from 'components/hooks';-import { Loading } from 'react-basics';-import TeamContext from './TeamContext';--export function Team({ children }) {- const { teamId } = useTeamUrl();- const { data: team, isLoading } = useTeam(teamId);-- if (isLoading) {- return <Loading />;- }-- if (!team) {- return null;- }-- return <TeamContext.Provider value={team}>{children}</TeamContext.Provider>;-}--export default Team;diff --git a/src/app/(main)/teams/[teamId]/TeamContext.tsx b/src/app/(main)/teams/[teamId]/TeamContext.tsxdeleted file mode 100644index fe1ec9c1d..000000000--- a/src/app/(main)/teams/[teamId]/TeamContext.tsx+++ /dev/null@@ -1,6 +0,0 @@-'use client';-import { createContext } from 'react';--export const TeamContext = createContext(null);--export default TeamContext;diff --git a/src/app/(main)/teams/[teamId]/TeamProvider.tsx b/src/app/(main)/teams/[teamId]/TeamProvider.tsxnew file mode 100644index 000000000..a456f987e--- /dev/null+++ b/src/app/(main)/teams/[teamId]/TeamProvider.tsx@@ -0,0 +1,30 @@+'use client';+import { createContext, ReactNode, useEffect } from 'react';+import { useTeam } from 'components/hooks';+import { Loading } from 'react-basics';+import useModified from 'store/modified';++export const TeamContext = createContext(null);++export function TeamProvider({ teamId, children }: { teamId: string; children: ReactNode }) {+ const modified = useModified(state => state?.[`team:${teamId}`]);+ const { data: team, isLoading, isFetching, refetch } = useTeam(teamId);++ useEffect(() => {+ if (modified) {+ refetch();+ }+ }, [modified]);++ if (isFetching && isLoading) {+ return <Loading />;+ }++ if (!team) {+ return null;+ }++ return <TeamContext.Provider value={team}>{children}</TeamContext.Provider>;+}++export default TeamProvider;diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsxindex 1f887ce8a..24831436e 100644--- a/src/app/(main)/teams/[teamId]/layout.tsx+++ b/src/app/(main)/teams/[teamId]/layout.tsx@@ -1,5 +1,5 @@-import Team from './Team';+import TeamProvider from './TeamProvider';export default function ({ children }) {- return <Team>{children}</Team>;+ return <TeamProvider>{children}</TeamProvider>;}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteContext.tsx b/src/app/(main)/websites/[websiteId]/WebsiteContext.tsxdeleted file mode 100644index ef1405847..000000000--- a/src/app/(main)/websites/[websiteId]/WebsiteContext.tsx+++ /dev/null@@ -1,6 +0,0 @@-'use client';-import { createContext } from 'react';--export const WebsiteContext = createContext(null);--export default WebsiteContext;diff --git a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsxnew file mode 100644index 000000000..4ea5a032a--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx@@ -0,0 +1,32 @@+'use client';+import { createContext, ReactNode, useEffect } from 'react';+import { useWebsite } from 'components/hooks';+import { Loading } from 'react-basics';+import useModified from 'store/modified';++export const WebsiteContext = createContext(null);++export function WebsiteProvider({+ websiteId,+ children,+}: {+ websiteId: string;+ children: ReactNode;+}) {+ const modified = useModified(state => state?.[`website:${websiteId}`]);+ const { data: website, isFetching, isLoading, refetch } = useWebsite(websiteId);++ useEffect(() => {+ if (modified) {+ refetch();+ }+ }, [modified]);++ if (isFetching && isLoading) {+ return <Loading position="page" />;+ }++ return <WebsiteContext.Provider value={website}>{children}</WebsiteContext.Provider>;+}++export default WebsiteProvider;diff --git a/src/components/hooks/queries/useWebsite.ts b/src/components/hooks/queries/useWebsite.tsindex 58b93ebb6..6aec87e86 100644--- a/src/components/hooks/queries/useWebsite.ts+++ b/src/components/hooks/queries/useWebsite.ts@@ -5,7 +5,7 @@ export function useWebsite(websiteId: string, options?: { [key: string]: any })const { get, useQuery } = useApi();return useQuery({- queryKey: ['websites', { websiteId }],+ queryKey: ['website', { websiteId }],queryFn: () => get(`/websites/${websiteId}`),enabled: !!websiteId,...options,diff --git a/src/index.ts b/src/index.tsindex 181fb49b5..64da2e6d7 100644--- a/src/index.ts+++ b/src/index.ts@@ -22,13 +22,16 @@ export * from 'app/(main)/settings/websites/[websiteId]/TrackingCode';export * from 'app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm';export * from 'app/(main)/settings/websites/[websiteId]/WebsiteEditForm';export * from 'app/(main)/settings/websites/[websiteId]/WebsiteResetForm';+export * from 'app/(main)/settings/websites/[websiteId]/WebsiteSettings';export * from 'app/(main)/settings/websites/WebsiteAddForm';export * from 'app/(main)/settings/websites/WebsitesHeader';-export * from 'app/(main)/settings/websites/WebsiteSettings';export * from 'app/(main)/settings/websites/WebsitesDataTable';export * from 'app/(main)/settings/websites/WebsitesTable';+export * from 'app/(main)/teams/[teamId]/TeamProvider';+export * from 'app/(main)/websites/[websiteId]/WebsiteProvider';+export * from 'components/common/TypeConfirmationForm';export * from 'components/common/DataTable';export * from 'components/common/Empty';diff --git a/src/pages/api/websites/[websiteId]/index.ts b/src/pages/api/websites/[websiteId]/index.tsindex 627484c7e..9154760ec 100644--- a/src/pages/api/websites/[websiteId]/index.ts+++ b/src/pages/api/websites/[websiteId]/index.ts@@ -57,17 +57,17 @@ export default async (const { name, domain, shareId } = req.body;- let website;-try {- website = await updateWebsite(websiteId, { name, domain, shareId });+ const website = await updateWebsite(websiteId, { name, domain, shareId });++ return ok(res, website);} catch (e: any) {if (e.message.includes('Unique constraint') && e.message.includes('share_id')) {return serverError(res, 'That share ID is already taken.');}- }- return ok(res, website);+ return serverError(res, e);+ }}if (req.method === 'DELETE') {diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.tsindex 246ac2d04..026158d69 100644--- a/src/queries/admin/website.ts+++ b/src/queries/admin/website.ts@@ -124,7 +124,7 @@ export async function updateWebsite(): Promise<Website> {return prisma.client.website.update({where: {- websiteId,+ id: websiteId,},data,});@@ -146,7 +146,7 @@ export async function resetWebsite(where: { websiteId },}),client.website.update({- where: { websiteId },+ where: { id: websiteId },data: {resetAt: new Date(),},@@ -186,10 +186,10 @@ export async function deleteWebsite(data: {deletedAt: new Date(),},- where: { websiteId },+ where: { id: websiteId },}): client.website.delete({- where: { websiteId },+ where: { id: websiteId },}),]).then(async data => {if (cache.enabled) {diff --git a/src/store/cache.ts b/src/store/cache.tsindex 0391455d4..bb587319e 100644--- a/src/store/cache.ts+++ b/src/store/cache.ts@@ -6,8 +6,4 @@ export function setValue(key: string, value: any) {store.setState({ [key]: value });}-export function touch(key: string) {- setValue(key, Date.now());-}-export default store;