@go-avro/avro-js 0.0.2-beta.164 → 0.0.2-beta.166

package/dist/auth/AuthManager.d.ts

@@ -19,6 +19,6 @@ export declare class AuthManager {
     setCache(data: Partial<CacheData>): Promise<void>;
     getCache(key?: keyof CacheData): Promise<CacheData | string | null>;
     clearCache(): Promise<void>;
-    getCompanyId(): Promise<string | null>;
+    getCompanyId(): Promise<string | undefined>;
     setCompanyId(companyId: string): Promise<void[]>;
 }

package/dist/auth/AuthManager.js

@@ -129,14 +129,14 @@ export class AuthManager {
     }
     async getCompanyId() {
         if (!this.storages.length) {
-            return null;
+            return undefined;
         }
         for (const storage of this.storages) {
             const companyId = await storage.get('companyId');
             if (companyId && typeof companyId === 'string')
                 return companyId;
         }
-        return null;
+        return undefined;
     }
     async setCompanyId(companyId) {
         return Promise.all(this.storages.map(s => s.set({ companyId })));

package/dist/client/QueryClient.d.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io-client';
 import { InfiniteData, QueryClient, UseInfiniteQueryResult, useMutation, UseQueryResult } from '@tanstack/react-query';
 import { AuthManager } from '../auth/AuthManager';
-import { _Event, ApiInfo, Avro, Bill, Break, Chat, Company, FinancialInsightData, Job, EventInsightData, LoginResponse, Message, Plan, Route, ServiceMonth, Session, Team, User, UserCompanyAssociation, Skill, Group, Label, RouteScheduleConfig } from '../types/api';
+import { _Event, ApiInfo, Avro, Bill, Break, Chat, Company, FinancialInsightData, Job, EventInsightData, LoginResponse, Message, Plan, Route, ServiceMonth, Session, Team, User, UserCompanyAssociation, Skill, Group, Label, RouteScheduleConfig, CatalogItem } from '../types/api';
 import { AuthState, Tokens } from '../types/auth';
 import { CancelToken, RetryStrategy } from '../types/client';
 import { StandardError } from '../types/error';
@@ -20,7 +20,11 @@ declare module '../client/QueryClient' {
         getDelay(strategy: RetryStrategy, attempt: number): number;
         sleep(ms: number): Promise<void>;
         useGetRoot(): UseQueryResult<ApiInfo, StandardError>;
-        useGetJobs(onProgress?: (fraction: number) => void): UseQueryResult<Job[], StandardError>;
+        useGetJobs(params: {
+            companyId?: string;
+            numJobs?: number;
+            onProgress?: (fraction: number) => void;
+        }): UseQueryResult<Job[], StandardError>;
         getJobsFromCache(queryClient?: QueryClient): Job[];
         useGetInfiniteJobs(body: {
             amt?: number;
@@ -120,6 +124,7 @@ declare module '../client/QueryClient' {
         useGetBill(billId: string): UseQueryResult<Bill, StandardError>;
         useGetRoute(routeId: string): UseQueryResult<Route, StandardError>;
         useGetChat(chatId: string): UseQueryResult<Chat, StandardError>;
+        useGetCatalogItem(catalogItemId: string): UseQueryResult<CatalogItem, StandardError>;
         useGetUserSessions(): UseQueryResult<Session[], StandardError>;
         useGetAvro(): UseQueryResult<Avro, StandardError>;
         useSearchUsers(searchUsername: string): UseQueryResult<User[], StandardError>;
@@ -176,6 +181,11 @@ declare module '../client/QueryClient' {
                 logo: File | null;
             }>;
         }>>;
+        useCreateCatalogItem(): ReturnType<typeof useMutation<{
+            id: string;
+        }, StandardError, {
+            data: Partial<CatalogItem>;
+        }>>;
         useCreateJob(): ReturnType<typeof useMutation<{
             id: string;
         }, StandardError, {
@@ -206,7 +216,6 @@ declare module '../client/QueryClient' {
             breakData: Partial<Break>;
         }>>;
         useManageJobs(): ReturnType<typeof useMutation<void, StandardError, {
-            companyId: string;
             jobs: Partial<Job>[];
         }>>;
         useScheduleRoutes(): ReturnType<typeof useMutation<{
@@ -243,6 +252,12 @@ declare module '../client/QueryClient' {
             labelId: string;
             labelData: Partial<Label>;
         }>>;
+        useUpdateCatalogItem(): ReturnType<typeof useMutation<{
+            msg: string;
+        }, StandardError, {
+            catalogItemId: string;
+            data: Partial<CatalogItem>;
+        }>>;
         useUpdateJob(): ReturnType<typeof useMutation<{
             msg: string;
         }, StandardError, {
@@ -291,6 +306,11 @@ declare module '../client/QueryClient' {
             user_id: string;
             data: Partial<UserCompanyAssociation>;
         }>>;
+        useDeleteCatalogItem(): ReturnType<typeof useMutation<{
+            msg: string;
+        }, StandardError, {
+            catalogItemId: string;
+        }>>;
         useUpdateSessionBreak(): ReturnType<typeof useMutation<{
             msg: string;
         }, StandardError, {
@@ -300,6 +320,11 @@ declare module '../client/QueryClient' {
         useUpdateSelf(): ReturnType<typeof useMutation<{
             msg: string;
         }, StandardError, Partial<User>>>;
+        useDeleteJobs(): ReturnType<typeof useMutation<{
+            msg: string;
+        }, StandardError, {
+            ids: string[];
+        }>>;
         useDeleteJob(): ReturnType<typeof useMutation<{
             msg: string;
         }, StandardError, {
@@ -373,8 +398,8 @@ export declare class AvroQueryClient {
     protected config: Required<AvroQueryClientConfig>;
     readonly socket: Socket;
     _authState: AuthState;
-    companyId: string | null;
-    company: Company | null;
+    companyId: string | undefined;
+    company: Company | undefined;
     private authStateListeners;
     constructor(config: AvroQueryClientConfig);
     emit(eventName: string, data: unknown): void;
@@ -412,7 +437,7 @@ export declare class AvroQueryClient {
     setCache(data: Partial<CacheData>): Promise<void>;
     getCache(key?: keyof CacheData | undefined): Promise<CacheData | string | null>;
     setCompanyId(companyId: string): Promise<void[]>;
-    getCompanyId(): Promise<string | null>;
+    getCompanyId(): Promise<string | undefined>;
     clearCache(): Promise<void>;
     onAuthStateChange(cb: (v: AuthState) => void): () => void;
     offAuthStateChange(cb: (v: AuthState) => void): void;
@@ -428,7 +453,7 @@ export declare class AvroQueryClient {
         query?: string;
         offset?: number;
         route_id?: string;
-    }, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<any>;
+    }, companyId?: string, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<any>;
     fetchChats(body?: {
         amt?: number;
         known_ids?: string[];

package/dist/client/QueryClient.js

@@ -6,8 +6,8 @@ import { StandardError } from '../types/error';
 export class AvroQueryClient {
     constructor(config) {
         this._authState = AuthState.UNKNOWN;
-        this.companyId = null;
-        this.company = null;
+        this.companyId = undefined;
+        this.company = undefined;
         this.authStateListeners = [];
         this.config = {
             baseUrl: config.baseUrl,
@@ -238,11 +238,12 @@ export class AvroQueryClient {
             }
         });
     }
-    fetchJobs(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === '') {
+    fetchJobs(body = {}, companyId, cancelToken, headers = {}) {
+        const companyIdToUse = companyId ?? this.companyId;
+        if (!companyIdToUse || companyIdToUse.trim() === '') {
             throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch('POST', `/company/${this.companyId}/jobs`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${companyIdToUse}/jobs`, JSON.stringify(body), cancelToken, {
             ...headers,
             'Content-Type': 'application/json',
         })

package/dist/client/hooks/catalog_items.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/client/hooks/catalog_items.js

@@ -0,0 +1,90 @@
+import { useMutation } from '@tanstack/react-query';
+import { AvroQueryClient } from '../../client/QueryClient';
+AvroQueryClient.prototype.useCreateCatalogItem = function () {
+    const queryClient = this.getQueryClient();
+    return useMutation({
+        mutationFn: async ({ data }) => {
+            return this.post(`/company/${this.companyId}/catalog`, JSON.stringify(data), undefined, { 'Content-Type': 'application/json' });
+        },
+        onMutate: async () => {
+            await queryClient.cancelQueries({ queryKey: ['catalog_items', this.companyId] });
+            const previousItems = queryClient.getQueryData(['catalog_items', this.companyId]);
+            return { previousItems };
+        },
+        onError: (_err, _variables, context) => {
+            if (context?.previousItems) {
+                queryClient.setQueryData(['catalog_items', this.companyId], context.previousItems);
+            }
+        },
+        onSettled: () => {
+            queryClient.invalidateQueries({ queryKey: ['catalog_items', this.companyId] });
+        },
+    });
+};
+AvroQueryClient.prototype.useUpdateCatalogItem = function () {
+    const queryClient = this.getQueryClient();
+    return useMutation({
+        mutationFn: ({ catalogItemId, data }) => {
+            return this.put(`/catalog_item/${catalogItemId}`, JSON.stringify(data), undefined, {
+                "Content-Type": "application/json",
+            });
+        },
+        onMutate: async ({ catalogItemId, data }) => {
+            await queryClient.cancelQueries({ queryKey: ['catalog_items'] });
+            await queryClient.cancelQueries({ queryKey: ['catalog_item', catalogItemId] });
+            const previousItems = queryClient.getQueryData(['catalog_items']);
+            const previousItem = queryClient.getQueryData(['catalog_item', catalogItemId]);
+            queryClient.setQueryData(['catalog_item', catalogItemId], (oldData) => oldData ? { ...oldData, ...data } : undefined);
+            queryClient.setQueriesData({ queryKey: ['catalog_items'] }, (oldData) => {
+                if (!oldData)
+                    return oldData;
+                if (oldData.pages) {
+                    return {
+                        ...oldData,
+                        pages: oldData.pages.map((page) => page.map((item) => item.id === catalogItemId ? { ...item, ...data } : item)),
+                    };
+                }
+                if (Array.isArray(oldData)) {
+                    return oldData.map((item) => item.id === catalogItemId ? { ...item, ...data } : item);
+                }
+                return oldData;
+            });
+            return { previousItems, previousItem };
+        },
+        onError: (err, variables, context) => {
+            const { catalogItemId } = variables;
+            if (context?.previousItems) {
+                queryClient.setQueryData(['catalog_items'], context.previousItems);
+            }
+            if (context?.previousItem) {
+                queryClient.setQueryData(['catalog_item', catalogItemId], context.previousItem);
+            }
+        },
+        onSettled: (_data, _error, variables) => {
+            const { catalogItemId } = variables;
+            queryClient.invalidateQueries({ queryKey: ['catalog_items'] });
+            queryClient.invalidateQueries({ queryKey: ['catalog_item', catalogItemId] });
+        },
+    });
+};
+AvroQueryClient.prototype.useDeleteCatalogItem = function () {
+    const queryClient = this.getQueryClient();
+    return useMutation({
+        mutationFn: async ({ catalogItemId }) => {
+            return this.delete(`/catalog_item/${catalogItemId}`);
+        },
+        onMutate: async ({ catalogItemId }) => {
+            await queryClient.cancelQueries({ queryKey: ['catalog_items'] });
+            const previousItems = queryClient.getQueryData(['catalog_items']);
+            return { previousItems };
+        },
+        onError: (_err, _variables, context) => {
+            if (context?.previousItems) {
+                queryClient.setQueryData(['catalog_items'], context.previousItems);
+            }
+        },
+        onSettled: (_data, _error) => {
+            queryClient.invalidateQueries({ queryKey: ['catalog_items'] });
+        },
+    });
+};

package/dist/client/hooks/jobs.js

@@ -6,20 +6,22 @@ AvroQueryClient.prototype.getJobsFromCache = function (queryClient) {
     }
     return (queryClient.getQueryData(['jobs', this.companyId, this.company?.num_jobs]) ?? []);
 };
-AvroQueryClient.prototype.useGetJobs = function (onProgress) {
+AvroQueryClient.prototype.useGetJobs = function (params) {
     const queryClient = this.getQueryClient();
     const amt = 50;
+    const company_id = params.companyId ?? this.companyId;
+    const num_jobs = params.numJobs ?? this.company?.num_jobs ?? 0;
     return useQuery({
-        queryKey: ['jobs', this.companyId, this.company?.num_jobs],
+        queryKey: ['jobs', company_id, num_jobs],
         queryFn: async () => {
-            onProgress?.(0);
-            const pageCount = amt ? Math.ceil((this.company?.num_jobs ?? 0) / amt) + 1 : 1;
+            params.onProgress?.(0);
+            const pageCount = amt ? Math.ceil((num_jobs ?? 0) / amt) + 1 : 1;
             let completed = 0;
-            const promises = Array.from({ length: pageCount }, (_, i) => this.fetchJobs({ offset: i * (amt ?? 1), amt }));
+            const promises = Array.from({ length: pageCount }, (_, i) => this.fetchJobs({ offset: i * (amt ?? 1), amt }, company_id));
             const trackedPromises = promises.map((promise) => promise.then((result) => {
                 completed++;
                 const fraction = completed / pageCount;
-                onProgress?.(fraction);
+                params.onProgress?.(fraction);
                 return result;
             }));
             const pages = await Promise.all(trackedPromises);
@@ -122,12 +124,12 @@ AvroQueryClient.prototype.useCreateJob = function () {
 AvroQueryClient.prototype.useManageJobs = function () {
     const queryClient = this.getQueryClient();
     return useMutation({
-        mutationFn: ({ companyId, jobs }) => {
-            return this.post(`/company/${companyId}/jobs/manage`, JSON.stringify({ jobs }), undefined, {
+        mutationFn: ({ jobs }) => {
+            return this.post(`/company/${this.companyId}/jobs/manage`, JSON.stringify({ jobs }), undefined, {
                 "Content-Type": "application/json",
             });
         },
-        onMutate: async ({ companyId, jobs }) => {
+        onMutate: async ({ jobs }) => {
             await queryClient.cancelQueries({ queryKey: ['jobs'] });
             const previousJobs = queryClient.getQueryData(['jobs']);
             queryClient.setQueryData(['jobs'], (oldData) => {
@@ -208,6 +210,44 @@ AvroQueryClient.prototype.useUpdateJob = function () {
         },
     });
 };
+AvroQueryClient.prototype.useDeleteJobs = function () {
+    const queryClient = this.getQueryClient();
+    return useMutation({
+        mutationFn: ({ ids }) => {
+            return this.post(`/company/${this.companyId}/jobs/delete`, JSON.stringify({ ids }), undefined, {
+                "Content-Type": "application/json",
+            });
+        },
+        onMutate: async ({ ids }) => {
+            await queryClient.cancelQueries({ queryKey: ['jobs'] });
+            const previousJobs = queryClient.getQueryData(['jobs']);
+            queryClient.setQueryData(['jobs'], (oldData) => {
+                if (!oldData)
+                    return oldData;
+                if (oldData.pages) {
+                    const updatedPages = oldData.pages.map((page) => page.filter((job) => !ids.includes(job.id)));
+                    return { ...oldData, pages: updatedPages };
+                }
+                if (Array.isArray(oldData)) {
+                    return oldData.filter((job) => !ids.includes(job.id));
+                }
+                return oldData;
+            });
+            return { previousJobs };
+        },
+        onError: (_err, variables, context) => {
+            if (context?.previousJobs) {
+                queryClient.setQueryData(['jobs'], context.previousJobs);
+            }
+        },
+        onSettled: (_data, _error, _variables) => {
+            queryClient.invalidateQueries({ queryKey: ['jobs'] });
+            queryClient.invalidateQueries({ queryKey: ['routes'] });
+            queryClient.invalidateQueries({ queryKey: ['job'] });
+            queryClient.invalidateQueries({ queryKey: ['route'] });
+        },
+    });
+};
 AvroQueryClient.prototype.useDeleteJob = function () {
     const queryClient = this.getQueryClient();
     return useMutation({

package/dist/index.d.ts

@@ -15,6 +15,7 @@ import './client/hooks/companies';
 import './client/hooks/users';
 import './client/hooks/sessions';
 import './client/hooks/chats';
+import './client/hooks/catalog_items';
 import './client/hooks/messages';
 import './client/hooks/plans';
 import './client/hooks/analytics';

package/dist/index.js

@@ -15,6 +15,7 @@ import './client/hooks/companies';
 import './client/hooks/users';
 import './client/hooks/sessions';
 import './client/hooks/chats';
+import './client/hooks/catalog_items';
 import './client/hooks/messages';
 import './client/hooks/plans';
 import './client/hooks/analytics';

package/dist/types/api.d.ts

@@ -7,6 +7,24 @@ export interface ApiInfo {
     version: string;
     vroom_healthy: boolean;
 }
+export interface CatalogItem {
+    id: string;
+    name: string;
+    company_id: string;
+    description: string;
+    industry: string;
+    price_format: string;
+    payment_options: PaymentOption[];
+}
+export interface PaymentOption {
+    name: string;
+    id: string;
+    is_prepay: boolean;
+    price_under_prepay?: number;
+    price: number;
+    recommended_prepay_count?: number;
+    mode: "MONTH" | "SERVICE";
+}
 export interface PaymentMethod {
     allow_redisplay: string;
     autopay: boolean;
@@ -438,6 +456,7 @@ export interface Company {
     email: string;
     emails: Email[];
     skills: Skill[];
+    catalog_items: CatalogItem[];
     time_created: number;
     time_updated: number | null;
     users: UserCompanyAssociation[];

package/package.json

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