watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 23:27:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	package.json
#	src/components/hooks/useTimezone.ts
#	yarn.lock
This commit is contained in:
Mike Cao 2025-02-19 22:55:40 -08:00
commit edb7022c55
13 changed files with 117 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/(main)/settings/teams/TeamJoinForm.tsx
View file

@ -11,7 +11,7 @@ import {
import { useApi, useMessages, useModified } from '@/components/hooks';
export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
const { formatMessage, labels, getMessage } = useMessages();
const { formatMessage, labels } = useMessages();
const { post, useMutation } = useApi();
const { mutate, error } = useMutation({ mutationFn: (data: any) => post('/teams/join', data) });
const ref = useRef(null);
@ -28,7 +28,7 @@ export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose:
};
return (
<Form ref={ref} onSubmit={handleSubmit} error={error && getMessage(error)}>
<Form ref={ref} onSubmit={handleSubmit} error={error}>
<FormRow label={formatMessage(labels.accessCode)}>
<FormInput name="accessCode" rules={{ required: formatMessage(labels.required) }}>
<TextField autoComplete="off" />