@geniee-inc/sfa-kit 1.19.0 → 1.19.2

package/GUIDE.md

@@ -287,7 +287,7 @@ const result = useRecordList('companies', {
 
 Disabling the hook, or clearing `collection`, discards any request still in flight: a response that lands after the caller stopped asking never becomes the result, and the `'loading'` a discarded refetch set does not outlive it — the hook goes back to how the query last ended.
 
-Returns `{ items, totalCount, hasMore, pageIndex, status, isLoading, error, refetch, goToPage }`.
+Returns `{ items, totalCount, hasMore, pageIndex, status, isLoading, error, refetch, goToPage }`. `totalCount` is `null` when it is not known: the backend does not report it — Keystone pages with cursors and returns no total — or no fetch has succeeded since the query last changed (an earlier answer to the same query does not count). Read it together with `status`, and use `hasMore` to tell whether another page exists.
 
 For cross-object queries (fetching child records of a parent), prefer `useRelatedRecords` which builds the filter automatically from describe metadata.
 
@@ -361,7 +361,7 @@ const { items, isLoading, error } = useRelatedRecords(
 
 Check `status` for **every** hook on the page, not just the first one. Each related-records hook fails independently: with several fetches firing on mount, one can hit a rate limit or a timeout while the others succeed, and the failed one renders as an empty section unless its own status is read.
 
-Returns `{ items, totalCount, hasMore, pageIndex, status, goToPage, isLoading, error, refetch, relationship }`.
+Returns `{ items, totalCount, hasMore, pageIndex, status, goToPage, isLoading, error, refetch, relationship }`. As in `useRecordList`, `totalCount` is `null` when it is not known.
 
 ### Bulk writes
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geniee-inc/sfa-kit",
-  "version": "1.19.0",
+  "version": "1.19.2",
   "description": "React hooks and components for building pages that connect to GENIEE SFA/CRM data.",
   "type": "module",
   "main": "./src/index.js",

package/src/lib/auth/DevToolbar.js

@@ -63,16 +63,13 @@ export function DevToolbar({ organizationId, preview, level, objectKey, onLogout
         };
     }, [client, hasObjectKey]);
     const [localRecordId, setLocalRecordId] = useState((_b = (_a = preview.state) === null || _a === void 0 ? void 0 : _a.record_id) !== null && _b !== void 0 ? _b : '');
-    // NOTE: フォームは record レベル かつ objectKey があるときだけ描くため、
-    // ここに来る時点で objectKey はある。型を絞るためのガードとして残す
+    // NOTE: フォームは record レベル かつ objectKey があるときだけ描く。対象の
+    // オブジェクトは StandaloneFlow が objectKey から決めるので、ここではレコード ID だけを渡す
     const handleSubmit = useCallback((e) => {
         e.preventDefault();
-        if (!hasObjectKey || objectKey == null)
-            return;
-        preview.setObjectKey(objectKey);
         preview.setRecordId(localRecordId);
         preview.triggerFetch();
-    }, [hasObjectKey, objectKey, localRecordId, preview]);
+    }, [localRecordId, preview]);
     // NOTE: カタログ取得前は key をそのまま表示名に使う。objectKey が無いページは
     // undefined のままにして、表示側で出し分ける
     const objectLabel = hasObjectKey

package/src/lib/auth/SfaLoginGate.js

@@ -166,22 +166,31 @@ function StandaloneFlow({ apiBase, defaultOrganizationId, objectKey, level, chil
     // NOTE: level を渡さない既存ページのために、objectKey の有無から補う。
     // 以前は objectKey があること自体が「record レベル」を意味していた
     const resolvedLevel = level !== null && level !== void 0 ? level : (objectKey != null && objectKey !== '' ? 'record' : 'object');
-    // Preview context state managed by DevToolbar.
-    // When objectKey is provided, pre-populate it.
-    const [previewObjectKey, setPreviewObjectKey] = useState(objectKey !== null && objectKey !== void 0 ? objectKey : '');
+    // Preview context state managed by DevToolbar. The object comes straight
+    // from the objectKey prop: nothing in the toolbar changes it.
     const [previewRecordId, setPreviewRecordId] = useState('');
+    // NOTE: a record id belongs to the object it was submitted for. objectKey can
+    // change without remounting this flow, so forget the id whenever it does —
+    // also when it changes back, or the old id would come back with it. This is
+    // React's "adjust state when a prop changes" pattern: it runs during render,
+    // so no frame pairs the new object with the old id
+    const [recordIdObjectKey, setRecordIdObjectKey] = useState(objectKey);
+    if (recordIdObjectKey !== objectKey) {
+        setRecordIdObjectKey(objectKey);
+        setPreviewRecordId('');
+    }
     const [fetchGeneration, setFetchGeneration] = useState(0);
     const triggerFetch = useCallback(() => {
         setFetchGeneration(prev => prev + 1);
     }, []);
     const previewControls = useMemo(() => ({
-        state: previewObjectKey !== ''
-            ? Object.assign({ object_key: previewObjectKey }, (previewRecordId !== '' ? { record_id: previewRecordId } : {})) : null,
-        setObjectKey: setPreviewObjectKey,
+        state: objectKey == null || objectKey === ''
+            ? null
+            : Object.assign({ object_key: objectKey }, (previewRecordId === '' ? {} : { record_id: previewRecordId })),
         setRecordId: setPreviewRecordId,
         triggerFetch,
         fetchGeneration,
-    }), [previewObjectKey, previewRecordId, triggerFetch, fetchGeneration]);
+    }), [objectKey, previewRecordId, triggerFetch, fetchGeneration]);
     const completeLogin = useCallback((newSession, normalizedBase) => {
         const sessionWithBase = Object.assign(Object.assign({}, newSession), { apiBase: normalizedBase });
         saveSession(sessionWithBase);
@@ -242,7 +251,7 @@ function StandaloneFlow({ apiBase, defaultOrganizationId, objectKey, level, chil
     if (!session || !auth) {
         return (_jsx(LoginForm, { defaultApiBase: apiBase, defaultOrganizationId: defaultOrganizationId, onSubmit: handleLogin, status: status, error: error }));
     }
-    return (_jsx(SfaProvider, { apiBase: activeBase, auth: auth, mode: "direct", organizationId: session.organizationId, onAuthError: handleLogout, children: _jsxs(StandalonePreviewCtx.Provider, { value: previewControls, children: [_jsx(DevToolbar, { organizationId: session.organizationId, preview: previewControls, objectKey: objectKey, level: resolvedLevel, onLogout: handleLogout }), objectKey ? (_jsx(ObjectKeyGuard, { objectKey: objectKey, children: children })) : (children)] }) }));
+    return (_jsx(SfaProvider, { apiBase: activeBase, auth: auth, mode: "direct", organizationId: session.organizationId, onAuthError: handleLogout, children: _jsxs(StandalonePreviewCtx.Provider, { value: previewControls, children: [_jsx(DevToolbar, { organizationId: session.organizationId, preview: previewControls, objectKey: objectKey, level: resolvedLevel, onLogout: handleLogout }, objectKey), objectKey ? (_jsx(ObjectKeyGuard, { objectKey: objectKey, children: children })) : (children)] }) }));
 }
 // ---------------------------------------------------------------------------
 // GENIEE SFA/CRM-branded login form

package/src/lib/auth/StandalonePreviewContext.d.ts

@@ -1,5 +1,6 @@
 /**
- * @description State managed by the DevToolbar in standalone (non-embedded) mode.
+ * @description Preview state in standalone (non-embedded) mode. `object_key`
+ * is SfaLoginGate's `objectKey`; `record_id` is what the DevToolbar submits.
  * Mirrors the shape of EmbedContext so useEmbedContext() can fall back to it.
  */
 export interface StandalonePreviewState {
@@ -9,7 +10,6 @@ export interface StandalonePreviewState {
 }
 export interface StandalonePreviewControls {
     readonly state: StandalonePreviewState | null;
-    readonly setObjectKey: (key: string) => void;
     readonly setRecordId: (id: string) => void;
     readonly triggerFetch: () => void;
     /** Increments on each triggerFetch call so consumers can react. */
@@ -17,7 +17,7 @@ export interface StandalonePreviewControls {
 }
 /**
  * @description React context carrying standalone preview state.
- * Populated only in standalone mode by StandaloneFlow's DevToolbar.
+ * Populated only in standalone mode by StandaloneFlow, for its DevToolbar.
  * useEmbedContext() checks this as a fallback when EmbedContext is null.
  */
 export declare const StandalonePreviewCtx: import("react").Context<StandalonePreviewControls | null>;

package/src/lib/auth/StandalonePreviewContext.js

@@ -1,7 +1,7 @@
 import { createContext, useContext } from 'react';
 /**
  * @description React context carrying standalone preview state.
- * Populated only in standalone mode by StandaloneFlow's DevToolbar.
+ * Populated only in standalone mode by StandaloneFlow, for its DevToolbar.
  * useEmbedContext() checks this as a fallback when EmbedContext is null.
  */
 export const StandalonePreviewCtx = createContext(null);

package/src/lib/auth/useEmbedContext.d.ts

@@ -10,7 +10,9 @@ export declare const EmbedContextValue: import("react").Context<EmbedContext | n
  * active runtime environment. Checks two sources in priority order:
  *
  * 1. Embed context (iframe postMessage flow) - set by the SFA/CRM host.
- * 2. Standalone preview context (DevToolbar) - set by the user in preview mode.
+ * 2. Standalone preview context - set by StandaloneFlow: `object_key` is
+ *    SfaLoginGate's `objectKey`, `record_id` is what the user submits in the
+ *    DevToolbar. It is null when no `objectKey` is passed.
  *
  * Returns null only when neither context is available.
  *

package/src/lib/auth/useEmbedContext.js

@@ -11,7 +11,9 @@ export const EmbedContextValue = createContext(null);
  * active runtime environment. Checks two sources in priority order:
  *
  * 1. Embed context (iframe postMessage flow) - set by the SFA/CRM host.
- * 2. Standalone preview context (DevToolbar) - set by the user in preview mode.
+ * 2. Standalone preview context - set by StandaloneFlow: `object_key` is
+ *    SfaLoginGate's `objectKey`, `record_id` is what the user submits in the
+ *    DevToolbar. It is null when no `objectKey` is passed.
  *
  * Returns null only when neither context is available.
  *

package/src/lib/components/RecordList.js

@@ -37,10 +37,28 @@ export function RecordList({ collection, columns, params, pageSize = 20, showPag
         return (_jsxs("div", { style: styles.container, children: [_jsx(EmptyState, { message: "\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093" }), _jsxs("div", { style: styles.versionFooter, children: ["@geniee-inc/sfa-kit v", SFA_KIT_VERSION] })] }));
     }
     const resolvedColumns = columns !== null && columns !== void 0 ? columns : autoDetectColumns(items);
-    const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+    // NOTE: totalCount is null when it is not known — the backend reports no
+    // total (Keystone), or the count is not in yet. Then show the page number and
+    // the range on screen without a total
     const rangeStart = pageIndex * pageSize + 1;
-    const rangeEnd = Math.min((pageIndex + 1) * pageSize, totalCount);
-    return (_jsxs("div", { style: styles.container, children: [_jsxs("div", { style: styles.header, children: [_jsx("span", { style: styles.collectionName, children: collection }), !isLoading && _jsxs("span", { style: styles.count, children: [totalCount, " records"] })] }), _jsx("div", { style: styles.tableWrapper, children: _jsxs("table", { style: styles.table, children: [_jsx("thead", { children: _jsx("tr", { children: resolvedColumns.map(col => {
+    const rangeEnd = totalCount == null
+        ? pageIndex * pageSize + items.length
+        : Math.min((pageIndex + 1) * pageSize, totalCount);
+    const pageLabel = totalCount == null
+        ? `Page ${pageIndex + 1}`
+        : `Page ${pageIndex + 1} of ${Math.max(1, Math.ceil(totalCount / pageSize))}`;
+    const rangeLabel = totalCount == null
+        ? `Showing ${rangeStart}-${rangeEnd}`
+        : `Showing ${rangeStart}-${rangeEnd} of ${totalCount}`;
+    // NOTE: a later page that came back empty (records removed between page
+    // turns) keeps the pager so Prev can lead back, also while that page turn
+    // loads. No page position is stated there — see hasRecordsOnScreen
+    const hasPages = (totalCount !== null && totalCount !== void 0 ? totalCount : items.length) > 0 || pageIndex > 0;
+    // NOTE: with no records on screen there is no range or page position to state.
+    // While loading the table shows the loading row instead of the items, and
+    // pageIndex already names the page being fetched
+    const hasRecordsOnScreen = !isLoading && items.length > 0;
+    return (_jsxs("div", { style: styles.container, children: [_jsxs("div", { style: styles.header, children: [_jsx("span", { style: styles.collectionName, children: collection }), !isLoading && totalCount != null && (_jsxs("span", { style: styles.count, children: [totalCount, " records"] }))] }), _jsx("div", { style: styles.tableWrapper, children: _jsxs("table", { style: styles.table, children: [_jsx("thead", { children: _jsx("tr", { children: resolvedColumns.map(col => {
                                     var _a;
                                     return (_jsx("th", { style: Object.assign(Object.assign({}, styles.th), { width: col.width }), children: (_a = col.header) !== null && _a !== void 0 ? _a : col.fieldName }, col.fieldName));
                                 }) }) }), _jsxs("tbody", { children: [isLoading && (_jsx("tr", { children: _jsx("td", { colSpan: resolvedColumns.length, style: styles.loadingCell, children: "Loading..." }) })), !isLoading && items.length === 0 && (_jsx("tr", { children: _jsx("td", { colSpan: resolvedColumns.length, style: styles.emptyCell, children: "No records found" }) })), !isLoading &&
@@ -48,7 +66,7 @@ export function RecordList({ collection, columns, params, pageSize = 20, showPag
                                     items.map(record => (_jsx("tr", { style: onRowClick ? styles.clickableRow : styles.row, onClick: onRowClick ? () => onRowClick(record) : undefined, children: resolvedColumns.map(col => {
                                             const fieldValue = record.fields[col.fieldName];
                                             return (_jsx("td", { style: styles.td, children: fieldValue ? (_jsx(FieldRenderer, { fieldValue: fieldValue, fieldName: col.fieldName })) : (_jsx("span", { style: styles.emptyValue, children: "\u2014" })) }, col.fieldName));
-                                        }) }, record.record_id)))] })] }) }), showPagination && totalCount > 0 && (_jsxs("div", { style: styles.pagination, children: [_jsx("button", { style: styles.pageButton, disabled: pageIndex === 0 || isLoading, onClick: () => goToPage(pageIndex - 1), type: "button", children: "Prev" }), _jsxs("span", { style: styles.pageInfo, children: ["Page ", pageIndex + 1, " of ", totalPages] }), _jsx("button", { style: styles.pageButton, disabled: !hasMore || isLoading, onClick: () => goToPage(pageIndex + 1), type: "button", children: "Next" }), _jsxs("span", { style: styles.rangeInfo, children: ["Showing ", rangeStart, "-", rangeEnd, " of ", totalCount] })] })), _jsxs("div", { style: styles.versionFooter, children: ["@geniee-inc/sfa-kit v", SFA_KIT_VERSION] })] }));
+                                        }) }, record.record_id)))] })] }) }), showPagination && hasPages && (_jsxs("div", { style: styles.pagination, children: [_jsx("button", { style: styles.pageButton, disabled: pageIndex === 0 || isLoading, onClick: () => goToPage(pageIndex - 1), type: "button", children: "Prev" }), hasRecordsOnScreen && (_jsx("span", { style: styles.pageInfo, children: pageLabel })), _jsx("button", { style: styles.pageButton, disabled: !hasMore || isLoading, onClick: () => goToPage(pageIndex + 1), type: "button", children: "Next" }), hasRecordsOnScreen && (_jsx("span", { style: styles.rangeInfo, children: rangeLabel }))] })), _jsxs("div", { style: styles.versionFooter, children: ["@geniee-inc/sfa-kit v", SFA_KIT_VERSION] })] }));
 }
 function autoDetectColumns(items) {
     const first = items[0];

package/src/lib/hooks/useRecordList.d.ts

@@ -26,7 +26,13 @@ interface UseRecordListResult {
      * it without checking `status` turns a failed fetch into a confident zero.
      */
     readonly items: readonly SfaRecord[];
-    readonly totalCount: number;
+    /**
+     * @description Records across all pages, or null when not known: the backend
+     * does not report it (Keystone), or no fetch has succeeded since the query
+     * last changed — an earlier answer to the same query does not count. Like
+     * `items`, read it together with `status`
+     */
+    readonly totalCount: number | null;
     readonly hasMore: boolean;
     readonly pageIndex: number;
     readonly status: SfaListStatus;

package/src/lib/hooks/useRecordList.js

@@ -14,7 +14,7 @@ export function useRecordList(collection, params, options) {
     const listId = (_a = params === null || params === void 0 ? void 0 : params.listId) !== null && _a !== void 0 ? _a : embedCtx === null || embedCtx === void 0 ? void 0 : embedCtx.list_id;
     const limit = (_b = params === null || params === void 0 ? void 0 : params.limit) !== null && _b !== void 0 ? _b : 20;
     const [items, setItems] = useState([]);
-    const [totalCount, setTotalCount] = useState(0);
+    const [totalCount, setTotalCount] = useState(null);
     const [hasMore, setHasMore] = useState(false);
     /**
      * Where the caller asked the listing to start.
@@ -161,7 +161,7 @@ export function useRecordList(collection, params, options) {
                     // would show one record's children — or one organization's data —
                     // under another, so drop them and let status report them unknown.
                     setItems([]);
-                    setTotalCount(0);
+                    setTotalCount(null);
                     setHasMore(false);
                     loadedRef.current = null;
                 }
@@ -245,7 +245,7 @@ export function useRecordList(collection, params, options) {
         ? { items, totalCount, hasMore, status, error }
         : {
             items: NO_ITEMS,
-            totalCount: 0,
+            totalCount: null,
             hasMore: false,
             status: willFetch ? 'loading' : 'idle',
             error: null,

package/src/lib/hooks/useRelatedRecords.d.ts

@@ -22,7 +22,11 @@ export interface UseRelatedRecordsResult {
      * only meaningful when `status` is `'success'` — see useRecordList.
      */
     readonly items: readonly SfaRecord[];
-    readonly totalCount: number;
+    /**
+     * @description Records across all pages, or null when not known — see
+     * useRecordList
+     */
+    readonly totalCount: number | null;
     readonly hasMore: boolean;
     readonly pageIndex: number;
     /**

package/src/lib/provider/SfaClient.js

@@ -132,7 +132,7 @@ export class SfaClient {
                 }
                 const path = `/v1/objects/${enc(collection)}/records/query`;
                 const raw = yield this.postJson(path, body);
-                return normalizeKeystoneListResponse(raw, pageIndex, pageSize);
+                return normalizeKeystoneListResponse(raw, pageIndex);
             }
             const query = new URLSearchParams();
             if ((params === null || params === void 0 ? void 0 : params.limit) != null)
@@ -660,7 +660,7 @@ function inferScalarKind(value) {
     }
     return 'text';
 }
-function normalizeKeystoneListResponse(raw, pageIndex, pageSize) {
+function normalizeKeystoneListResponse(raw, pageIndex) {
     var _a, _b, _c;
     const data = raw;
     const rawRecords = (_a = data['records']) !== null && _a !== void 0 ? _a : [];
@@ -668,12 +668,17 @@ function normalizeKeystoneListResponse(raw, pageIndex, pageSize) {
     const nextCursor = (_b = data['next_cursor']) !== null && _b !== void 0 ? _b : null;
     const prevCursor = (_c = data['prev_cursor']) !== null && _c !== void 0 ? _c : null;
     const hasMore = nextCursor != null;
-    // Keystone uses cursor pagination without a total count.
-    // Estimate a totalCount that keeps the hasMore logic correct.
-    const totalCount = hasMore
-        ? (pageIndex + 1) * pageSize + 1
-        : pageIndex * pageSize + items.length;
-    return { items, totalCount, hasMore, pageIndex, nextCursor, prevCursor };
+    // NOTE: Keystone pages with cursors and returns no total count. Report it as
+    // unknown rather than estimating one: an estimate reads as the real total
+    // ("21 records" for 500). Whether another page exists comes from hasMore
+    return {
+        items,
+        totalCount: null,
+        hasMore,
+        pageIndex,
+        nextCursor,
+        prevCursor,
+    };
 }
 // ── Legacy Chikyu normalization (proxy mode) ──
 const CHIKYU_KIND_MAP = {

package/src/lib/provider/types.d.ts

@@ -53,7 +53,13 @@ export interface SfaRecord {
 }
 export interface SfaListResponse {
     readonly items: readonly SfaRecord[];
-    readonly totalCount: number;
+    /**
+     * Records across all pages, or null when the backend does not report it.
+     *
+     * NOTE: Keystone pages with cursors and returns no total, so it is null in
+     * direct mode. Use `hasMore` to tell whether another page exists
+     */
+    readonly totalCount: number | null;
     readonly hasMore: boolean;
     readonly pageIndex: number;
     /** Cursor for fetching the next page (keystone cursor-based pagination). */

package/src/lib/version.d.ts

@@ -1 +1 @@
-export declare const SFA_KIT_VERSION = "1.19.0";
+export declare const SFA_KIT_VERSION = "1.19.2";

package/src/lib/version.js

@@ -1,3 +1,3 @@
 // このファイルは libs/sfa-kit/scripts/sync-version.cjs が生成する。
 // 手で編集しないこと。バージョンを上げるときは libs/sfa-kit/package.json を変更する。
-export const SFA_KIT_VERSION = '1.19.0';
+export const SFA_KIT_VERSION = '1.19.2';