@go-avro/avro-js 0.0.4-beta.34 → 0.0.4-beta.36

package/dist/client/hooks/events.js

@@ -1,6 +1,6 @@
 import { useInfiniteQuery, useQuery, useMutation } from '@tanstack/react-query';
 import { AvroQueryClient } from '../../client/QueryClient';
-import { LineItemStatus } from '../../types/api';
+import { _Event, LineItemStatus } from '../../types/api';
 AvroQueryClient.prototype.useGetEvents = function (body) {
     const queryClient = this.getQueryClient();
     const result = useInfiniteQuery({
@@ -23,7 +23,7 @@ AvroQueryClient.prototype.useGetEvents = function (body) {
                 return undefined;
             return allPages.flat().length; // next offset
         },
-        queryFn: ({ pageParam = 0 }) => this.fetchEvents({ ...body, job_id: body.jobId, offset: pageParam }),
+        queryFn: ({ pageParam = 0 }) => this.fetchEvents({ ...body, job_id: body.jobId, offset: pageParam }).then((events) => events.map((event) => new _Event(event))),
         enabled: body.enabled ?? true,
     });
     if (result.data) {
@@ -38,7 +38,7 @@ AvroQueryClient.prototype.useGetEvents = function (body) {
 AvroQueryClient.prototype.useGetEvent = function (eventId) {
     return useQuery({
         queryKey: ['event', eventId],
-        queryFn: () => this.get(`/event/${eventId}`),
+        queryFn: () => this.get(`/event/${eventId}`).then((event) => new _Event(event)),
         enabled: Boolean(eventId),
     });
 };
@@ -55,18 +55,23 @@ AvroQueryClient.prototype.useCreateEvent = function () {
             const previousEvents = queryClient.getQueryData(['events']);
             const previousJob = queryClient.getQueryData(['job', eventData.job_id]);
             const previousJobs = queryClient.getQueryData(['jobs']);
+            const optimisticEvent = new _Event({
+                ...eventData,
+                id: Math.random().toString(36).substring(2, 11),
+                company_id: this.companyId,
+            });
             if (previousJob) {
                 const updatedJob = {
                     ...previousJob,
-                    current_event: eventData,
-                    last_completed_event: (eventData.time_ended ?? -1) > -1 ? eventData : previousJob.last_completed_event,
+                    current_event: optimisticEvent,
+                    last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : previousJob.last_completed_event,
                 };
                 updatedJob.tasks = previousJob.tasks.map((task) => {
                     if (eventData.tasks?.includes(task.id ?? "")) {
                         return {
                             ...task,
-                            current_event: eventData,
-                            last_completed_event: (eventData.time_ended ?? -1) > -1 ? eventData : task.last_completed_event,
+                            current_event: optimisticEvent,
+                            last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : task.last_completed_event,
                         };
                     }
                     return task;
@@ -84,11 +89,7 @@ AvroQueryClient.prototype.useCreateEvent = function () {
                         ...oldData,
                         pages: [
                             [
-                                {
-                                    ...eventData,
-                                    id: Math.random().toString(36).substring(2, 11),
-                                    company_id: this.companyId,
-                                },
+                                optimisticEvent,
                                 ...firstPage,
                             ],
                             ...oldData.pages.slice(1),
@@ -97,11 +98,7 @@ AvroQueryClient.prototype.useCreateEvent = function () {
                 }
                 if (Array.isArray(oldData)) {
                     return [
-                        {
-                            ...eventData,
-                            id: Math.random().toString(36).substring(2, 11),
-                            company_id: this.companyId,
-                        },
+                        optimisticEvent,
                         ...oldData,
                     ];
                 }

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

@@ -3,5 +3,6 @@ export interface ServiceMonth extends LineItem {
     line_item_type: "SERVICE_MONTH";
     bill_id: string | null;
     tasks: string[];
+    task_names: string[];
     time_updated: number | null;
 }

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

@@ -1,19 +1,26 @@
 import { LineItem } from "../../types/api/LineItem";
 import { AdditionalCharge } from "../../types/api/AdditionalCharge";
 import { UserEvent } from "../../types/api/UserEvent";
-export interface _Event extends LineItem {
-    breaks: string[];
-    line_item_type: "EVENT";
-    internal_notes: string;
-    external_notes: string;
-    proofs: string[];
-    tasks: string[];
-    time_ended: number | null;
-    time_started: number;
-    time_updated: number | null;
-    bill_id: string;
-    billed_amount: number;
-    additional_charges: AdditionalCharge[];
-    users: UserEvent[];
-    autostart: boolean;
+declare module '../../types/api/_Event' {
+    interface _Event extends LineItem {
+        breaks: string[];
+        line_item_type: "EVENT";
+        internal_notes: string;
+        external_notes: string;
+        proofs: string[];
+        tasks: string[];
+        task_names: string[];
+        time_ended: number | null;
+        time_started: number;
+        time_updated: number | null;
+        bill_id: string;
+        billed_amount: number;
+        additional_charges: AdditionalCharge[];
+        users: UserEvent[];
+        autostart: boolean;
+    }
+}
+export declare class _Event extends LineItem {
+    constructor(init?: Partial<_Event>);
+    getCost: () => number;
 }

package/dist/types/api/_Event.js

@@ -1 +1,18 @@
-export {};
+import { LineItem } from "../../types/api/LineItem";
+export class _Event extends LineItem {
+    constructor(init) {
+        super(init);
+        this.getCost = () => {
+            const additionalChargesCost = this.additional_charges.reduce((acc, charge) => acc + (charge.cost ?? 0) * (charge.amount ?? 0), 0);
+            return (this.cost * this.amount) + additionalChargesCost;
+        };
+        Object.assign(this, init);
+        this.breaks = init?.breaks ?? [];
+        this.proofs = init?.proofs ?? [];
+        this.tasks = init?.tasks ?? [];
+        this.task_names = init?.task_names ?? [];
+        this.additional_charges = init?.additional_charges ?? [];
+        this.users = init?.users ?? [];
+        this.autostart = init?.autostart ?? false;
+    }
+}

package/package.json

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