@carlonicora/nextjs-jsonapi 1.138.1 → 1.139.1

package/dist/server/index.js

@@ -15,7 +15,7 @@ var _chunkIOLU4ASDjs = require('../chunk-IOLU4ASD.js');
 
 
 
-var _chunkW73JBOIRjs = require('../chunk-W73JBOIR.js');
+var _chunkAWOOIQLFjs = require('../chunk-AWOOIQLF.js');
 require('../chunk-LXKSUWAV.js');
 require('../chunk-IBS6NI7D.js');
 
@@ -86,7 +86,7 @@ var ServerSession = class {
     if (!rawModules) return false;
     const modules = JSON.parse(_pako2.default.ungzip(Buffer.from(rawModules, "base64"), { to: "string" }));
     const selectedModule = modules.find((module) => module.id === params.module.moduleId);
-    return _chunkW73JBOIRjs.checkPermissionsFromServer.call(void 0, {
+    return _chunkAWOOIQLFjs.checkPermissionsFromServer.call(void 0, {
       module: params.module,
       action: params.action,
       data: params.data,
@@ -296,5 +296,5 @@ _chunk7QVYU63Ejs.__name.call(void 0, ServerJsonApiDelete, "ServerJsonApiDelete")
 
 
 
-exports.ServerAuthService = _chunkW73JBOIRjs.AuthService; exports.ServerCompanyService = _chunkW73JBOIRjs.CompanyService; exports.ServerContentService = _chunkW73JBOIRjs.ContentService; exports.ServerFeatureService = _chunkW73JBOIRjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunkW73JBOIRjs.NotificationService; exports.ServerPushService = _chunkW73JBOIRjs.PushService; exports.ServerRoleService = _chunkW73JBOIRjs.RoleService; exports.ServerS3Service = _chunkW73JBOIRjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunkW73JBOIRjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunkIOLU4ASDjs.serverRequest;
+exports.ServerAuthService = _chunkAWOOIQLFjs.AuthService; exports.ServerCompanyService = _chunkAWOOIQLFjs.CompanyService; exports.ServerContentService = _chunkAWOOIQLFjs.ContentService; exports.ServerFeatureService = _chunkAWOOIQLFjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunkAWOOIQLFjs.NotificationService; exports.ServerPushService = _chunkAWOOIQLFjs.PushService; exports.ServerRoleService = _chunkAWOOIQLFjs.RoleService; exports.ServerS3Service = _chunkAWOOIQLFjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunkAWOOIQLFjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunkIOLU4ASDjs.serverRequest;
 //# sourceMappingURL=index.js.map

package/dist/server/index.mjs

@@ -15,7 +15,7 @@ import {
   S3Service,
   UserService,
   checkPermissionsFromServer
-} from "../chunk-DVOBOFCF.mjs";
+} from "../chunk-GF4OWZKE.mjs";
 import "../chunk-AUXK7QSA.mjs";
 import "../chunk-C7C7VY4F.mjs";
 import {

package/dist/{useDataListRetriever-BqJSFBck.d.mts → useDataListRetriever-WEXL4bqB.d.mts}

@@ -9,6 +9,7 @@ type DataListRetriever<T> = {
     isLoaded: boolean;
     data: T[] | undefined;
     total?: number;
+    meta?: Record<string, any>;
     next?: (onlyNewRecords?: boolean) => Promise<void>;
     previous?: (onlyNewRecords?: boolean) => Promise<void>;
     search: (search: string) => Promise<void>;

package/dist/{useDataListRetriever-BqJSFBck.d.ts → useDataListRetriever-WEXL4bqB.d.ts}

@@ -9,6 +9,7 @@ type DataListRetriever<T> = {
     isLoaded: boolean;
     data: T[] | undefined;
     total?: number;
+    meta?: Record<string, any>;
     next?: (onlyNewRecords?: boolean) => Promise<void>;
     previous?: (onlyNewRecords?: boolean) => Promise<void>;
     search: (search: string) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "1.138.1",
+  "version": "1.139.1",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/components/forms/EntityMultiSelector.tsx

@@ -63,6 +63,7 @@ export function EntityMultiSelector<T extends { id: string }>({
   const [searchTerm, setSearchTerm] = useState("");
   const [options, setOptions] = useState<OptionData<T>[]>([]);
   const searchInputRef = useRef<HTMLInputElement>(null);
+  const searchTermRef = useRef<string>("");
 
   // Stabilize callback props in refs to prevent infinite re-render loops.
   // These functions are passed inline by consumers (e.g. getLabel={(w) => w.name})
@@ -110,11 +111,10 @@ export function EntityMultiSelector<T extends { id: string }>({
 
   const updateSearch = useCallback(
     (searchedTerm: string) => {
-      if (searchedTerm.trim()) {
-        data.addAdditionalParameter("search", searchedTerm.trim());
-      } else {
-        data.removeAdditionalParameter("search");
-      }
+      const trimmed = searchedTerm.trim();
+      if (trimmed === searchTermRef.current) return;
+      searchTermRef.current = trimmed;
+      data.search(trimmed);
     },
     [data],
   );
@@ -202,17 +202,15 @@ export function EntityMultiSelector<T extends { id: string }>({
     [form, id, options],
   );
 
+  // No client-side filtering: the search term is sent to the API (debounced), so filtering
+  // the response again by label would hide matches found on other fields (e.g. email).
   const sortedOptions = useMemo(() => {
-    const filtered = searchTerm.trim()
-      ? options.filter((o) => o.label.toLowerCase().includes(searchTerm.trim().toLowerCase()))
-      : options;
-
-    return [...filtered].sort((a, b) => {
+    return [...options].sort((a, b) => {
       const aSelected = selectedIds.has(a.id) ? 0 : 1;
       const bSelected = selectedIds.has(b.id) ? 0 : 1;
       return aSelected - bSelected;
     });
-  }, [options, selectedIds, searchTerm]);
+  }, [options, selectedIds]);
 
   const triggerSummary = useMemo(() => {
     if (selectedValues.length === 0) return null;

package/src/core/abstracts/AbstractService.ts

@@ -36,6 +36,19 @@ export function clearLastApiTotal(): void {
   lastApiTotal = undefined;
 }
 
+// Store the last full top-level `meta` object from any list API call - accessible by
+// hooks that need aggregate meta beyond `total` (e.g. per-list counts). Same
+// module-global design as lastApiTotal above.
+let lastApiMeta: Record<string, any> | undefined = undefined;
+
+export function getLastApiMeta(): Record<string, any> | undefined {
+  return lastApiMeta;
+}
+
+export function clearLastApiMeta(): void {
+  lastApiMeta = undefined;
+}
+
 let globalErrorHandler: ((status: number, message: string) => void) | null = null;
 
 /**
@@ -258,6 +271,8 @@ export abstract class AbstractService {
       lastApiTotal = apiResponse.meta.total;
       if (params.total) params.total.total = apiResponse.meta.total;
     }
+    // Store the full top-level meta too, so hooks can read aggregates beyond `total`.
+    lastApiMeta = apiResponse.meta;
 
     return apiResponse.data as T;
   }

package/src/hooks/__tests__/useDataListRetriever.test.ts

@@ -288,6 +288,29 @@ describe("useDataListRetriever", () => {
       });
     });
 
+    it("should forward an explicit search additional parameter to the retriever", async () => {
+      const retriever = vi.fn().mockResolvedValue([]);
+
+      const { result } = renderHook(() =>
+        useDataListRetriever({
+          retriever,
+          module: mockModule,
+        }),
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoaded).toBe(true);
+      });
+
+      act(() => {
+        result.current.addAdditionalParameter("search", "mario");
+      });
+
+      await waitFor(() => {
+        expect(retriever).toHaveBeenCalledWith(expect.objectContaining({ search: "mario" }));
+      });
+    });
+
     it("should remove additional parameter", async () => {
       const retriever = vi.fn().mockResolvedValue([]);
 

package/src/hooks/useDataListRetriever.ts

@@ -2,7 +2,7 @@
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { ClientAbstractService } from "../core/abstracts/ClientAbstractService";
-import { getLastApiTotal } from "../core/abstracts/AbstractService";
+import { getLastApiMeta, getLastApiTotal } from "../core/abstracts/AbstractService";
 
 export type PageInfo = {
   startItem: number;
@@ -16,6 +16,7 @@ export type DataListRetriever<T> = {
   isLoaded: boolean;
   data: T[] | undefined;
   total?: number;
+  meta?: Record<string, any>;
   next?: (onlyNewRecords?: boolean) => Promise<void>;
   previous?: (onlyNewRecords?: boolean) => Promise<void>;
   search: (search: string) => Promise<void>;
@@ -39,6 +40,7 @@ export function useDataListRetriever<T>(params: {
 }): DataListRetriever<T> {
   const [data, setData] = useState<T[] | undefined>(undefined);
   const [total, setTotal] = useState<number | undefined>(undefined);
+  const [meta, setMeta] = useState<Record<string, any> | undefined>(undefined);
   const [nextPage, setNextPage] = useState<string | undefined>(undefined);
   const [previousPage, setPreviousPage] = useState<string | undefined>(undefined);
   const [isLoaded, setIsLoaded] = useState(false);
@@ -194,7 +196,9 @@ export function useDataListRetriever<T>(params: {
             ...additionalParamsRef.current,
           };
 
-          retrieverParams.search = currentSearchTerm;
+          // An explicit `search` passed through addAdditionalParameter wins: overwriting it
+          // with the internal term (only ever set by `search()`) silently dropped it.
+          if (additionalParamsRef.current.search === undefined) retrieverParams.search = currentSearchTerm;
           retrieverParams.next = nextRef;
           retrieverParams.previous = previousRef;
           retrieverParams.self = selfRef;
@@ -218,6 +222,11 @@ export function useDataListRetriever<T>(params: {
           if (apiTotal !== undefined) {
             setTotal(apiTotal);
           }
+          // Full top-level meta (aggregates beyond `total`, e.g. per-list counts)
+          const apiMeta = getLastApiMeta();
+          if (apiMeta !== undefined) {
+            setMeta(apiMeta);
+          }
         }
       } catch (error) {
         if (thisRequestId === requestIdRef.current) {
@@ -359,6 +368,7 @@ export function useDataListRetriever<T>(params: {
     isLoaded: isLoaded,
     data: data as T[],
     total,
+    meta,
     next: nextPage ? loadNext : undefined,
     previous: previousPage ? loadPrevious : undefined,
     search: search,