shelflife-react-hooks 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shelflife-react-hooks",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "",
   "license": "ISC",
   "author": "Preisler25",

package/src/context/ProductContext.tsx

@@ -31,7 +31,7 @@ type ProductContextValue = {
     isLoading: boolean;
     isError: boolean;
     error: Error | null;
-    fetchProducts: (query?: ProductQuery) => Promise<Product[]>;
+    fetchProducts: (search: string, size: number, page: number) => Promise<Product[]>;
     fetchProduct: (id: number) => Promise<Product | null>;
     createProduct: (dto: CreateProductRequest) => Promise<Product>;
     updateProduct: (id: number, dto: UpdateProductRequest) => Promise<Product>;
@@ -66,7 +66,7 @@ export const ProductProvider = ({ baseUrl, children }: ProductProviderProps) =>
     }), [baseUrl, token]);
 
     const fetchProducts = useCallback(
-        (query?: ProductQuery) => fetchProductsRequest(apiConfig, query),
+        (search: string = "", size: number = 0, page: number = 0) => fetchProductsRequest(apiConfig, search, size, page),
         [apiConfig]
     );
     const fetchProduct = useCallback((id: number) => fetchProductRequest(apiConfig, id), [apiConfig]);

package/src/context/StorageContext.tsx

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

package/src/context/api/productApi.ts

@@ -4,12 +4,6 @@ import type { CreateProductRequest, UpdateProductRequest } from '../../type/requ
 import { buildAuthHeaders, normalizeBaseUrl, readArrayBuffer, readJson } from '../http.js';
 import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
 
-type ProductQuery = {
-    barcode?: string;
-    name?: string;
-    category?: string;
-};
-
 type ProductApiConfig = RequestStateHandlers & {
     baseUrl: string;
     token: string | null;
@@ -30,23 +24,14 @@ const updateById = (items: Product[], updated: Product): Product[] => {
 
 export const fetchProductsRequest = async (
     config: ProductApiConfig,
-    query?: ProductQuery
+    search: string,
+    size: number,
+    page: number
 ): Promise<Product[]> => runWithRequestState(config, async () => {
     const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const params = new URLSearchParams();
-    if (query?.barcode) {
-        params.set('barcode', query.barcode);
-    }
-    if (query?.name) {
-        params.set('name', query.name);
-    }
-    if (query?.category) {
-        params.set('category', query.category);
-    }
-
-    const url = params.toString()
-        ? `${normalizedBaseUrl}/api/products?${params.toString()}`
-        : `${normalizedBaseUrl}/api/products`;
+    let url = `${normalizedBaseUrl}/api/products?search=${search}`;
+    if (size > 0)
+        url += `&page=${page}&size=${size}`;
 
     const response = await fetch(url, {
         headers: buildAuthHeaders(config.token)

package/src/context/api/storageApi.ts

@@ -22,11 +22,20 @@ const updateById = (items: Storage[], updated: Storage): Storage[] => {
     return next;
 };
 
-export const fetchStoragesRequest = async (config: StorageApiConfig): Promise<Storage[]> => runWithRequestState(
+export const fetchStoragesRequest = async (
+    config: StorageApiConfig,
+    search: string,
+    size: number,
+    page: number
+): Promise<Storage[]> => runWithRequestState(
     config,
     async () => {
         const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-        const response = await fetch(`${normalizedBaseUrl}/api/storages`, {
+        let url = `${normalizedBaseUrl}/api/storages?search=${search}`;
+        if (size > 0)
+            url += `&page=${page}&size=${size}`;
+
+        const response = await fetch(url, {
             headers: buildAuthHeaders(config.token)
         });
 
@@ -123,7 +132,7 @@ export const changeStorageNameRequest = async (
         const payload = await readJson<CreateStorageError>(response);
         if (payload?.name)
             throw payload;
-        
+
         throw new Error('Failed to update storage');
     }
 

package/src/index.ts

@@ -1,9 +1,12 @@
 export * from './type/auth.js';
 export * from './type/base.js';
+export * from './type/item.js';
+export * from './type/member.js';
 export * from './type/models.js';
 export * from './type/product.js';
-export * from './type/runninglow.js';
 export * from './type/requests.js';
+export * from './type/runninglow.js';
+export * from './type/shoppingList.js';
 export * from './type/storage.js';
 export * from './type/user.js';
 export * from './context/AuthContext.js';

package/src/type/requests.ts

@@ -1,6 +1,7 @@
 export type CreateProductRequest = {
     name: string;
     category: string;
+    description?: string;
     barcode?: string;
     expirationDaysDelta: number;
 };
@@ -8,6 +9,7 @@ export type CreateProductRequest = {
 export type UpdateProductRequest = {
     name?: string;
     category?: string;
+    description?: string;
     barcode?: string;
     expirationDaysDelta?: number;
 };