Skip to content
This repository was archived by the owner on Nov 4, 2026. It is now read-only.

Commit 8628df2

Browse files
committed
Merge origin/main (c2a8d23) into claude/issue-11070-strict-face-read-keys
Brings in objectui#11068's first key group (#11130): on ObjectGridSchema, name / placeholder / rowSpecActions / bulkSpecActions are retired as tombstones, and emptyState / description are honoured. Conflicts resolved with both sides kept: - objectql.ts: ObjectGridSchema keeps `dataSource` right after `type`, followed by main's `name` / `placeholder` tombstones. The table-slot docblock keeps main's unread / not-relayed split, and `dataSource` is added to the record sources the view owns. - objectql.zod.ts: main's four retired-key strings, then the binding description string. In the table-slot withheld map, the `dataSource` refusal sits beside main's `TABLE_KEY_NOT_RELAYED` description refusal. - zod-mirror-parity.test.ts: the header figures were recomputed from the merged ledger (the objectui#7279 pin derives them). SPEC-DERIVED is 4 / 35 (3 / 34 on main, plus FormFieldSchema's one key moved in by membership). LOCAL is 8 / 46. The total is 12 entries / 81 keys. The auto-merged slot pin keeps main's notRelayed group and the 63 / 69 member counts, which the merged interface still measures. Co-authored-by: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012UwY3ahMixEFkfTUxMVkYm
2 parents 42feeeb + c2a8d23 commit 8628df2

185 files changed

Lines changed: 13835 additions & 1096 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
'@object-ui/app-shell': patch
3+
---
4+
5+
fix(app-shell,i18n): the designer's flow, federated-panel and field-stub chrome speak the user's language (objectui#10862, slice 4)
6+
7+
Under zh-CN these designer surfaces rendered their own words in English beside
8+
Chinese text:
9+
10+
- the federated datasource panel's tables tab: the filter box, refresh button,
11+
loading, empty and no-match notes, table headers, import buttons and the
12+
federation-unavailable message;
13+
- its validation tab: the intro, run button, match and divergence summaries,
14+
per-object diff counts, the ten diff-kind badges, the expected / actual line
15+
and its federation-unavailable message;
16+
- the import dialog: its title, intro, draft progress, object name, review
17+
count, generated-source heading, import / cancel / close buttons, the
18+
imported confirmation and the federation-unavailable message;
19+
- the flow canvas: an edge's hover title for an un-declared cycle and for a
20+
back-edge, and a node card's branch count, approver count and `code` summary;
21+
- the flow preview's variable `in` / `out` tags, and an expanded run's
22+
`run …` / `trigger …` line in the run history;
23+
- the address field stub's placeholder in the form designer;
24+
- the "not found" reason the view, report and dashboard widget inspectors
25+
show when the bound object or dataset is missing.
26+
27+
Each new en row is the English the literal carried, so en renders unchanged.
28+
Remote table, column and object names, a diff's expected and actual values, a
29+
draft's review notes and generated source, node ids, run ids and trigger types,
30+
and a server's own error message show as written in every locale.
31+
32+
This is slice 4 of objectui#10862.

‎.changeset/10976-table-slot-relay.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ only `columns`, `fields`, `filter` and `sort` from `table`.
2525
**`@object-ui/types` (breaking for a writer of a withheld key, hence `minor`).** The `table`
2626
slot no longer declares the grid keys the view's grid does not honour:
2727

28-
- no read in `ObjectGrid`: `emptyState`, `showFilters`, `description`, `keyboardNavigation`,
29-
`rowSpecActions`, `bulkSpecActions`, `name`, `placeholder`;
28+
- no read in `ObjectGrid`: `showFilters`, `keyboardNavigation`, `rowSpecActions`,
29+
`bulkSpecActions`, `name`, `placeholder` (the last four retired from `object-grid` itself by
30+
objectui#11068);
31+
- not handed on by the view: `emptyState`, `description` (`ObjectGrid` honours both on an
32+
`object-grid` node since objectui#11068; write them there);
3033
- owned by the view: `data`, `staticData`, `bind` (the view lists its own `objectName`),
3134
`navigation`, `onNavigate` (write them on the `object-view` node), `id`;
3235
- node-level keys, which no renderer applies to a grid the view draws as a component: `style`,
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
'@object-ui/plugin-grid': patch
3+
---
4+
5+
An `object-grid` whose deprecated `title` is a per-locale map now shows the viewer's language in the table caption and the export file name, instead of failing to render (objectui#10993, batch 3).
6+
7+
**What it was.** `title` is the legacy spelling of `label`, read only when `label` resolves to nothing. `@objectstack/spec` types it as `I18nLabel`: a plain string or an inline per-locale map such as `{ en: 'Accounts', 'zh-CN': '客户' }`. `ObjectGrid` resolved `label` against the display locale at its two reads, the data-table caption and the export file name, but handed `title` on raw. A map therefore reached the caption as an object, the data-table threw "Objects are not valid as a React child", and the node rendered `Component "data-table" failed to render` instead of the grid; in the export file name the same map would have read `[object Object]`.
8+
9+
**What changed, in observable terms.**
10+
11+
- The caption and the view label in the export file name take the `title` entry for the display locale, the same channel `label` uses: the workspace's regional default when one is configured, otherwise the active UI language.
12+
- `label` still wins whenever it resolves to something, and a plain-string `title` renders exactly as authored.
13+
14+
No registry input changes: `title` stays one of the block's unregistered deprecated spellings, so `validateTree` reads it as before.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
'@object-ui/plugin-grid': minor
3+
'@object-ui/types': minor
4+
---
5+
6+
An `object-grid` now honours `description` and `emptyState`, and four keys it declared but
7+
never read are retired (objectui#11068).
8+
9+
**What was wrong.** `ObjectGridSchema` declared eight keys the grid never read. An author who
10+
wrote `description`, `emptyState`, `name`, `placeholder`, `rowSpecActions` or `bulkSpecActions`
11+
on an `object-grid` got no type error, no validator refusal and no effect. The reference
12+
example in `schema-reference.md` taught `description` and `showFilters` as if they worked. It
13+
now authors only keys the grid reads.
14+
15+
**`@object-ui/plugin-grid` (feature).**
16+
17+
- `description` draws one line of help text above the grid, in the muted style `list-view`
18+
uses for a view's description. A per-locale map resolves against the display locale, as
19+
`label` does. A map with no usable entry draws nothing.
20+
- `emptyState: { title?, message?, icon? }` draws in place of an empty table, through the same
21+
empty-state component and icon resolver `list-view` uses. A member you leave out keeps the
22+
grid's default: the shared empty-state glyph, the table's "No results found" heading, and no
23+
message. It is not drawn when a term typed into the grid's own server-side search box emptied
24+
it: the table and its search box stay, so the term can be cleared. A grid without the key
25+
draws the table's own empty row, as before.
26+
27+
**`@object-ui/types` (breaking for a writer of a retired key, hence `minor`).**
28+
29+
- `rowSpecActions` and `bulkSpecActions` are retired. They were second spellings of
30+
`rowActions` and `bulkActions`, which the grid reads. Rename the key.
31+
- `name` and `placeholder` are retired on `object-grid`. A grid is not a form field or an
32+
input, and the grid never read either key. Write `id` for the node's identity, `label` for
33+
its caption, and `emptyState: { message }` for the text shown when it has no rows.
34+
- Each retired key is `?: never` on the interface and a named refusal on the Zod twin, so
35+
TypeScript code that writes one fails to compile, and a document that carries one fails
36+
validation with a message that names the key and its replacement.
37+
- The Zod twin now also validates `emptyState`: three optional strings, with an unknown member
38+
refused by name.
39+
40+
**Unchanged.** An `object-view`'s `table` slot still withholds `description` and `emptyState`.
41+
Write them on the `object-grid` node itself. `showFilters` and `keyboardNavigation` are still
42+
declared and still not read.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
'@object-ui/console': patch
3+
'@object-ui/i18n': patch
4+
'@object-ui/plugin-form': patch
5+
---
6+
7+
fix(console,plugin-form,i18n): the public form page and the master-detail form chrome speak the user's language
8+
9+
objectui#11039 moved the form family's feedback chrome onto the locale packs and
10+
left two halves behind, both still English inside a Chinese UI.
11+
12+
The console form page (`/f/:slug`, `/forms/:name`) rendered its action chrome from
13+
literals: the submit button's `Submit`, its in-flight `Submitting…` and
14+
`Uploading…`, the `Redirecting…` line of a pending redirect, and the frame of the
15+
`Required: …` refusal. They now read `publicForm.submit`, `publicForm.submitting`,
16+
`fields.file.uploading` (the key every other form's in-flight Save label already
17+
reads), and two new keys, `publicForm.redirectPending` and
18+
`publicForm.requiredFields`. The refusal is one key with a `{{fields}}` hole and
19+
its labels are joined with the pack's own list separator, so the colon, its
20+
spacing and the word order belong to the locale.
21+
22+
`plugin-form` had the same literals in the master-detail form: `Loading columns…`,
23+
the `Subtotal` / `Tax (N%)` / `Total` stack, the row editor's `Line item — row N`
24+
title with its `Apply` and `Close`, the in-form collection's `Add`, and the Save
25+
button's `Saving…`; in `ModalForm`, the sr-only description of a master-detail
26+
dialog; and in `ObjectForm`, the hint under a field the caller may read but not
27+
write. They now read the pack (new keys under `form.masterDetail` and
28+
`form.deniedDescription`, plus the existing `detail.add`, `detail.saving` and
29+
`common.close`), in all ten packs.
30+
31+
Only defaults move. An authored value still wins everywhere it did: a collection
32+
`title` and `addLabel`, a dialog `description`, a field `description`, an authored
33+
field label inside the refusal. English output is byte-identical to the literals.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
'@object-ui/core': patch
3+
'@object-ui/app-shell': patch
4+
---
5+
6+
An unlabelled undoable action's Undo and Redo toast names the object and carries no English verb (objectui#11080).
7+
8+
- **The description no longer starts with a verb.** An `undoable` update whose action declared no `label` (or an empty one) described its operation as `Undo ` followed by the object's API name. The three places that build the operation now write the object identifier each already holds: `ActionRunner`, the console runtime's `api` handler and `RecordDetailView`'s `api` handler. An authored `label` still wins, byte for byte.
9+
- **Why the verb goes.** The console's global Ctrl+Z / Ctrl+Shift+Z toasts already say Undo or Redo themselves, from the pack keys `actions.undoneOperation` and `actions.redoneOperation`. The fallback's own `Undo ` doubled that verb on the undo toast, and was wrong on the redo toast: under zh-CN they read 「撤销:Undo task」 and 「重做:Undo task」, and now read 「撤销:task」 and 「重做:task」. English reads `Undo: task` and `Redo: task`.
10+
- **What does not change.** `UndoableOperation` is byte-identical, there is no new key, and `@object-ui/core` gains no text and no translator contract. The object is named by its API name in all three producers, not by its label.
11+
- **No migration.** A stack restored from `objectui:undo-history` keeps the description it was saved with.
12+
13+
The fallback is reached only by an undoable action with an empty or missing `label`: `@objectstack/spec` requires an action to declare one, so in practice that is a code-built `ActionDef` or an authored empty label.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
'@object-ui/app-shell': patch
3+
'@object-ui/i18n': patch
4+
---
5+
6+
The console's global Undo and Redo toasts read the session's language (objectui#11080).
7+
8+
- **The Ctrl+Z / Ctrl+Shift+Z toasts.** `AppContent`'s `useGlobalUndo` handlers used to raise `Undo: ` or `Redo: ` in English before the operation's description, under every language. They now read two new keys, `actions.undoneOperation` and `actions.redoneOperation`, through the translator `AppContent` already holds. The operation's description is interpolated unchanged, so the pack owns the words and their order. Under zh-CN the toasts read 「撤销:…」 and 「重做:…」.
9+
- **English is unchanged.** The `en` values are `Undo: {{description}}` and `Redo: {{description}}`, the same text as before.
10+
- **The new keys are in all ten packs.** Each pack words them with its own `actions.undo` and its own word for Redo, followed by its usual colon: full-width in zh, and a space before the colon in fr.
11+
12+
The description of an operation whose action declared no `label` is still built in English by its producer. That half of objectui#11080 is not changed here.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
'@object-ui/core': minor
3+
'@object-ui/app-shell': patch
4+
---
5+
6+
fix(app-shell,core): the record page's Undo captures only what the record carries, through core's one capture rule (objectui#11082)
7+
8+
**Clause-②: yes** — `captureUpdateUndoData` becomes a named export of `@object-ui/core`, a new published symbol. Its answers do not change. No declared type or accepted key moves.
9+
10+
- **`@object-ui/core` exports `captureUpdateUndoData(writtenFields, rowRecord)`.** It is the rule `ActionRunner` already used for an `undoable` update's Undo snapshot (objectui#10404): it answers each written field's stored value when the row carries every written field, and `undefined` when any one is missing, so the caller offers no Undo at all. A `null` the row carries is captured as `null`. "Carries" means an own key whose value is not `undefined`.
11+
- **The record page's own `api` handler calls it.** `RecordDetailView` read each written field's prior value off the loaded page record as `pageRecord[k] ?? null`. The page record is read with no column list, but the server removes every field the reader may not read, so an undoable action that writes such a field found it absent and captured `null`. Pressing Undo then wrote `null` over the stored value. Now that action offers no Undo button, logs a warning naming the missing fields, and still performs the write. A carried value, `null` included, is restored as before.
12+
- **The console runtime's `api` handler calls it too**, in place of its inline copy of the same rule. Its behaviour does not change.
13+
14+
Pinned in `packages/app-shell/src/views/RecordDetailView.undoCapture-11082.test.tsx` and `packages/core/src/actions/__tests__/captureUpdateUndoData.export-11082.test.ts`.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
'@object-ui/components': patch
3+
'@object-ui/plugin-detail': patch
4+
---
5+
6+
Nine blocks now render the accessible name an author declares in their nested `aria` bag (objectui#11083, batch 2).
7+
8+
The spec declares an `aria` bag (`AriaPropsSchema`) on `element:text_input`, `element:record_picker`, `element:metadata_viewer`, `page:header`, `page:tabs`, `page:card` and `page:accordion`, and on the `feed` of `record:chatter` / `record:discussion`. None of these renderers read it, so `properties: { aria: { ariaLabel: 'Orders' } }` rendered no `aria-label` anywhere. Each one now reads the bag through `resolveInlineAriaProps` from `@object-ui/react`, the reader the other `element:*` blocks and the page root use, against the display locale (`useDisplayLocale()`). `ariaLabel` becomes `aria-label` (a locale map such as `{ en: 'Orders', 'zh-CN': '订单' }` gives the entry for the display locale), `ariaDescribedBy` becomes `aria-describedby`, and `role` becomes `role`.
9+
10+
Where the attributes land:
11+
12+
- `element:text_input`: on the input. Its description paragraph stays in `aria-describedby`, and an authored `ariaDescribedBy` is added after it.
13+
- `element:record_picker`: on the combobox trigger, which keeps its `combobox` role unless the author declares another.
14+
- `element:metadata_viewer`: on a new root `div` around the view. The block had no single root element before; with no `aria` declared the `div` carries no attribute.
15+
- `page:header`, `page:tabs`, `page:card`, `page:accordion`: on the block's root element (the `header`, and the `Tabs`, `Card` and `Accordion` roots).
16+
- The `feed` of `record:chatter` / `record:discussion`: on a new `div` around the embedded timeline, the way `record:activity` puts its own `aria` on the `div` around its timeline, with the same `record:*` defaults: no role while nothing is declared, and `region` to carry a declared name. The timeline keeps its heading as its own name. With no `feed.aria` declared the `div` carries no attribute.
17+
18+
None of the blocks adds a default role of its own, and a block that declares no `aria` renders the same attributes as before; the metadata viewer and the chat feed gain one attribute-less wrapper `div`.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
'@object-ui/app-shell': patch
3+
---
4+
5+
fix(app-shell): the flow designer stops warning on an edge guard that reads its source node's own outputs
6+
7+
The engine writes a node's outputs (a `get_record`'s `outputVariable`, a
8+
connector action's `nodeId.key` write-back, an approval's `nodeId.decision`)
9+
before it evaluates that node's out-edge guards. The designer resolved an
10+
edge's scope as the scope AT its source node, which by design excludes the
11+
node's own outputs, so `lead.status == 'open'` on the out-edge of a
12+
`get_record` with `outputVariable: lead` was reported "not a reference in
13+
scope" in both the edge inspector's note and the Problems panel, although the
14+
engine writes `lead` first.
15+
16+
An edge's scope is now the scope at its source plus the source's own outputs,
17+
through one rule both surfaces read (`edgeSourceOutputRefs`, composed by
18+
`resolveEdgeScope` for the Problems panel and `useEdgeScope` for the edge
19+
inspector). A `fault` edge keeps the scope at its source: the engine walks it
20+
only when the node failed, with nothing written back. A reference no node
21+
writes still warns.
22+
23+
The Problems panel also stops warning on a later node's reference to a
24+
committed connector action's declared output (`post.ok` after a `post` node
25+
whose action's `outputSchema` declares `ok`), which the node and edge
26+
inspectors already accepted. The flow designer now reads the runtime connector
27+
registry for its problem list the way the inspectors read it, only when the
28+
draft holds a committed connector action, and `buildFlowProblems` takes it as
29+
an optional `connectors` argument. The panel rows and the canvas badges read
30+
that one list, so they agree with the inspectors.

0 commit comments

Comments
 (0)