@nixxie-cms/core 2.0.0 → 2.2.0

package/internal-unstable/admin-ui/pages/ItemPage/dist/nixxie-cms-core-internal-unstable-admin-ui-pages-ItemPage.esm.js

@@ -1,5 +1,5 @@
 import router, { useRouter } from 'next/router';
-import { useMemo, useState, useEffect, Fragment, useRef, useCallback } from 'react';
+import { useMemo, useState, useEffect, useRef, Fragment, useCallback } from 'react';
 import { Button } from '@keystar/ui/button';
 import { DialogContainer, DialogTrigger, AlertDialog } from '@keystar/ui/dialog';
 import { Icon } from '@keystar/ui/icon';
@@ -11,33 +11,34 @@ import { toastQueue } from '@keystar/ui/toast';
 import { Text, Heading } from '@keystar/ui/typography';
 import { gql, CombinedGraphQLErrors } from '@apollo/client';
 import { useMutation } from '@apollo/client/react';
-import { p as pick, C as CreateButtonLink } from '../../../../../dist/pick-b7ef3115.esm.js';
+import { p as pick, C as CreateButtonLink } from '../../../../../dist/pick-4c785a54.esm.js';
 import { b as ErrorDetailsDialog } from '../../../../../dist/Errors-bf24759e.esm.js';
-import { G as GraphQLErrorNotice } from '../../../../../dist/GraphQLErrorNotice-d9f0931b.esm.js';
-import { P as PageContainer } from '../../../../../dist/PageContainer-5ae731cc.esm.js';
-import { a as useList, b as useListItem } from '../../../../../dist/context-af9957ed.esm.js';
-import { F as Fields } from '../../../../../dist/Fields-956d9a14.esm.js';
+import { G as GraphQLErrorNotice } from '../../../../../dist/GraphQLErrorNotice-7594a9f8.esm.js';
+import { P as PageContainer } from '../../../../../dist/PageContainer-355cfbfa.esm.js';
+import { a as useList, b as useListItem } from '../../../../../dist/context-2924eaaa.esm.js';
+import { u as usePreventNavigation, F as Fields } from '../../../../../dist/usePreventNavigation-093389dd.esm.js';
 import { g as getConditionalFilterFieldKeys, s as serializeItemForConditionalFilters, r as resolveActionMode, i as isActionAvailable } from '../../../../../dist/filters-8c8616f9.esm.js';
 import { d as deserializeItemToValue, u as useInvalidFields, a as useHasChanges, s as serializeValueToOperationItem } from '../../../../../dist/utils-5e1d4d28.esm.js';
 import { I as ItemPageHeader, C as ColumnLayout, S as StickySidebar, B as BaseToolbar } from '../../../../../dist/common-ea5c441a.esm.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import '@keystar/ui/style';
+import '@keystar/ui/icon/icons/plusIcon';
 import '@babel/runtime/helpers/defineProperty';
 import '@keystar/ui/icon/icons/alertTriangleIcon';
 import '@keystar/ui/notice';
+import '@keystar/ui/style';
 import 'next/head';
 import 'next/link';
+import '@react-aria/utils';
 import 'apollo-upload-client/UploadHttpLink.mjs';
 import '@keystar/ui/core';
 import '@nixxie-cms/core/admin-ui/router';
 import '@keystar/ui/icon/icons/chevronLeftIcon';
 import '@keystar/ui/icon/icons/chevronRightIcon';
 import '@keystar/ui/icon/icons/undo2Icon';
+import '@keystar/ui/number-field';
 import '@keystar/ui/picker';
-import '@keystar/ui/tag';
 import '@keystar/ui/tooltip';
 import '../../../../../dist/admin-meta-graphql-0e6e606e.esm.js';
-import '@react-aria/utils';
 import '@keystar/ui/icon/icons/textCursorInputIcon';
 import '@keystar/ui/utils';
 import 'fast-deep-equal';
@@ -57,6 +58,27 @@ function useEventCallback(callback) {
   });
   return cb;
 }
+
+// after forcing validation, move focus to the first invalid field so the user
+// can see and fix it. runs on the next frame so the DOM reflects the new
+// aria-invalid state, and is fully defensive so it can never throw.
+function focusFirstInvalidField() {
+  requestAnimationFrame(() => {
+    try {
+      const el = document.querySelector('[aria-invalid="true"]');
+      if (!el) return;
+      el.focus({
+        preventScroll: false
+      });
+      el.scrollIntoView({
+        block: 'center',
+        behavior: 'smooth'
+      });
+    } catch {
+      // ignore — focusing is a best-effort enhancement
+    }
+  });
+}
 function DeleteButton({
   list,
   itemId,
@@ -155,7 +177,6 @@ function ResetButton(props) {
       title: "Reset changes",
       cancelLabel: "Cancel",
       primaryActionLabel: "Yes, reset",
-      autoFocusButton: "primary",
       onPrimaryAction: props.onReset,
       children: "Are you sure? Any unsaved changes will be lost and cannot be recovered."
     })]
@@ -195,7 +216,11 @@ function ItemForm({
     e.preventDefault();
     const newForceValidation = invalidFields.size !== 0;
     setForceValidation(newForceValidation);
-    if (newForceValidation) return;
+    if (newForceValidation) {
+      toastQueue.critical('Please fix the highlighted field(s) before saving.');
+      focusFirstInvalidField();
+      return;
+    }
     const {
       error: _error
     } = await update({
@@ -219,9 +244,18 @@ function ItemForm({
     toastQueue.positive(`Saved changes to ${list.singular.toLocaleLowerCase()}.`, {
       timeout: 5000
     });
+
+    // reset the navigation guard before refetch so saving and then navigating
+    // away doesn't prompt for unsaved changes
+    shouldPreventNavigationRef.current = false;
     onSaveSuccess();
   });
   const hasChangedFields = useHasChanges('update', list.fields, value, initialValue);
+  const shouldPreventNavigationRef = useRef(hasChangedFields);
+  useEffect(() => {
+    shouldPreventNavigationRef.current = hasChangedFields;
+  }, [hasChangedFields]);
+  usePreventNavigation(shouldPreventNavigationRef);
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsxs("form", {
       onSubmit: onSave,
@@ -317,7 +351,13 @@ function ItemPage({
   const item = data === null || data === void 0 ? void 0 : data.item;
   const itemLabel_ = (_item$list$labelField = item === null || item === void 0 ? void 0 : item[list.labelField]) !== null && _item$list$labelField !== void 0 ? _item$list$labelField : item === null || item === void 0 ? void 0 : item.id;
   const itemLabel = typeof itemLabel_ === 'string' ? itemLabel_ : itemId !== null && itemId !== void 0 ? itemId : '';
-  const pageLoading = loading || itemId === undefined;
+
+  // Only show the full-page spinner on the INITIAL load (no data yet). On a
+  // post-save refetch Apollo keeps `data` populated while `loading` flips back
+  // to true; gating on `!data` keeps the form mounted (no scroll reset / flash)
+  // during background refetches while still showing the spinner before the
+  // first result arrives.
+  const pageLoading = loading && !data || itemId === undefined;
   const pageLabel = itemLabel || itemId;
   const pageTitle = list.isSingleton || typeof pageLabel !== 'string' ? list.label : pageLabel;
   const initialValue = useMemo(() => {

package/internal-unstable/admin-ui/pages/ListPage/dist/nixxie-cms-core-internal-unstable-admin-ui-pages-ListPage.cjs.js

@@ -28,21 +28,22 @@ var link = require('@keystar/ui/link');
 var notice = require('@keystar/ui/notice');
 var client = require('@apollo/client');
 var react$1 = require('@apollo/client/react');
-var pick = require('../../../../../dist/pick-5fe45878.cjs.js');
+var pick = require('../../../../../dist/pick-906341bb.cjs.js');
 var utils$1 = require('../../../../../dist/utils-230cddb1.cjs.js');
-var GraphQLErrorNotice = require('../../../../../dist/GraphQLErrorNotice-cd74180d.cjs.js');
-var PageContainer = require('../../../../../dist/PageContainer-abd7159f.cjs.js');
-var adminUi_context_dist_nixxieCmsCoreAdminUiContext = require('../../../../../dist/context-b5204629.cjs.js');
+var GraphQLErrorNotice = require('../../../../../dist/GraphQLErrorNotice-c8890f80.cjs.js');
+var PageContainer = require('../../../../../dist/PageContainer-4095555a.cjs.js');
+var adminUi_context_dist_nixxieCmsCoreAdminUiContext = require('../../../../../dist/context-2ce61d0b.cjs.js');
 require('@react-aria/utils');
 require('@keystar/ui/icon/icons/chevronRightIcon');
 require('@keystar/ui/icon/icons/textCursorInputIcon');
 var filters = require('../../../../../dist/filters-b3e5eb50.cjs.js');
 var jsxRuntime = require('react/jsx-runtime');
 var actionData = require('../../../../../dist/actionData-7858738d.cjs.js');
-var useFilter = require('../../../../../dist/useFilter-acc9d413.cjs.js');
+var useFilter = require('../../../../../dist/useFilter-c29f17a8.cjs.js');
 var picker = require('@keystar/ui/picker');
 var xIcon = require('@keystar/ui/icon/icons/xIcon');
 var utils = require('@keystar/ui/utils');
+require('@keystar/ui/icon/icons/plusIcon');
 require('graphql');
 require('next/head');
 require('next/link');
@@ -50,7 +51,7 @@ require('apollo-upload-client/UploadHttpLink.mjs');
 require('@keystar/ui/core');
 require('@nixxie-cms/core/admin-ui/router');
 require('@keystar/ui/icon/icons/chevronLeftIcon');
-require('@keystar/ui/tag');
+require('@keystar/ui/number-field');
 require('../../../../../dist/admin-meta-graphql-306c224a.cjs.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -1094,26 +1095,36 @@ function ActionItemsDialog({
         id
       }
     }`;
+  // The ids actually included in the mutation payload, in the exact order
+  // they are sent to the server. Server error paths reference indices into
+  // this array, so error/affected-record attribution must be done against it
+  // rather than the original (possibly larger) itemIds list.
+  const sentIds = [];
+  const mutationData = action.key === 'delete' ? itemIds.map(id => {
+    sentIds.push(id);
+    return {
+      id
+    };
+  }) : itemIds.flatMap(id => {
+    const row = items.find(item => String(item.id) === id);
+    if (!row) {
+      return [];
+    }
+    const deserialized = utils$1.deserializeItemToValue(list.fields, row);
+    const args = actionData.getActionArguments(list, action, deserialized);
+    sentIds.push(id);
+    return {
+      where: {
+        id
+      },
+      ...args
+    };
+  });
   const [actionOnItems] = react$1.useMutation(actionMutation, {
     variables: action.key === 'delete' ? {
-      where: itemIds.map(id => ({
-        id
-      }))
+      where: mutationData
     } : {
-      data: itemIds.flatMap(id => {
-        const row = items.find(item => String(item.id) === id);
-        if (!row) {
-          return [];
-        }
-        const deserialized = utils$1.deserializeItemToValue(list.fields, row);
-        const args = actionData.getActionArguments(list, action, deserialized);
-        return {
-          where: {
-            id
-          },
-          ...args
-        };
-      })
+      data: mutationData
     },
     errorPolicy: 'all'
   });
@@ -1134,13 +1145,13 @@ function ActionItemsDialog({
           var _error$errors, _err$path, _actionErrors$itemId;
           const i = (_err$path = err.path) === null || _err$path === void 0 ? void 0 : _err$path[1];
           if (typeof i !== 'number') continue;
-          const itemId = itemIds[i];
+          const itemId = sentIds[i];
           failed.add(itemId);
           (_actionErrors$itemId = actionErrors[itemId]) !== null && _actionErrors$itemId !== void 0 ? _actionErrors$itemId : actionErrors[itemId] = [];
           actionErrors[itemId].push(err);
         }
       }
-      const countSuccess = itemIds.length - countFail;
+      const countSuccess = sentIds.length - countFail;
       if (countSuccess) {
         toast.toastQueue.neutral(replace(m.successMany, list, {
           ...action,

package/internal-unstable/admin-ui/pages/ListPage/dist/nixxie-cms-core-internal-unstable-admin-ui-pages-ListPage.esm.js

@@ -24,21 +24,22 @@ import { TextLink } from '@keystar/ui/link';
 import { Notice } from '@keystar/ui/notice';
 import { gql, CombinedGraphQLErrors } from '@apollo/client';
 import { useQuery, useMutation } from '@apollo/client/react';
-import { p as pick, C as CreateButtonLink } from '../../../../../dist/pick-b7ef3115.esm.js';
+import { p as pick, C as CreateButtonLink } from '../../../../../dist/pick-4c785a54.esm.js';
 import { d as deserializeItemToValue, E as EmptyState } from '../../../../../dist/utils-5e1d4d28.esm.js';
-import { G as GraphQLErrorNotice } from '../../../../../dist/GraphQLErrorNotice-d9f0931b.esm.js';
-import { P as PageContainer } from '../../../../../dist/PageContainer-5ae731cc.esm.js';
-import { a as useList, P as PaginationControls, s as snapValueToClosest } from '../../../../../dist/context-af9957ed.esm.js';
+import { G as GraphQLErrorNotice } from '../../../../../dist/GraphQLErrorNotice-7594a9f8.esm.js';
+import { P as PageContainer } from '../../../../../dist/PageContainer-355cfbfa.esm.js';
+import { a as useList, P as PaginationControls, s as snapValueToClosest } from '../../../../../dist/context-2924eaaa.esm.js';
 import '@react-aria/utils';
 import '@keystar/ui/icon/icons/chevronRightIcon';
 import '@keystar/ui/icon/icons/textCursorInputIcon';
 import { i as isActionAvailable, g as getConditionalFilterFieldKeys, s as serializeItemForConditionalFilters, r as resolveActionMode } from '../../../../../dist/filters-8c8616f9.esm.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { g as getActionArguments } from '../../../../../dist/actionData-64d4c37a.esm.js';
-import { u as useSearchFilter } from '../../../../../dist/useFilter-9b6db1f9.esm.js';
+import { u as useSearchFilter } from '../../../../../dist/useFilter-f79b2abb.esm.js';
 import { Picker } from '@keystar/ui/picker';
 import { xIcon } from '@keystar/ui/icon/icons/xIcon';
 import { composeId } from '@keystar/ui/utils';
+import '@keystar/ui/icon/icons/plusIcon';
 import 'graphql';
 import 'next/head';
 import 'next/link';
@@ -46,7 +47,7 @@ import 'apollo-upload-client/UploadHttpLink.mjs';
 import '@keystar/ui/core';
 import '@nixxie-cms/core/admin-ui/router';
 import '@keystar/ui/icon/icons/chevronLeftIcon';
-import '@keystar/ui/tag';
+import '@keystar/ui/number-field';
 import '../../../../../dist/admin-meta-graphql-0e6e606e.esm.js';
 
 function FilterAdd({
@@ -1086,26 +1087,36 @@ function ActionItemsDialog({
         id
       }
     }`;
+  // The ids actually included in the mutation payload, in the exact order
+  // they are sent to the server. Server error paths reference indices into
+  // this array, so error/affected-record attribution must be done against it
+  // rather than the original (possibly larger) itemIds list.
+  const sentIds = [];
+  const mutationData = action.key === 'delete' ? itemIds.map(id => {
+    sentIds.push(id);
+    return {
+      id
+    };
+  }) : itemIds.flatMap(id => {
+    const row = items.find(item => String(item.id) === id);
+    if (!row) {
+      return [];
+    }
+    const deserialized = deserializeItemToValue(list.fields, row);
+    const args = getActionArguments(list, action, deserialized);
+    sentIds.push(id);
+    return {
+      where: {
+        id
+      },
+      ...args
+    };
+  });
   const [actionOnItems] = useMutation(actionMutation, {
     variables: action.key === 'delete' ? {
-      where: itemIds.map(id => ({
-        id
-      }))
+      where: mutationData
     } : {
-      data: itemIds.flatMap(id => {
-        const row = items.find(item => String(item.id) === id);
-        if (!row) {
-          return [];
-        }
-        const deserialized = deserializeItemToValue(list.fields, row);
-        const args = getActionArguments(list, action, deserialized);
-        return {
-          where: {
-            id
-          },
-          ...args
-        };
-      })
+      data: mutationData
     },
     errorPolicy: 'all'
   });
@@ -1126,13 +1137,13 @@ function ActionItemsDialog({
           var _error$errors, _err$path, _actionErrors$itemId;
           const i = (_err$path = err.path) === null || _err$path === void 0 ? void 0 : _err$path[1];
           if (typeof i !== 'number') continue;
-          const itemId = itemIds[i];
+          const itemId = sentIds[i];
           failed.add(itemId);
           (_actionErrors$itemId = actionErrors[itemId]) !== null && _actionErrors$itemId !== void 0 ? _actionErrors$itemId : actionErrors[itemId] = [];
           actionErrors[itemId].push(err);
         }
       }
-      const countSuccess = itemIds.length - countFail;
+      const countSuccess = sentIds.length - countFail;
       if (countSuccess) {
         toastQueue.neutral(replace(m.successMany, list, {
           ...action,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nixxie-cms/core",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/nixxiecms/nixxie/tree/main/packages/core"
@@ -302,7 +302,7 @@
     "@types/react-dom": "^19.2.3",
     "@types/resolve": "^1.20.2",
     "@types/uuid": "^11.0.0",
-    "@nixxie-cms/core": "^2.0.0"
+    "@nixxie-cms/core": "^2.2.0"
   },
   "preconstruct": {
     "entrypoints": [