@entryscape/rdforms 10.13.0 → 10.13.2

package/package.json

@@ -8,7 +8,7 @@
     "application profile",
     "linked data"
   ],
-  "version": "10.13.0",
+  "version": "10.13.2",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",

package/src/template/ItemStore.js

@@ -265,6 +265,11 @@ export default class ItemStore {
           }
         }
         if (id != null) {
+          if (this._registry[id]) {
+            console.log(`RDForms conflict with item id ${id}, overwriting item from bundle "${
+              this._registry[id].getBundle()?.getPath() || ''}" with item from bundle "${
+              item.getBundle()?.getPath() || ''}".`);
+          }
           this._registry[id] = item;
           if (bundle != null) {
             bundle.addItem(item);

package/src/template/bundleLoader.js

@@ -18,7 +18,7 @@ const stopFetchingOrJustLog = (iteration, length, templateId) => {
 };
 
 /**
- * Return the first sucessfully fetched bundle from a list of urls or throw en error if none could be fetched
+ * Return the first successfully fetched bundle from a list of urls or throw en error if none could be fetched
  *
  * @param {Array<String>} urls
  * @returns {Promise<Response | never | void>}
@@ -27,14 +27,16 @@ const fetchBundle = async (urls) => {
   const totalUrls = urls.length;
   let response;
   let bundle;
+  let path;
 
 
   for (let i = 0; i < totalUrls; i++) {
     // try to fetch the bundle, fails only if there's some network error. A 404 is not an error
+    path = urls[i];
     try {
-      response = await fetch(urls[i]);
+      response = await fetch(path);
     } catch (e) {
-      throw Error(`A network error ocurred while trying to fetch bundle ${urls[i]}`);
+      throw Error(`A network error ocurred while trying to fetch bundle ${path}`);
     }
 
     // check if we got a 2xx
@@ -48,18 +50,18 @@ const fetchBundle = async (urls) => {
           bundle = await response.json();
           break;
         } else {
-          throw new Error(`Failed fetching template ${urls[i]}. Expected a JSON file and got ${contentType}`);
+          throw new Error(`Failed fetching template ${path}. Expected a JSON file and got ${contentType}`);
         }
       } catch (e) {
-        stopFetchingOrJustLog(i, totalUrls, urls[i]);
+        stopFetchingOrJustLog(i, totalUrls, path);
       }
       // got back something that's not a 2xx
     } else {
-      stopFetchingOrJustLog(i, totalUrls, urls[i]);
+      stopFetchingOrJustLog(i, totalUrls, path);
     }
   }
 
-  return bundle;
+  return {path, source: bundle};
 };
 
 /**
@@ -76,7 +78,7 @@ const promisifyBundles = bundles => bundles.map(bundle =>
  * @param {ItemStore} itemStore
  * @param {array} bundles
  */
-const registerBundles = (itemStore, bundles = []) => bundles.map(source => itemStore.registerBundle({ source }));
+const registerBundles = (itemStore, bundles = []) => bundles.map(bundle => itemStore.registerBundle(bundle));
 
 /**
  *

package/src/view/View.js

@@ -11,6 +11,7 @@ export default class View {
   constructor(params, srcNodeRef) {
     this._viewId = viewCounter;
     viewCounter += 1;
+    this.renderingParams = params.renderingParams || {};
     this.locale = params.locale;
     this.defaultTextLanguage = params.defaultTextLanguage;
     this.messages = params.messages;

package/src/view/react/choiceEditors/ChoiceLookupAndInlineSearch.js

@@ -122,6 +122,7 @@ export default (props) => {
         getOptionDisabled={option => option.mismatch === true}
         renderInput={renderInput}
         disablePortal
+        {...props.context.view.renderingParams.ChoiceLookupAndInlineSearch}
       />
       <ShowButton {...props} onClick={showHandler} disabled={!!ngId}/>
       {value && value.original.upgrade && (

package/src/view/react/choiceEditors/ChoiceSelector.js

@@ -66,6 +66,7 @@ export default (props) => {
         filterSelectedOptions
         renderInput={renderInput}
         disablePortal
+        {...props.context.view.renderingParams.ChoiceSelector}
       />
       {error && (
         <div key="warning" className="rdformsWarning">

package/src/view/renderingContext.js

@@ -328,6 +328,7 @@ const groupPresenter = (fieldDiv, binding, context) => {
   // eslint-disable-next-line no-new
   new Cls({
     parentView: context.view,
+    renderingParams: context.view.renderingParams,
     messages: context.view.messages,
     binding,
     topLevel: false,
@@ -350,6 +351,7 @@ const groupEditor = (fieldDiv, binding, context) => {
   const Cls = context.view.constructor;
   const subView = new Cls({
     parentView: context.view,
+    renderingParams: context.view.renderingParams,
     messages: context.view.messages,
     languages: context.view.languages,
     binding,