chore(): get rid of EventDataAccepted

Author: e11sy

workers/grouper/tests/mocks/generateEvent.ts

@@ -1,4 +1,4 @@
-import type { EventAddons, EventData } from '@hawk.so/types';
+import type { DefaultAddons, EventAddons, EventData, JavaScriptAddons } from '@hawk.so/types';
 import { generateRandomId } from './randomId';
 
 /**
@@ -11,7 +11,7 @@ const userIdMock = generateRandomId();
  *
  * @param event - Partial event data to override default values
  */
-export function generateEvent(event: Partial<EventData<EventAddons>> = undefined): EventData<EventAddons> {
+export function generateEvent(event: Partial<EventData<JavaScriptAddons>> = undefined): EventData<JavaScriptAddons> {
   return {
     title: 'Hawk client catcher test',
     backtrace: [],
@@ -23,11 +23,19 @@ export function generateEvent(event: Partial<EventData<EventAddons>> = undefined
       'ima$ge.jpg': 'img',
     },
     addons: {
+      window: {
+        innerWidth: 1024,
+        innerHeight: 768,
+      },
+      userAgent: 'Hawk client catcher test',
+      url: 'https://hawk.so',
       vue: {
         props: {
           'test-test': false,
           'ima$ge.jpg': 'img',
         },
+        lifecycle: 'Mounted',
+        component: 'TestComponent',
       },
     },
     ...event,

workers/grouper/tests/mocks/generateTask.ts

@@ -1,4 +1,4 @@
-import type { EventAddons, EventDataAccepted } from '@hawk.so/types';
+import type {  ErrorsCatcherType, EventData, JavaScriptAddons } from '@hawk.so/types';
 import type { GroupWorkerTask } from '../../types/group-worker-task';
 import { projectIdMock } from './projectId';
 import { generateEvent } from './generateEvent';
@@ -9,11 +9,12 @@ import { generateEvent } from './generateEvent';
  * @param event - allows to override some event properties in generated task
  */
 export function generateTask(
-  event: Partial<EventDataAccepted<EventAddons>> = undefined
-): GroupWorkerTask {
+  event: Partial<EventData<JavaScriptAddons>> = undefined
+): GroupWorkerTask<ErrorsCatcherType> {
   return {
     projectId: projectIdMock,
-    catcherType: 'grouper',
-    event: generateEvent(event),
+    catcherType: 'errors/javascript',
+    payload: generateEvent(event),
+    timestamp: new Date().getTime(),
   };
 }

workers/notifier/types/notifier-task.ts

@@ -1,10 +1,10 @@
-import { EventDataAccepted, EventAddons } from '@hawk.so/types';
+import { EventAddons, EventData } from '@hawk.so/types';
 import { WorkerTask } from '../../../lib/types/worker-task';
 
 /**
  * Data needed for NotificationWorker from GrouperWorker
  */
-export type NotifierEvent = Pick<EventDataAccepted<EventAddons>, 'title'> & {
+export type NotifierEvent = Pick<EventData<EventAddons>, 'title'> & {
   /**
    * Event group hash
    */