@go-avro/avro-js 0.0.9-beta.2 → 0.0.10-beta.0

package/dist/client/hooks/jobs.js

@@ -34,9 +34,6 @@ AvroQueryClient.prototype.useGetJobs = function (params) {
                 job.last_completed_event = job.tasks.reduce((latest, task) => {
                     return task.last_completed_event && (!latest || task.last_completed_event.time_started > latest.time_started) ? task.last_completed_event : latest;
                 }, job.last_completed_event);
-                job.overdue_time = job.tasks.reduce((maxOverdue, task) => {
-                    return task.overdue_time && task.overdue_time > maxOverdue ? task.overdue_time : maxOverdue;
-                }, 0);
                 queryClient.setQueryData(['job', job.id], job);
             });
             return jobs;
@@ -66,9 +63,6 @@ AvroQueryClient.prototype.useGetInfiniteJobs = function (body, onProgress) {
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((job) => {
-                job.overdue_time = (job.tasks || []).reduce((maxOverdue, task) => {
-                    return (task.overdue_time && task.overdue_time > maxOverdue) ? task.overdue_time : maxOverdue;
-                }, 0);
                 queryClient.setQueryData(['job', job.id], job);
             });
         });

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

@@ -8,29 +8,29 @@ declare module '../../types/api/Job' {
         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;
+        serviced_by: number;
+        time_windows: unknown[];
         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;
+        owner: string | null;
     }
 }
 export declare class Job {
     constructor(init?: Partial<Job>);
+    getOverdueLabel: () => string;
     getStatus(): "PENDING_CUSTOMER" | "PENDING_COMPANY" | "ACTIVE" | "ARCHIVED" | "DRAFT" | "PENDING_PAYMENT" | "PENDING_ACTIVATION";
     getStatusLabel(): "Active" | "Draft" | "Archived" | "Pending Activation" | "Customer Approval" | "Company Approval" | "Awaiting Payment";
     portionDone: (fallback?: Date | null, routeJob?: RouteJob) => number;

package/dist/types/api/Job.js

@@ -2,6 +2,26 @@ import { Task, TaskStatus } from "../../types/api/Task";
 import { RouteJob } from "../../types/api/RouteJob";
 export class Job {
     constructor(init) {
+        this.getOverdueLabel = () => {
+            const activeTasks = this.tasks.filter(t => t.status === TaskStatus.ACTIVE
+                && t.overdueness !== null
+                && t.overdueness !== undefined
+                && t.overdue_time !== undefined);
+            if (activeTasks.length === 0) {
+                return "N/A";
+            }
+            const maxOverdueness = Math.max(...activeTasks.map(t => t.overdueness ?? 0));
+            const minOverdueTime = Math.min(...activeTasks.map(t => t.overdue_time ?? 0));
+            if (maxOverdueness <= 0) {
+                return `In ${Math.abs(Math.round(minOverdueTime / 86400))}d`;
+            }
+            else if (maxOverdueness < 86400) {
+                return "< 1d overdue";
+            }
+            else {
+                return `${Math.floor(maxOverdueness / 86400)}d overdue`;
+            }
+        };
         this.portionDone = (fallback, routeJob) => {
             if (!this.tasks || this.tasks.length === 0) {
                 return 0;

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

@@ -52,6 +52,7 @@ declare module '../../types/api/Task' {
 export declare class Task {
     constructor(init?: Partial<Task>);
     getStatusLabel: () => "Active" | "Draft" | "Archived" | "Pending Customer Approval" | "Pending Company Approval" | "Pending Payment" | "Pending Activation";
+    getOverdueLabel: () => string;
     getNextDue: () => number | null;
     computeNextTaskState: (isCustomer: boolean, action: "accept" | "modify" | "reject") => TaskStatus;
     getPrepaidEventsRemaining: () => number;

package/dist/types/api/Task.js

@@ -30,9 +30,23 @@ export class Task {
                     return this.status;
             }
         };
+        this.getOverdueLabel = () => {
+            if (this.overdueness === null || this.status !== TaskStatus.ACTIVE) {
+                return "N/A";
+            }
+            else if (this.overdueness <= 0) {
+                return `In ${Math.abs(Math.round(this.overdue_time / 86400))}d`;
+            }
+            else if (this.overdue_time < 86400) {
+                return "< 1d overdue";
+            }
+            else {
+                return `${Math.floor(this.overdueness / 86400)}d overdue`;
+            }
+        };
         this.getNextDue = () => {
-            if (this.frequency > 0) {
-                const lastEventTime = this.last_completed_event?.time_ended ?? this.time_created;
+            if (this.frequency > 0 && (this.status === TaskStatus.ACTIVE)) {
+                const lastEventTime = this.last_completed_event?.time_ended ?? this.activate_on ?? this.time_created;
                 return lastEventTime + this.delay + this.frequency;
             }
             return null;

package/package.json

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