This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 0b0a168e061 NO-ISSUE: Fix setting values on
`form-code-generator-bootstrap4-theme` disabled ListField (#3000)
0b0a168e061 is described below
commit 0b0a168e061857d99fd3d271a1a2fcf881bd7fa2
Author: Luiz João Motta <[email protected]>
AuthorDate: Thu Mar 13 19:14:41 2025 -0300
NO-ISSUE: Fix setting values on `form-code-generator-bootstrap4-theme`
disabled ListField (#3000)
---
.../src/resources/templates/form.template | 4 ++--
.../src/resources/templates/listField.writeModelData.template | 4 +---
.../src/resources/templates/nestField.writeModelData.template | 4 +---
.../src/uniforms/templates/ListFieldTemplate.ts | 5 +----
.../src/uniforms/templates/NestFieldTemplate.ts | 10 ++++------
.../tests/NestField.test.tsx | 2 +-
.../tests/__snapshots__/ListField.test.tsx.snap | 2 +-
.../tests/__snapshots__/NestField.test.tsx.snap | 4 ++--
8 files changed, 13 insertions(+), 22 deletions(-)
diff --git
a/packages/form-code-generator-bootstrap4-theme/src/resources/templates/form.template
b/packages/form-code-generator-bootstrap4-theme/src/resources/templates/form.template
index 71327a87fd2..c3e80a7dbbc 100644
---
a/packages/form-code-generator-bootstrap4-theme/src/resources/templates/form.template
+++
b/packages/form-code-generator-bootstrap4-theme/src/resources/templates/form.template
@@ -54,7 +54,7 @@
function getFormData() {
<% const addedWriteValueCode = []; %>
<% _.each(props.children, function(child) { %>
- <% if (!child.disabled && child.writeValueToModelCode &&
child.writeValueToModelCode.requiredCode) { %>
+ <% if (child.writeValueToModelCode &&
child.writeValueToModelCode.requiredCode) { %>
<% _.each(child.writeValueToModelCode.requiredCode,
function(codeFragment) { %>
<% if (!addedWriteValueCode.includes(codeFragment)) { %>
<% addedWriteValueCode.push(codeFragment); %>
@@ -65,7 +65,7 @@
<% }); %>
const formData = {};
<% _.each(props.children, function(child) { %>
- <% if (!child.disabled && child.writeValueToModelCode) { %>
+ <% if (child.writeValueToModelCode) { %>
<%= child.writeValueToModelCode.code %>
<% } %>
<% }); %>
diff --git
a/packages/form-code-generator-bootstrap4-theme/src/resources/templates/listField.writeModelData.template
b/packages/form-code-generator-bootstrap4-theme/src/resources/templates/listField.writeModelData.template
index 4d76efb14c1..cf434695eb1 100644
---
a/packages/form-code-generator-bootstrap4-theme/src/resources/templates/listField.writeModelData.template
+++
b/packages/form-code-generator-bootstrap4-theme/src/resources/templates/listField.writeModelData.template
@@ -1,5 +1,3 @@
-<% if(!disabled) { %>
formData.<%=name%> =
Array.from(document.getElementById("<%=name%>").childNodes).reduce((values,
element) => {
return [...values, getListValue(element)];
-}, []);
-<% } %>
\ No newline at end of file
+}, []);
\ No newline at end of file
diff --git
a/packages/form-code-generator-bootstrap4-theme/src/resources/templates/nestField.writeModelData.template
b/packages/form-code-generator-bootstrap4-theme/src/resources/templates/nestField.writeModelData.template
index 7878841b74c..8fa0c0d6ca1 100644
---
a/packages/form-code-generator-bootstrap4-theme/src/resources/templates/nestField.writeModelData.template
+++
b/packages/form-code-generator-bootstrap4-theme/src/resources/templates/nestField.writeModelData.template
@@ -1,8 +1,6 @@
-<% if(!props.disabled) { %>
formData.<%=props.name%> = {};
<% _.each(props.children, function(child) { %>
<% if (child.writeValueToModelCode) { %>
<%= child.writeValueToModelCode.code %>
<% } %>
-<% }); %>
-<% } %>
\ No newline at end of file
+<% }); %>
\ No newline at end of file
diff --git
a/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/ListFieldTemplate.ts
b/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/ListFieldTemplate.ts
index 6ece259d7cd..976b03175ce 100644
---
a/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/ListFieldTemplate.ts
+++
b/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/ListFieldTemplate.ts
@@ -96,10 +96,7 @@ export class ListFieldTemplate implements
FormElementTemplate<FormInputContainer
requiredCode: [],
},
writeValueToModelCode: {
- code: this.listFieldWriteValueToModelTemplate({
- disabled,
- name,
- }),
+ code: this.listFieldWriteValueToModelTemplate({ name }),
requiredCode: [],
},
};
diff --git
a/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/NestFieldTemplate.ts
b/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/NestFieldTemplate.ts
index 920d022fb7a..49e08f9faee 100644
---
a/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/NestFieldTemplate.ts
+++
b/packages/form-code-generator-bootstrap4-theme/src/uniforms/templates/NestFieldTemplate.ts
@@ -75,12 +75,10 @@ export class NestFieldTemplate implements
FormElementTemplate<FormInputContainer
code: this.nestFieldSetValueFromModelTemplate({ props: props }),
requiredCode: setValueFromModelRequiredCode,
},
- writeValueToModelCode: props.disabled
- ? undefined
- : {
- code: this.nestFieldWriteValueToModelTemplate({ props: props }),
- requiredCode: writeValueToModelRequiredCode,
- },
+ writeValueToModelCode: {
+ code: this.nestFieldWriteValueToModelTemplate({ props: props }),
+ requiredCode: writeValueToModelRequiredCode,
+ },
};
}
}
diff --git
a/packages/form-code-generator-bootstrap4-theme/tests/NestField.test.tsx
b/packages/form-code-generator-bootstrap4-theme/tests/NestField.test.tsx
index 348411b23e6..d0d65ec0730 100644
--- a/packages/form-code-generator-bootstrap4-theme/tests/NestField.test.tsx
+++ b/packages/form-code-generator-bootstrap4-theme/tests/NestField.test.tsx
@@ -84,6 +84,6 @@ describe("<NestField> tests", () => {
expect(inputContainer.ref[2].binding).toEqual("candidate.role");
expect(formElement.setValueFromModelCode).not.toBeUndefined();
- expect(formElement.writeValueToModelCode).toBeUndefined();
+ expect(formElement.writeValueToModelCode).not.toBeUndefined();
});
});
diff --git
a/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/ListField.test.tsx.snap
b/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/ListField.test.tsx.snap
index 4ff83ec15ab..8847e9bc301 100644
---
a/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/ListField.test.tsx.snap
+++
b/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/ListField.test.tsx.snap
@@ -2,6 +2,6 @@
exports[`<ListField> tests <ListField> - rendering enabled 1`] = `
<div>
-
{"ref":[{"id":"friends.$.name","binding":"friends.$.name"},{"id":"friends.$.age","binding":"friends.$.age"},{"id":"friends.$.country","binding":"friends.$.country"},{"id":"friends.$.married","binding":"friends.$.married"},{"id":"friends.$.know.$","binding":"friends.$.know.$"},{"id":"friends.$.areas","binding":"friends.$.areas"},{"id":"friends.$.birthday","binding":"friends.$.birthday"}],"html":"<div
class=\\"form-group\\">\\n <div class=\\"card mb-3\\">\\n
<div cla [...]
+
{"ref":[{"id":"friends.$.name","binding":"friends.$.name"},{"id":"friends.$.age","binding":"friends.$.age"},{"id":"friends.$.country","binding":"friends.$.country"},{"id":"friends.$.married","binding":"friends.$.married"},{"id":"friends.$.know.$","binding":"friends.$.know.$"},{"id":"friends.$.areas","binding":"friends.$.areas"},{"id":"friends.$.birthday","binding":"friends.$.birthday"}],"html":"<div
class=\\"form-group\\">\\n <div class=\\"card mb-3\\">\\n
<div cla [...]
</div>
`;
diff --git
a/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/NestField.test.tsx.snap
b/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/NestField.test.tsx.snap
index 78cbf87194c..7e03a6e7f6b 100644
---
a/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/NestField.test.tsx.snap
+++
b/packages/form-code-generator-bootstrap4-theme/tests/__snapshots__/NestField.test.tsx.snap
@@ -2,12 +2,12 @@
exports[`<NestField> tests <NestField> - rendering 1`] = `
<div>
-
{"ref":[{"id":"candidate.name","binding":"candidate.name"},{"id":"candidate.age","binding":"candidate.age"},{"id":"candidate.role","binding":"candidate.role"}],"html":"<fieldset>\\n
<legend>Candidate</legend>\\n <div
role=\\"group\\">\\n\\n <div class=\\"form-group\\">\\n
<label for=\\"candidate.name\\">Name</label>\\n <input
type=\\"text\\"\\n id=\\"candidate.name\\"\\n
name=\\"candidate.name\\"\\n class=\\"form- [...]
+
{"ref":[{"id":"candidate.name","binding":"candidate.name"},{"id":"candidate.age","binding":"candidate.age"},{"id":"candidate.role","binding":"candidate.role"}],"html":"<fieldset>\\n
<legend>Candidate</legend>\\n <div
role=\\"group\\">\\n\\n <div class=\\"form-group\\">\\n
<label for=\\"candidate.name\\">Name</label>\\n <input
type=\\"text\\"\\n id=\\"candidate.name\\"\\n
name=\\"candidate.name\\"\\n class=\\"form- [...]
</div>
`;
exports[`<NestField> tests <NestField> - rendering disabled 1`] = `
<div>
-
{"ref":[{"id":"candidate.name","binding":"candidate.name"},{"id":"candidate.age","binding":"candidate.age"},{"id":"candidate.role","binding":"candidate.role"}],"html":"<fieldset
disabled>\\n <legend>Candidate</legend>\\n <div
role=\\"group\\">\\n\\n <div class=\\"form-group\\">\\n
<label for=\\"candidate.name\\">Name</label>\\n <input
type=\\"text\\"\\n id=\\"candidate.name\\"\\n
name=\\"candidate.name\\"\\n class [...]
+
{"ref":[{"id":"candidate.name","binding":"candidate.name"},{"id":"candidate.age","binding":"candidate.age"},{"id":"candidate.role","binding":"candidate.role"}],"html":"<fieldset
disabled>\\n <legend>Candidate</legend>\\n <div
role=\\"group\\">\\n\\n <div class=\\"form-group\\">\\n
<label for=\\"candidate.name\\">Name</label>\\n <input
type=\\"text\\"\\n id=\\"candidate.name\\"\\n
name=\\"candidate.name\\"\\n class [...]
</div>
`;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
