shelflife-react-hooks 1.0.14 → 1.0.16

package/src/context/ProductContext.tsx

@@ -18,12 +18,7 @@ import {
     updateProductRequest,
     uploadProductIconRequest
 } from './api/productApi.js';
-
-type ProductQuery = {
-    barcode?: string;
-    name?: string;
-    category?: string;
-};
+import type { PaginatedResponse } from '../type/PaginatedResponse.js';
 
 type ProductContextValue = {
     products: Product[];
@@ -31,7 +26,7 @@ type ProductContextValue = {
     isLoading: boolean;
     isError: boolean;
     error: Error | null;
-    fetchProducts: (search: string, size: number, page: number) => Promise<Product[]>;
+    fetchProducts: (search?: string, size?: number, page?: number) => Promise<PaginatedResponse<Product>>;
     fetchProduct: (id: number) => Promise<Product | null>;
     createProduct: (dto: CreateProductRequest) => Promise<Product>;
     updateProduct: (id: number, dto: UpdateProductRequest) => Promise<Product>;

package/src/context/StorageContext.tsx

@@ -16,6 +16,7 @@ import {
     fetchStorageRequest,
     fetchStoragesRequest
 } from './api/storageApi.js';
+import type { PaginatedResponse } from '../type/PaginatedResponse.js';
 
 type StorageContextValue = {
     storages: Storage[];
@@ -23,7 +24,7 @@ type StorageContextValue = {
     isLoading: boolean;
     isError: boolean;
     error: Error | null;
-    fetchStorages: (search?: string, size?: number, page?: number) => Promise<Storage[]>;
+    fetchStorages: (search?: string, size?: number, page?: number) => Promise<PaginatedResponse<Storage>>;
     fetchStorage: (id: number) => Promise<Storage | null>;
     createStorage: (dto: CreateStorageRequest) => Promise<Storage>;
     changeStorageName: (id: number, dto: ChangeStorageNameRequest) => Promise<Storage>;
@@ -55,7 +56,7 @@ export const StorageProvider = ({ baseUrl, children }: StorageProviderProps) =>
         setError
     }), [baseUrl, token]);
 
-    const fetchStorages = useCallback((search: string = "", size: number = 0, page: number = 0) => fetchStoragesRequest(apiConfig, search, page, size), [apiConfig]);
+    const fetchStorages = useCallback((search: string = "", size: number = 0, page: number = 0) => fetchStoragesRequest(apiConfig, search, size, page), [apiConfig]);
     const fetchStorage = useCallback((id: number) => fetchStorageRequest(apiConfig, id), [apiConfig]);
     const createStorage = useCallback(
         (dto: CreateStorageRequest) => createStorageRequest(apiConfig, dto),

package/src/context/api/productApi.ts

@@ -1,4 +1,5 @@
 import type { Product } from '../../type/models.js';
+import type { PaginatedResponse } from '../../type/PaginatedResponse.js';
 import type { ProductCreateError } from '../../type/product.js';
 import type { CreateProductRequest, UpdateProductRequest } from '../../type/requests.js';
 import { buildAuthHeaders, normalizeBaseUrl, readArrayBuffer, readJson } from '../http.js';
@@ -27,7 +28,7 @@ export const fetchProductsRequest = async (
     search: string,
     size: number,
     page: number
-): Promise<Product[]> => runWithRequestState(config, async () => {
+): Promise<PaginatedResponse<Product>> => runWithRequestState(config, async () => {
     const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
     let url = `${normalizedBaseUrl}/api/products?search=${search}`;
     if (size > 0)
@@ -41,13 +42,13 @@ export const fetchProductsRequest = async (
         throw new Error('Failed to fetch products');
     }
 
-    const payload = await readJson<Product[]>(response);
+    const payload = await readJson<PaginatedResponse<Product>>(response);
     if (payload) {
-        config.setProducts(payload);
+        config.setProducts(payload.data);
         return payload;
     }
 
-    return [];
+    return { data: [], currentPage: 0, hasNext: false, hasPrevious: false, pageSize: 0, totalItems: 0, totalPages: 0 };
 });
 
 export const fetchProductRequest = async (

package/src/context/api/storageApi.ts

@@ -1,4 +1,5 @@
 import type { Storage } from '../../type/models.js';
+import type { PaginatedResponse } from '../../type/PaginatedResponse.js';
 import type { ChangeStorageNameRequest, CreateStorageRequest } from '../../type/requests.js';
 import type { CreateStorageError } from '../../type/storage.js';
 import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
@@ -27,7 +28,7 @@ export const fetchStoragesRequest = async (
     search: string,
     size: number,
     page: number
-): Promise<Storage[]> => runWithRequestState(
+): Promise<PaginatedResponse<Storage>> => runWithRequestState(
     config,
     async () => {
         const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
@@ -43,13 +44,13 @@ export const fetchStoragesRequest = async (
             throw new Error('Failed to fetch storages');
         }
 
-        const payload = await readJson<Storage[]>(response);
+        const payload = await readJson<PaginatedResponse<Storage>>(response);
         if (payload) {
-            config.setStorages(payload);
+            config.setStorages(payload.data);
             return payload;
         }
 
-        return [];
+        return { data: [], currentPage: 0, hasNext: false, hasPrevious: false, pageSize: 0, totalItems: 0, totalPages: 0 };
     }
 );
 

package/src/index.ts

@@ -3,6 +3,7 @@ export * from './type/base.js';
 export * from './type/item.js';
 export * from './type/member.js';
 export * from './type/models.js';
+export * from './type/PaginatedResponse.js';
 export * from './type/product.js';
 export * from './type/requests.js';
 export * from './type/runninglow.js';

package/src/type/PaginatedResponse.ts

@@ -0,0 +1,9 @@
+export type PaginatedResponse<T> = {
+    data: T[];
+    currentPage: number;
+    totalPages: number;
+    totalItems: number;
+    pageSize: number;
+    hasNext: boolean;
+    hasPrevious: boolean;
+}

package/src/type/models.ts

@@ -14,6 +14,7 @@ export type Product = {
     id: number;
     ownerId: number;
     name: string;
+    description: string | null;
     category: string;
     expirationDaysDelta: number;
     barcode: string | null;

package/src/type/product.ts

@@ -1,5 +1,6 @@
 type ProductCreateError = {
-    name?: string;
+    name?: string;  
+    description?: string;
     category?: string;
     barcode?: string;
     expirationDaysDelta?: number;