@go-avro/avro-js 0.0.10 → 0.0.12

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 (6) hide show
  1. package/dist/client/hooks/jobs.js +2 -138
  2. package/dist/types/api/Job.d.ts +3 -2
  3. package/dist/types/api/Job.js +12 -5
  4. package/dist/types/api/Task.d.ts +2 -1
  5. package/dist/types/api/Task.js +3 -7
  6. package/package.json +1 -1
package/dist/client/hooks/jobs.js CHANGED
@@ -91,32 +91,7 @@ AvroQueryClient.prototype.useCreateJob = function () {
91
91
  headers: { "Content-Type": "application/json" }
92
92
  });
93
93
  },
94
- onMutate: async ({ jobData }) => {
95
- await queryClient.cancelQueries({ queryKey: ['jobs'] });
96
- const previousJobs = queryClient.getQueryData(['jobs']);
97
- queryClient.setQueryData(['jobs'], (oldData) => {
98
- if (!oldData)
99
- return [jobData];
100
- if (oldData.pages) {
101
- const firstPage = oldData.pages[0] || [];
102
- return {
103
- ...oldData,
104
- pages: [[jobData, ...firstPage], ...oldData.pages.slice(1)],
105
- };
106
- }
107
- if (Array.isArray(oldData)) {
108
- return [jobData, ...oldData];
109
- }
110
- return oldData;
111
- });
112
- return { previousJobs };
113
- },
114
- onError: (err, variables, context) => {
115
- if (context?.previousJobs) {
116
- queryClient.setQueryData(['jobs'], context.previousJobs);
117
- }
118
- },
119
- onSettled: (data, error, variables) => {
94
+ onSettled: (data) => {
120
95
  const { id: jobId } = data ?? {};
121
96
  queryClient.invalidateQueries({ queryKey: ['jobs'] });
122
97
  queryClient.invalidateQueries({ queryKey: ['job', jobId] });
@@ -134,38 +109,9 @@ AvroQueryClient.prototype.useManageJobs = function () {
134
109
  headers: { "Content-Type": "application/json" }
135
110
  });
136
111
  },
137
- onMutate: async ({ jobs }) => {
138
- await queryClient.cancelQueries({ queryKey: ['jobs'] });
139
- const previousJobs = queryClient.getQueryData(['jobs']);
140
- queryClient.setQueryData(['jobs'], (oldData) => {
141
- if (!oldData)
142
- return oldData;
143
- if (oldData.pages) {
144
- return {
145
- ...oldData,
146
- pages: oldData.pages.map((page) => page.map((job) => {
147
- const updatedJob = jobs.find((j) => j.id === job.id);
148
- return updatedJob ? { ...job, ...updatedJob } : job;
149
- })),
150
- };
151
- }
152
- if (Array.isArray(oldData)) {
153
- return oldData.map((job) => {
154
- const updatedJob = jobs.find((j) => j.id === job.id);
155
- return updatedJob ? { ...job, ...updatedJob } : job;
156
- });
157
- }
158
- return oldData;
159
- });
160
- return { previousJobs };
161
- },
162
- onError: (err, variables, context) => {
163
- if (context?.previousJobs) {
164
- queryClient.setQueryData(['jobs'], context.previousJobs);
165
- }
166
- },
167
112
  onSettled: (_data, _error, _variables) => {
168
113
  queryClient.invalidateQueries({ queryKey: ['jobs'] });
114
+ queryClient.invalidateQueries({ queryKey: ['job'] });
169
115
  },
170
116
  });
171
117
  };
@@ -179,37 +125,6 @@ AvroQueryClient.prototype.useUpdateJob = function () {
179
125
  headers: { "Content-Type": "application/json" }
180
126
  });
181
127
  },
182
- onMutate: async ({ jobId, updates }) => {
183
- await queryClient.cancelQueries({ queryKey: ['jobs'] });
184
- await queryClient.cancelQueries({ queryKey: ['job', jobId] });
185
- const previousJobs = queryClient.getQueryData(['jobs']);
186
- const previousJob = queryClient.getQueryData(['job', jobId]);
187
- queryClient.setQueryData(['job', jobId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
188
- queryClient.setQueriesData({ queryKey: ['jobs'] }, (oldData) => {
189
- if (!oldData)
190
- return oldData;
191
- if (oldData.pages) {
192
- return {
193
- ...oldData,
194
- pages: oldData.pages.map((page) => page.map((job) => job.id === jobId ? { ...job, ...updates } : job)),
195
- };
196
- }
197
- if (Array.isArray(oldData)) {
198
- return oldData.map((job) => job.id === jobId ? { ...job, ...updates } : job);
199
- }
200
- return oldData;
201
- });
202
- return { previousJobs, previousJob };
203
- },
204
- onError: (err, variables, context) => {
205
- const { jobId } = variables;
206
- if (context?.previousJobs) {
207
- queryClient.setQueryData(['jobs'], context.previousJobs);
208
- }
209
- if (context?.previousJob) {
210
- queryClient.setQueryData(['job', jobId], context.previousJob);
211
- }
212
- },
213
128
  onSettled: (data, error, variables) => {
214
129
  const { jobId } = variables;
215
130
  queryClient.invalidateQueries({ queryKey: ['jobs'] });
@@ -227,28 +142,6 @@ AvroQueryClient.prototype.useDeleteJobs = function () {
227
142
  headers: { "Content-Type": "application/json" }
228
143
  });
229
144
  },
230
- onMutate: async ({ ids }) => {
231
- await queryClient.cancelQueries({ queryKey: ['jobs'] });
232
- const previousJobs = queryClient.getQueryData(['jobs']);
233
- queryClient.setQueryData(['jobs'], (oldData) => {
234
- if (!oldData)
235
- return oldData;
236
- if (oldData.pages) {
237
- const updatedPages = oldData.pages.map((page) => page.filter((job) => !ids.includes(job.id)));
238
- return { ...oldData, pages: updatedPages };
239
- }
240
- if (Array.isArray(oldData)) {
241
- return oldData.filter((job) => !ids.includes(job.id));
242
- }
243
- return oldData;
244
- });
245
- return { previousJobs };
246
- },
247
- onError: (_err, variables, context) => {
248
- if (context?.previousJobs) {
249
- queryClient.setQueryData(['jobs'], context.previousJobs);
250
- }
251
- },
252
145
  onSettled: (_data, _error, _variables) => {
253
146
  queryClient.invalidateQueries({ queryKey: ['jobs'] });
254
147
  queryClient.invalidateQueries({ queryKey: ['routes'] });
@@ -268,35 +161,6 @@ AvroQueryClient.prototype.useDeleteJob = function () {
268
161
  }
269
162
  });
270
163
  },
271
- onMutate: async ({ jobId }) => {
272
- await queryClient.cancelQueries({ queryKey: ['jobs'] });
273
- await queryClient.cancelQueries({ queryKey: ['job', jobId] });
274
- const previousJobs = queryClient.getQueryData(['jobs']);
275
- const previousJob = queryClient.getQueryData(['job', jobId]);
276
- queryClient.setQueryData(['job', jobId], undefined);
277
- queryClient.setQueriesData({ queryKey: ['jobs'] }, (oldData) => {
278
- if (!oldData)
279
- return oldData;
280
- if (oldData.pages) {
281
- const updatedPages = oldData.pages.map((page) => page.filter((job) => job.id !== jobId));
282
- return { ...oldData, pages: updatedPages };
283
- }
284
- if (Array.isArray(oldData)) {
285
- return oldData.filter((job) => job.id !== jobId);
286
- }
287
- return oldData;
288
- });
289
- return { previousJobs, previousJob };
290
- },
291
- onError: (_err, variables, context) => {
292
- const { jobId } = variables;
293
- if (context?.previousJobs) {
294
- queryClient.setQueryData(['jobs'], context.previousJobs);
295
- }
296
- if (context?.previousJob) {
297
- queryClient.setQueryData(['job', jobId], context.previousJob);
298
- }
299
- },
300
164
  onSettled: (_data, _error, variables) => {
301
165
  const { jobId } = variables;
302
166
  queryClient.invalidateQueries({ queryKey: ['jobs'] });
package/dist/types/api/Job.d.ts CHANGED
@@ -2,6 +2,7 @@ import { Task } from "../../types/api/Task";
2
2
  import { _Event } from "../../types/api/_Event";
3
3
  import { RouteJob } from "../../types/api/RouteJob";
4
4
  import { Subscription } from "../../types/api/Subscription";
5
+ import { Route } from "../../types/api/Route";
5
6
  declare module '../../types/api/Job' {
6
7
  interface Job {
7
8
  address: string;
@@ -34,6 +35,6 @@ export declare class Job {
34
35
  getOverdueLabel: () => string;
35
36
  getStatus(): "PENDING_CUSTOMER" | "PENDING_COMPANY" | "ACTIVE" | "ARCHIVED" | "DRAFT" | "PENDING_PAYMENT" | "PENDING_ACTIVATION";
36
37
  getStatusLabel(): "Active" | "Draft" | "Archived" | "Pending Activation" | "Customer Approval" | "Company Approval" | "Awaiting Payment";
37
- portionDone: (fallback?: Date | null, routeJob?: RouteJob) => number;
38
- isDone: (fallback?: Date | null, routeJob?: RouteJob) => boolean;
38
+ portionDone: (route: Route) => number;
39
+ isDone: (route: Route) => boolean;
39
40
  }
package/dist/types/api/Job.js CHANGED
@@ -21,15 +21,22 @@ export class Job {
21
21
  return `${Math.floor(maxOverdueTime / 86400)}d overdue`;
22
22
  }
23
23
  };
24
- this.portionDone = (fallback, routeJob) => {
24
+ this.portionDone = (route) => {
25
25
  if (!this.tasks || this.tasks.length === 0) {
26
26
  return 0;
27
27
  }
28
- const contextTasks = routeJob ? this.tasks.filter(t => !t.id || routeJob.tasks.includes(t.id)) : this.tasks;
29
- return contextTasks.filter(t => t.isDone?.(fallback)).length / contextTasks.length;
28
+ const routeJob = this.routes.find(r => r.job_id === this.id);
29
+ if (!routeJob) {
30
+ return 0;
31
+ }
32
+ const contextTasks = this.tasks.filter(t => !t.id || routeJob.tasks.includes(t.id));
33
+ if (contextTasks.length === 0) {
34
+ return 0;
35
+ }
36
+ return contextTasks.filter(t => t.isDone?.(route)).length / contextTasks.length;
30
37
  };
31
- this.isDone = (fallback, routeJob) => {
32
- return this.portionDone(fallback, routeJob) === 1;
38
+ this.isDone = (route) => {
39
+ return this.portionDone(route) === 1;
33
40
  };
34
41
  Object.assign(this, init);
35
42
  if (init?.tasks) {
package/dist/types/api/Task.d.ts CHANGED
@@ -2,6 +2,7 @@ import { UserCompanyAssociation } from "../../types/api/UserCompanyAssociation";
2
2
  import { Prepayment } from "../../types/api/Prepayment";
3
3
  import { PaymentOption } from "../../types/api/PaymentOption";
4
4
  import { _Event } from "../../types/api/_Event";
5
+ import { Route } from "../../types/api/Route";
5
6
  export declare const TaskStatus: {
6
7
  readonly PENDING_CUSTOMER: "PENDING_CUSTOMER";
7
8
  readonly PENDING_COMPANY: "PENDING_COMPANY";
@@ -58,5 +59,5 @@ export declare class Task {
58
59
  computeNextTaskState: (isCustomer: boolean, action: "accept" | "modify" | "reject") => TaskStatus;
59
60
  getPrepaidEventsRemaining: () => number;
60
61
  getPrepaidMonthsRemaining: () => number;
61
- isDone: (fallback?: Date | null) => boolean | 1;
62
+ isDone: (route: Route) => boolean;
62
63
  }
package/dist/types/api/Task.js CHANGED
@@ -95,16 +95,12 @@ export class Task {
95
95
  return acc;
96
96
  }, 0);
97
97
  };
98
- this.isDone = (fallback) => {
98
+ this.isDone = (route) => {
99
99
  if (!this.status || this.status !== TaskStatus.ACTIVE) {
100
- return 1;
100
+ return true;
101
101
  }
102
102
  if (this.frequency > 0) {
103
- return this.overdue_time <= 0;
104
- }
105
- else if (fallback) {
106
- // If frequency is 0, use fallback
107
- return new Date((this.last_completed_event?.time_ended ?? 0) * 1000) > (fallback);
103
+ return (this.last_completed_event?.time_ended ?? 0) > route.start_time;
108
104
  }
109
105
  else {
110
106
  return this.last_completed_event?.time_ended ? true : false;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@go-avro/avro-js",
3
- "version": "0.0.10",
3
+ "version": "0.0.12",
4
4
  "description": "JS client for Avro backend integration.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",