@go-avro/avro-js 0.0.4-beta.20 → 0.0.4-beta.22

package/dist/client/hooks/jobs.js

@@ -1,6 +1,6 @@
 import { useMutation, useQuery, useInfiniteQuery } from '@tanstack/react-query';
 import { AvroQueryClient } from '../../client/QueryClient';
-import { Task } from '../../types/api';
+import { Job } from '../../types/api';
 AvroQueryClient.prototype.getJobsFromCache = function (queryClient) {
     if (!queryClient) {
         queryClient = this.getQueryClient();
@@ -26,9 +26,8 @@ AvroQueryClient.prototype.useGetJobs = function (params) {
                 return result;
             }));
             const pages = await Promise.all(trackedPromises);
-            const jobs = pages.flat();
+            const jobs = pages.flat().map((job) => new Job(job));
             jobs.forEach((job) => {
-                job.tasks = job.tasks.map((task) => new Task(task));
                 job.current_event = job.tasks.reduce((latest, task) => {
                     return task.current_event && (!latest || task.current_event.time_started > latest.time_started) ? task.current_event : latest;
                 }, job.current_event);
@@ -60,13 +59,12 @@ AvroQueryClient.prototype.useGetInfiniteJobs = function (body, onProgress) {
                 ...body,
                 route_id: body.routeId,
                 offset: pageParam,
-            });
+            }).then((jobs) => jobs.map((job) => new Job(job)));
         },
     });
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((job) => {
-                job.tasks = job.tasks.map((task) => new Task(task));
                 job.overdue_time = (job.tasks || []).reduce((maxOverdue, task) => {
                     return (task.overdue_time && task.overdue_time > maxOverdue) ? task.overdue_time : maxOverdue;
                 }, 0);
@@ -81,8 +79,7 @@ AvroQueryClient.prototype.useGetJob = function (jobId) {
         queryKey: ['job', jobId],
         queryFn: async () => {
             const job = await this.get(`/job/${jobId}`);
-            job.tasks = job.tasks.map((task) => new Task(task));
-            return job;
+            return new Job(job);
         },
         enabled: Boolean(jobId),
     });

package/dist/client/hooks/routes.js

@@ -1,11 +1,13 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { AvroQueryClient } from '../../client/QueryClient';
+import { Route } from '../../types/api';
 AvroQueryClient.prototype.useGetRoutes = function (body, total, onProgress) {
     return useQuery({
         queryKey: ['routes', this.companyId, body.amt ?? 50, body.query ?? "", total ?? "all"],
         queryFn: async () => {
             if (typeof total !== "number") {
-                return this.fetchRoutes({ ...body, offset: 0 });
+                const routes = await this.fetchRoutes({ ...body, offset: 0 });
+                return routes.map((route) => new Route(route));
             }
             onProgress?.(0);
             const pageCount = body.amt ? Math.ceil(total / body.amt) + 1 : 1;
@@ -21,7 +23,7 @@ AvroQueryClient.prototype.useGetRoutes = function (body, total, onProgress) {
                 return result;
             }));
             const pages = await Promise.all(trackedPromises);
-            const routes = pages.flat();
+            const routes = pages.flat().map((route) => new Route(route));
             return routes;
         },
     });
@@ -30,7 +32,10 @@ AvroQueryClient.prototype.useGetRoute = function (routeId) {
     const queryClient = this.getQueryClient();
     return useQuery({
         queryKey: ['route', routeId],
-        queryFn: () => this.get(`/route/${routeId}`),
+        queryFn: async () => {
+            const route = await this.get(`/route/${routeId}`);
+            return new Route(route);
+        },
         enabled: Boolean(routeId) && routeId.length > 0,
     });
 };
@@ -50,13 +55,13 @@ AvroQueryClient.prototype.useCreateRoute = function () {
                     return {
                         ...oldData,
                         pages: [
-                            [{ ...routeData, id: 'temp-id' }],
+                            [new Route({ ...routeData, id: 'temp-id' })],
                             ...oldData.pages,
                         ],
                     };
                 }
                 if (Array.isArray(oldData)) {
-                    return [{ ...routeData, id: 'temp-id' }, ...oldData];
+                    return [new Route({ ...routeData, id: 'temp-id' }), ...oldData];
                 }
                 return oldData;
             });
@@ -93,18 +98,18 @@ AvroQueryClient.prototype.useUpdateRoute = function () {
             await queryClient.cancelQueries({ queryKey: ['routes'] });
             const previousRoute = queryClient.getQueryData(['route', routeId]);
             const previousRoutes = queryClient.getQueryData(['routes']);
-            queryClient.setQueryData(['route', routeId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
+            queryClient.setQueryData(['route', routeId], (oldData) => oldData ? new Route({ ...oldData, ...updates }) : undefined);
             queryClient.setQueriesData({ queryKey: ['routes'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
                     return {
                         ...oldData,
-                        pages: oldData.pages.map((page) => page.map((route) => route.id === routeId ? { ...route, ...updates } : route)),
+                        pages: oldData.pages.map((page) => page.map((route) => route.id === routeId ? new Route({ ...route, ...updates }) : route)),
                     };
                 }
                 if (Array.isArray(oldData)) {
-                    return oldData.map((route) => route.id === routeId ? { ...route, ...updates } : route);
+                    return oldData.map((route) => route.id === routeId ? new Route({ ...route, ...updates }) : route);
                 }
                 return oldData;
             });

package/dist/types/api/Job.d.ts

@@ -2,28 +2,35 @@ import { Task } from "../../types/api/Task";
 import { _Event } from "../../types/api/_Event";
 import { RouteJob } from "../../types/api/RouteJob";
 import { Subscription } from "../../types/api/Subscription";
-export interface Job {
-    address: string;
-    company: string;
-    description: string;
-    id: string;
-    is_one_time: boolean;
-    autostart_radius: number;
-    latitude: number;
-    longitude: number;
-    name: string;
-    internal_notes: string;
-    external_notes: string;
-    priority: number;
-    tasks: Partial<Task>[];
-    time_created: number;
-    time_updated: number | null;
-    routes: RouteJob[];
-    subscribers: Subscription[];
-    manual_emails: string[][];
-    overdue_time: number;
-    last_completed_event: _Event | null;
-    current_event: _Event | null;
-    labels: string[];
-    owner: string;
+declare module '../../types/api/Job' {
+    interface Job {
+        address: string;
+        company: string;
+        description: string;
+        id: string;
+        is_one_time: boolean;
+        autostart_radius: number;
+        latitude: number;
+        longitude: number;
+        name: string;
+        internal_notes: string;
+        external_notes: string;
+        priority: number;
+        tasks: Partial<Task>[];
+        time_created: number;
+        time_updated: number | null;
+        routes: RouteJob[];
+        subscribers: Subscription[];
+        manual_emails: string[][];
+        overdue_time: number;
+        last_completed_event: _Event | null;
+        current_event: _Event | null;
+        labels: string[];
+        owner: string;
+    }
+}
+export declare class Job {
+    constructor(init?: Partial<Job>);
+    portionDone: () => number;
+    isDone: () => boolean;
 }

package/dist/types/api/Job.js

@@ -1 +1,22 @@
-export {};
+import { Task } from "../../types/api/Task";
+import { RouteJob } from "../../types/api/RouteJob";
+export class Job {
+    constructor(init) {
+        this.portionDone = () => {
+            if (!this.tasks || this.tasks.length === 0) {
+                return 0;
+            }
+            return this.tasks.filter(t => t.isDone?.()).length / this.tasks.length;
+        };
+        this.isDone = () => {
+            return this.portionDone() === 1;
+        };
+        Object.assign(this, init);
+        if (init?.tasks) {
+            this.tasks = init.tasks.map(t => new Task(t));
+        }
+        if (init?.routes) {
+            this.routes = init.routes.map(r => new RouteJob(r));
+        }
+    }
+}

package/dist/types/api/Task.d.ts

@@ -53,4 +53,5 @@ export declare class Task {
     computeNextTaskState: (isCustomer: boolean, action: "accept" | "modify" | "reject") => TaskStatus;
     getPrepaidEventsRemaining: () => number;
     getPrepaidMonthsRemaining: () => number;
+    isDone: (fallback?: number) => number | boolean;
 }

package/dist/types/api/Task.js

@@ -51,6 +51,18 @@ export class Task {
                 return acc;
             }, 0);
         };
+        this.isDone = (fallback = 0) => {
+            if (!this.status || this.status !== TaskStatus.ACTIVE) {
+                return 1;
+            }
+            if (this.frequency > 0) {
+                return this.overdue_time <= 0;
+            }
+            else {
+                // If frequency is 0, task falls back to company.indicator_lifetime
+                return this.last_completed_event?.time_ended ?? 0 > (new Date().getTime() / 1000 - fallback);
+            }
+        };
         Object.assign(this, init);
         if (init?.prepayments) {
             this.prepayments = init.prepayments.map(p => new Prepayment(p));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.4-beta.20",
+  "version": "0.0.4-beta.22",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",