Skip to content

armgit / umami

Public Imported from GitHub
0

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.

filter usagewebsites

Francis Caoedefdfb4b1f6
diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 547de3383..b50003951 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -62,6 +62,7 @@ export default async (
websiteName: a.name,
websiteEventUsage: websiteEventUsage.find(b => a.id === b.websiteId)?.count || 0,
eventDataUsage: eventDataUsage.find(b => a.id === b.websiteId)?.count || 0,
+ deletedAt: a.deletedAt,
}));
const usage = websiteUsage.reduce(
@@ -74,9 +75,13 @@ export default async (
{ websiteEventUsage: 0, eventDataUsage: 0 },
);
+ const filteredWebsiteUsage = websiteUsage.filter(
+ a => !a.deletedAt && (a.websiteEventUsage > 0 || a.eventDataUsage > 0),
+ );
+
return ok(res, {
...usage,
- websites: websiteUsage,
+ websites: filteredWebsiteUsage,
});
}
diff --git a/src/pages/api/users/[userId]/websites.ts b/src/pages/api/users/[userId]/websites.ts
index f443deb8a..88a2bad1e 100644
--- a/src/pages/api/users/[userId]/websites.ts
+++ b/src/pages/api/users/[userId]/websites.ts
@@ -9,7 +9,6 @@ import * as yup from 'yup';
const schema = {
GET: yup.object().shape({
userId: yup.string().uuid().required(),
- teamId: yup.string().uuid(),
...pageInfo,
}),
};
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index a3bcac7b8..eb07f7799 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -61,6 +61,7 @@ export async function getAllWebsites(userId: string) {
},
},
],
+ deletedAt: null,
},
});
}