solid-ui 2.4.22-179d5c10 → 2.4.22-2b59ecec

package/dist/main.js

@@ -15192,8 +15192,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-05-05T15:17:36Z',
-  commit: '179d5c10c63ea5c2237ce00981e2dd2b8ae8cd05',
+  buildTime: '2022-05-06T18:28:57Z',
+  commit: '2b59ececdbeff0b9fc6c2b0710d65711cb6fce3b',
   npmInfo: {
     'solid-ui': '2.4.22',
     npm: '6.14.16',
@@ -18158,12 +18158,6 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
   }
 
   lhs.appendChild((0, _basic.fieldLabel)(dom, property, form));
-  var from = kb.any(form, ui('from'));
-
-  if (!from) {
-    return (0, _error.errorMessageBlock)(dom, "No 'from' for Choice: " + form);
-  }
-
   var subForm = kb.any(form, ui('use')); // Optional
 
   var follow = kb.anyJS(form, ui('follow'), null, formDoc); // data doc moves to new subject?
@@ -18178,19 +18172,25 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     firstSelectOptionText: firstSelectOptionText,
     disambiguate: false
   };
-  possible = kb.each(undefined, ns.rdf('type'), from, formDoc);
+  var uiFrom = kb.any(form, ui('from'));
+
+  if (!uiFrom) {
+    return (0, _error.errorMessageBlock)(dom, "No 'from' for Choice: " + form);
+  }
+
+  possible = kb.each(undefined, ns.rdf('type'), uiFrom, formDoc);
 
-  for (var x in kb.findMembersNT(from)) {
+  for (var x in kb.findMembersNT(uiFrom)) {
     possible.push(kb.fromNT(x));
   } // Use rdfs
 
 
-  if (from.sameTerm(ns.rdfs('Class'))) {
+  if (uiFrom.sameTerm(ns.rdfs('Class'))) {
     for (p in buttons.allClassURIs()) {
       possible.push(kb.sym(p));
     } // log.debug("%%% Choice field: possible.length 2 = "+possible.length)
 
-  } else if (from.sameTerm(ns.rdf('Property'))) {
+  } else if (uiFrom.sameTerm(ns.rdf('Property'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.op) {
@@ -18202,7 +18202,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     }
 
     opts.disambiguate = true; // This is a big class, and the labels won't be enough.
-  } else if (from.sameTerm(ns.owl('ObjectProperty'))) {
+  } else if (uiFrom.sameTerm(ns.owl('ObjectProperty'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.op) {
@@ -18210,7 +18210,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     }
 
     opts.disambiguate = true;
-  } else if (from.sameTerm(ns.owl('DatatypeProperty'))) {
+  } else if (uiFrom.sameTerm(ns.owl('DatatypeProperty'))) {
     possibleProperties = buttons.propertyTriage(kb);
 
     for (p in possibleProperties.dp) {
@@ -18226,7 +18226,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     opts.mint = '* Create new *'; // @@ could be better
   }
 
-  var selector = makeSelectForOptions(dom, kb, subject, property, sortedPossible, opts, dataDoc, callbackFunction);
+  var selector = makeSelectForOptions(dom, kb, subject, property, sortedPossible, uiFrom, opts, dataDoc, callbackFunction);
   rhs.appendChild(selector);
   var object;
 
@@ -18238,7 +18238,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
 
   if (object && subForm) {
     removeNextSiblingsAfterElement(selector);
-    addSubFormDropDown(dom, rhs, already, object, subForm, follow ? object.doc() : dataDoc, callbackFunction);
+    addSubFormChoice(dom, rhs, already, object, subForm, follow ? object.doc() : dataDoc, callbackFunction);
   }
 
   return box;
@@ -18256,7 +18256,7 @@ function removeNextSiblingsAfterElement(currentElement) {
   }
 }
 
-function addSubFormDropDown(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction) {
+function addSubFormChoice(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction) {
   (0, _fieldFunction.fieldFunction)(dom, subForm)(dom, selectDiv, already, subject, subForm, dataDoc, callbackFunction);
 } //          Documentation - non-interactive fields
 //
@@ -18606,7 +18606,7 @@ function makeDescription(dom, kb, subject, predicate, dataDoc, callbackFunction)
 */
 
 
-function makeSelectForOptions(dom, kb, subject, predicate, possible, options, dataDoc, callbackFunction) {
+function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, options, dataDoc, callbackFunction) {
   log.debug('Select list length now ' + possible.length);
   var n = 0;
   var uris = {}; // Count them
@@ -18649,8 +18649,6 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
   actual = getActual();
 
   var onChange = function onChange(_e) {
-    select.disabled = true; // until data written back - gives user feedback too
-
     var ds = [];
     var is = [];
 
@@ -18666,9 +18664,29 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       var opt = select.options[_i];
 
       if (opt.selected && opt.AJAR_mint) {
-        newObject = newThing(dataDoc);
-        removeNextSiblingsAfterElement(select);
-        addSubFormDropDown(dom, select.parentNode, {}, $rdf.sym(newObject), options.subForm, dataDoc, callbackFunction);
+        // not sure if this if is used because I cannot find mintClass
+        if (options.mintClass) {
+          var thisForm = promptForNew(dom, kb, subject, predicate, options.mintClass, null, dataDoc, function (ok, body) {
+            if (!ok) {
+              callbackFunction(ok, body, {
+                change: 'new'
+              }); // @@ if ok, need some form of refresh of the select for the new thing
+            }
+          });
+          select.parentNode.appendChild(thisForm);
+          newObject = thisForm.AJAR_subject;
+        } else {
+          newObject = newThing(dataDoc);
+        }
+
+        is.push($rdf.st(subject, predicate, kb.sym(newObject), dataDoc));
+        if (uiFrom) is.push($rdf.st(newObject, ns.rdf('type'), kb.sym(uiFrom), dataDoc)); // not sure if this if is used because I cannot find mintStatementsFun
+
+        if (options.mintStatementsFun) {
+          is = is.concat(options.mintStatementsFun(newObject));
+        }
+
+        select.currentURI = newObject;
       }
 
       if (!opt.AJAR_uri) continue; // a prompt or mint
@@ -18676,6 +18694,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       if (opt.selected && !(opt.AJAR_uri in actual)) {
         // new class
         is.push($rdf.st(subject, predicate, kb.sym(opt.AJAR_uri), dataDoc));
+        select.currentURI = opt.AJAR_uri;
       }
 
       if (opt.selected) select.currentURI = opt.AJAR_uri;
@@ -18695,34 +18714,21 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, options, da
       sel = sel.superSelect;
     }
 
-    function doneNew(ok, _body) {
-      callbackFunction(ok, {
-        widget: 'select',
-        event: 'new'
-      });
-    }
+    log.info('selectForOptions: data doc = ' + dataDoc); // refresh subForm
 
-    log.info('selectForOptions: data doc = ' + dataDoc);
     removeNextSiblingsAfterElement(select);
-    addSubFormDropDown(dom, select.parentNode, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, callbackFunction);
-    kb.updater.update(ds, is, function (uri, ok, body) {
-      actual = getActual(); // refresh
-
+    addSubFormChoice(dom, select.parentNode, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, function (ok, body) {
       if (ok) {
-        if (newObject) {
-          removeNextSiblingsAfterElement(select);
-          addSubFormDropDown(dom, select.parentNode, {}, newObject, options.subForm, dataDoc, doneNew);
-        }
-
-        select.disabled = false; // data written back
-      } else {
-        return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + body));
-      }
+        kb.updater.update(ds, is, function (uri, success, errorBody) {
+          actual = getActual(); // refresh
 
-      if (callbackFunction) callbackFunction(ok, {
-        widget: 'select',
-        event: 'change'
-      });
+          if (!success) return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + errorBody));
+          if (callbackFunction) callbackFunction(success, {
+            widget: 'select',
+            event: 'new'
+          });
+        });
+      } else return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in field of select: ' + body));
     });
   };
 
@@ -18824,7 +18830,7 @@ function makeSelectForCategory(dom, kb, subject, category, dataDoc, callbackFunc
     return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiple ? 'multiple ' : '') + 'selector with only 1 subclass of category: ' + category + ':' + subs[1]);
   }
 
-  return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, {
+  return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, null, {
     multiple: multiple
   }, dataDoc, callbackFunction);
 }