@shipfox/client-triggers 5.0.0 → 6.0.2

package/src/pages/events-page.test.tsx

@@ -1,9 +1,9 @@
 import type {
   TriggerEventDetailResponseDto,
   TriggerEventListItemDto,
-  TriggerEventListResponseDto,
 } from '@shipfox/api-triggers-dto';
 import {fireEvent, render, screen, waitFor} from '@testing-library/react';
+import {toTriggerEventDetail, toTriggerEventListPage} from '#hooks/api/trigger-event-mapper.js';
 import {
   useTriggerEventFacetsQuery,
   useTriggerEventQuery,
@@ -49,10 +49,10 @@ function makeDetail(overrides: Partial<TriggerEventDetailResponseDto> = {}) {
 }
 
 function makeListQuery(triggerEvents: TriggerEventListItemDto[]) {
-  const page: TriggerEventListResponseDto = {
+  const page = toTriggerEventListPage({
     trigger_events: triggerEvents,
     next_cursor: null,
-  };
+  });
 
   return {
     data: {pages: [page], pageParams: [undefined]},
@@ -75,7 +75,7 @@ describe('EventsPage', () => {
     useTriggerEventQueryMock.mockImplementation(
       (eventId) =>
         ({
-          data: eventId ? makeDetail({id: eventId}) : undefined,
+          data: eventId ? toTriggerEventDetail(makeDetail({id: eventId})) : undefined,
           isError: false,
           refetch: vi.fn(),
         }) as unknown as ReturnType<typeof useTriggerEventQuery>,

package/src/pages/events-page.tsx

@@ -1,12 +1,11 @@
-import type {TriggerEventListItemDto} from '@shipfox/api-triggers-dto';
 import {RelativeTimeProvider} from '@shipfox/react-ui/relative-time';
 import {Header, Text} from '@shipfox/react-ui/typography';
 import {cn} from '@shipfox/react-ui/utils';
 import {useEffect, useMemo, useState} from 'react';
 import {EventsList} from '#components/events-list.js';
 import {TriggerEventDetail} from '#components/trigger-event-detail.js';
+import type {TriggerEventFilters, TriggerEventSummary} from '#core/trigger-event.js';
 import {
-  type TriggerEventFilters,
   useTriggerEventFacetsQuery,
   useTriggerEventsInfiniteQuery,
 } from '#hooks/api/trigger-events.js';
@@ -26,8 +25,8 @@ export function EventsPage({workspaceId, filters, onFiltersChange}: EventsPagePr
   const facetsQuery = useTriggerEventFacetsQuery(workspaceId);
   const [selectedEventId, setSelectedEventId] = useState<string | undefined>();
 
-  const events = useMemo<TriggerEventListItemDto[]>(
-    () => query.data?.pages.flatMap((page) => page.trigger_events) ?? [],
+  const events = useMemo<TriggerEventSummary[]>(
+    () => query.data?.pages.flatMap((page) => page.events) ?? [],
     [query.data],
   );
 

package/src/routes/events-settings.tsx

@@ -1,6 +1,6 @@
 import {defineRoute, useActiveWorkspace} from '@shipfox/client-shell/runtime';
 import {getRouteApi} from '@tanstack/react-router';
-import type {TriggerEventFilters} from '#hooks/api/trigger-events.js';
+import type {TriggerEventFilters} from '#core/trigger-event.js';
 import {EventsPage} from '#pages/events-page.js';
 import {type TriggerEventsSearch, validateTriggerEventsSearch} from '#search.js';
 

package/src/search.ts

@@ -1,5 +1,5 @@
-import {triggerEventOutcomeSchema} from '@shipfox/api-triggers-dto';
 import {z} from 'zod';
+import {type TriggerEventFilters, triggerEventOutcomes} from '#core/trigger-event.js';
 
 const stringListSearchSchema = z
   .preprocess((value) => (typeof value === 'string' ? [value] : value), z.array(z.string()))
@@ -9,14 +9,13 @@ const stringListSearchSchema = z
 const outcomeListSearchSchema = z
   .preprocess(
     (value) => (typeof value === 'string' ? [value] : value),
-    z.array(triggerEventOutcomeSchema),
+    z.array(z.enum(triggerEventOutcomes)),
   )
   .optional()
   .catch(undefined);
 
 /**
- * URL search params for the Events page. Reuses the DTO outcome enum so the page and the
- * read API share one source of truth, and matches the `TriggerEventFilters` shape the data
+ * URL search params for the Events page. Matches the `TriggerEventFilters` shape the data
  * hook consumes. Every field uses `.catch(undefined)` so a hand-edited or stale URL drops
  * the bad param rather than throwing inside the router's `validateSearch`.
  */
@@ -31,7 +30,7 @@ export const triggerEventsSearchSchema = z.object({
   to: z.string().datetime().optional().catch(undefined),
 });
 
-export type TriggerEventsSearch = z.infer<typeof triggerEventsSearchSchema>;
+export type TriggerEventsSearch = z.infer<typeof triggerEventsSearchSchema> & TriggerEventFilters;
 
 export function validateTriggerEventsSearch(search: Record<string, unknown>): TriggerEventsSearch {
   return triggerEventsSearchSchema.parse(search);