@go-avro/avro-js 0.0.2-beta.120 → 0.0.2-beta.122

package/dist/client/QueryClient.d.ts

@@ -21,7 +21,7 @@ declare module '../client/QueryClient' {
         getDelay(strategy: RetryStrategy, attempt: number): number;
         sleep(ms: number): Promise<void>;
         useGetRoot(): UseQueryResult<ApiInfo, StandardError>;
-        useGetJobs(total: number, onProgress?: (fraction: number) => void): UseQueryResult<Job[], StandardError>;
+        useGetJobs(onProgress?: (fraction: number) => void): UseQueryResult<Job[], StandardError>;
         getJobsFromCache(): Job[];
         useGetInfiniteJobs(body: {
             amt?: number;
@@ -282,6 +282,7 @@ export declare class AvroQueryClient {
     readonly socket: Socket;
     _isAuthenticated: boolean;
     companyId: string | null;
+    company: Company | null;
     constructor(config: AvroQueryClientConfig);
     emit(eventName: string, data: unknown): void;
     on<T>(eventName: string, callback: (data: T) => void): void;

package/dist/client/QueryClient.js

@@ -6,6 +6,7 @@ export class AvroQueryClient {
     constructor(config) {
         this._isAuthenticated = false;
         this.companyId = null;
+        this.company = null;
         this.config = {
             baseUrl: config.baseUrl,
             authManager: config.authManager,

package/dist/client/hooks/companies.js

@@ -27,7 +27,8 @@ AvroQueryClient.prototype.useGetCurrentCompany = function () {
                     throw new Error("No company ID set and no companies available");
                 }
             }
-            return this.get(`/company/${this.companyId}`);
+            this.company = await this.get(`/company/${this.companyId}`);
+            return this.company;
         },
     });
 };

package/dist/client/hooks/jobs.js

@@ -1,26 +1,21 @@
 import { useMutation, useQuery, useInfiniteQuery } from '@tanstack/react-query';
 import { AvroQueryClient } from '../../client/QueryClient';
-AvroQueryClient.prototype.getJobsFromCache = function (total = 0) {
+AvroQueryClient.prototype.getJobsFromCache = function () {
     const queryClient = this.getQueryClient();
-    const cachedJobsData = queryClient.getQueryData(['jobs', this.companyId, total]);
-    if (cachedJobsData && cachedJobsData.pages) {
-        return cachedJobsData.pages.flat();
-    }
-    const cachedJobs = queryClient.getQueryData(['jobs', this.companyId]);
-    return cachedJobs || [];
+    return (queryClient.getQueryData(['jobs', this.companyId, this.company?.num_jobs]) ?? []);
 };
-AvroQueryClient.prototype.useGetJobs = function (total = 0, onProgress) {
+AvroQueryClient.prototype.useGetJobs = function (onProgress) {
     const queryClient = this.getQueryClient();
     const amt = 50;
     return useQuery({
-        queryKey: ['jobs', this.companyId, total],
+        queryKey: ['jobs', this.companyId, this.company?.num_jobs],
         queryFn: async () => {
-            if (total === 0) {
+            if (this.company?.num_jobs === 0) {
                 onProgress?.(1);
                 return [];
             }
             onProgress?.(0);
-            const pageCount = amt ? Math.ceil(total / amt) : 0;
+            const pageCount = amt ? Math.ceil((this.company?.num_jobs ?? 0) / amt) : 0;
             let completed = 0;
             const promises = Array.from({ length: pageCount }, (_, i) => this.fetchJobs({ offset: i * amt }));
             const trackedPromises = promises.map((promise) => promise.then((result) => {
@@ -50,7 +45,7 @@ AvroQueryClient.prototype.useGetJobs = function (total = 0, onProgress) {
 AvroQueryClient.prototype.useGetInfiniteJobs = function (body, onProgress) {
     const queryClient = this.getQueryClient();
     const result = useInfiniteQuery({
-        queryKey: ['jobs', this.companyId, body.amt ?? 50, body.query ?? "", body.routeId ?? ""],
+        queryKey: ['infinite', 'jobs', this.companyId, body.amt ?? 50, body.query ?? "", body.routeId ?? ""],
         initialPageParam: 0,
         getNextPageParam: (lastPage, allPages) => {
             if (lastPage.length < (body.amt ?? 50))

package/package.json

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