m
/
umami
mirror of https://github.com/kremalicious/umami.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1605 from umami-software/app 

v1.39.3
This commit is contained in:
Mike Cao 2022-10-26 16:02:00 -07:00 committed by GitHub
parent aceb904398 34791c3f14
commit ab4a60f814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/forms/WebsiteEditForm.js
View File

@ -78,7 +78,7 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { id: websiteId } = values;
const { websiteUuid: websiteId } = values;
const { ok, data } = await post(websiteId ? `/websites/${websiteId}` : '/websites', values);

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "umami",
"version": "1.39.2",
"version": "1.39.3",
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
"author": "Mike Cao <mike@mikecao.com>",
"license": "MIT",

2
pages/api/websites/index.js
View File

@ -25,7 +25,7 @@ export default async (req, res) => {
const websites =
isAdmin && include_all
? await getAllWebsites()
: await getUserWebsites({ userId: account.id });
: await getUserWebsites({ userId: account?.id });
return ok(res, websites);
}

2
queries/admin/account/deleteAccount.js
View File

@ -39,7 +39,7 @@ export async function deleteAccount(userId) {
}),
])
.then(async res => {
if (redis.client) {
if (redis.enabled) {
for (let i = 0; i < websiteUuids.length; i++) {
await redis.set(`website:${websiteUuids[i]}`, DELETED);
}

4
queries/admin/website/createWebsite.js
View File

@ -14,8 +14,8 @@ export async function createWebsite(userId, data) {
},
})
.then(async res => {
if (redis.client && res) {
await redis.client.set(`website:${res.websiteUuid}`, res.id);
if (redis.enabled && res) {
await redis.set(`website:${res.websiteUuid}`, res.id);
}
return res;

4
queries/admin/website/deleteWebsite.js
View File

@ -21,8 +21,8 @@ export async function deleteWebsite(websiteUuid) {
where: { websiteUuid },
}),
]).then(async res => {
if (redis.client) {
await redis.client.set(`website:${websiteUuid}`, DELETED);
if (redis.enabled) {
await redis.set(`website:${websiteUuid}`, DELETED);
}
return res;

2
queries/admin/website/getWebsite.js
View File

@ -8,7 +8,7 @@ export async function getWebsite(where) {
})
.then(async data => {
if (redis.enabled && data) {
await redis.client.set(`website:${data.websiteUuid}`, data.id);
await redis.set(`website:${data.websiteUuid}`, data.id);
}
return data;

8
queries/analytics/session/createSession.js
View File

@ -30,8 +30,8 @@ async function relationalQuery(websiteId, data) {
},
})
.then(async res => {
if (redis.client && res) {
await redis.client.set(`session:${res.sessionUuid}`, 1);
if (redis.enabled && res) {
await redis.set(`session:${res.sessionUuid}`, 1);
}
return res;
@ -59,7 +59,7 @@ async function clickhouseQuery(
await sendMessage(params, 'event');
if (redis.client) {
await redis.client.set(`session:${sessionUuid}`, 1);
if (redis.enabled) {
await redis.set(`session:${sessionUuid}`, 1);
}
}

8
queries/analytics/session/getSessionByUuid.js
View File

@ -18,8 +18,8 @@ async function relationalQuery(sessionUuid) {
},
})
.then(async res => {
if (redis.client && res) {
await redis.client.set(`session:${res.sessionUuid}`, 1);
if (redis.enabled && res) {
await redis.set(`session:${res.sessionUuid}`, 1);
}
return res;
@ -48,8 +48,8 @@ async function clickhouseQuery(sessionUuid) {
)
.then(result => findFirst(result))
.then(async res => {
if (redis.client && res) {
await redis.client.set(`session:${res.session_uuid}`, 1);
if (redis.enabled && res) {
await redis.set(`session:${res.session_uuid}`, 1);
}
return res;