@carlonicora/nextjs-jsonapi 1.117.1 → 1.119.0

package/src/components/containers/__tests__/partitionTabs.spec.ts

@@ -0,0 +1,51 @@
+import { describe, expect, it } from "vitest";
+import { partitionTabs } from "../partitionTabs";
+import type { Tab } from "../TabsContainer";
+
+const tab = (label: string, group?: string): Tab => ({
+  label,
+  content: null,
+  group,
+});
+
+describe("partitionTabs", () => {
+  it("returns empty partition for empty input", () => {
+    expect(partitionTabs([])).toEqual({ ungrouped: [], groups: [] });
+  });
+
+  it("keeps tabs without a group in the ungrouped stratum, in declared order", () => {
+    const result = partitionTabs([tab("a"), tab("b"), tab("c")]);
+    expect(result.ungrouped.map((t) => t.label)).toEqual(["a", "b", "c"]);
+    expect(result.groups).toEqual([]);
+  });
+
+  it("clusters tabs by group label", () => {
+    const result = partitionTabs([tab("a", "Casebook"), tab("b", "Casebook"), tab("c", "Work")]);
+    expect(result.ungrouped).toEqual([]);
+    expect(result.groups).toEqual([
+      { label: "Casebook", items: [expect.objectContaining({ label: "a" }), expect.objectContaining({ label: "b" })] },
+      { label: "Work", items: [expect.objectContaining({ label: "c" })] },
+    ]);
+  });
+
+  it("renders groups in the order they first appear", () => {
+    const result = partitionTabs([tab("a", "Work"), tab("b", "Casebook"), tab("c", "Work"), tab("d", "Casebook")]);
+    expect(result.groups.map((g) => g.label)).toEqual(["Work", "Casebook"]);
+    expect(result.groups[0].items.map((t) => t.label)).toEqual(["a", "c"]);
+    expect(result.groups[1].items.map((t) => t.label)).toEqual(["b", "d"]);
+  });
+
+  it("preserves ungrouped tabs above grouped tabs regardless of array order", () => {
+    const result = partitionTabs([tab("one", "Work"), tab("two"), tab("three", "Work"), tab("four")]);
+    expect(result.ungrouped.map((t) => t.label)).toEqual(["two", "four"]);
+    expect(result.groups).toHaveLength(1);
+    expect(result.groups[0].items.map((t) => t.label)).toEqual(["one", "three"]);
+  });
+
+  it("treats an empty-string group as 'no group'", () => {
+    const result = partitionTabs([tab("a", ""), tab("b", "Work")]);
+    expect(result.ungrouped.map((t) => t.label)).toEqual(["a"]);
+    expect(result.groups).toHaveLength(1);
+    expect(result.groups[0].label).toBe("Work");
+  });
+});

package/src/components/containers/index.ts

@@ -1,4 +1,5 @@
 export * from "./PageContainer";
+export * from "./partitionTabs";
 export * from "./ReactMarkdownContainer";
 export * from "./RoundPageContainer";
 export * from "./RoundPageContainerTitle";

package/src/components/containers/partitionTabs.ts

@@ -0,0 +1,43 @@
+import { Tab } from "./TabsContainer";
+
+export type PartitionedTabs = {
+  ungrouped: Tab[];
+  groups: Array<{ label: string; items: Tab[] }>;
+};
+
+/**
+ * Split a `Tab[]` into ungrouped + grouped strata for the
+ * `RoundPageContainer` `layout="rail"` navigation.
+ *
+ * Tabs without a `group` land in `ungrouped` (the pinned stratum) in declared
+ * order. Grouped tabs cluster under their `group` label; groups appear in the
+ * order they first occur in the input array.
+ *
+ * Pure function — safe to call on every render. Complexity O(n).
+ */
+export function partitionTabs(tabs: Tab[]): PartitionedTabs {
+  const ungrouped: Tab[] = [];
+  const groupMap = new Map<string, Tab[]>();
+  const groupOrder: string[] = [];
+
+  for (const tab of tabs) {
+    if (!tab.group) {
+      ungrouped.push(tab);
+      continue;
+    }
+    if (!groupMap.has(tab.group)) {
+      groupMap.set(tab.group, []);
+      groupOrder.push(tab.group);
+    }
+    // The map entry is guaranteed to exist because we just initialized it.
+    groupMap.get(tab.group)!.push(tab);
+  }
+
+  return {
+    ungrouped,
+    groups: groupOrder.map((label) => ({
+      label,
+      items: groupMap.get(label)!,
+    })),
+  };
+}

package/src/components/forms/EditorSheet.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useTranslations } from "next-intl";
-import { ReactNode, useCallback, useEffect, useRef } from "react";
+import { ReactElement, ReactNode, useCallback, useEffect, useRef } from "react";
 import { FieldValues, UseFormReturn } from "react-hook-form";
 import { PencilIcon } from "lucide-react";
 import { ModuleWithPermissions } from "../../permissions/types";
@@ -161,7 +161,12 @@ export function EditorSheet<T extends FieldValues>({
         {dialogOpen === undefined &&
           forceShow === undefined &&
           (trigger ? (
-            <SheetTrigger>{trigger}</SheetTrigger>
+            // Base UI: the trigger renders its own <button>. Pass the caller's
+            // element via `render` (NOT as children) so it BECOMES the trigger
+            // button — otherwise an interactive trigger (e.g. <Button>) nests a
+            // <button> inside SheetTrigger's <button> (invalid HTML / hydration
+            // error). `render` also preserves the element's native `disabled`.
+            <SheetTrigger render={trigger as ReactElement} />
           ) : (
             <SheetTrigger>
               {isEdit ? (

package/src/core/abstracts/AbstractService.ts

@@ -147,6 +147,12 @@ export abstract class AbstractService {
     files?: { [key: string]: File | Blob } | File | Blob;
     token?: string;
     suppressGlobalError?: boolean;
+    /**
+     * Per-call override of the API base URL. When omitted, the existing global
+     * `NEXT_PUBLIC_API_URL` (or `configureJsonApi({ apiUrl })`) resolution is used —
+     * fully backward compatible. Ignored when `endpoint` starts with "http" (passthrough).
+     */
+    baseUrl?: string;
   }): Promise<T> {
     // Dynamic import to avoid bundling issues
     const { JsonApiGet, JsonApiPost, JsonApiPut, JsonApiPatch, JsonApiDelete } =
@@ -171,6 +177,7 @@ export abstract class AbstractService {
           endpoint: params.endpoint,
           companyId: params.companyId,
           language: language,
+          baseUrl: params.baseUrl,
         });
         break;
       case HttpMethod.POST:
@@ -184,6 +191,7 @@ export abstract class AbstractService {
           responseType: params.responseType,
           files: params.files,
           token: params.token,
+          baseUrl: params.baseUrl,
         });
         break;
       case HttpMethod.PUT:
@@ -195,6 +203,7 @@ export abstract class AbstractService {
           language: language,
           responseType: params.responseType,
           files: params.files,
+          baseUrl: params.baseUrl,
         });
         break;
       case HttpMethod.PATCH:
@@ -207,6 +216,7 @@ export abstract class AbstractService {
           language: language,
           responseType: params.responseType,
           files: params.files,
+          baseUrl: params.baseUrl,
         });
         break;
       case HttpMethod.DELETE:
@@ -216,6 +226,7 @@ export abstract class AbstractService {
           companyId: params.companyId,
           language: language,
           responseType: params.responseType,
+          baseUrl: params.baseUrl,
         });
         break;
       default:
@@ -359,6 +370,7 @@ export abstract class AbstractService {
     method: HttpMethod;
     endpoint: string;
     companyId?: string;
+    baseUrl?: string;
     suppressGlobalError?: boolean;
   }): Promise<any> {
     const { JsonApiGet } = await import("../../unified/JsonApiRequest");
@@ -377,6 +389,7 @@ export abstract class AbstractService {
       classKey: params.type,
       endpoint: params.endpoint,
       companyId: params.companyId,
+      baseUrl: params.baseUrl,
       language: language,
     });
 

package/src/core/abstracts/ClientAbstractService.ts

@@ -147,6 +147,11 @@ export abstract class ClientAbstractService {
     total?: ClientTotalRef;
     responseType?: ApiRequestDataTypeInterface;
     files?: { [key: string]: File | Blob } | File | Blob;
+    /**
+     * Per-call override of the API base URL (mirrors `AbstractService.callApi`'s `baseUrl`).
+     * Omitted => existing global `NEXT_PUBLIC_API_URL` resolution, unchanged.
+     */
+    baseUrl?: string;
   }): Promise<T> {
     let apiResponse: ApiResponseInterface;
 
@@ -160,6 +165,7 @@ export abstract class ClientAbstractService {
           endpoint: params.endpoint,
           companyId: params.companyId,
           language: language,
+          baseUrl: params.baseUrl,
         });
         break;
       case ClientHttpMethod.POST:
@@ -172,6 +178,7 @@ export abstract class ClientAbstractService {
           language: language,
           responseType: params.responseType,
           files: params.files,
+          baseUrl: params.baseUrl,
         });
         break;
       case ClientHttpMethod.PUT:
@@ -183,6 +190,7 @@ export abstract class ClientAbstractService {
           language: language,
           responseType: params.responseType,
           files: params.files,
+          baseUrl: params.baseUrl,
         });
         break;
       case ClientHttpMethod.PATCH:
@@ -195,6 +203,7 @@ export abstract class ClientAbstractService {
           language: language,
           responseType: params.responseType,
           files: params.files,
+          baseUrl: params.baseUrl,
         });
         break;
       case ClientHttpMethod.DELETE:
@@ -204,6 +213,7 @@ export abstract class ClientAbstractService {
           companyId: params.companyId,
           language: language,
           responseType: params.responseType,
+          baseUrl: params.baseUrl,
         });
         break;
       default:

package/src/unified/JsonApiRequest.ts

@@ -167,9 +167,17 @@ function runBootstrapper(): void {
   }
 }
 
-function buildUrl(endpoint: string): string {
-  const apiUrl = getApiUrl();
-  return endpoint.startsWith("http") ? endpoint : `${apiUrl}${endpoint}`;
+/**
+ * Resolve the final request URL for an endpoint.
+ *
+ * - `endpoint` starting with "http" is always passed through unchanged (existing behaviour).
+ * - Otherwise, an explicit `baseUrl` (per-call override) takes precedence over the global
+ *   `getApiUrl()` resolution. Omitting `baseUrl` preserves today's behaviour exactly.
+ */
+export function buildUrl(endpoint: string, baseUrl?: string): string {
+  if (endpoint.startsWith("http")) return endpoint;
+  const apiUrl = baseUrl ?? getApiUrl();
+  return `${apiUrl}${endpoint}`;
 }
 
 export async function JsonApiGet(params: {
@@ -177,13 +185,14 @@ export async function JsonApiGet(params: {
   endpoint: string;
   companyId?: string;
   language: string;
+  baseUrl?: string;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = await getToken();
 
   const apiResponse = await makeRequest({
     method: "GET",
-    url: buildUrl(params.endpoint),
+    url: buildUrl(params.endpoint, params.baseUrl),
     token,
     cache: params.classKey.cache,
     companyId: params.companyId,
@@ -202,6 +211,7 @@ export async function JsonApiGet(params: {
         endpoint,
         companyId: params.companyId,
         language: params.language,
+        baseUrl: params.baseUrl,
       }),
   });
 }
@@ -216,6 +226,7 @@ export async function JsonApiPost(params: {
   language: string;
   responseType?: ApiRequestDataTypeInterface;
   token?: string;
+  baseUrl?: string;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = params.token ?? (await getToken());
@@ -229,7 +240,7 @@ export async function JsonApiPost(params: {
 
   const apiResponse = await makeRequest({
     method: "POST",
-    url: buildUrl(params.endpoint),
+    url: buildUrl(params.endpoint, params.baseUrl),
     token,
     body,
     files: params.files,
@@ -254,6 +265,7 @@ export async function JsonApiPut(params: {
   files?: { [key: string]: File | Blob } | File | Blob;
   language: string;
   responseType?: ApiRequestDataTypeInterface;
+  baseUrl?: string;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = await getToken();
@@ -267,7 +279,7 @@ export async function JsonApiPut(params: {
 
   const apiResponse = await makeRequest({
     method: "PUT",
-    url: buildUrl(params.endpoint),
+    url: buildUrl(params.endpoint, params.baseUrl),
     token,
     body,
     files: params.files,
@@ -293,6 +305,7 @@ export async function JsonApiPatch(params: {
   overridesJsonApiCreation?: boolean;
   responseType?: ApiRequestDataTypeInterface;
   language: string;
+  baseUrl?: string;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = await getToken();
@@ -306,7 +319,7 @@ export async function JsonApiPatch(params: {
 
   const apiResponse = await makeRequest({
     method: "PATCH",
-    url: buildUrl(params.endpoint),
+    url: buildUrl(params.endpoint, params.baseUrl),
     token,
     body,
     files: params.files,
@@ -329,13 +342,14 @@ export async function JsonApiDelete(params: {
   companyId?: string;
   language: string;
   responseType?: ApiRequestDataTypeInterface;
+  baseUrl?: string;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = await getToken();
 
   const apiResponse = await makeRequest({
     method: "DELETE",
-    url: buildUrl(params.endpoint),
+    url: buildUrl(params.endpoint, params.baseUrl),
     token,
     companyId: params.companyId,
     language: params.language,

package/src/unified/__tests__/JsonApiRequest.test.ts

@@ -0,0 +1,29 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { buildUrl } from "../JsonApiRequest";
+
+describe("buildUrl", () => {
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
+
+  it("uses NEXT_PUBLIC_API_URL when baseUrl is omitted", () => {
+    vi.stubEnv("NEXT_PUBLIC_API_URL", "https://api.example.com");
+
+    expect(buildUrl("/sncass/sync")).toBe("https://api.example.com/sncass/sync");
+  });
+
+  it("uses the per-call baseUrl override when provided", () => {
+    vi.stubEnv("NEXT_PUBLIC_API_URL", "https://api.example.com");
+
+    expect(buildUrl("/sncass/sync", "https://corpus.example.com")).toBe("https://corpus.example.com/sncass/sync");
+  });
+
+  it("passes through an http-prefixed endpoint regardless of baseUrl", () => {
+    vi.stubEnv("NEXT_PUBLIC_API_URL", "https://api.example.com");
+
+    expect(buildUrl("https://elsewhere.example.com/sncass/sync", "https://corpus.example.com")).toBe(
+      "https://elsewhere.example.com/sncass/sync",
+    );
+    expect(buildUrl("https://elsewhere.example.com/sncass/sync")).toBe("https://elsewhere.example.com/sncass/sync");
+  });
+});

package/dist/JsonApiRequest-OSGJ63XR.js

@@ -1,24 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-
-
-
-
-
-
-
-var _chunkJ5LROFGLjs = require('./chunk-J5LROFGL.js');
-require('./chunk-7QVYU63E.js');
-
-
-
-
-
-
-
-
-
-
-exports.JsonApiDelete = _chunkJ5LROFGLjs.JsonApiDelete; exports.JsonApiGet = _chunkJ5LROFGLjs.JsonApiGet; exports.JsonApiPatch = _chunkJ5LROFGLjs.JsonApiPatch; exports.JsonApiPost = _chunkJ5LROFGLjs.JsonApiPost; exports.JsonApiPut = _chunkJ5LROFGLjs.JsonApiPut; exports.configureJsonApi = _chunkJ5LROFGLjs.configureJsonApi; exports.getApiUrl = _chunkJ5LROFGLjs.getApiUrl; exports.getAppUrl = _chunkJ5LROFGLjs.getAppUrl; exports.getTrackablePages = _chunkJ5LROFGLjs.getTrackablePages;
-//# sourceMappingURL=JsonApiRequest-OSGJ63XR.js.map

package/dist/JsonApiRequest-OSGJ63XR.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["/home/runner/work/nextjs-jsonapi/nextjs-jsonapi/dist/JsonApiRequest-OSGJ63XR.js"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,sDAA4B;AAC5B,+BAA4B;AAC5B;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACF,meAAC","file":"/home/runner/work/nextjs-jsonapi/nextjs-jsonapi/dist/JsonApiRequest-OSGJ63XR.js"}