Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@manojadams/metaforms-core",
"version": "4.1.0-beta.1",
"version": "4.2.0-beta.140",
"description": "React Library for rendering dynamic forms from json schema",
"author": "manojadams",
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions src/constants/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const DEP_TYPE = {
EQUALS: "equals",
LOAD: "load",
LOAD_OPTIONS: "loadOptions",
OPTIONS: "options",
CHANGE: "change",
VALIDATION: "validation",
PROP_UPDATE: "propUpdate",
Expand Down
31 changes: 25 additions & 6 deletions src/utils/DependencyUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ class DependencyUtil {
};
// eslint-disable-next-line no-fallthrough
case DEP_TYPE.LOAD:
case DEP_TYPE.OPTIONS:
{
const url = dependency.url;
const labelKey = dependency?.labelKey;
const valueKey = dependency?.valueKey;
const responseKey = dependency.responseKey;
const queryParams = dependency.queryParams;
const config = form[formSection][field].config;
const url = dependency.url || config?.url;
const labelKey = dependency?.labelKey || config?.labelKey;
const valueKey = dependency?.valueKey || config?.valueKey;
const responseKey = dependency.responseKey || config?.responseKey;
const queryParams = dependency.queryParams || config?.queryParams;
const pathParams = dependency.pathParams;
form[formSection][ref][D_KEY].push({
section,
Expand Down Expand Up @@ -274,17 +276,23 @@ class DependencyUtil {
}
break;
case DEP_TYPE.LOAD:
case DEP_TYPE.OPTIONS:
if (value && dep.url) {
const field = dep.field;
// reset options
metaform.setFieldOptions(dep.section, field, []);
metaform.setField(dep.section, field, "");
metaform
.getData(
{
url: dep.url,
requestType: dep.requestType ?? API_METHOD.GET,
requestBody: dep.requestBody,
requestBodyParams: dep.requestBodyParams,
queryParams: dep.queryParams
queryParams: dep.queryParams,
labelKey: dep.labelKey,
valueKey: dep.valueKey,
responseKey: dep.responseKey
},
value,
section
Expand All @@ -293,6 +301,17 @@ class DependencyUtil {
metaform.setFieldOptions(dep.section, field, results);
resolved.next();
})
.then(() => {
// cascade
const subfield = metaform.getField(dep.section, field);
this.handleDependencies(
metaform,
dep.section,
field,
subfield.value,
false
).then(() => resolved.next());
})
.catch(() => {
resolved.next();
});
Expand Down
Loading