@asteby/metacore-runtime-react 17.0.1 → 17.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/dialogs/dynamic-record.d.ts.map +1 -1
- package/dist/dialogs/dynamic-record.js +4 -1
- package/dist/dynamic-columns-helpers.d.ts +21 -0
- package/dist/dynamic-columns-helpers.d.ts.map +1 -0
- package/dist/dynamic-columns-helpers.js +59 -0
- package/dist/dynamic-columns.d.ts.map +1 -1
- package/dist/dynamic-columns.js +12 -6
- package/dist/dynamic-relation-helpers.d.ts.map +1 -1
- package/dist/dynamic-relation-helpers.js +23 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/package.json +3 -3
- package/src/__tests__/humanize-token.test.ts +58 -0
- package/src/dialogs/dynamic-record.tsx +4 -1
- package/src/dynamic-columns-helpers.ts +58 -0
- package/src/dynamic-columns.tsx +13 -7
- package/src/dynamic-relation-helpers.ts +24 -1
- package/src/index.ts +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
# @asteby/metacore-runtime-react
|
|
2
2
|
|
|
3
|
+
## 17.0.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 3e45754: Humanize unmatched enum/status/option tokens as a scalable fallback. When a
|
|
8
|
+
column value has no matching declared `option`, dynamic cells (table, record
|
|
9
|
+
detail, relation rows) now render a humanized label (`in_progress` → "In
|
|
10
|
+
Progress", `pos` → "POS") instead of the raw token. A matched `option.label`
|
|
11
|
+
(the addon-localized source of truth) still wins; this only affects the
|
|
12
|
+
previously-raw fallback.
|
|
13
|
+
|
|
3
14
|
## 17.0.1
|
|
4
15
|
|
|
5
16
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-record.d.ts","sourceRoot":"","sources":["../../src/dialogs/dynamic-record.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"dynamic-record.d.ts","sourceRoot":"","sources":["../../src/dialogs/dynamic-record.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AA0F1C,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAA;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;QAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAA;IAClF;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;QAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAA;IACpG;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;CACtB;AA0DD,wBAAgB,mBAAmB,CAAC,EAChC,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,GACT,EAAE,wBAAwB,+BAsP1B"}
|
|
@@ -15,6 +15,7 @@ import { useApi } from '../api-context';
|
|
|
15
15
|
import { DynamicSelectField } from '../dynamic-select-field';
|
|
16
16
|
import { getFieldRef } from '../dynamic-form-schema';
|
|
17
17
|
import { normalizeNilUuid } from '../nil-uuid';
|
|
18
|
+
import { humanizeToken } from '../dynamic-columns-helpers';
|
|
18
19
|
function resolvePath(obj, path) {
|
|
19
20
|
return path.split('.').reduce((acc, part) => acc?.[part], obj);
|
|
20
21
|
}
|
|
@@ -37,7 +38,9 @@ function formatDisplayValue(rawValue, field) {
|
|
|
37
38
|
}
|
|
38
39
|
if (field.type === 'select' && field.options?.length) {
|
|
39
40
|
const match = field.options.find(o => o.value === String(value));
|
|
40
|
-
|
|
41
|
+
// Matched option label wins (localized); humanize the raw token only
|
|
42
|
+
// when no declared option matches the value.
|
|
43
|
+
return match?.label ?? humanizeToken(value);
|
|
41
44
|
}
|
|
42
45
|
return String(value);
|
|
43
46
|
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Scalable safety net for enum/status/option values that have **no matching
|
|
3
|
+
* declared option**. Turns a raw machine token into a readable label so a cell
|
|
4
|
+
* never leaks `in_progress` / `out-of-stock` verbatim:
|
|
5
|
+
*
|
|
6
|
+
* - `in_progress` → `In Progress` (snake_case)
|
|
7
|
+
* - `out-of-stock` → `Out Of Stock` (kebab-case)
|
|
8
|
+
* - `payment.failed` → `Payment Failed` (dotted)
|
|
9
|
+
* - `sale` → `Sale` (single word)
|
|
10
|
+
* - `pos` → `POS`, `sku_count` → `SKU Count` (acronyms uppercased)
|
|
11
|
+
*
|
|
12
|
+
* This is a FALLBACK only. The localized source of truth is the `options` an
|
|
13
|
+
* addon declares; callers must prefer a matched `option.label` and only reach
|
|
14
|
+
* for `humanizeToken` when nothing matched.
|
|
15
|
+
*
|
|
16
|
+
* Values that don't look like an enum token are returned unchanged: anything
|
|
17
|
+
* already containing whitespace (free text), overly long strings, UUIDs, and
|
|
18
|
+
* non-strings. This keeps it safe to call on arbitrary cell values.
|
|
19
|
+
*/
|
|
20
|
+
export declare function humanizeToken(value: unknown): string;
|
|
21
|
+
//# sourceMappingURL=dynamic-columns-helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-columns-helpers.d.ts","sourceRoot":"","sources":["../src/dynamic-columns-helpers.ts"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiBpD"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
// Pure, DOM-free helpers for the dynamic-column / record / relation renderers.
|
|
2
|
+
// Kept in their own module so they unit-test in node (no React, no
|
|
3
|
+
// metacore-ui primitives) and the same logic is shared across every cell
|
|
4
|
+
// renderer.
|
|
5
|
+
// Short, case-insensitive list of tokens that read better fully capitalized
|
|
6
|
+
// than Title-Cased. Intentionally tiny: this is a last-resort fallback, not a
|
|
7
|
+
// dictionary. Addons localize real labels via the column `options`.
|
|
8
|
+
const ACRONYMS = {
|
|
9
|
+
pos: 'POS',
|
|
10
|
+
sku: 'SKU',
|
|
11
|
+
id: 'ID',
|
|
12
|
+
url: 'URL',
|
|
13
|
+
api: 'API',
|
|
14
|
+
iva: 'IVA',
|
|
15
|
+
rfc: 'RFC',
|
|
16
|
+
};
|
|
17
|
+
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
18
|
+
/**
|
|
19
|
+
* Scalable safety net for enum/status/option values that have **no matching
|
|
20
|
+
* declared option**. Turns a raw machine token into a readable label so a cell
|
|
21
|
+
* never leaks `in_progress` / `out-of-stock` verbatim:
|
|
22
|
+
*
|
|
23
|
+
* - `in_progress` → `In Progress` (snake_case)
|
|
24
|
+
* - `out-of-stock` → `Out Of Stock` (kebab-case)
|
|
25
|
+
* - `payment.failed` → `Payment Failed` (dotted)
|
|
26
|
+
* - `sale` → `Sale` (single word)
|
|
27
|
+
* - `pos` → `POS`, `sku_count` → `SKU Count` (acronyms uppercased)
|
|
28
|
+
*
|
|
29
|
+
* This is a FALLBACK only. The localized source of truth is the `options` an
|
|
30
|
+
* addon declares; callers must prefer a matched `option.label` and only reach
|
|
31
|
+
* for `humanizeToken` when nothing matched.
|
|
32
|
+
*
|
|
33
|
+
* Values that don't look like an enum token are returned unchanged: anything
|
|
34
|
+
* already containing whitespace (free text), overly long strings, UUIDs, and
|
|
35
|
+
* non-strings. This keeps it safe to call on arbitrary cell values.
|
|
36
|
+
*/
|
|
37
|
+
export function humanizeToken(value) {
|
|
38
|
+
if (typeof value !== 'string')
|
|
39
|
+
return value == null ? '' : String(value);
|
|
40
|
+
const raw = value;
|
|
41
|
+
const trimmed = raw.trim();
|
|
42
|
+
// Already human (has spaces), empty, or free-form long text → leave as-is.
|
|
43
|
+
if (trimmed === '' || /\s/.test(trimmed) || trimmed.length > 40)
|
|
44
|
+
return raw;
|
|
45
|
+
// UUIDs (unresolved FKs) contain dashes but are not enum tokens.
|
|
46
|
+
if (UUID_RE.test(trimmed))
|
|
47
|
+
return raw;
|
|
48
|
+
const parts = trimmed.split(/[_.\-]+/).filter(Boolean);
|
|
49
|
+
if (parts.length === 0)
|
|
50
|
+
return raw;
|
|
51
|
+
return parts
|
|
52
|
+
.map((part) => {
|
|
53
|
+
const lower = part.toLowerCase();
|
|
54
|
+
if (ACRONYMS[lower])
|
|
55
|
+
return ACRONYMS[lower];
|
|
56
|
+
return lower.charAt(0).toUpperCase() + lower.slice(1);
|
|
57
|
+
})
|
|
58
|
+
.join(' ');
|
|
59
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-columns.d.ts","sourceRoot":"","sources":["../src/dynamic-columns.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dynamic-columns.d.ts","sourceRoot":"","sources":["../src/dynamic-columns.tsx"],"names":[],"mappings":"AAgDA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE9D,OAAO,KAAK,EAER,iBAAiB,EACpB,MAAM,wBAAwB,CAAA;AAE/B,qEAAqE;AACrE,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACtB;AAgGD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,0BAA0B,GAAI,QAAQ,GAAG,EAAE,KAAK,GAAG,KAAG,OAMlE,CAAA;AA0HD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAAI,KAAK,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,KAAG,MAGnE,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,gBAAgB,EAAE,KAAK,GAAG,KAAG,MAWtE,CAAA;AAiED;;;;GAIG;AACH,wBAAgB,4BAA4B,CACxC,OAAO,GAAE,qBAA0B,GACpC,iBAAiB,CAsmBnB;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBACL,CAAA"}
|
package/dist/dynamic-columns.js
CHANGED
|
@@ -21,6 +21,7 @@ import { Avatar, AvatarFallback, AvatarImage, Badge, Button, Checkbox, DropdownM
|
|
|
21
21
|
import { DataTableColumnHeader, FilterableColumnHeader, } from '@asteby/metacore-ui/data-table';
|
|
22
22
|
import { generateBadgeStyles, getInitials, optionColor, relationChipStyles, } from '@asteby/metacore-ui/lib';
|
|
23
23
|
import { Progress } from './dialogs/_primitives';
|
|
24
|
+
import { humanizeToken } from './dynamic-columns-helpers';
|
|
24
25
|
import { OptionsContext } from './options-context';
|
|
25
26
|
import { DynamicIcon } from './dynamic-icon';
|
|
26
27
|
import { isNilUuid, normalizeNilUuid } from './nil-uuid';
|
|
@@ -184,7 +185,9 @@ const BadgeWithEndpointOptions = ({ endpoint, value }) => {
|
|
|
184
185
|
const option = options.find((opt) => opt.value === value);
|
|
185
186
|
if (option)
|
|
186
187
|
return _jsx(OptionBadge, { option: option, fallback: String(value) });
|
|
187
|
-
|
|
188
|
+
// No declared option matched → humanize the raw token as a safety net so a
|
|
189
|
+
// cell never shows `in_progress` verbatim (option.label still wins above).
|
|
190
|
+
return _jsx(Badge, { variant: "outline", children: humanizeToken(value) });
|
|
188
191
|
};
|
|
189
192
|
/**
|
|
190
193
|
* Resolves the relation sibling object a backend serves alongside an FK column.
|
|
@@ -315,16 +318,17 @@ export function makeDefaultGetDynamicColumns(helpers = {}) {
|
|
|
315
318
|
const option = col.options.find((o) => o.value === String(value));
|
|
316
319
|
if (option)
|
|
317
320
|
return _jsx(OptionBadge, { option: option, fallback: String(value) });
|
|
318
|
-
return _jsx(Badge, { variant: "outline", children:
|
|
321
|
+
return _jsx(Badge, { variant: "outline", children: humanizeToken(value) });
|
|
319
322
|
}
|
|
320
323
|
if (renderAs === 'relation-badge-list') {
|
|
321
324
|
return renderRelationBadges(value, col);
|
|
322
325
|
}
|
|
323
|
-
// Generic badge (no options/endpoint) — still pill it
|
|
326
|
+
// Generic badge (no options/endpoint) — still pill it, and
|
|
327
|
+
// humanize raw enum tokens (no option exists to localize it).
|
|
324
328
|
if (renderAs === 'badge') {
|
|
325
329
|
if (!value && value !== 0)
|
|
326
330
|
return _jsx(EmptyCell, {});
|
|
327
|
-
return _jsx(Badge, { variant: "outline", children:
|
|
331
|
+
return _jsx(Badge, { variant: "outline", children: humanizeToken(value) });
|
|
328
332
|
}
|
|
329
333
|
// Status — semantic color by value, options color wins.
|
|
330
334
|
if (renderAs === 'status') {
|
|
@@ -337,7 +341,9 @@ export function makeDefaultGetDynamicColumns(helpers = {}) {
|
|
|
337
341
|
const isDark = typeof document !== 'undefined' &&
|
|
338
342
|
document.documentElement.classList.contains('dark');
|
|
339
343
|
const styles = generateBadgeStyles(statusColorFor(sv), { isDark });
|
|
340
|
-
|
|
344
|
+
// No declared option → humanize the status token so
|
|
345
|
+
// `in_progress` reads as "In Progress" instead of raw.
|
|
346
|
+
return (_jsx(Badge, { variant: "outline", className: "border-0", style: styles, children: humanizeToken(sv) }));
|
|
341
347
|
}
|
|
342
348
|
// Resolved FK relation chip. Triggers on an explicit
|
|
343
349
|
// `cellStyle: 'relation'` or on any column carrying a `ref`
|
|
@@ -361,7 +367,7 @@ export function makeDefaultGetDynamicColumns(helpers = {}) {
|
|
|
361
367
|
const option = col.options.find((o) => o.value === String(value));
|
|
362
368
|
if (option)
|
|
363
369
|
return _jsx(OptionBadge, { option: option, fallback: String(value) });
|
|
364
|
-
return _jsx(Badge, { variant: "outline", children:
|
|
370
|
+
return _jsx(Badge, { variant: "outline", children: humanizeToken(value) });
|
|
365
371
|
}
|
|
366
372
|
switch (renderAs) {
|
|
367
373
|
case 'date': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-relation-helpers.d.ts","sourceRoot":"","sources":["../src/dynamic-relation-helpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"dynamic-relation-helpers.d.ts","sourceRoot":"","sources":["../src/dynamic-relation-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
import { isNilUuid } from './nil-uuid';
|
|
2
|
+
import { humanizeToken } from './dynamic-columns-helpers';
|
|
3
|
+
// An enum-like column renders a single token value (status/select/option/badge)
|
|
4
|
+
// rather than free text, so an unmatched value should be humanized, not leaked.
|
|
5
|
+
function isEnumLikeColumn(col) {
|
|
6
|
+
const renderAs = col.cellStyle ?? col.type;
|
|
7
|
+
return (renderAs === 'select' ||
|
|
8
|
+
renderAs === 'option' ||
|
|
9
|
+
renderAs === 'status' ||
|
|
10
|
+
renderAs === 'badge' ||
|
|
11
|
+
!!col.options?.length);
|
|
12
|
+
}
|
|
2
13
|
// Pulls a human label off a resolved relation/user object a backend serves:
|
|
3
14
|
// `{ value, label }` (FK sibling), `{ name, … }` (user object such as
|
|
4
15
|
// created_by) or `{ title }`. Returns undefined for plain/empty objects so the
|
|
@@ -43,7 +54,18 @@ export function formatRelationCell(row, col) {
|
|
|
43
54
|
if (typeof value === 'object')
|
|
44
55
|
return '—';
|
|
45
56
|
const text = String(value);
|
|
46
|
-
|
|
57
|
+
if (text === '')
|
|
58
|
+
return '—';
|
|
59
|
+
// Enum/status/option columns: prefer the declared option label (localized
|
|
60
|
+
// source of truth), then humanize the raw token as a fallback so a status
|
|
61
|
+
// never reads as `in_progress`. Plain text columns are left untouched.
|
|
62
|
+
if (isEnumLikeColumn(col)) {
|
|
63
|
+
const match = col.options?.find((o) => String(o.value) === text);
|
|
64
|
+
if (match)
|
|
65
|
+
return match.label;
|
|
66
|
+
return humanizeToken(text);
|
|
67
|
+
}
|
|
68
|
+
return text;
|
|
47
69
|
}
|
|
48
70
|
/**
|
|
49
71
|
* Builds the query params used by `<DynamicRelation kind="one_to_many">` to
|
package/dist/index.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export { useHotSwapReload, applyHotSwapReload, withVersionParam, clearFederation
|
|
|
17
17
|
export * from './dynamic-icon';
|
|
18
18
|
export type { ColumnFilterConfig, FilterOption as DynamicColumnFilterOption, GetDynamicColumns, DynamicIconComponent, } from './dynamic-columns-shim';
|
|
19
19
|
export { defaultGetDynamicColumns, makeDefaultGetDynamicColumns, relationKeyFor, resolveRelationLabel, type DynamicColumnsHelpers, } from './dynamic-columns';
|
|
20
|
+
export { humanizeToken } from './dynamic-columns-helpers';
|
|
20
21
|
export { NIL_UUID, isNilUuid, normalizeNilUuid } from './nil-uuid';
|
|
21
22
|
export { DynamicRecordDialog } from './dialogs/dynamic-record';
|
|
22
23
|
export { CreateRecordDialog } from './dialogs/create-record-dialog';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -21,6 +21,7 @@ export { ADDON_MANIFEST_CHANGED_TYPE, wireHotSwapInvalidation, useManifestHotSwa
|
|
|
21
21
|
export { useHotSwapReload, applyHotSwapReload, withVersionParam, clearFederationContainer, shortenHash, } from './hotswap-reload-policy';
|
|
22
22
|
export * from './dynamic-icon';
|
|
23
23
|
export { defaultGetDynamicColumns, makeDefaultGetDynamicColumns, relationKeyFor, resolveRelationLabel, } from './dynamic-columns';
|
|
24
|
+
export { humanizeToken } from './dynamic-columns-helpers';
|
|
24
25
|
export { NIL_UUID, isNilUuid, normalizeNilUuid } from './nil-uuid';
|
|
25
26
|
export { DynamicRecordDialog } from './dialogs/dynamic-record';
|
|
26
27
|
export { CreateRecordDialog } from './dialogs/create-record-dialog';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@asteby/metacore-runtime-react",
|
|
3
|
-
"version": "17.0.
|
|
3
|
+
"version": "17.0.2",
|
|
4
4
|
"description": "React runtime for metacore hosts — renders addon contributions dynamically",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"lucide-react": ">=0.460",
|
|
34
34
|
"date-fns": ">=3",
|
|
35
35
|
"react-day-picker": ">=8",
|
|
36
|
-
"@asteby/metacore-
|
|
37
|
-
"@asteby/metacore-
|
|
36
|
+
"@asteby/metacore-sdk": "^3.2.0",
|
|
37
|
+
"@asteby/metacore-ui": "^2.4.1"
|
|
38
38
|
},
|
|
39
39
|
"peerDependenciesMeta": {
|
|
40
40
|
"@tanstack/react-router": {
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest'
|
|
2
|
+
import { humanizeToken } from '../dynamic-columns-helpers'
|
|
3
|
+
|
|
4
|
+
describe('humanizeToken', () => {
|
|
5
|
+
it('title-cases snake_case tokens', () => {
|
|
6
|
+
expect(humanizeToken('in_progress')).toBe('In Progress')
|
|
7
|
+
expect(humanizeToken('out_of_stock')).toBe('Out Of Stock')
|
|
8
|
+
})
|
|
9
|
+
|
|
10
|
+
it('title-cases kebab-case tokens', () => {
|
|
11
|
+
expect(humanizeToken('out-of-stock')).toBe('Out Of Stock')
|
|
12
|
+
expect(humanizeToken('draft-pending')).toBe('Draft Pending')
|
|
13
|
+
})
|
|
14
|
+
|
|
15
|
+
it('handles dotted tokens', () => {
|
|
16
|
+
expect(humanizeToken('payment.failed')).toBe('Payment Failed')
|
|
17
|
+
})
|
|
18
|
+
|
|
19
|
+
it('title-cases a single word', () => {
|
|
20
|
+
expect(humanizeToken('sale')).toBe('Sale')
|
|
21
|
+
expect(humanizeToken('completed')).toBe('Completed')
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
it('uppercases known acronyms (case-insensitive)', () => {
|
|
25
|
+
expect(humanizeToken('pos')).toBe('POS')
|
|
26
|
+
expect(humanizeToken('SKU')).toBe('SKU')
|
|
27
|
+
expect(humanizeToken('sku_count')).toBe('SKU Count')
|
|
28
|
+
expect(humanizeToken('api_url')).toBe('API URL')
|
|
29
|
+
expect(humanizeToken('rfc')).toBe('RFC')
|
|
30
|
+
expect(humanizeToken('id')).toBe('ID')
|
|
31
|
+
})
|
|
32
|
+
|
|
33
|
+
it('leaves already-humanized text untouched', () => {
|
|
34
|
+
expect(humanizeToken('In Progress')).toBe('In Progress')
|
|
35
|
+
expect(humanizeToken('Some free form note')).toBe('Some free form note')
|
|
36
|
+
})
|
|
37
|
+
|
|
38
|
+
it('leaves long free text untouched', () => {
|
|
39
|
+
const long = 'this is a fairly long sentence describing the order status today'
|
|
40
|
+
expect(humanizeToken(long)).toBe(long)
|
|
41
|
+
})
|
|
42
|
+
|
|
43
|
+
it('leaves UUIDs untouched', () => {
|
|
44
|
+
const uuid = '550e8400-e29b-41d4-a716-446655440000'
|
|
45
|
+
expect(humanizeToken(uuid)).toBe(uuid)
|
|
46
|
+
})
|
|
47
|
+
|
|
48
|
+
it('coerces non-string values without transforming them', () => {
|
|
49
|
+
expect(humanizeToken(42 as unknown as string)).toBe('42')
|
|
50
|
+
expect(humanizeToken(null)).toBe('')
|
|
51
|
+
expect(humanizeToken(undefined)).toBe('')
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
it('returns empty/whitespace input unchanged', () => {
|
|
55
|
+
expect(humanizeToken('')).toBe('')
|
|
56
|
+
expect(humanizeToken(' ')).toBe(' ')
|
|
57
|
+
})
|
|
58
|
+
})
|
|
@@ -43,6 +43,7 @@ import { useApi } from '../api-context'
|
|
|
43
43
|
import { DynamicSelectField } from '../dynamic-select-field'
|
|
44
44
|
import { getFieldRef } from '../dynamic-form-schema'
|
|
45
45
|
import { normalizeNilUuid } from '../nil-uuid'
|
|
46
|
+
import { humanizeToken } from '../dynamic-columns-helpers'
|
|
46
47
|
import type { ActionFieldDef } from '../types'
|
|
47
48
|
|
|
48
49
|
interface FieldOption {
|
|
@@ -156,7 +157,9 @@ function formatDisplayValue(rawValue: any, field: FieldDef): string {
|
|
|
156
157
|
|
|
157
158
|
if (field.type === 'select' && field.options?.length) {
|
|
158
159
|
const match = field.options.find(o => o.value === String(value))
|
|
159
|
-
|
|
160
|
+
// Matched option label wins (localized); humanize the raw token only
|
|
161
|
+
// when no declared option matches the value.
|
|
162
|
+
return match?.label ?? humanizeToken(value)
|
|
160
163
|
}
|
|
161
164
|
|
|
162
165
|
return String(value)
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
// Pure, DOM-free helpers for the dynamic-column / record / relation renderers.
|
|
2
|
+
// Kept in their own module so they unit-test in node (no React, no
|
|
3
|
+
// metacore-ui primitives) and the same logic is shared across every cell
|
|
4
|
+
// renderer.
|
|
5
|
+
|
|
6
|
+
// Short, case-insensitive list of tokens that read better fully capitalized
|
|
7
|
+
// than Title-Cased. Intentionally tiny: this is a last-resort fallback, not a
|
|
8
|
+
// dictionary. Addons localize real labels via the column `options`.
|
|
9
|
+
const ACRONYMS: Record<string, string> = {
|
|
10
|
+
pos: 'POS',
|
|
11
|
+
sku: 'SKU',
|
|
12
|
+
id: 'ID',
|
|
13
|
+
url: 'URL',
|
|
14
|
+
api: 'API',
|
|
15
|
+
iva: 'IVA',
|
|
16
|
+
rfc: 'RFC',
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const UUID_RE =
|
|
20
|
+
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Scalable safety net for enum/status/option values that have **no matching
|
|
24
|
+
* declared option**. Turns a raw machine token into a readable label so a cell
|
|
25
|
+
* never leaks `in_progress` / `out-of-stock` verbatim:
|
|
26
|
+
*
|
|
27
|
+
* - `in_progress` → `In Progress` (snake_case)
|
|
28
|
+
* - `out-of-stock` → `Out Of Stock` (kebab-case)
|
|
29
|
+
* - `payment.failed` → `Payment Failed` (dotted)
|
|
30
|
+
* - `sale` → `Sale` (single word)
|
|
31
|
+
* - `pos` → `POS`, `sku_count` → `SKU Count` (acronyms uppercased)
|
|
32
|
+
*
|
|
33
|
+
* This is a FALLBACK only. The localized source of truth is the `options` an
|
|
34
|
+
* addon declares; callers must prefer a matched `option.label` and only reach
|
|
35
|
+
* for `humanizeToken` when nothing matched.
|
|
36
|
+
*
|
|
37
|
+
* Values that don't look like an enum token are returned unchanged: anything
|
|
38
|
+
* already containing whitespace (free text), overly long strings, UUIDs, and
|
|
39
|
+
* non-strings. This keeps it safe to call on arbitrary cell values.
|
|
40
|
+
*/
|
|
41
|
+
export function humanizeToken(value: unknown): string {
|
|
42
|
+
if (typeof value !== 'string') return value == null ? '' : String(value)
|
|
43
|
+
const raw = value
|
|
44
|
+
const trimmed = raw.trim()
|
|
45
|
+
// Already human (has spaces), empty, or free-form long text → leave as-is.
|
|
46
|
+
if (trimmed === '' || /\s/.test(trimmed) || trimmed.length > 40) return raw
|
|
47
|
+
// UUIDs (unresolved FKs) contain dashes but are not enum tokens.
|
|
48
|
+
if (UUID_RE.test(trimmed)) return raw
|
|
49
|
+
const parts = trimmed.split(/[_.\-]+/).filter(Boolean)
|
|
50
|
+
if (parts.length === 0) return raw
|
|
51
|
+
return parts
|
|
52
|
+
.map((part) => {
|
|
53
|
+
const lower = part.toLowerCase()
|
|
54
|
+
if (ACRONYMS[lower]) return ACRONYMS[lower]
|
|
55
|
+
return lower.charAt(0).toUpperCase() + lower.slice(1)
|
|
56
|
+
})
|
|
57
|
+
.join(' ')
|
|
58
|
+
}
|
package/src/dynamic-columns.tsx
CHANGED
|
@@ -42,6 +42,7 @@ import {
|
|
|
42
42
|
relationChipStyles,
|
|
43
43
|
} from '@asteby/metacore-ui/lib'
|
|
44
44
|
import { Progress } from './dialogs/_primitives'
|
|
45
|
+
import { humanizeToken } from './dynamic-columns-helpers'
|
|
45
46
|
import { OptionsContext } from './options-context'
|
|
46
47
|
import { DynamicIcon } from './dynamic-icon'
|
|
47
48
|
import { isNilUuid, normalizeNilUuid } from './nil-uuid'
|
|
@@ -297,7 +298,9 @@ const BadgeWithEndpointOptions: React.FC<{ endpoint: string; value: any }> = ({
|
|
|
297
298
|
const options = optionsMap.get(endpoint) || []
|
|
298
299
|
const option = options.find((opt: any) => opt.value === value)
|
|
299
300
|
if (option) return <OptionBadge option={option} fallback={String(value)} />
|
|
300
|
-
|
|
301
|
+
// No declared option matched → humanize the raw token as a safety net so a
|
|
302
|
+
// cell never shows `in_progress` verbatim (option.label still wins above).
|
|
303
|
+
return <Badge variant="outline">{humanizeToken(value)}</Badge>
|
|
301
304
|
}
|
|
302
305
|
|
|
303
306
|
/**
|
|
@@ -499,17 +502,18 @@ export function makeDefaultGetDynamicColumns(
|
|
|
499
502
|
if (!value && value !== 0) return <span className="text-muted-foreground">-</span>
|
|
500
503
|
const option = col.options.find((o) => o.value === String(value))
|
|
501
504
|
if (option) return <OptionBadge option={option} fallback={String(value)} />
|
|
502
|
-
return <Badge variant="outline">{
|
|
505
|
+
return <Badge variant="outline">{humanizeToken(value)}</Badge>
|
|
503
506
|
}
|
|
504
507
|
|
|
505
508
|
if (renderAs === 'relation-badge-list') {
|
|
506
509
|
return renderRelationBadges(value, col)
|
|
507
510
|
}
|
|
508
511
|
|
|
509
|
-
// Generic badge (no options/endpoint) — still pill it
|
|
512
|
+
// Generic badge (no options/endpoint) — still pill it, and
|
|
513
|
+
// humanize raw enum tokens (no option exists to localize it).
|
|
510
514
|
if (renderAs === 'badge') {
|
|
511
515
|
if (!value && value !== 0) return <EmptyCell />
|
|
512
|
-
return <Badge variant="outline">{
|
|
516
|
+
return <Badge variant="outline">{humanizeToken(value)}</Badge>
|
|
513
517
|
}
|
|
514
518
|
|
|
515
519
|
// Status — semantic color by value, options color wins.
|
|
@@ -522,9 +526,11 @@ export function makeDefaultGetDynamicColumns(
|
|
|
522
526
|
typeof document !== 'undefined' &&
|
|
523
527
|
document.documentElement.classList.contains('dark')
|
|
524
528
|
const styles = generateBadgeStyles(statusColorFor(sv), { isDark })
|
|
529
|
+
// No declared option → humanize the status token so
|
|
530
|
+
// `in_progress` reads as "In Progress" instead of raw.
|
|
525
531
|
return (
|
|
526
|
-
<Badge variant="outline" className="border-0
|
|
527
|
-
{sv}
|
|
532
|
+
<Badge variant="outline" className="border-0" style={styles}>
|
|
533
|
+
{humanizeToken(sv)}
|
|
528
534
|
</Badge>
|
|
529
535
|
)
|
|
530
536
|
}
|
|
@@ -554,7 +560,7 @@ export function makeDefaultGetDynamicColumns(
|
|
|
554
560
|
if (!value && value !== 0) return <EmptyCell />
|
|
555
561
|
const option = col.options.find((o) => o.value === String(value))
|
|
556
562
|
if (option) return <OptionBadge option={option} fallback={String(value)} />
|
|
557
|
-
return <Badge variant="outline">{
|
|
563
|
+
return <Badge variant="outline">{humanizeToken(value)}</Badge>
|
|
558
564
|
}
|
|
559
565
|
|
|
560
566
|
switch (renderAs) {
|
|
@@ -3,6 +3,20 @@
|
|
|
3
3
|
// URL/payload conventions outside the component.
|
|
4
4
|
import type { ActionFieldDef, ColumnDefinition, TableMetadata } from './types'
|
|
5
5
|
import { isNilUuid } from './nil-uuid'
|
|
6
|
+
import { humanizeToken } from './dynamic-columns-helpers'
|
|
7
|
+
|
|
8
|
+
// An enum-like column renders a single token value (status/select/option/badge)
|
|
9
|
+
// rather than free text, so an unmatched value should be humanized, not leaked.
|
|
10
|
+
function isEnumLikeColumn(col: ColumnDefinition): boolean {
|
|
11
|
+
const renderAs = col.cellStyle ?? col.type
|
|
12
|
+
return (
|
|
13
|
+
renderAs === 'select' ||
|
|
14
|
+
renderAs === 'option' ||
|
|
15
|
+
renderAs === 'status' ||
|
|
16
|
+
renderAs === 'badge' ||
|
|
17
|
+
!!col.options?.length
|
|
18
|
+
)
|
|
19
|
+
}
|
|
6
20
|
|
|
7
21
|
export type DynamicRelationKind = 'one_to_many' | 'many_to_many'
|
|
8
22
|
|
|
@@ -49,7 +63,16 @@ export function formatRelationCell(row: Record<string, unknown>, col: ColumnDefi
|
|
|
49
63
|
if (typeof value === 'object') return '—'
|
|
50
64
|
|
|
51
65
|
const text = String(value)
|
|
52
|
-
|
|
66
|
+
if (text === '') return '—'
|
|
67
|
+
// Enum/status/option columns: prefer the declared option label (localized
|
|
68
|
+
// source of truth), then humanize the raw token as a fallback so a status
|
|
69
|
+
// never reads as `in_progress`. Plain text columns are left untouched.
|
|
70
|
+
if (isEnumLikeColumn(col)) {
|
|
71
|
+
const match = col.options?.find((o) => String(o.value) === text)
|
|
72
|
+
if (match) return match.label
|
|
73
|
+
return humanizeToken(text)
|
|
74
|
+
}
|
|
75
|
+
return text
|
|
53
76
|
}
|
|
54
77
|
|
|
55
78
|
export interface PivotRowLike {
|
package/src/index.ts
CHANGED
|
@@ -66,6 +66,7 @@ export {
|
|
|
66
66
|
resolveRelationLabel,
|
|
67
67
|
type DynamicColumnsHelpers,
|
|
68
68
|
} from './dynamic-columns'
|
|
69
|
+
export { humanizeToken } from './dynamic-columns-helpers'
|
|
69
70
|
export { NIL_UUID, isNilUuid, normalizeNilUuid } from './nil-uuid'
|
|
70
71
|
export { DynamicRecordDialog } from './dialogs/dynamic-record'
|
|
71
72
|
export { CreateRecordDialog } from './dialogs/create-record-dialog'
|