@nixxie-cms/core 2.1.0 → 2.2.0

package/src/internal-unstable/admin-ui/pages/ListPage/index.tsx

@@ -897,21 +897,29 @@ 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: string[] = []
+  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<{ results?: ({ id: string } | null)[] }>(actionMutation, {
-    variables:
-      action.key === 'delete'
-        ? { where: itemIds.map(id => ({ id })) }
-        : {
-            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 }
-            }),
-          },
+    variables: action.key === 'delete' ? { where: mutationData } : { data: mutationData },
     errorPolicy: 'all',
   })
   const { messages: m } = action
@@ -927,14 +935,14 @@ function ActionItemsDialog({
         for (const err of error.errors ?? []) {
           const i = err.path?.[1]
           if (typeof i !== 'number') continue
-          const itemId = itemIds[i]
+          const itemId = sentIds[i]
 
           failed.add(itemId)
           actionErrors[itemId] ??= []
           actionErrors[itemId].push(err)
         }
       }
-      const countSuccess = itemIds.length - countFail
+      const countSuccess = sentIds.length - countFail
 
       if (countSuccess) {
         toastQueue.neutral(

package/dist/GraphQLErrorNotice-cd74180d.cjs.js

@@ -1,57 +0,0 @@
-'use strict';
-
-var client = require('@apollo/client');
-var layout = require('@keystar/ui/layout');
-var notice = require('@keystar/ui/notice');
-var slots = require('@keystar/ui/slots');
-var typography = require('@keystar/ui/typography');
-var jsxRuntime = require('react/jsx-runtime');
-
-function GraphQLErrorNotice({
-  errors: errors_ = []
-}) {
-  let errors = errors_.flatMap(x => {
-    if (!x) return [];
-    if (client.CombinedGraphQLErrors.is(x)) {
-      return x.errors;
-    }
-    return x;
-  });
-  if (!errors.length) return null;
-  return /*#__PURE__*/jsxRuntime.jsxs(notice.Notice, {
-    tone: "critical",
-    children: [/*#__PURE__*/jsxRuntime.jsx(typography.Heading, {
-      children: "Errors"
-    }), /*#__PURE__*/jsxRuntime.jsx(slots.Content, {
-      children: /*#__PURE__*/jsxRuntime.jsx(layout.VStack, {
-        elementType: "ul",
-        gap: "large",
-        children: [...function* () {
-          let i = 0;
-          for (const error of errors) {
-            const lines = error.message.split('\n');
-            for (const line of lines) {
-              yield /*#__PURE__*/jsxRuntime.jsx(typography.Text, {
-                elementType: "li",
-                children: line
-              }, i++);
-            }
-            if ('result' in error && typeof error.result === 'object' && error.result !== null && 'errors' in error.result && Array.isArray(error.result.errors)) {
-              for (const {
-                message
-              } of error.result.errors) {
-                if (typeof message !== 'string') continue;
-                yield /*#__PURE__*/jsxRuntime.jsx(typography.Text, {
-                  elementType: "li",
-                  children: message
-                }, i++);
-              }
-            }
-          }
-        }()]
-      })
-    })]
-  });
-}
-
-exports.GraphQLErrorNotice = GraphQLErrorNotice;

package/dist/GraphQLErrorNotice-d9f0931b.esm.js

@@ -1,55 +0,0 @@
-import { CombinedGraphQLErrors } from '@apollo/client';
-import { VStack } from '@keystar/ui/layout';
-import { Notice } from '@keystar/ui/notice';
-import { Content } from '@keystar/ui/slots';
-import { Heading, Text } from '@keystar/ui/typography';
-import { jsxs, jsx } from 'react/jsx-runtime';
-
-function GraphQLErrorNotice({
-  errors: errors_ = []
-}) {
-  let errors = errors_.flatMap(x => {
-    if (!x) return [];
-    if (CombinedGraphQLErrors.is(x)) {
-      return x.errors;
-    }
-    return x;
-  });
-  if (!errors.length) return null;
-  return /*#__PURE__*/jsxs(Notice, {
-    tone: "critical",
-    children: [/*#__PURE__*/jsx(Heading, {
-      children: "Errors"
-    }), /*#__PURE__*/jsx(Content, {
-      children: /*#__PURE__*/jsx(VStack, {
-        elementType: "ul",
-        gap: "large",
-        children: [...function* () {
-          let i = 0;
-          for (const error of errors) {
-            const lines = error.message.split('\n');
-            for (const line of lines) {
-              yield /*#__PURE__*/jsx(Text, {
-                elementType: "li",
-                children: line
-              }, i++);
-            }
-            if ('result' in error && typeof error.result === 'object' && error.result !== null && 'errors' in error.result && Array.isArray(error.result.errors)) {
-              for (const {
-                message
-              } of error.result.errors) {
-                if (typeof message !== 'string') continue;
-                yield /*#__PURE__*/jsx(Text, {
-                  elementType: "li",
-                  children: message
-                }, i++);
-              }
-            }
-          }
-        }()]
-      })
-    })]
-  });
-}
-
-export { GraphQLErrorNotice as G };

package/dist/pick-5fe45878.cjs.js

@@ -1,71 +0,0 @@
-'use strict';
-
-var style = require('@keystar/ui/style');
-var jsxRuntime = require('react/jsx-runtime');
-
-function CreateButtonLink(props) {
-  const {
-    list,
-    children = `New ${list.singular}`
-  } = props;
-  return /*#__PURE__*/jsxRuntime.jsxs("a", {
-    href: `/${list.path}/create`,
-    "aria-label": `New ${list.singular}`,
-    className: style.css({
-      display: 'inline-flex',
-      alignItems: 'center',
-      gap: 6,
-      paddingInline: '13px',
-      paddingBlock: '7px',
-      borderRadius: 6,
-      border: '1px solid transparent',
-      backgroundColor: '#111827',
-      color: '#ffffff',
-      fontSize: 13,
-      fontWeight: 500,
-      fontFamily: 'inherit',
-      textDecoration: 'none',
-      cursor: 'pointer',
-      whiteSpace: 'nowrap',
-      flexShrink: 0,
-      letterSpacing: '-0.01em',
-      transition: 'background 130ms',
-      '&:hover': {
-        backgroundColor: '#1f2937'
-      },
-      '&:active': {
-        backgroundColor: '#374151'
-      },
-      '&:focus-visible': {
-        outline: '2px solid #111827',
-        outlineOffset: 2
-      }
-    }),
-    children: [/*#__PURE__*/jsxRuntime.jsx("svg", {
-      width: "12",
-      height: "12",
-      viewBox: "0 0 12 12",
-      fill: "none",
-      "aria-hidden": true,
-      children: /*#__PURE__*/jsxRuntime.jsx("path", {
-        d: "M6 1.5v9M1.5 6h9",
-        stroke: "currentColor",
-        strokeWidth: "1.5",
-        strokeLinecap: "round"
-      })
-    }), children]
-  });
-}
-
-function pick(value, keys) {
-  const result = {};
-  for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(value, key)) {
-      result[key] = value[key];
-    }
-  }
-  return result;
-}
-
-exports.CreateButtonLink = CreateButtonLink;
-exports.pick = pick;

package/dist/pick-b7ef3115.esm.js

@@ -1,68 +0,0 @@
-import { css } from '@keystar/ui/style';
-import { jsxs, jsx } from 'react/jsx-runtime';
-
-function CreateButtonLink(props) {
-  const {
-    list,
-    children = `New ${list.singular}`
-  } = props;
-  return /*#__PURE__*/jsxs("a", {
-    href: `/${list.path}/create`,
-    "aria-label": `New ${list.singular}`,
-    className: css({
-      display: 'inline-flex',
-      alignItems: 'center',
-      gap: 6,
-      paddingInline: '13px',
-      paddingBlock: '7px',
-      borderRadius: 6,
-      border: '1px solid transparent',
-      backgroundColor: '#111827',
-      color: '#ffffff',
-      fontSize: 13,
-      fontWeight: 500,
-      fontFamily: 'inherit',
-      textDecoration: 'none',
-      cursor: 'pointer',
-      whiteSpace: 'nowrap',
-      flexShrink: 0,
-      letterSpacing: '-0.01em',
-      transition: 'background 130ms',
-      '&:hover': {
-        backgroundColor: '#1f2937'
-      },
-      '&:active': {
-        backgroundColor: '#374151'
-      },
-      '&:focus-visible': {
-        outline: '2px solid #111827',
-        outlineOffset: 2
-      }
-    }),
-    children: [/*#__PURE__*/jsx("svg", {
-      width: "12",
-      height: "12",
-      viewBox: "0 0 12 12",
-      fill: "none",
-      "aria-hidden": true,
-      children: /*#__PURE__*/jsx("path", {
-        d: "M6 1.5v9M1.5 6h9",
-        stroke: "currentColor",
-        strokeWidth: "1.5",
-        strokeLinecap: "round"
-      })
-    }), children]
-  });
-}
-
-function pick(value, keys) {
-  const result = {};
-  for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(value, key)) {
-      result[key] = value[key];
-    }
-  }
-  return result;
-}
-
-export { CreateButtonLink as C, pick as p };