@go-avro/avro-js 0.0.35 → 0.0.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/client/hooks/events.js +71 -68
  2. package/package.json +1 -1
package/dist/client/hooks/events.js CHANGED
@@ -1,6 +1,10 @@
1
1
  import { useInfiniteQuery, useQuery, useMutation } from '@tanstack/react-query';
2
2
  import { AvroQueryClient } from '../../client/QueryClient';
3
- import { _Event, LineItemStatus } from '../../types/api';
3
+ import { _Event, Job, LineItemStatus } from '../../types/api';
4
+ /** Predicate that matches all 'jobs' queries (list and individual, but NOT 'infinite'). */
5
+ const isJobsQuery = (q) => q.queryKey[0] === 'jobs';
6
+ /** Predicate that matches all 'events' queries (list and individual). */
7
+ const isEventsQuery = (q) => q.queryKey[0] === 'events';
4
8
  AvroQueryClient.prototype.useGetEvents = function (body) {
5
9
  const queryClient = this.getQueryClient();
6
10
  const result = useInfiniteQuery({
@@ -54,70 +58,67 @@ AvroQueryClient.prototype.useCreateEvent = function () {
54
58
  },
55
59
  onMutate: async ({ eventData }) => {
56
60
  await queryClient.cancelQueries({ queryKey: ['events'] });
57
- const previousEvents = queryClient.getQueryData(['events']);
58
61
  const previousJob = queryClient.getQueryData(['jobs', eventData.job_id]);
59
- const previousJobs = queryClient.getQueryData(['jobs']);
60
62
  const optimisticEvent = new _Event({
61
63
  ...eventData,
62
64
  id: Math.random().toString(36).substring(2, 11),
63
65
  company_id: this.companyId,
64
66
  });
65
67
  if (previousJob) {
66
- const updatedJob = {
68
+ const updatedJob = new Job({
67
69
  ...previousJob,
68
70
  current_event: optimisticEvent,
69
71
  last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : previousJob.last_completed_event,
70
- };
71
- updatedJob.tasks = previousJob.tasks.map((task) => {
72
- if (eventData.tasks?.includes(task.id ?? "")) {
73
- return {
74
- ...task,
75
- current_event: optimisticEvent,
76
- last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : task.last_completed_event,
77
- };
78
- }
79
- return task;
72
+ tasks: previousJob.tasks.map((task) => {
73
+ if (eventData.tasks?.includes(task.id ?? "")) {
74
+ return {
75
+ ...task,
76
+ current_event: optimisticEvent,
77
+ last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : task.last_completed_event,
78
+ };
79
+ }
80
+ return task;
81
+ }),
82
+ });
83
+ // Update individual job cache AND every active jobs list/query
84
+ queryClient.setQueriesData({ predicate: isJobsQuery, type: 'active' }, (old) => {
85
+ if (!old)
86
+ return old;
87
+ if (Array.isArray(old))
88
+ return old.map((j) => j?.id === updatedJob.id ? updatedJob : j);
89
+ if (old?.id === updatedJob.id)
90
+ return updatedJob;
91
+ return old;
80
92
  });
81
- const updatedJobs = previousJobs?.map((job) => job.id === updatedJob.id ? updatedJob : job);
82
- queryClient.setQueryData(['jobs', previousJob.id], updatedJob);
83
- queryClient.setQueryData(['jobs'], updatedJobs);
84
93
  }
85
- queryClient.setQueryData(['events'], (oldData) => {
94
+ // Add optimistic event to all active events queries
95
+ queryClient.setQueriesData({ predicate: isEventsQuery, type: 'active' }, (oldData) => {
86
96
  if (!oldData)
87
- return [];
97
+ return oldData;
88
98
  if (oldData.pages) {
89
99
  const firstPage = oldData.pages[0] || [];
90
100
  return {
91
101
  ...oldData,
92
102
  pages: [
93
- [
94
- optimisticEvent,
95
- ...firstPage,
96
- ],
103
+ [optimisticEvent, ...firstPage],
97
104
  ...oldData.pages.slice(1),
98
105
  ],
99
106
  };
100
107
  }
101
108
  if (Array.isArray(oldData)) {
102
- return [
103
- optimisticEvent,
104
- ...oldData,
105
- ];
109
+ return [optimisticEvent, ...oldData];
106
110
  }
107
111
  return oldData;
108
112
  });
109
- return { previousEvents, previousJob, previousJobs };
113
+ return { previousJob };
110
114
  },
111
115
  onError: (err, variables, context) => {
112
- if (context?.previousEvents) {
113
- queryClient.setQueryData(['events'], context.previousEvents);
114
- }
116
+ // Restore individual job; invalidate lists to refetch clean state
115
117
  if (context?.previousJob) {
116
118
  queryClient.setQueryData(['jobs', context.previousJob.id], context.previousJob);
117
119
  }
118
- if (context?.previousJobs) {
119
- queryClient.setQueryData(['jobs'], context.previousJobs);
120
- }
120
+ queryClient.invalidateQueries({ predicate: isJobsQuery });
121
+ queryClient.invalidateQueries({ predicate: isEventsQuery });
121
122
  },
122
123
  });
123
124
  };
@@ -134,46 +135,52 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
134
135
  onMutate: async ({ eventId, updates }) => {
135
136
  await queryClient.cancelQueries({ queryKey: ['events', eventId] });
136
137
  await queryClient.cancelQueries({ queryKey: ['events'] });
137
- // Try individual cache first; fall back to scanning the events list
138
+ // Try individual cache first; fall back to scanning all active events queries
138
139
  let previousEvent = queryClient.getQueryData(['events', eventId]);
139
140
  if (!previousEvent) {
140
- const eventsData = queryClient.getQueryData(['events']);
141
- const pages = eventsData?.pages ?? (Array.isArray(eventsData) ? [eventsData] : undefined);
142
- if (pages) {
143
- for (const page of pages) {
144
- const found = page.find((e) => e.id === eventId);
145
- if (found) {
146
- previousEvent = found;
147
- break;
141
+ const allEventsData = queryClient.getQueriesData({ predicate: isEventsQuery });
142
+ outer: for (const [, data] of allEventsData) {
143
+ const pages = data?.pages ?? (Array.isArray(data) ? [data] : undefined);
144
+ if (pages) {
145
+ for (const page of pages) {
146
+ const found = page.find((e) => e.id === eventId);
147
+ if (found) {
148
+ previousEvent = found;
149
+ break outer;
150
+ }
148
151
  }
149
152
  }
150
153
  }
151
154
  }
152
- const previousEvents = queryClient.getQueryData(['events']);
153
155
  const previousJob = queryClient.getQueryData(['jobs', previousEvent?.job_id]);
154
- const previousJobs = queryClient.getQueryData(['jobs']);
155
156
  if (previousJob) {
156
157
  const isEnding = (updates.time_ended ?? -1) > -1;
157
- const mergedEvent = previousEvent ? { ...previousEvent, ...updates } : null;
158
- const updatedJob = {
158
+ const mergedEvent = previousEvent ? new _Event({ ...previousEvent, ...updates }) : null;
159
+ const updatedJob = new Job({
159
160
  ...previousJob,
160
161
  current_event: isEnding ? null : (mergedEvent ?? previousJob.current_event),
161
162
  last_completed_event: isEnding && mergedEvent ? mergedEvent : previousJob.last_completed_event,
162
- };
163
- updatedJob.tasks = previousJob.tasks.map((task) => {
164
- if (updates.tasks?.includes(task.id ?? "")) {
165
- return {
166
- ...task,
167
- current_event: previousEvent ? { ...previousEvent, ...updates } : task.current_event,
168
- last_completed_event: (updates.time_ended ?? -1) > -1 ? (previousEvent ? { ...previousEvent, ...updates } : task.last_completed_event) : task.last_completed_event,
169
- overdue_time: -(task.frequency ?? 0) - (task.delay ?? 0),
170
- };
171
- }
172
- return task;
163
+ tasks: previousJob.tasks.map((task) => {
164
+ if (updates.tasks?.includes(task.id ?? "")) {
165
+ return {
166
+ ...task,
167
+ current_event: isEnding ? null : (previousEvent ? { ...previousEvent, ...updates } : task.current_event),
168
+ last_completed_event: isEnding ? (previousEvent ? { ...previousEvent, ...updates } : task.last_completed_event) : task.last_completed_event,
169
+ overdue_time: isEnding ? -(task.frequency ?? 0) - (task.delay ?? 0) : task.overdue_time,
170
+ };
171
+ }
172
+ return task;
173
+ }),
174
+ });
175
+ queryClient.setQueriesData({ predicate: isJobsQuery, type: 'active' }, (old) => {
176
+ if (!old)
177
+ return old;
178
+ if (Array.isArray(old))
179
+ return old.map((j) => j?.id === updatedJob.id ? updatedJob : j);
180
+ if (old?.id === updatedJob.id)
181
+ return updatedJob;
182
+ return old;
173
183
  });
174
- const updatedJobs = previousJobs?.map((job) => job.id === updatedJob.id ? updatedJob : job);
175
- queryClient.setQueryData(['jobs', previousJob.id], updatedJob);
176
- queryClient.setQueryData(['jobs'], updatedJobs);
177
184
  }
178
185
  queryClient.setQueryData(['events', eventId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
179
186
  queryClient.setQueriesData({ queryKey: ['events'] }, (oldData) => {
@@ -188,22 +195,18 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
188
195
  }
189
196
  return oldData;
190
197
  });
191
- return { previousEvent, previousEvents, previousJob, previousJobs };
198
+ return { previousEvent, previousJob };
192
199
  },
193
200
  onError: (_err, variables, context) => {
194
201
  const { eventId } = variables;
195
202
  if (context?.previousEvent) {
196
203
  queryClient.setQueryData(['events', eventId], context.previousEvent);
197
204
  }
198
- if (context?.previousEvents) {
199
- queryClient.setQueryData(['events'], context.previousEvents);
200
- }
201
205
  if (context?.previousJob) {
202
206
  queryClient.setQueryData(['jobs', context.previousJob.id], context.previousJob);
203
207
  }
204
- if (context?.previousJobs) {
205
- queryClient.setQueryData(['jobs'], context.previousJobs);
206
- }
208
+ queryClient.invalidateQueries({ predicate: isJobsQuery });
209
+ queryClient.invalidateQueries({ predicate: isEventsQuery });
207
210
  },
208
211
  });
209
212
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@go-avro/avro-js",
3
- "version": "0.0.35",
3
+ "version": "0.0.36",
4
4
  "description": "JS client for Avro backend integration.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",