watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

use uuid

Browse source
This commit is contained in:
Brian Cao 2022-10-31 23:42:37 -07:00
parent 246e4e5f4f
commit 17041efaae
73 changed files with 491 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/forms/ChangePasswordForm.js
View file

@ -43,7 +43,7 @@ export default function ChangePasswordForm({ values, onSave, onClose }) {
const { user } = useUser();
const handleSubmit = async values => {
const { ok, error } = await post(`/accounts/${user.accountUuid}/password`, values);
const { ok, error } = await post(`/users/${user.id}/password`, values);
if (ok) {
onSave();

2
components/forms/TrackingCodeForm.js
View file

@ -26,7 +26,7 @@ export default function TrackingCodeForm({ values, onClose }) {
rows={3}
cols={60}
spellCheck={false}
defaultValue={`<script async defer data-website-id="${values.websiteUuid}" src="${
defaultValue={`<script async defer data-website-id="${values.id}" src="${
document.location.origin
}${basePath}/${trackerScriptName ? `${trackerScriptName}.js` : 'umami.js'}"></script>`}
readOnly

4
components/forms/AccountEditForm.js → components/forms/UserEditForm.js
View file

@ -28,13 +28,13 @@ const validate = ({ id, username, password }) => {
return errors;
};
export default function AccountEditForm({ values, onSave, onClose }) {
export default function UserEditForm({ values, onSave, onClose }) {
const { post } = useApi();
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { id } = values;
const { ok, data } = await post(id ? `/accounts/${id}` : '/accounts', values);
const { ok, data } = await post(id ? `/users/${id}` : '/users', values);
if (ok) {
onSave();

14
components/forms/WebsiteEditForm.js
View file

@ -37,7 +37,7 @@ const validate = ({ name, domain }) => {
return errors;
};
const OwnerDropDown = ({ user, accounts }) => {
const OwnerDropDown = ({ user, users }) => {
const { setFieldValue, values } = useFormikContext();
useEffect(() => {
@ -46,7 +46,7 @@ const OwnerDropDown = ({ user, accounts }) => {
} else if (user?.id && values.owner === '') {
setFieldValue('owner', user.id.toString());
}
}, [accounts, setFieldValue, user, values]);
}, [users, setFieldValue, user, values]);
if (user?.isAdmin) {
return (
@ -56,7 +56,7 @@ const OwnerDropDown = ({ user, accounts }) => {
</label>
<div>
<Field as="select" name="owner" className={styles.dropdown}>
{accounts?.map(acc => (
{users?.map(acc => (
<option key={acc.id} value={acc.id}>
{acc.username}
</option>
@ -73,14 +73,14 @@ const OwnerDropDown = ({ user, accounts }) => {
export default function WebsiteEditForm({ values, onSave, onClose }) {
const { post } = useApi();
const { data: accounts } = useFetch(`/accounts`);
const { data: users } = useFetch(`/users`);
const { user } = useUser();
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { websiteUuid: websiteId } = values;
const { id } = values;
const { ok, data } = await post(websiteId ? `/websites/${websiteId}` : '/websites', values);
const { ok, data } = await post(id ? `/websites/${id}` : '/websites', values);
if (ok) {
onSave();
@ -125,7 +125,7 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
<FormError name="domain" />
</div>
</FormRow>
<OwnerDropDown accounts={accounts} user={user} />
<OwnerDropDown users={users} user={user} />
<FormRow>
<label />
<Field name="enableShareUrl">