Skip to content

Commit 8b772b5

Browse files
helenosheaahelenosheaa
authored
fix: save nested fields/arrays not to default context (#4528)
1 parent 4c02b17 commit 8b772b5

File tree

4 files changed

+100
-24
lines changed

4 files changed

+100
-24
lines changed

‎src/writeData/subscriptions/components/JsonParsingForm.tsx‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,13 @@ const JsonParsingForm: FC<Props> = ({formContent, updateForm, edit}) => {
7979
autoFocus={true}
8080
value={formContent.jsonTimestamp.path}
8181
onChange={e => {
82-
formContent.jsonTimestamp.path = e.target.value
83-
updateForm({...formContent})
82+
updateForm({
83+
...formContent,
84+
jsonTimestamp: {
85+
...formContent.jsonTimestamp,
86+
path: e.target.value,
87+
},
88+
})
8489
}}
8590
onBlur={() =>
8691
event(
@@ -133,8 +138,13 @@ const JsonParsingForm: FC<Props> = ({formContent, updateForm, edit}) => {
133138
autoFocus={true}
134139
value={formContent.jsonMeasurementKey.path}
135140
onChange={e => {
136-
formContent.jsonMeasurementKey.path = e.target.value
137-
updateForm({...formContent})
141+
updateForm({
142+
...formContent,
143+
jsonMeasurementKey: {
144+
...formContent.jsonMeasurementKey,
145+
path: e.target.value,
146+
},
147+
})
138148
}}
139149
onBlur={() =>
140150
event(

‎src/writeData/subscriptions/components/JsonPathInput.tsx‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,24 @@ const JsonPathInput: FC<Props> = ({
125125
: formContent.jsonFieldKeys[itemNum].name
126126
}
127127
onChange={e => {
128-
tagType
129-
? (formContent.jsonTagKeys[itemNum].name = e.target.value)
130-
: (formContent.jsonFieldKeys[itemNum].name = e.target.value)
131-
updateForm({...formContent})
128+
let newArr
129+
if (tagType) {
130+
newArr = Object.assign([...formContent.jsonTagKeys], {
131+
[itemNum]: {
132+
...formContent.jsonTagKeys[itemNum],
133+
name: e.target.value,
134+
},
135+
})
136+
updateForm({...formContent, jsonTagKeys: newArr})
137+
} else {
138+
newArr = Object.assign([...formContent.jsonFieldKeys], {
139+
[itemNum]: {
140+
...formContent.jsonFieldKeys[itemNum],
141+
name: e.target.value,
142+
},
143+
})
144+
updateForm({...formContent, jsonFieldKeys: newArr})
145+
}
132146
}}
133147
onBlur={() =>
134148
event(
@@ -234,10 +248,24 @@ const JsonPathInput: FC<Props> = ({
234248
: formContent.jsonFieldKeys[itemNum].path
235249
}
236250
onChange={e => {
237-
tagType
238-
? (formContent.jsonTagKeys[itemNum].path = e.target.value)
239-
: (formContent.jsonFieldKeys[itemNum].path = e.target.value)
240-
updateForm({...formContent})
251+
let newArr
252+
if (tagType) {
253+
newArr = Object.assign([...formContent.jsonTagKeys], {
254+
[itemNum]: {
255+
...formContent.jsonTagKeys[itemNum],
256+
path: e.target.value,
257+
},
258+
})
259+
updateForm({...formContent, jsonTagKeys: newArr})
260+
} else {
261+
newArr = Object.assign([...formContent.jsonFieldKeys], {
262+
[itemNum]: {
263+
...formContent.jsonFieldKeys[itemNum],
264+
path: e.target.value,
265+
},
266+
})
267+
updateForm({...formContent, jsonFieldKeys: newArr})
268+
}
241269
}}
242270
onBlur={() =>
243271
event(

‎src/writeData/subscriptions/components/StringParsingForm.tsx‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,13 @@ const StringParsingForm: FC<Props> = ({formContent, updateForm, edit}) => {
7171
autoFocus={true}
7272
value={formContent.stringTimestamp.pattern}
7373
onChange={e => {
74-
formContent.stringTimestamp.pattern = e.target.value
75-
updateForm({...formContent})
74+
updateForm({
75+
...formContent,
76+
stringTimestamp: {
77+
...formContent.stringTimestamp,
78+
pattern: e.target.value,
79+
},
80+
})
7681
}}
7782
onBlur={() =>
7883
event(
@@ -119,8 +124,13 @@ const StringParsingForm: FC<Props> = ({formContent, updateForm, edit}) => {
119124
autoFocus={true}
120125
value={formContent.stringMeasurement.pattern}
121126
onChange={e => {
122-
formContent.stringMeasurement.pattern = e.target.value
123-
updateForm({...formContent})
127+
updateForm({
128+
...formContent,
129+
stringMeasurement: {
130+
...formContent.stringMeasurement,
131+
pattern: e.target.value,
132+
},
133+
})
124134
}}
125135
onBlur={() =>
126136
event(

‎src/writeData/subscriptions/components/StringPatternInput.tsx‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,24 @@ const StringPatternInput: FC<Props> = ({
116116
: formContent.stringFields[itemNum].name
117117
}
118118
onChange={e => {
119-
tagType
120-
? (formContent.stringTags[itemNum].name = e.target.value)
121-
: (formContent.stringFields[itemNum].name = e.target.value)
122-
updateForm({...formContent})
119+
let newArr
120+
if (tagType) {
121+
newArr = Object.assign([...formContent.stringTags], {
122+
[itemNum]: {
123+
...formContent.stringTags[itemNum],
124+
name: e.target.value,
125+
},
126+
})
127+
updateForm({...formContent, stringTags: newArr})
128+
} else {
129+
newArr = Object.assign([...formContent.stringFields], {
130+
[itemNum]: {
131+
...formContent.stringFields[itemNum],
132+
name: e.target.value,
133+
},
134+
})
135+
updateForm({...formContent, stringFields: newArr})
136+
}
123137
}}
124138
onBlur={() =>
125139
event(
@@ -169,10 +183,24 @@ const StringPatternInput: FC<Props> = ({
169183
: formContent.stringFields[itemNum].pattern
170184
}
171185
onChange={e => {
172-
tagType
173-
? (formContent.stringTags[itemNum].pattern = e.target.value)
174-
: (formContent.stringFields[itemNum].pattern = e.target.value)
175-
updateForm({...formContent})
186+
let newArr
187+
if (tagType) {
188+
newArr = Object.assign([...formContent.stringTags], {
189+
[itemNum]: {
190+
...formContent.stringTags[itemNum],
191+
pattern: e.target.value,
192+
},
193+
})
194+
updateForm({...formContent, stringTags: newArr})
195+
} else {
196+
newArr = Object.assign([...formContent.stringFields], {
197+
[itemNum]: {
198+
...formContent.stringFields[itemNum],
199+
pattern: e.target.value,
200+
},
201+
})
202+
updateForm({...formContent, stringFields: newArr})
203+
}
176204
}}
177205
onBlur={() =>
178206
event(

0 commit comments

Comments
 (0)