Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix(dashboard): handle `*` (any events) for notifications

Carl-Gerhard Lindesvärd964daef4c17c
diff --git a/apps/dashboard/src/components/notifications/rule-card.tsx b/apps/dashboard/src/components/notifications/rule-card.tsx
index 8a8c3d87f..7e49e8056 100644
--- a/apps/dashboard/src/components/notifications/rule-card.tsx
+++ b/apps/dashboard/src/components/notifications/rule-card.tsx
@@ -34,7 +34,7 @@ function EventBadge({
}
>
<Badge variant="outline" className="inline-flex">
- {event.name}
+ {event.name === '*' ? 'Any event' : event.name}
{Boolean(event.filters.length) && (
<FilterIcon className="size-2 ml-1" />
)}
diff --git a/packages/db/src/services/notification.service.ts b/packages/db/src/services/notification.service.ts
index e2a3f2fe0..908de6185 100644
--- a/packages/db/src/services/notification.service.ts
+++ b/packages/db/src/services/notification.service.ts
@@ -134,7 +134,7 @@ export function triggerNotification(notification: Notification) {
}
function matchEventFilters(
- event: IServiceCreateEventPayload,
+ payload: IServiceCreateEventPayload,
filters: IChartEventFilter[],
) {
return filters.every((filter) => {
@@ -144,15 +144,15 @@ function matchEventFilters(
if (name === 'has_profile') {
if (value.includes('true')) {
- return event.profileId !== event.deviceId;
+ return payload.profileId !== payload.deviceId;
}
- return event.profileId === event.deviceId;
+ return payload.profileId === payload.deviceId;
}
const propertyValue = (
name.startsWith('properties.')
- ? pathOr('', name.split('.'), event)
- : pathOr('', [name], event)
+ ? pathOr('', name.split('.'), payload)
+ : pathOr('', [name], payload)
).trim();
switch (operator) {
@@ -180,15 +180,15 @@ function matchEventFilters(
}
export function matchEvent(
- event: IServiceCreateEventPayload,
+ payload: IServiceCreateEventPayload,
chartEvent: IChartEvent,
) {
- if (event.name !== chartEvent.name) {
+ if (payload.name !== chartEvent.name && chartEvent.name !== '*') {
return false;
}
if (chartEvent.filters.length > 0) {
- return matchEventFilters(event, chartEvent.filters);
+ return matchEventFilters(payload, chartEvent.filters);
}
return true;
diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.ts
index 372a7e0f5..ea0d7e269 100644
--- a/packages/validation/src/index.ts
+++ b/packages/validation/src/index.ts
@@ -189,7 +189,7 @@ export const zWebhookConfig = z.object({
type: z.literal('webhook'),
url: z.string().url(),
headers: z.record(z.string()),
- payload: z.record(z.string(), z.unknown()),
+ payload: z.record(z.string(), z.unknown()).optional(),
});
export type IWebhookConfig = z.infer<typeof zWebhookConfig>;