Commit 573a816
authored
Accept _unsafe_-prefixed forward-compat fields on scenario graph DTOs (#9309)
* Allow arbitrary _unsafeExtra fields on LayoutData without validation
* Work around sbt-git's lack of git worktree support
Enable useConsoleForROGit when `.git` is a file — the telltale of a
worktree checkout — so sbt-git shells out to the git CLI for read-only
operations that its embedded JGit cannot perform against worktrees.
* Accept arbitrary _unsafe_-prefixed fields on UserDefinedAdditionalNodeFields
Replaces the nested _unsafeExtra field on LayoutData with top-level
pattern-matched fields on UserDefinedAdditionalNodeFields: any JSON
property starting with `_unsafe_` is round-tripped via a dedicated
Map[String, Json] on the case class through a hand-written Circe codec.
Tapir schema keeps the named $ref for UserDefinedAdditionalNodeFields;
extra _unsafe_* properties pass validation because JSON Schema allows
additional properties by default. The TS NodeType mirrors this with
a UnsafeOptions intersection typed as Record<`_unsafe_${string}`, unknown>.
* Accept _unsafe_-prefixed fields on ProcessAdditionalFields
Mirrors the node-level mechanism at the scenario level: any JSON property
starting with `_unsafe_` sitting next to description / properties / metaDataType
/ showDescription is round-tripped via a Map[String, Json] on the case class
through a hand-written Circe codec. A small `omitSchemaField` helper drops
the synthetic `unsafeFields` container from the derived Tapir schema (used
for both ProcessAdditionalFields and UserDefinedAdditionalNodeFields) so the
generated OpenAPI stays byte-identical. TS ProcessAdditionalFields picks up
the matching `& UnsafeOptions` intersection.
* Extract the `_unsafe_` prefix convention into shared helpers
Both ProcessAdditionalFields and UserDefinedAdditionalNodeFields inlined
the same prefix constant and the same extract/merge logic across the Circe
codecs; lift that into CirceUtil.UnsafePrefixedFields in common-api so the
prefix lives in one place. On the TS side, export the UnsafeOptions type
from node.ts and consume it from scenarioGraph.ts instead of redefining
the `_unsafe_${string}` template literal locally.
* Add codec tests for _unsafe_-prefixed additional fields
Cover the round-trip (encoder spreads the map as top-level properties, decoder
collects them back) and the symmetric check that non-prefixed extras are still
dropped, for both ProcessAdditionalFields and UserDefinedAdditionalNodeFields.
* Strip _unsafe_ fields from the scenario before it hits Flink
_unsafe_ entries are frontend-only metadata (layout, UX preferences, render
hints) that should be persisted in the saved scenario but never leak into
the Flink job graph, logs or UI. Add UnsafePrefixedFields.deepStrip that
recursively removes _unsafe_-prefixed keys from any JSON tree and expose
CanonicalProcess.withoutUnsafeFields as a round-trip wrapper over it; both
the remote and mini-cluster Flink job runners now apply it at the boundary.
* Link sbt-git PR #243 (which introduced useConsoleForROGit) instead of the stale placeholder URL
* Make `$toggleUserFlag` return the resolved flag value so Cypress can assert on it
Previously the global helper dispatched the Redux action and returned `void`,
forcing tests to separately poll the store to verify the toggle took effect.
Now it returns a Promise that resolves to the post-dispatch value, and the
Cypress `toggleUserFlag` command asserts the value matches when one was passed.1 parent 53e800d commit 573a816
15 files changed
Lines changed: 312 additions & 50 deletions
File tree
- common-api/src/main/scala/pl/touk/nussknacker/engine/api
- designer
- client
- cypress
- support
- src
- containers
- types
- deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment
- server/src/main/scala/pl/touk/nussknacker/ui/api/description
- scenario-api/src
- main/scala/pl/touk/nussknacker/engine
- canonicalgraph
- graph
- util
- test/scala/pl/touk/nussknacker/engine
- canonicalgraph
- marshall
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
1 | 2 | | |
2 | 3 | | |
3 | 4 | | |
| |||
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
57 | 67 | | |
58 | 68 | | |
59 | 69 | | |
| |||
Lines changed: 22 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
118 | 140 | | |
Lines changed: 30 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
| 90 | + | |
90 | 91 | | |
91 | 92 | | |
92 | 93 | | |
| |||
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
121 | 121 | | |
| 122 | + | |
122 | 123 | | |
123 | | - | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
124 | 138 | | |
125 | 139 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
327 | 328 | | |
328 | 329 | | |
329 | 330 | | |
330 | | - | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
331 | 335 | | |
332 | 336 | | |
333 | 337 | | |
334 | 338 | | |
335 | | - | |
336 | | - | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
337 | 344 | | |
338 | 345 | | |
339 | 346 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | | - | |
| 19 | + | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
| |||
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
34 | 40 | | |
35 | 41 | | |
36 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
10 | 12 | | |
11 | 13 | | |
12 | 14 | | |
| |||
23 | 25 | | |
24 | 26 | | |
25 | 27 | | |
26 | | - | |
| 28 | + | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
Lines changed: 17 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
48 | 64 | | |
49 | 65 | | |
50 | 66 | | |
| |||
Lines changed: 27 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1022 | 1022 | | |
1023 | 1023 | | |
1024 | 1024 | | |
1025 | | - | |
1026 | | - | |
1027 | | - | |
| 1025 | + | |
| 1026 | + | |
| 1027 | + | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
1028 | 1040 | | |
1029 | 1041 | | |
1030 | 1042 | | |
| |||
1055 | 1067 | | |
1056 | 1068 | | |
1057 | 1069 | | |
1058 | | - | |
1059 | | - | |
1060 | | - | |
1061 | | - | |
1062 | | - | |
1063 | | - | |
1064 | | - | |
1065 | | - | |
1066 | | - | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
1067 | 1082 | | |
1068 | 1083 | | |
1069 | 1084 | | |
| |||
0 commit comments