Merge branch '2.2' into 2

silverstripe · Jun 11, 2024 · 5a2e532 · 5a2e532
2 parents fc76d17 + df02655
commit 5a2e532
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 107 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/client/src/containers/FormBuilderLoader/FormBuilderLoader.js b/client/src/containers/FormBuilderLoader/FormBuilderLoader.js
@@ -51,7 +51,7 @@ class FormBuilderLoader extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (this.props.schemaUrl !== prevProps.schemaUrl) {
+    if (this.props.schemaUrl !== prevProps.schemaUrl || this.props.refetchSchemaCriteria !== prevProps.refetchSchemaCriteria) {
       this.fetch();
     }
   }
@@ -441,6 +441,7 @@ FormBuilderLoader.propTypes = Object.assign({}, basePropTypes, {
   schemaUrl: PropTypes.string.isRequired,
   schema: schemaPropType,
   refetchSchemaOnMount: PropTypes.bool.isRequired,
+  refetchSchemaCriteria: PropTypes.string,
   form: PropTypes.string,
   submitting: PropTypes.bool,
   onFetchingSchema: PropTypes.func,

diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "toposort": "^2.0.2",
     "url": "^0.11.0",
     "uuid": "^9.0.0",
-    "validator": "^13.7.0",
+    "validator": "^13.12.0",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {