@qoretechnologies/reqraft 0.10.41-pr.95.g294e5aa → 0.10.41
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/.claude/CLAUDE.md +12 -0
- package/.tasks/INDEX.md +1 -0
- package/.tasks/TEMPLATE_TOKEN_GRAMMAR.md +72 -0
- package/dist/components/codeSize/index.d.ts +37 -0
- package/dist/components/codeSize/index.d.ts.map +1 -0
- package/dist/components/codeSize/index.js +87 -0
- package/dist/components/codeSize/index.js.map +1 -0
- package/dist/components/form/engine/CompactRow.d.ts +20 -1
- package/dist/components/form/engine/CompactRow.d.ts.map +1 -1
- package/dist/components/form/engine/CompactRow.js +284 -42
- package/dist/components/form/engine/CompactRow.js.map +1 -1
- package/dist/components/form/engine/CompactToolbar.d.ts.map +1 -1
- package/dist/components/form/engine/CompactToolbar.js +72 -72
- package/dist/components/form/engine/CompactToolbar.js.map +1 -1
- package/dist/components/form/engine/FormEngine.d.ts +48 -1
- package/dist/components/form/engine/FormEngine.d.ts.map +1 -1
- package/dist/components/form/engine/FormEngine.js +163 -75
- package/dist/components/form/engine/FormEngine.js.map +1 -1
- package/dist/components/form/engine/_structuredData/SchemaDataView.d.ts.map +1 -1
- package/dist/components/form/engine/_structuredData/SchemaDataView.js +102 -87
- package/dist/components/form/engine/_structuredData/SchemaDataView.js.map +1 -1
- package/dist/components/form/engine/compactRowStyles.d.ts +2 -0
- package/dist/components/form/engine/compactRowStyles.d.ts.map +1 -1
- package/dist/components/form/engine/compactRowStyles.js +22 -5
- package/dist/components/form/engine/compactRowStyles.js.map +1 -1
- package/dist/components/form/engine/compactToolbarContext.d.ts +8 -0
- package/dist/components/form/engine/compactToolbarContext.d.ts.map +1 -1
- package/dist/components/form/engine/compactToolbarContext.js.map +1 -1
- package/dist/components/form/engine/readFirst.d.ts +57 -1
- package/dist/components/form/engine/readFirst.d.ts.map +1 -1
- package/dist/components/form/engine/readFirst.js +143 -4
- package/dist/components/form/engine/readFirst.js.map +1 -1
- package/dist/components/form/fields/Field.d.ts.map +1 -1
- package/dist/components/form/fields/Field.js +1 -1
- package/dist/components/form/fields/Field.js.map +1 -1
- package/dist/components/form/fields/allowed-values/AllowedValues.d.ts +12 -2
- package/dist/components/form/fields/allowed-values/AllowedValues.d.ts.map +1 -1
- package/dist/components/form/fields/allowed-values/AllowedValues.js +16 -6
- package/dist/components/form/fields/allowed-values/AllowedValues.js.map +1 -1
- package/dist/components/form/fields/array/ArrayAuto.d.ts.map +1 -1
- package/dist/components/form/fields/array/ArrayAuto.js +44 -26
- package/dist/components/form/fields/array/ArrayAuto.js.map +1 -1
- package/dist/components/form/fields/array/ArrayAutoField.d.ts.map +1 -1
- package/dist/components/form/fields/array/ArrayAutoField.js +42 -25
- package/dist/components/form/fields/array/ArrayAutoField.js.map +1 -1
- package/dist/components/form/fields/auto/AutoFormField.d.ts.map +1 -1
- package/dist/components/form/fields/auto/AutoFormField.js +32 -4
- package/dist/components/form/fields/auto/AutoFormField.js.map +1 -1
- package/dist/components/form/fields/long-string/LongString.d.ts +9 -1
- package/dist/components/form/fields/long-string/LongString.d.ts.map +1 -1
- package/dist/components/form/fields/long-string/LongString.js +25 -4
- package/dist/components/form/fields/long-string/LongString.js.map +1 -1
- package/dist/components/form/fields/template/ExampleValueModal.d.ts +29 -0
- package/dist/components/form/fields/template/ExampleValueModal.d.ts.map +1 -0
- package/dist/components/form/fields/template/ExampleValueModal.js +122 -0
- package/dist/components/form/fields/template/ExampleValueModal.js.map +1 -0
- package/dist/components/form/fields/template/ReadOnlyTemplateTag.d.ts.map +1 -1
- package/dist/components/form/fields/template/ReadOnlyTemplateTag.js +3 -3
- package/dist/components/form/fields/template/ReadOnlyTemplateTag.js.map +1 -1
- package/dist/components/form/fields/template/TemplateField.d.ts.map +1 -1
- package/dist/components/form/fields/template/TemplateField.js +35 -6
- package/dist/components/form/fields/template/TemplateField.js.map +1 -1
- package/dist/components/form/fields/template/__fixtures__/longExampleValue.d.ts +2 -0
- package/dist/components/form/fields/template/__fixtures__/longExampleValue.d.ts.map +1 -0
- package/dist/components/form/fields/template/__fixtures__/longExampleValue.js +9 -0
- package/dist/components/form/fields/template/__fixtures__/longExampleValue.js.map +1 -0
- package/dist/components/form/index.d.ts +1 -0
- package/dist/components/form/index.d.ts.map +1 -1
- package/dist/components/form/index.js +1 -0
- package/dist/components/form/index.js.map +1 -1
- package/dist/helpers/common.d.ts +8 -1
- package/dist/helpers/common.d.ts.map +1 -1
- package/dist/helpers/common.js +9 -1
- package/dist/helpers/common.js.map +1 -1
- package/dist/helpers/optionUiTypes.d.ts +30 -0
- package/dist/helpers/optionUiTypes.d.ts.map +1 -0
- package/dist/helpers/optionUiTypes.js +148 -0
- package/dist/helpers/optionUiTypes.js.map +1 -0
- package/dist/helpers/options.d.ts +19 -0
- package/dist/helpers/options.d.ts.map +1 -1
- package/dist/helpers/options.js +25 -1
- package/dist/helpers/options.js.map +1 -1
- package/dist/helpers/providerValue.d.ts +68 -0
- package/dist/helpers/providerValue.d.ts.map +1 -0
- package/dist/helpers/providerValue.js +50 -0
- package/dist/helpers/providerValue.js.map +1 -0
- package/dist/helpers/singleLineString.d.ts +37 -0
- package/dist/helpers/singleLineString.d.ts.map +1 -0
- package/dist/helpers/singleLineString.js +66 -0
- package/dist/helpers/singleLineString.js.map +1 -0
- package/dist/helpers/templates.d.ts +100 -0
- package/dist/helpers/templates.d.ts.map +1 -1
- package/dist/helpers/templates.js +237 -4
- package/dist/helpers/templates.js.map +1 -1
- package/dist/helpers/validations.d.ts +103 -2
- package/dist/helpers/validations.d.ts.map +1 -1
- package/dist/helpers/validations.js +858 -91
- package/dist/helpers/validations.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/components/codeSize/index.tsx +79 -0
- package/src/components/form/engine/CompactRow.tsx +407 -34
- package/src/components/form/engine/CompactToolbar.tsx +105 -98
- package/src/components/form/engine/FormEngine.stories.tsx +863 -12
- package/src/components/form/engine/FormEngine.tsx +183 -33
- package/src/components/form/engine/_structuredData/SchemaDataView.stories.tsx +110 -103
- package/src/components/form/engine/_structuredData/SchemaDataView.tsx +132 -80
- package/src/components/form/engine/compactRowStyles.ts +44 -1
- package/src/components/form/engine/compactToolbarContext.ts +8 -0
- package/src/components/form/engine/readFirst.ts +163 -4
- package/src/components/form/fields/Field.tsx +3 -1
- package/src/components/form/fields/allowed-values/AllowedValues.tsx +24 -2
- package/src/components/form/fields/array/ArrayAuto.tsx +23 -4
- package/src/components/form/fields/array/ArrayAutoField.stories.tsx +134 -0
- package/src/components/form/fields/array/ArrayAutoField.tsx +22 -4
- package/src/components/form/fields/auto/AutoFormField.tsx +31 -1
- package/src/components/form/fields/long-string/LongString.tsx +46 -5
- package/src/components/form/fields/schema-definition/SchemaDefinitionField.stories.tsx +5 -0
- package/src/components/form/fields/template/ExampleValueModal.stories.tsx +114 -0
- package/src/components/form/fields/template/ExampleValueModal.tsx +99 -0
- package/src/components/form/fields/template/ReadOnlyTemplateTag.tsx +8 -4
- package/src/components/form/fields/template/TemplateField.stories.tsx +314 -1
- package/src/components/form/fields/template/TemplateField.tsx +47 -8
- package/src/components/form/fields/template/__fixtures__/longExampleValue.ts +7 -0
- package/src/components/form/index.tsx +1 -0
- package/src/helpers/common.ts +11 -1
- package/src/helpers/optionUiTypes.ts +153 -0
- package/src/helpers/options.ts +23 -0
- package/src/helpers/providerValue.ts +125 -0
- package/src/helpers/singleLineString.ts +61 -0
- package/src/helpers/templates.ts +272 -3
- package/src/helpers/validations.ts +1177 -109
- package/src/hooks/useWebSocket/useWebsocket.stories.tsx +23 -2
- package/src/index.tsx +2 -0
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { ReqoreModal, ReqoreTextarea, useReqoreProperty } from '@qoretechnologies/reqore';
|
|
2
|
+
import { IReqoreModalProps } from '@qoretechnologies/reqore/dist/components/Modal';
|
|
3
|
+
import { CSSProperties, memo, useCallback } from 'react';
|
|
4
|
+
|
|
5
|
+
export interface IReqraftTemplateExampleValueModalProps extends Partial<IReqoreModalProps> {
|
|
6
|
+
/** The template field's display name — the modal heading. */
|
|
7
|
+
label?: string;
|
|
8
|
+
/** The FULL serialized example value. */
|
|
9
|
+
value: string;
|
|
10
|
+
/** Copy-action label. @default 'Copy' */
|
|
11
|
+
copyLabel?: string;
|
|
12
|
+
/**
|
|
13
|
+
* Notification shown after a successful copy (prop-overridable so consumers
|
|
14
|
+
* can pass translated copy — same contract as `ReqoreExportModal`).
|
|
15
|
+
* @default 'Example value copied to clipboard'
|
|
16
|
+
*/
|
|
17
|
+
copyNotificationContent?: string;
|
|
18
|
+
/** Notification shown when the browser denies clipboard access. @default 'Could not copy to clipboard' */
|
|
19
|
+
copyFailedNotificationContent?: string;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/* Fill the modal's fixed-height body instead of scaling with content: a
|
|
23
|
+
content-scaled textarea either stops short of the body (dead space below, a
|
|
24
|
+
partial-height scrollbar) or explodes it on huge values. Filling hands the
|
|
25
|
+
whole body to the textarea, so its scrollbar spans the modal body. Module
|
|
26
|
+
scope for stable identity. */
|
|
27
|
+
const FILL_STYLE: CSSProperties = { height: '100%' };
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Full example-value viewer for template/context-data items whose
|
|
31
|
+
* `example_value` is too long for the picker's item description (a
|
|
32
|
+
* binary-carrying field's example can be an entire base64 file). Opened by the
|
|
33
|
+
* "?" item action wired in `helpers/templates.ts` via reqore's global
|
|
34
|
+
* `modalStore.addModal()` — the modals wrapper injects `isOpen`/`onClose`, so
|
|
35
|
+
* this component stays presentation-only (pass `isOpen` yourself only when
|
|
36
|
+
* rendering it standalone, e.g. in a story).
|
|
37
|
+
*/
|
|
38
|
+
export const ReqraftTemplateExampleValueModal = memo(
|
|
39
|
+
({
|
|
40
|
+
label,
|
|
41
|
+
value,
|
|
42
|
+
copyLabel = 'Copy',
|
|
43
|
+
copyNotificationContent = 'Example value copied to clipboard',
|
|
44
|
+
copyFailedNotificationContent = 'Could not copy to clipboard',
|
|
45
|
+
...rest
|
|
46
|
+
}: IReqraftTemplateExampleValueModalProps) => {
|
|
47
|
+
const addNotification = useReqoreProperty('addNotification');
|
|
48
|
+
|
|
49
|
+
const handleCopyClick = useCallback(async () => {
|
|
50
|
+
// Clipboard access can be denied (permissions, insecure context) — the
|
|
51
|
+
// failure surfaces as a notification instead of an unhandled rejection.
|
|
52
|
+
try {
|
|
53
|
+
await navigator.clipboard.writeText(value);
|
|
54
|
+
addNotification({
|
|
55
|
+
content: copyNotificationContent,
|
|
56
|
+
intent: 'success',
|
|
57
|
+
duration: 3000,
|
|
58
|
+
});
|
|
59
|
+
} catch (error) {
|
|
60
|
+
addNotification({
|
|
61
|
+
content: copyFailedNotificationContent,
|
|
62
|
+
intent: 'danger',
|
|
63
|
+
duration: 3000,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}, [value, addNotification, copyNotificationContent, copyFailedNotificationContent]);
|
|
67
|
+
|
|
68
|
+
return (
|
|
69
|
+
<ReqoreModal
|
|
70
|
+
label={label || 'Example value'}
|
|
71
|
+
icon='FileTextLine'
|
|
72
|
+
height='70vh'
|
|
73
|
+
className='reqraft-template-example-value-modal'
|
|
74
|
+
bottomActions={[
|
|
75
|
+
{
|
|
76
|
+
position: 'right',
|
|
77
|
+
label: copyLabel,
|
|
78
|
+
icon: 'ClipboardLine',
|
|
79
|
+
onClick: () => {
|
|
80
|
+
handleCopyClick();
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
]}
|
|
84
|
+
{...rest}
|
|
85
|
+
>
|
|
86
|
+
<ReqoreTextarea
|
|
87
|
+
readOnly
|
|
88
|
+
value={value}
|
|
89
|
+
minimal
|
|
90
|
+
fluid
|
|
91
|
+
style={FILL_STYLE}
|
|
92
|
+
wrapperStyle={FILL_STYLE}
|
|
93
|
+
/>
|
|
94
|
+
</ReqoreModal>
|
|
95
|
+
);
|
|
96
|
+
}
|
|
97
|
+
);
|
|
98
|
+
|
|
99
|
+
ReqraftTemplateExampleValueModal.displayName = 'ReqraftTemplateExampleValueModal';
|
|
@@ -2,7 +2,11 @@ import { ReqoreTag, ReqoreTagGroup } from '@qoretechnologies/reqore';
|
|
|
2
2
|
import { IReqoreFormTemplates } from '@qoretechnologies/reqore/dist/components/Textarea';
|
|
3
3
|
import { TSizes } from '@qoretechnologies/reqore/dist/constants/sizes';
|
|
4
4
|
import { memo } from 'react';
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
getTemplateTagStyle,
|
|
7
|
+
describeTemplateReference,
|
|
8
|
+
TTemplateMeta,
|
|
9
|
+
} from '../../../../helpers/templates';
|
|
6
10
|
|
|
7
11
|
export interface IReadOnlyTemplateTagProps {
|
|
8
12
|
/** The template reference value, e.g. `$local:test`. */
|
|
@@ -22,14 +26,14 @@ export interface IReadOnlyTemplateTagProps {
|
|
|
22
26
|
*/
|
|
23
27
|
export const ReadOnlyTemplateTag = memo(
|
|
24
28
|
({ value, templates, size }: IReadOnlyTemplateTagProps) => {
|
|
25
|
-
const
|
|
26
|
-
const metadata =
|
|
29
|
+
const { label, item } = describeTemplateReference(templates, value);
|
|
30
|
+
const metadata = item?.metadata as TTemplateMeta | undefined;
|
|
27
31
|
return (
|
|
28
32
|
<ReqoreTagGroup size={size}>
|
|
29
33
|
<ReqoreTag
|
|
30
34
|
icon='ExchangeDollarLine'
|
|
31
35
|
leftIconProps={{ image: metadata?.image }}
|
|
32
|
-
label={
|
|
36
|
+
label={label}
|
|
33
37
|
tooltip={value}
|
|
34
38
|
{...getTemplateTagStyle(metadata)}
|
|
35
39
|
/>
|
|
@@ -19,6 +19,7 @@ import { AutoFormField as auto } from '../auto/AutoFormField';
|
|
|
19
19
|
import LongStringFormField from '../long-string/LongString';
|
|
20
20
|
import NumberFormField from '../number/Number';
|
|
21
21
|
import { StringFormField } from '../string/String';
|
|
22
|
+
import { LONG_EXAMPLE_VALUE } from './__fixtures__/longExampleValue';
|
|
22
23
|
import { TemplateField } from './TemplateField';
|
|
23
24
|
import multiLevelTemplates from './__fixtures__/multiLevelTemplates.json';
|
|
24
25
|
import templates from './__fixtures__/templates.json';
|
|
@@ -307,6 +308,158 @@ export const TemplateValue: StoryObj<typeof meta> = {
|
|
|
307
308
|
},
|
|
308
309
|
};
|
|
309
310
|
|
|
311
|
+
/** REGRESSION — a rehydrated whole-token template value (the FSM state-output
|
|
312
|
+
* `$data:{…}` form above all) must render as the picker CHIP, not as its raw
|
|
313
|
+
* token text in a string editor. */
|
|
314
|
+
export const BracedTemplateValue: StoryObj<typeof meta> = {
|
|
315
|
+
args: {
|
|
316
|
+
component: LongStringField,
|
|
317
|
+
type: 'string',
|
|
318
|
+
allowTemplates: true,
|
|
319
|
+
allowCustomValues: true,
|
|
320
|
+
value: '$data:{W2n_BuSHbaNrbvV1MkfPF.filename}',
|
|
321
|
+
templates: buildTemplates({
|
|
322
|
+
state_outputs: {
|
|
323
|
+
display_name: 'Context Data',
|
|
324
|
+
short_desc: 'Outputs of previous states',
|
|
325
|
+
app: 'GoogleDrive',
|
|
326
|
+
items: [
|
|
327
|
+
{
|
|
328
|
+
name: 'filename',
|
|
329
|
+
display_name: 'Filename',
|
|
330
|
+
short_desc: 'The uploaded file name',
|
|
331
|
+
desc: 'The uploaded file name',
|
|
332
|
+
value: '$data:{W2n_BuSHbaNrbvV1MkfPF.filename}',
|
|
333
|
+
type: 'string',
|
|
334
|
+
},
|
|
335
|
+
],
|
|
336
|
+
},
|
|
337
|
+
} as any),
|
|
338
|
+
},
|
|
339
|
+
parameters: {
|
|
340
|
+
docs: {
|
|
341
|
+
description: {
|
|
342
|
+
story:
|
|
343
|
+
'Renders TemplateField for a string field whose saved value is a braced state-output reference ($data:{id.filename}) — the field shows the resolved picker chip ("Filename"), never the raw token in a textarea, which is what rehydrated drafts degraded to before the token grammar learned braces.',
|
|
344
|
+
},
|
|
345
|
+
},
|
|
346
|
+
},
|
|
347
|
+
play: async () => {
|
|
348
|
+
await waitFor(() => {
|
|
349
|
+
const chip = Array.from(document.querySelectorAll('.reqore-button')).find((button) =>
|
|
350
|
+
button.textContent?.includes('Filename')
|
|
351
|
+
);
|
|
352
|
+
expect(chip, 'the braced value renders as the labeled picker chip').toBeTruthy();
|
|
353
|
+
});
|
|
354
|
+
const rawTextareas = Array.from(document.querySelectorAll('textarea')).filter((textarea) =>
|
|
355
|
+
textarea.value.includes('$data:{')
|
|
356
|
+
);
|
|
357
|
+
expect(rawTextareas, 'no textarea holds the raw token').toHaveLength(0);
|
|
358
|
+
},
|
|
359
|
+
};
|
|
360
|
+
|
|
361
|
+
/** A template-authored Qog keys its states `'1'`, `'2'`, … while each state
|
|
362
|
+
* carries its own id, and its saved `$data:{…}` refs use that id — so the
|
|
363
|
+
* catalogue (spelled with the key) and the value (spelled with the id) never
|
|
364
|
+
* match as text. The producer supplies the alternate spelling as an alias so
|
|
365
|
+
* the chip still resolves to a name instead of printing the raw token. */
|
|
366
|
+
export const AliasedStateTemplateValue: StoryObj<typeof meta> = {
|
|
367
|
+
args: {
|
|
368
|
+
component: LongStringField,
|
|
369
|
+
type: 'string',
|
|
370
|
+
allowTemplates: true,
|
|
371
|
+
allowCustomValues: true,
|
|
372
|
+
// what the Qog has saved — the state's own id
|
|
373
|
+
value: '$data:{dc_ai_reply.choices}',
|
|
374
|
+
templates: {
|
|
375
|
+
items: [
|
|
376
|
+
{
|
|
377
|
+
label: 'Generate AI Reply',
|
|
378
|
+
description: 'Outputs of the Groq chat-completion state',
|
|
379
|
+
items: [
|
|
380
|
+
{
|
|
381
|
+
label: 'Choices',
|
|
382
|
+
// what the server's catalogue offers — the states-hash key
|
|
383
|
+
value: '$data:{3.choices}',
|
|
384
|
+
badge: 'list',
|
|
385
|
+
metadata: { aliasValues: ['$data:{dc_ai_reply.choices}'] },
|
|
386
|
+
},
|
|
387
|
+
],
|
|
388
|
+
},
|
|
389
|
+
],
|
|
390
|
+
} as any,
|
|
391
|
+
},
|
|
392
|
+
parameters: {
|
|
393
|
+
docs: {
|
|
394
|
+
description: {
|
|
395
|
+
story:
|
|
396
|
+
'Renders TemplateField holding a state-output reference spelled with the state id ($data:{dc_ai_reply.choices}) while the catalogue offers the same item spelled with the states-hash key ($data:{3.choices}) — the chip resolves through the item alias and shows "Choices", where it used to print the raw token.',
|
|
397
|
+
},
|
|
398
|
+
},
|
|
399
|
+
},
|
|
400
|
+
play: async () => {
|
|
401
|
+
await waitFor(() => {
|
|
402
|
+
const chip = Array.from(document.querySelectorAll('.reqore-button')).find((button) =>
|
|
403
|
+
button.textContent?.includes('Choices')
|
|
404
|
+
);
|
|
405
|
+
expect(chip, 'the aliased value resolves to the labeled picker chip').toBeTruthy();
|
|
406
|
+
});
|
|
407
|
+
const rawChips = Array.from(document.querySelectorAll('.reqore-button')).filter((button) =>
|
|
408
|
+
button.textContent?.includes('$data:{')
|
|
409
|
+
);
|
|
410
|
+
expect(rawChips, 'no chip prints the raw token').toHaveLength(0);
|
|
411
|
+
},
|
|
412
|
+
};
|
|
413
|
+
|
|
414
|
+
/** A catalogue can only offer what the action's output type declares, so it
|
|
415
|
+
* stops at a list — `choices` is offered, `choices[0].message.content` is
|
|
416
|
+
* hand-written past it. Such a value has no item of its own and used to
|
|
417
|
+
* render as its raw token; it is now named after its nearest ancestor. */
|
|
418
|
+
export const ExtendedPathTemplateValue: StoryObj<typeof meta> = {
|
|
419
|
+
args: {
|
|
420
|
+
component: LongStringField,
|
|
421
|
+
type: 'string',
|
|
422
|
+
allowTemplates: true,
|
|
423
|
+
allowCustomValues: true,
|
|
424
|
+
value: '$data:{dc_ai_reply.choices[0].message.content}',
|
|
425
|
+
templates: {
|
|
426
|
+
items: [
|
|
427
|
+
{
|
|
428
|
+
label: 'Generate AI Reply',
|
|
429
|
+
items: [
|
|
430
|
+
{
|
|
431
|
+
label: 'Choices',
|
|
432
|
+
value: '$data:{3.choices}',
|
|
433
|
+
badge: 'list',
|
|
434
|
+
metadata: { aliasValues: ['$data:{dc_ai_reply.choices}'] },
|
|
435
|
+
},
|
|
436
|
+
],
|
|
437
|
+
},
|
|
438
|
+
],
|
|
439
|
+
} as any,
|
|
440
|
+
},
|
|
441
|
+
parameters: {
|
|
442
|
+
docs: {
|
|
443
|
+
description: {
|
|
444
|
+
story:
|
|
445
|
+
'Renders TemplateField holding a path extended past the named field it starts from ($data:{dc_ai_reply.choices[0].message.content}, where the catalogue only offers "choices") — the chip is named after its nearest ancestor as "Choices[0].message.content" instead of printing the raw token.',
|
|
446
|
+
},
|
|
447
|
+
},
|
|
448
|
+
},
|
|
449
|
+
play: async () => {
|
|
450
|
+
await waitFor(() => {
|
|
451
|
+
const chip = Array.from(document.querySelectorAll('.reqore-button')).find((button) =>
|
|
452
|
+
button.textContent?.includes('Choices[0].message.content')
|
|
453
|
+
);
|
|
454
|
+
expect(chip, 'the extended path is named after its ancestor').toBeTruthy();
|
|
455
|
+
});
|
|
456
|
+
const rawChips = Array.from(document.querySelectorAll('.reqore-button')).filter((button) =>
|
|
457
|
+
button.textContent?.includes('$data:{')
|
|
458
|
+
);
|
|
459
|
+
expect(rawChips, 'no chip prints the raw token').toHaveLength(0);
|
|
460
|
+
},
|
|
461
|
+
};
|
|
462
|
+
|
|
310
463
|
export const ElementTypeInListShowsCorrectTemplates: StoryObj<typeof meta> = {
|
|
311
464
|
args: {
|
|
312
465
|
component: auto,
|
|
@@ -521,7 +674,7 @@ export const TemplateCanBeSelected: StoryObj<typeof meta> = {
|
|
|
521
674
|
docs: {
|
|
522
675
|
description: {
|
|
523
676
|
story:
|
|
524
|
-
'Renders TemplateField for a string, opens the templates popover and clicks the Interface ID template — the field switches to the $local:id template value.',
|
|
677
|
+
'Renders TemplateField for a string, opens the templates popover and clicks the Interface ID template — the field switches to the $local:id template value inside the template-offering input (plain word tokens stay typeable; only braced context refs chip).',
|
|
525
678
|
},
|
|
526
679
|
},
|
|
527
680
|
},
|
|
@@ -652,3 +805,163 @@ export const TemplateWithItemsCanBeSelected: StoryObj<typeof meta> = {
|
|
|
652
805
|
await _testsWaitForText('Testing Hash');
|
|
653
806
|
},
|
|
654
807
|
};
|
|
808
|
+
|
|
809
|
+
/* One group, four items covering every affordance combination:
|
|
810
|
+
- "Attachment Body" — leaf, LONG example → "?" (right) only
|
|
811
|
+
- "Attachment Name" — leaf, short example → no actions at all
|
|
812
|
+
- "Message Author Props" — hash with children, LONG example (the whole
|
|
813
|
+
object) → BOTH: the "+" select action (left) and the "?" (right)
|
|
814
|
+
- "Delivery Flags" — hash with children, short example → "+" only
|
|
815
|
+
The sentinel at the very end proves truncation in the picker and
|
|
816
|
+
completeness in the modal. */
|
|
817
|
+
const longExampleTemplates = {
|
|
818
|
+
gmail_attachment: {
|
|
819
|
+
display_name: 'New Attachment',
|
|
820
|
+
short_desc: 'Data from the attachment trigger',
|
|
821
|
+
app: 'Gmail',
|
|
822
|
+
items: [
|
|
823
|
+
{
|
|
824
|
+
name: 'attachment_body',
|
|
825
|
+
display_name: 'Attachment Body',
|
|
826
|
+
value: '$data:{on_attachment.data}',
|
|
827
|
+
type: 'data',
|
|
828
|
+
example_value: LONG_EXAMPLE_VALUE,
|
|
829
|
+
},
|
|
830
|
+
{
|
|
831
|
+
name: 'attachment_name',
|
|
832
|
+
display_name: 'Attachment Name',
|
|
833
|
+
value: '$data:{on_attachment.name}',
|
|
834
|
+
type: 'string',
|
|
835
|
+
example_value: 'invoice.pdf',
|
|
836
|
+
},
|
|
837
|
+
{
|
|
838
|
+
name: 'author',
|
|
839
|
+
display_name: 'Message Author Properties',
|
|
840
|
+
value: '$data:{on_attachment.author}',
|
|
841
|
+
type: 'hash',
|
|
842
|
+
// A parent's example is the whole object, so it goes long almost by
|
|
843
|
+
// definition — this is the "+ AND ?" case.
|
|
844
|
+
example_value: {
|
|
845
|
+
name: 'Ada Lovelace',
|
|
846
|
+
email: 'ada@example.com',
|
|
847
|
+
signature: LONG_EXAMPLE_VALUE.slice(0, 600),
|
|
848
|
+
},
|
|
849
|
+
items: [
|
|
850
|
+
{
|
|
851
|
+
name: 'author_name',
|
|
852
|
+
display_name: 'Name',
|
|
853
|
+
value: '$data:{on_attachment.author.name}',
|
|
854
|
+
type: 'string',
|
|
855
|
+
example_value: 'Ada Lovelace',
|
|
856
|
+
},
|
|
857
|
+
{
|
|
858
|
+
name: 'author_email',
|
|
859
|
+
display_name: 'Email',
|
|
860
|
+
value: '$data:{on_attachment.author.email}',
|
|
861
|
+
type: 'string',
|
|
862
|
+
example_value: 'ada@example.com',
|
|
863
|
+
},
|
|
864
|
+
],
|
|
865
|
+
},
|
|
866
|
+
{
|
|
867
|
+
name: 'flags',
|
|
868
|
+
display_name: 'Delivery Flags',
|
|
869
|
+
value: '$data:{on_attachment.flags}',
|
|
870
|
+
type: 'hash',
|
|
871
|
+
// Small object: the serialized example stays under the preview
|
|
872
|
+
// threshold, so this parent keeps ONLY the "+" select action.
|
|
873
|
+
example_value: { read: true },
|
|
874
|
+
items: [
|
|
875
|
+
{
|
|
876
|
+
name: 'flags_read',
|
|
877
|
+
display_name: 'Read',
|
|
878
|
+
value: '$data:{on_attachment.flags.read}',
|
|
879
|
+
type: 'bool',
|
|
880
|
+
example_value: true,
|
|
881
|
+
},
|
|
882
|
+
],
|
|
883
|
+
},
|
|
884
|
+
],
|
|
885
|
+
},
|
|
886
|
+
};
|
|
887
|
+
|
|
888
|
+
export const LongExampleValueTruncatedWithModal: StoryObj<typeof meta> = {
|
|
889
|
+
args: {
|
|
890
|
+
component: LongStringField,
|
|
891
|
+
value: 'Some string',
|
|
892
|
+
type: 'string',
|
|
893
|
+
templates: buildTemplates(longExampleTemplates as any),
|
|
894
|
+
},
|
|
895
|
+
parameters: {
|
|
896
|
+
docs: {
|
|
897
|
+
description: {
|
|
898
|
+
story:
|
|
899
|
+
'Every item-affordance combination in one picker: a leaf with a whole-base64-file example gets a single-line ellipsized preview (cut at the popover\'s actual width — no breakpoints) and the "?" action (right) opening the full value in a modal; a hash parent whose own example object is long gets BOTH the "+" select action (left) and the "?"; a small hash parent keeps only the "+"; and a short leaf keeps its full wrapped preview with no actions. Neither previewing nor copying ever selects an item.',
|
|
900
|
+
},
|
|
901
|
+
},
|
|
902
|
+
},
|
|
903
|
+
play: async ({ args }) => {
|
|
904
|
+
await _testsOpenTemplates();
|
|
905
|
+
await _testsWaitForText('Attachment Body');
|
|
906
|
+
|
|
907
|
+
// The picker shows TRUNCATED previews — the long value's tail sentinel
|
|
908
|
+
// must not be in the popover…
|
|
909
|
+
const popover = document.querySelector('.reqore-popover-content');
|
|
910
|
+
await expect(popover.textContent).toContain('Example value: "JVBERi0x');
|
|
911
|
+
await expect(popover.textContent).not.toContain('THE_VERY_END');
|
|
912
|
+
|
|
913
|
+
// …and the affordances land exactly by shape: "?" on the long leaf AND
|
|
914
|
+
// the long-example hash parent (2), "+" on both hash parents (2) — the
|
|
915
|
+
// long-example parent carries both at once. The short leaf and the small
|
|
916
|
+
// parent's example stay modal-free.
|
|
917
|
+
await expect(popover.querySelectorAll('.reqore-menu-item-right-action').length).toBe(2);
|
|
918
|
+
await expect(popover.querySelectorAll('.reqore-menu-item-left-action').length).toBe(2);
|
|
919
|
+
|
|
920
|
+
// Long previews are single-line ellipsized at the RENDERED width
|
|
921
|
+
// (container-intrinsic — the same item adapts to any popover width);
|
|
922
|
+
// short previews keep normal wrapping.
|
|
923
|
+
const descriptions = popover.querySelectorAll('.reqore-button-description');
|
|
924
|
+
const longDescription = Array.from(descriptions).find((el) =>
|
|
925
|
+
el.textContent?.includes('JVBERi0x')
|
|
926
|
+
) as HTMLElement;
|
|
927
|
+
const shortDescription = Array.from(descriptions).find((el) =>
|
|
928
|
+
el.textContent?.includes('invoice.pdf')
|
|
929
|
+
) as HTMLElement;
|
|
930
|
+
await expect(getComputedStyle(longDescription).whiteSpace).toBe('nowrap');
|
|
931
|
+
await expect(longDescription.scrollWidth).toBeGreaterThan(longDescription.clientWidth);
|
|
932
|
+
await expect(getComputedStyle(shortDescription).whiteSpace).not.toBe('nowrap');
|
|
933
|
+
|
|
934
|
+
await _testsClickButton({ selector: '.reqore-menu-item-right-action' });
|
|
935
|
+
|
|
936
|
+
const modal = await waitFor(
|
|
937
|
+
() => {
|
|
938
|
+
const el = document.querySelector('.reqraft-template-example-value-modal');
|
|
939
|
+
if (!el) throw new Error('modal not open yet');
|
|
940
|
+
return el;
|
|
941
|
+
},
|
|
942
|
+
{ timeout: 10000 }
|
|
943
|
+
);
|
|
944
|
+
|
|
945
|
+
// The modal holds the WHOLE value, down to the sentinel.
|
|
946
|
+
const textarea = modal.querySelector('textarea') as HTMLTextAreaElement;
|
|
947
|
+
await expect(textarea.value.endsWith('THE_VERY_END"')).toBe(true);
|
|
948
|
+
|
|
949
|
+
// Close it; opening/previewing must never have selected the item.
|
|
950
|
+
fireEvent.click(modal.querySelector('.reqore-drawer-close-button'));
|
|
951
|
+
await waitFor(
|
|
952
|
+
() => {
|
|
953
|
+
if (document.querySelector('.reqraft-template-example-value-modal')) {
|
|
954
|
+
throw new Error('modal still open');
|
|
955
|
+
}
|
|
956
|
+
},
|
|
957
|
+
{ timeout: 10000 }
|
|
958
|
+
);
|
|
959
|
+
await expect(args.onChange).not.toHaveBeenCalled();
|
|
960
|
+
|
|
961
|
+
// End on the informative frame for the visual snapshot: the popover with
|
|
962
|
+
// the truncated preview and its "?" action visible (the assertions above
|
|
963
|
+
// close everything, which would leave the capture showing an empty field).
|
|
964
|
+
await _testsOpenTemplates();
|
|
965
|
+
await _testsWaitForText('Attachment Body');
|
|
966
|
+
},
|
|
967
|
+
};
|
|
@@ -30,9 +30,11 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react';
|
|
|
30
30
|
import { useUpdateEffect } from 'react-use';
|
|
31
31
|
import {
|
|
32
32
|
filterTemplatesByType as templatesFilterFunc,
|
|
33
|
-
findTemplate,
|
|
34
33
|
getTemplateKey,
|
|
35
34
|
getTemplateValue,
|
|
35
|
+
isBracedTemplateToken,
|
|
36
|
+
isCompleteTemplateToken,
|
|
37
|
+
describeTemplateReference,
|
|
36
38
|
isValueTemplate,
|
|
37
39
|
} from '../../../../helpers/templates';
|
|
38
40
|
import { getTypeFromValue } from '../../../../helpers/validations';
|
|
@@ -72,8 +74,17 @@ export const TemplatesListProps: IReqoreDropdownProps = {
|
|
|
72
74
|
// markup stays verbatim. `type`/`level`/`allowTemplates` are destructured
|
|
73
75
|
// only to keep them off the underlying ReQore component / DOM.
|
|
74
76
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
77
|
+
// `type` is FORWARDED here, unlike the other wrappers below: the long-string
|
|
78
|
+
// field consumes it to decide whether it holds one line (a `string` does, a
|
|
79
|
+
// `long-string`, `hash` or `list` does not) and never spreads it to the DOM.
|
|
80
|
+
// Dropping it made every string field in every FormEngine form a growing
|
|
81
|
+
// textarea, so an alert rule's Internal Name took Enter.
|
|
75
82
|
const LongStringField = ({ name, onChange, type, level, allowTemplates, ...rest }: any) => (
|
|
76
|
-
<LongStringFormField
|
|
83
|
+
<LongStringFormField
|
|
84
|
+
{...rest}
|
|
85
|
+
type={type}
|
|
86
|
+
onChange={(value: string) => onChange?.(name, value)}
|
|
87
|
+
/>
|
|
77
88
|
);
|
|
78
89
|
const Number = ({ name, onChange, type, level, allowTemplates, ...rest }: any) => (
|
|
79
90
|
<NumberFormField {...rest} onChange={(value: number | string) => onChange?.(name, value)} />
|
|
@@ -216,8 +227,13 @@ export const TemplateDropdownSelector = memo(
|
|
|
216
227
|
size,
|
|
217
228
|
...rest
|
|
218
229
|
}: ITemplateDropdownSelectorProps) => {
|
|
219
|
-
|
|
220
|
-
|
|
230
|
+
// One resolver for every surface that names a reference — the picker chip
|
|
231
|
+
// here, the read-only tag, and the compact row's expression summary. The
|
|
232
|
+
// row and this editor must agree: a reference that reads as its path when
|
|
233
|
+
// the row is closed cannot read as `$data:{…}` the moment it is opened.
|
|
234
|
+
const resolved = describeTemplateReference(templates, value);
|
|
235
|
+
const template = resolved.item;
|
|
236
|
+
const label = resolved.label || rest.label || 'Select Template';
|
|
221
237
|
const leftIconProps = useMemo(
|
|
222
238
|
(): IReqoreButtonProps['leftIconProps'] => ({
|
|
223
239
|
image: template?.metadata?.image,
|
|
@@ -335,8 +351,15 @@ export const TemplateField = memo(
|
|
|
335
351
|
|
|
336
352
|
useEffect(() => {
|
|
337
353
|
if (!isTemplate && isValueTemplate(value) && allowTemplates) {
|
|
338
|
-
//
|
|
339
|
-
|
|
354
|
+
// In auto mode, leave user-typed dollar-strings alone ('$foo: hello'
|
|
355
|
+
// passes the loose check) — but a string that IS one well-formed token
|
|
356
|
+
// ($data:{…}, $config:item) must still flip into template mode, or an
|
|
357
|
+
// arg whose value hydrates after mount is stuck rendering raw text.
|
|
358
|
+
if (
|
|
359
|
+
type === 'auto' &&
|
|
360
|
+
getTypeFromValue(value) === 'string' &&
|
|
361
|
+
!isCompleteTemplateToken(value)
|
|
362
|
+
) {
|
|
340
363
|
return;
|
|
341
364
|
}
|
|
342
365
|
|
|
@@ -359,6 +382,15 @@ export const TemplateField = memo(
|
|
|
359
382
|
|
|
360
383
|
const showTemplateToggle = allowCustomValues && allowTemplates && !rest.arg_schema;
|
|
361
384
|
|
|
385
|
+
// Only a BRACED context ref (`$data:{…}` — machine-written, nobody types
|
|
386
|
+
// one) renders as the picker chip (named via `resolveTemplateLabel`)
|
|
387
|
+
// rather than as its raw text in a string editor. Plain word-path tokens
|
|
388
|
+
// (`$local:id`) are typeable, so per the build #123 review they keep the
|
|
389
|
+
// input that offers templates while typing. Mixed text-and-token strings
|
|
390
|
+
// keep the string editor too; the chip-in-editor treatment arrives with
|
|
391
|
+
// the rich-text string mode.
|
|
392
|
+
const templateValueIsBracedToken = isBracedTemplateToken(templateValue);
|
|
393
|
+
|
|
362
394
|
const templateSupportsCustomValues =
|
|
363
395
|
allowCustomValues && type === 'string' && !hasOnlyAllowedValues;
|
|
364
396
|
const showTemplatesDropdown =
|
|
@@ -374,6 +406,11 @@ export const TemplateField = memo(
|
|
|
374
406
|
showTemplatesDropdown;
|
|
375
407
|
|
|
376
408
|
const Component = componentFromType ? ComponentMap[type] : Comp;
|
|
409
|
+
// Only a ComponentMap component gets `type`: it is ours and CONSUMES the
|
|
410
|
+
// prop (the long-string field needs it to know whether it holds one line)
|
|
411
|
+
// rather than spreading it onto the DOM. A caller-supplied `Comp` is someone
|
|
412
|
+
// else's, which is why `type` was kept off this call in the first place.
|
|
413
|
+
const componentTypeProp = componentFromType ? { type } : {};
|
|
377
414
|
const fieldAriaLabel = rest['aria-label'] ?? label ?? rest.display_name ?? name;
|
|
378
415
|
|
|
379
416
|
const filteredTemplates = useMemo<IReqoreFormTemplates>(():
|
|
@@ -746,13 +783,14 @@ export const TemplateField = memo(
|
|
|
746
783
|
name={name}
|
|
747
784
|
level={level}
|
|
748
785
|
{...rest}
|
|
786
|
+
{...componentTypeProp}
|
|
749
787
|
aria-label={fieldAriaLabel}
|
|
750
788
|
className={`${className} template-selector`}
|
|
751
789
|
templates={componentTemplates}
|
|
752
790
|
/>
|
|
753
791
|
) : null}
|
|
754
792
|
|
|
755
|
-
{isTemplate && templateSupportsCustomValues ? (
|
|
793
|
+
{isTemplate && templateSupportsCustomValues && !templateValueIsBracedToken ? (
|
|
756
794
|
<LongStringField
|
|
757
795
|
className='template-selector'
|
|
758
796
|
type='string'
|
|
@@ -769,7 +807,8 @@ export const TemplateField = memo(
|
|
|
769
807
|
/>
|
|
770
808
|
) : null}
|
|
771
809
|
|
|
772
|
-
{showTemplatesDropdown
|
|
810
|
+
{showTemplatesDropdown ||
|
|
811
|
+
(isTemplate && templateSupportsCustomValues && templateValueIsBracedToken) ? (
|
|
773
812
|
<TemplateDropdownSelector
|
|
774
813
|
allowCustomValues={allowCustomValues}
|
|
775
814
|
templates={templates}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/* A deterministic "whole base64 file" example value — the payload class the
|
|
2
|
+
example-value modal exists for (an email attachment body). No spaces on
|
|
3
|
+
purpose: the unbroken run is what breaks naive rendering. The sentinel
|
|
4
|
+
proves a consumer holds the value to the very end. */
|
|
5
|
+
export const LONG_EXAMPLE_VALUE = `${'JVBERi0xLjcKJcTl8uXrp9Og0MTGCjQgMCBvYmoKPDwvRmlsdGVyL0ZsYXRlRGVjb2RlCg=='.repeat(
|
|
6
|
+
90
|
|
7
|
+
)}THE_VERY_END`;
|
|
@@ -21,6 +21,7 @@ export * from './fields/rich-text/RichText';
|
|
|
21
21
|
export * from './fields/select/Select';
|
|
22
22
|
export * from './fields/select/SelectCollection';
|
|
23
23
|
export * from './fields/string/String';
|
|
24
|
+
export * from './fields/template/ExampleValueModal';
|
|
24
25
|
export * from './fields/template/TemplateField';
|
|
25
26
|
export * from './engine/FormEngine';
|
|
26
27
|
export * from './engine/optionActions';
|
package/src/helpers/common.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IReqoreRichTextEditorProps } from '@qoretechnologies/reqore/dist/components/RichTextEditor';
|
|
2
|
-
import { TQorusFormFieldSchema } from '@qoretechnologies/ts-toolkit';
|
|
2
|
+
import { TQorusFormFieldSchema, TQorusFormOperatorValue } from '@qoretechnologies/ts-toolkit';
|
|
3
3
|
import yaml from 'js-yaml';
|
|
4
4
|
|
|
5
5
|
// ─── Typed ↔ YAML helpers ──────────────────────────────────────────────────────
|
|
@@ -163,6 +163,16 @@ export const richtextToSegments = (
|
|
|
163
163
|
return segments;
|
|
164
164
|
};
|
|
165
165
|
|
|
166
|
+
/**
|
|
167
|
+
* An operator value as the list it logically is.
|
|
168
|
+
*
|
|
169
|
+
* An option's `op` holds either one operator or a chain of them, and both
|
|
170
|
+
* spellings are legitimate on the wire. Every reader wants the list.
|
|
171
|
+
*/
|
|
172
|
+
export const fixOperatorValue = (
|
|
173
|
+
operator: TQorusFormOperatorValue
|
|
174
|
+
): (string | null | undefined)[] => (Array.isArray(operator) ? operator : [operator]);
|
|
175
|
+
|
|
166
176
|
export const insertAtIndex = (array: any[] = [], index = 0, value: any): any[] => {
|
|
167
177
|
return [...array.slice(0, index), value, ...array.slice(index)];
|
|
168
178
|
};
|