m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-12-24 02:06:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into app

Browse Source
This commit is contained in:
Brian Cao 2022-10-26 13:09:42 -07:00
commit 18e7462fe8
8 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/pages/DashboardEdit.js
View File

@ -24,7 +24,7 @@ export default function DashboardEdit({ websites }) {
const ordered = useMemo(
() =>
websites
.map(website => ({ ...website, order: order.indexOf(website.websiteId) }))
.map(website => ({ ...website, order: order.indexOf(website.websiteUuid) }))
.sort(firstBy('order')),
[websites, order],
);
@ -36,7 +36,7 @@ export default function DashboardEdit({ websites }) {
const [removed] = orderedWebsites.splice(source.index, 1);
orderedWebsites.splice(destination.index, 0, removed);
setOrder(orderedWebsites.map(website => website?.websiteId || 0));
setOrder(orderedWebsites.map(website => website?.websiteUuid || 0));
}
function handleSave() {
@ -76,8 +76,12 @@ export default function DashboardEdit({ websites }) {
ref={provided.innerRef}
style={{ marginBottom: snapshot.isDraggingOver ? 260 : null }}
>
{ordered.map(({ websiteId, name, domain }, index) => (
<Draggable key={websiteId} draggableId={`${dragId}-${websiteId}`} index={index}>
{ordered.map(({ websiteUuid, name, domain }, index) => (
<Draggable
key={websiteUuid}
draggableId={`${dragId}-${websiteUuid}`}
index={index}
>
{(provided, snapshot) => (
<div
ref={provided.innerRef}

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;