solid-ui 2.4.22-a39ed737 → 2.4.22-a5a36443
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -58
- package/dist/main.js +317 -175
- package/dist/main.js.map +1 -1
- package/lib/utils/label.js +1 -1
- package/lib/utils/label.js.map +1 -1
- package/lib/versionInfo.js +5 -5
- package/lib/versionInfo.js.map +1 -1
- package/lib/widgets/buttons.d.ts.map +1 -1
- package/lib/widgets/buttons.js +2 -0
- package/lib/widgets/buttons.js.map +1 -1
- package/lib/widgets/forms.js +309 -169
- package/lib/widgets/forms.js.map +1 -1
- package/package.json +1 -1
package/dist/main.js
CHANGED
|
@@ -15172,7 +15172,7 @@ function slice(s, suffix) {
|
|
|
15172
15172
|
|
|
15173
15173
|
function getWellKnownLabel(thing) {
|
|
15174
15174
|
return _solidLogic.store.any(thing, UI.ns.ui('label')) || // Prioritize ui:label
|
|
15175
|
-
_solidLogic.store.any(thing, UI.ns.link('message')) || _solidLogic.store.any(thing, UI.ns.vcard('fn')) || _solidLogic.store.any(thing, UI.ns.foaf('name')) || _solidLogic.store.any(thing, UI.ns.dct('title')) || _solidLogic.store.any(thing, UI.ns.dc('title')) || _solidLogic.store.any(thing, UI.ns.rss('title')) || _solidLogic.store.any(thing, UI.ns.contact('fullName')) || _solidLogic.store.any(thing, _solidLogic.store.sym('http://www.w3.org/2001/04/roadmap/org#name')) || _solidLogic.store.any(thing, UI.ns.cal('summary')) || _solidLogic.store.any(thing, UI.ns.foaf('nick')) || _solidLogic.store.any(thing, UI.ns.as('name')) || _solidLogic.store.any(thing, UI.ns.schema('name')) || _solidLogic.store.any(thing, UI.ns.rdfs('label'));
|
|
15175
|
+
_solidLogic.store.any(thing, UI.ns.link('message')) || _solidLogic.store.any(thing, UI.ns.vcard('fn')) || _solidLogic.store.any(thing, UI.ns.foaf('name')) || _solidLogic.store.any(thing, UI.ns.dct('title')) || _solidLogic.store.any(thing, UI.ns.dc('title')) || _solidLogic.store.any(thing, UI.ns.rss('title')) || _solidLogic.store.any(thing, UI.ns.contact('fullName')) || _solidLogic.store.any(thing, _solidLogic.store.sym('http://www.w3.org/2001/04/roadmap/org#name')) || _solidLogic.store.any(thing, UI.ns.cal('summary')) || _solidLogic.store.any(thing, UI.ns.foaf('nick')) || _solidLogic.store.any(thing, UI.ns.as('name')) || _solidLogic.store.any(thing, UI.ns.schema('name')) || _solidLogic.store.any(thing, UI.ns.rdfs('label')) || _solidLogic.store.any(thing, _solidLogic.store.sym('http://www.w3.org/2004/02/skos/core#prefLabel'));
|
|
15176
15176
|
}
|
|
15177
15177
|
//# sourceMappingURL=label.js.map
|
|
15178
15178
|
|
|
@@ -15192,11 +15192,11 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
15192
15192
|
}));
|
|
15193
15193
|
exports.versionInfo = void 0;
|
|
15194
15194
|
var versionInfo = {
|
|
15195
|
-
buildTime: '2022-05-
|
|
15196
|
-
commit: '
|
|
15195
|
+
buildTime: '2022-05-20T09:44:30Z',
|
|
15196
|
+
commit: 'a5a36443be6e25d047585d79bb83eb6d7ec33b35',
|
|
15197
15197
|
npmInfo: {
|
|
15198
15198
|
'solid-ui': '2.4.22',
|
|
15199
|
-
npm: '6.14.
|
|
15199
|
+
npm: '6.14.17',
|
|
15200
15200
|
ares: '1.18.1',
|
|
15201
15201
|
brotli: '1.0.9',
|
|
15202
15202
|
cldr: '40.0',
|
|
@@ -15205,12 +15205,12 @@ var versionInfo = {
|
|
|
15205
15205
|
modules: '83',
|
|
15206
15206
|
napi: '8',
|
|
15207
15207
|
nghttp2: '1.42.0',
|
|
15208
|
-
node: '14.19.
|
|
15208
|
+
node: '14.19.2',
|
|
15209
15209
|
openssl: '1.1.1n',
|
|
15210
15210
|
tz: '2021a3',
|
|
15211
15211
|
unicode: '14.0',
|
|
15212
15212
|
uv: '1.42.0',
|
|
15213
|
-
v8: '8.4.371.23-node.
|
|
15213
|
+
v8: '8.4.371.23-node.87',
|
|
15214
15214
|
zlib: '1.2.11'
|
|
15215
15215
|
}
|
|
15216
15216
|
};
|
|
@@ -16280,6 +16280,7 @@ function openHrefInOutlineMode(e) {
|
|
|
16280
16280
|
|
|
16281
16281
|
if (dom.outlineManager) {
|
|
16282
16282
|
// @@ TODO Remove the use of document as a global object
|
|
16283
|
+
// TODO fix dependency cycle to solid-panes by calling outlineManager
|
|
16283
16284
|
;
|
|
16284
16285
|
dom.outlineManager.GotoSubject(_solidLogic.store.sym(uri), true, undefined, true, undefined);
|
|
16285
16286
|
} else if (window && window.panes && window.panes.getOutliner) {
|
|
@@ -16407,6 +16408,7 @@ function linkButton(dom, object) {
|
|
|
16407
16408
|
b.textContent = 'Goto ' + utils.label(object);
|
|
16408
16409
|
b.addEventListener('click', function (_event) {
|
|
16409
16410
|
// b.parentNode.removeChild(b)
|
|
16411
|
+
// TODO fix dependency cycle to solid-panes by calling outlineManager
|
|
16410
16412
|
;
|
|
16411
16413
|
dom.outlineManager.GotoSubject(object, true, undefined, true, undefined);
|
|
16412
16414
|
}, true);
|
|
@@ -17147,6 +17149,7 @@ exports.findClosest = findClosest;
|
|
|
17147
17149
|
exports.formsFor = formsFor;
|
|
17148
17150
|
exports.makeDescription = makeDescription;
|
|
17149
17151
|
exports.makeSelectForCategory = makeSelectForCategory;
|
|
17152
|
+
exports.makeSelectForChoice = makeSelectForChoice;
|
|
17150
17153
|
exports.makeSelectForNestedCategory = makeSelectForNestedCategory;
|
|
17151
17154
|
exports.makeSelectForOptions = makeSelectForOptions;
|
|
17152
17155
|
exports.newButton = newButton;
|
|
@@ -17258,14 +17261,16 @@ _fieldFunction.field[ns.ui('Form').uri] = _fieldFunction.field[ns.ui('Group').ur
|
|
|
17258
17261
|
var ui = ns.ui;
|
|
17259
17262
|
if (container) container.appendChild(box); // Prevent loops
|
|
17260
17263
|
|
|
17264
|
+
if (!form) return;
|
|
17261
17265
|
var key = subject.toNT() + '|' + form.toNT();
|
|
17262
17266
|
|
|
17263
17267
|
if (already[key]) {
|
|
17264
17268
|
// been there done that
|
|
17265
|
-
box.appendChild(dom.createTextNode('Group: see above ' + key));
|
|
17266
|
-
|
|
17269
|
+
box.appendChild(dom.createTextNode('Group: see above ' + key)); // TODO fix dependency cycle to solid-panes by calling outlineManager
|
|
17270
|
+
// const plist = [$rdf.st(subject, ns.owl('sameAs'), subject)] // @@ need prev subject
|
|
17271
|
+
// dom.outlineManager.appendPropertyTRs(box, plist)
|
|
17272
|
+
// dom.appendChild(plist)
|
|
17267
17273
|
|
|
17268
|
-
dom.outlineManager.appendPropertyTRs(box, plist);
|
|
17269
17274
|
return box;
|
|
17270
17275
|
}
|
|
17271
17276
|
|
|
@@ -17366,47 +17371,43 @@ _fieldFunction.field[ns.ui('Options').uri] = function (dom, container, already,
|
|
|
17366
17371
|
values = kb.each(subject, dependingOn);
|
|
17367
17372
|
}
|
|
17368
17373
|
|
|
17369
|
-
|
|
17370
|
-
|
|
17371
|
-
|
|
17372
|
-
for (var i = 0; i < cases.length; i++) {
|
|
17373
|
-
var c = cases[i];
|
|
17374
|
-
var tests = kb.each(c, ui('for'), null, formDoc); // There can be multiple 'for'
|
|
17374
|
+
for (var i = 0; i < cases.length; i++) {
|
|
17375
|
+
var c = cases[i];
|
|
17376
|
+
var tests = kb.each(c, ui('for'), null, formDoc); // There can be multiple 'for'
|
|
17375
17377
|
|
|
17376
|
-
|
|
17378
|
+
var match = false;
|
|
17377
17379
|
|
|
17378
|
-
|
|
17379
|
-
|
|
17380
|
-
|
|
17380
|
+
for (var j = 0; j < tests.length; j++) {
|
|
17381
|
+
var _iterator = _createForOfIteratorHelper(values),
|
|
17382
|
+
_step;
|
|
17381
17383
|
|
|
17382
|
-
|
|
17383
|
-
|
|
17384
|
-
|
|
17385
|
-
|
|
17384
|
+
try {
|
|
17385
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
17386
|
+
var value = _step.value;
|
|
17387
|
+
var test = tests[j];
|
|
17386
17388
|
|
|
17387
|
-
|
|
17388
|
-
|
|
17389
|
-
}
|
|
17389
|
+
if (value.sameTerm(tests) || value.termType === test.termType && value.value === test.value) {
|
|
17390
|
+
match = true;
|
|
17390
17391
|
}
|
|
17391
|
-
} catch (err) {
|
|
17392
|
-
_iterator.e(err);
|
|
17393
|
-
} finally {
|
|
17394
|
-
_iterator.f();
|
|
17395
17392
|
}
|
|
17393
|
+
} catch (err) {
|
|
17394
|
+
_iterator.e(err);
|
|
17395
|
+
} finally {
|
|
17396
|
+
_iterator.f();
|
|
17396
17397
|
}
|
|
17398
|
+
}
|
|
17397
17399
|
|
|
17398
|
-
|
|
17399
|
-
|
|
17400
|
-
|
|
17401
|
-
if (!_field3) {
|
|
17402
|
-
box.appendChild((0, _error.errorMessageBlock)(dom, 'No "use" part for case in form ' + form));
|
|
17403
|
-
return box;
|
|
17404
|
-
} else {
|
|
17405
|
-
appendForm(dom, box, already, subject, _field3, dataDoc, callbackFunction);
|
|
17406
|
-
}
|
|
17400
|
+
if (match) {
|
|
17401
|
+
var _field3 = kb.the(c, ui('use'));
|
|
17407
17402
|
|
|
17408
|
-
|
|
17403
|
+
if (!_field3) {
|
|
17404
|
+
box.appendChild((0, _error.errorMessageBlock)(dom, 'No "use" part for case in form ' + form));
|
|
17405
|
+
return box;
|
|
17406
|
+
} else {
|
|
17407
|
+
appendForm(dom, box, already, subject, _field3, dataDoc, callbackFunction);
|
|
17409
17408
|
}
|
|
17409
|
+
|
|
17410
|
+
break;
|
|
17410
17411
|
}
|
|
17411
17412
|
} // @@ Add box.refresh() to sync fields with values
|
|
17412
17413
|
|
|
@@ -17694,7 +17695,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
|
|
|
17694
17695
|
// delete button and move buttons
|
|
17695
17696
|
|
|
17696
17697
|
if (kb.updater.editable(dataDoc.uri)) {
|
|
17697
|
-
buttons.deleteButtonWithCheck(dom, subField,
|
|
17698
|
+
buttons.deleteButtonWithCheck(dom, subField, multipleUIlabel, deleteThisItem);
|
|
17698
17699
|
|
|
17699
17700
|
if (ordered) {
|
|
17700
17701
|
// Add controsl in a frame
|
|
@@ -17745,7 +17746,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
|
|
|
17745
17746
|
|
|
17746
17747
|
var _shim = dom.createElement('div');
|
|
17747
17748
|
|
|
17748
|
-
_shim.appendChild(subField); // Subfield has its own
|
|
17749
|
+
_shim.appendChild(subField); // Subfield has its own layout
|
|
17749
17750
|
|
|
17750
17751
|
|
|
17751
17752
|
frame.appendChild(_shim);
|
|
@@ -17794,6 +17795,8 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
|
|
|
17794
17795
|
return shim;
|
|
17795
17796
|
}
|
|
17796
17797
|
|
|
17798
|
+
var multipleUIlabel = kb.any(form, ui('label'));
|
|
17799
|
+
if (!multipleUIlabel) multipleUIlabel = utils.label(property);
|
|
17797
17800
|
var min = kb.any(form, ui('min')); // This is the minimum number -- default 0
|
|
17798
17801
|
|
|
17799
17802
|
min = min ? 0 + min.value : 0;
|
|
@@ -17834,10 +17837,9 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
|
|
|
17834
17837
|
img.setAttribute('src', plusIconURI); // plus sign
|
|
17835
17838
|
|
|
17836
17839
|
img.setAttribute('style', 'margin: 0.2em; width: 1.5em; height:1.5em');
|
|
17837
|
-
img.title = 'Click to add
|
|
17838
|
-
var prompt =
|
|
17839
|
-
prompt.textContent = (values.length === 0 ? 'Add
|
|
17840
|
-
|
|
17840
|
+
img.title = 'Click to add another ' + multipleUIlabel;
|
|
17841
|
+
var prompt = dom.createElement('span');
|
|
17842
|
+
prompt.textContent = (values.length === 0 ? 'Add another ' : 'Add ') + multipleUIlabel;
|
|
17841
17843
|
tail.addEventListener('click', /*#__PURE__*/function () {
|
|
17842
17844
|
var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(_eventNotUsed) {
|
|
17843
17845
|
return _regenerator["default"].wrap(function _callee5$(_context5) {
|
|
@@ -17859,6 +17861,7 @@ _fieldFunction.field[ns.ui('Multiple').uri] = function (dom, container, already,
|
|
|
17859
17861
|
return _ref3.apply(this, arguments);
|
|
17860
17862
|
};
|
|
17861
17863
|
}(), true);
|
|
17864
|
+
tail.appendChild(prompt);
|
|
17862
17865
|
}
|
|
17863
17866
|
|
|
17864
17867
|
function createListIfNecessary() {
|
|
@@ -18133,16 +18136,16 @@ _fieldFunction.field[ns.ui('Classifier').uri] = function (dom, container, alread
|
|
|
18133
18136
|
** -- radio buttons
|
|
18134
18137
|
** -- auto-complete typing
|
|
18135
18138
|
**
|
|
18136
|
-
**
|
|
18139
|
+
** TODO: according to ontology ui:choice can also have ns.ui('default') - this is not implemented yet
|
|
18137
18140
|
*/
|
|
18138
18141
|
|
|
18139
18142
|
|
|
18140
18143
|
_fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, subject, form, dataDoc, callbackFunction) {
|
|
18141
18144
|
var ui = ns.ui;
|
|
18142
18145
|
var kb = _solidLogic.store;
|
|
18143
|
-
var multiple = false;
|
|
18144
18146
|
var formDoc = form.doc ? form.doc() : null; // @@ if blank no way to know
|
|
18145
18147
|
|
|
18148
|
+
var multiSelect = false;
|
|
18146
18149
|
var p;
|
|
18147
18150
|
var box = dom.createElement('div');
|
|
18148
18151
|
box.setAttribute('class', 'choiceBox'); // Set flexDirection column?
|
|
@@ -18171,79 +18174,79 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
|
|
|
18171
18174
|
|
|
18172
18175
|
var follow = kb.anyJS(form, ui('follow'), null, formDoc); // data doc moves to new subject?
|
|
18173
18176
|
|
|
18174
|
-
var possible = [];
|
|
18175
|
-
var possibleProperties;
|
|
18176
|
-
var firstSelectOptionText = '* Select from ' + utils.label(subject, true) + ' *';
|
|
18177
18177
|
var opts = {
|
|
18178
18178
|
form: form,
|
|
18179
18179
|
subForm: subForm,
|
|
18180
|
-
|
|
18181
|
-
firstSelectOptionText: firstSelectOptionText,
|
|
18180
|
+
multiSelect: multiSelect,
|
|
18182
18181
|
disambiguate: false
|
|
18183
18182
|
};
|
|
18184
|
-
possible = kb.each(undefined, ns.rdf('type'), uiFrom, formDoc);
|
|
18185
18183
|
|
|
18186
|
-
|
|
18187
|
-
possible
|
|
18188
|
-
|
|
18184
|
+
function getSelectorOptions() {
|
|
18185
|
+
var possible = [];
|
|
18186
|
+
var possibleProperties;
|
|
18187
|
+
possible = kb.each(undefined, ns.rdf('type'), uiFrom, formDoc);
|
|
18189
18188
|
|
|
18189
|
+
for (var x in kb.findMembersNT(uiFrom)) {
|
|
18190
|
+
possible.push(kb.fromNT(x));
|
|
18191
|
+
} // Use rdfs
|
|
18190
18192
|
|
|
18191
|
-
if (uiFrom.sameTerm(ns.rdfs('Class'))) {
|
|
18192
|
-
for (p in buttons.allClassURIs()) {
|
|
18193
|
-
possible.push(kb.sym(p));
|
|
18194
|
-
} // log.debug("%%% Choice field: possible.length 2 = "+possible.length)
|
|
18195
18193
|
|
|
18196
|
-
|
|
18197
|
-
|
|
18194
|
+
if (uiFrom.sameTerm(ns.rdfs('Class'))) {
|
|
18195
|
+
for (p in buttons.allClassURIs()) {
|
|
18196
|
+
possible.push(kb.sym(p));
|
|
18197
|
+
} // log.debug("%%% Choice field: possible.length 2 = "+possible.length)
|
|
18198
18198
|
|
|
18199
|
-
|
|
18200
|
-
|
|
18201
|
-
}
|
|
18199
|
+
} else if (uiFrom.sameTerm(ns.rdf('Property'))) {
|
|
18200
|
+
possibleProperties = buttons.propertyTriage(kb);
|
|
18202
18201
|
|
|
18203
|
-
|
|
18204
|
-
|
|
18205
|
-
|
|
18202
|
+
for (p in possibleProperties.op) {
|
|
18203
|
+
possible.push(kb.fromNT(p));
|
|
18204
|
+
}
|
|
18205
|
+
|
|
18206
|
+
for (p in possibleProperties.dp) {
|
|
18207
|
+
possible.push(kb.fromNT(p));
|
|
18208
|
+
}
|
|
18206
18209
|
|
|
18207
|
-
|
|
18208
|
-
|
|
18209
|
-
|
|
18210
|
+
opts.disambiguate = true; // This is a big class, and the labels won't be enough.
|
|
18211
|
+
} else if (uiFrom.sameTerm(ns.owl('ObjectProperty'))) {
|
|
18212
|
+
possibleProperties = buttons.propertyTriage(kb);
|
|
18210
18213
|
|
|
18211
|
-
|
|
18212
|
-
|
|
18213
|
-
|
|
18214
|
+
for (p in possibleProperties.op) {
|
|
18215
|
+
possible.push(kb.fromNT(p));
|
|
18216
|
+
}
|
|
18217
|
+
|
|
18218
|
+
opts.disambiguate = true;
|
|
18219
|
+
} else if (uiFrom.sameTerm(ns.owl('DatatypeProperty'))) {
|
|
18220
|
+
possibleProperties = buttons.propertyTriage(kb);
|
|
18214
18221
|
|
|
18215
|
-
|
|
18216
|
-
|
|
18217
|
-
|
|
18222
|
+
for (p in possibleProperties.dp) {
|
|
18223
|
+
possible.push(kb.fromNT(p));
|
|
18224
|
+
}
|
|
18218
18225
|
|
|
18219
|
-
|
|
18220
|
-
possible.push(kb.fromNT(p));
|
|
18226
|
+
opts.disambiguate = true;
|
|
18221
18227
|
}
|
|
18222
18228
|
|
|
18223
|
-
|
|
18224
|
-
|
|
18229
|
+
var object = kb.any(subject, property);
|
|
18230
|
+
if (object) possible.push(object);
|
|
18231
|
+
return sortByLabel(possible);
|
|
18232
|
+
} // TODO: this checks for any occurrence, regardless of true or false setting
|
|
18225
18233
|
|
|
18226
|
-
var sortedPossible = sortByLabel(possible); // TODO: this checks for any occurance regardles if it is set to true or false
|
|
18227
18234
|
|
|
18228
18235
|
if (kb.any(form, ui('canMintNew'))) {
|
|
18229
18236
|
opts.mint = '* Create new *'; // @@ could be better
|
|
18230
18237
|
}
|
|
18231
18238
|
|
|
18232
|
-
var selector
|
|
18233
|
-
rhs.appendChild(selector);
|
|
18234
|
-
var object;
|
|
18235
|
-
|
|
18236
|
-
if (selector.currentURI) {
|
|
18237
|
-
object = $rdf.sym(selector.currentURI);
|
|
18238
|
-
} else {
|
|
18239
|
-
object = kb.any(subject, property);
|
|
18240
|
-
}
|
|
18239
|
+
var selector;
|
|
18241
18240
|
|
|
18242
|
-
|
|
18243
|
-
|
|
18244
|
-
|
|
18245
|
-
|
|
18241
|
+
rhs.refresh = function () {
|
|
18242
|
+
var selectorOptions = getSelectorOptions();
|
|
18243
|
+
selector = makeSelectForChoice(dom, rhs, kb, subject, property, selectorOptions, uiFrom, opts, dataDoc, callbackFunction);
|
|
18244
|
+
rhs.innerHTML = '';
|
|
18245
|
+
rhs.appendChild(selector);
|
|
18246
|
+
};
|
|
18246
18247
|
|
|
18248
|
+
rhs.refresh();
|
|
18249
|
+
if (selector && selector.refresh) selector.refresh();
|
|
18247
18250
|
return box;
|
|
18248
18251
|
};
|
|
18249
18252
|
/**
|
|
@@ -18464,7 +18467,8 @@ function promptForNew(dom, kb, subject, predicate, theClass, form, dataDoc, call
|
|
|
18464
18467
|
b.setAttribute('type', 'button');
|
|
18465
18468
|
b.setAttribute('style', 'float: right;');
|
|
18466
18469
|
b.innerHTML = 'Goto ' + utils.label(theClass);
|
|
18467
|
-
b.addEventListener('click',
|
|
18470
|
+
b.addEventListener('click', // TODO fix dependency cycle to solid-panes by calling outlineManager
|
|
18471
|
+
function (_e) {
|
|
18468
18472
|
dom.outlineManager.GotoSubject(theClass, true, undefined, true, undefined);
|
|
18469
18473
|
}, false);
|
|
18470
18474
|
return box;
|
|
@@ -18599,17 +18603,15 @@ function makeDescription(dom, kb, subject, predicate, dataDoc, callbackFunction)
|
|
|
18599
18603
|
// @param subject - a term, the subject of the statement(s) being edited.
|
|
18600
18604
|
// @param predicate - a term, the predicate of the statement(s) being edited
|
|
18601
18605
|
// @param possible - a list of terms, the possible value the object can take
|
|
18602
|
-
// @param options.
|
|
18603
|
-
// @param options.firstSelectOptionText - a string to be displayed as the
|
|
18606
|
+
// @param options.nullLabel - a string to be displayed as the
|
|
18604
18607
|
// option for none selected (for non multiple)
|
|
18605
|
-
// @param options.mint - User may create thing if this sent to the prompt string eg "New foo"
|
|
18606
18608
|
// @param options.subForm - If mint, then the form to be used for minting the new thing
|
|
18607
18609
|
// @param dataDoc - The web document being edited
|
|
18608
18610
|
// @param callbackFunction - takes (boolean ok, string errorBody)
|
|
18609
18611
|
*/
|
|
18610
18612
|
|
|
18611
18613
|
|
|
18612
|
-
function makeSelectForOptions(dom, kb, subject, predicate, possible,
|
|
18614
|
+
function makeSelectForOptions(dom, kb, subject, predicate, possible, options, dataDoc, callbackFunction) {
|
|
18613
18615
|
log.debug('Select list length now ' + possible.length);
|
|
18614
18616
|
var n = 0;
|
|
18615
18617
|
var uris = {}; // Count them
|
|
@@ -18626,7 +18628,7 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
|
|
|
18626
18628
|
} // uris is now the set of possible options
|
|
18627
18629
|
|
|
18628
18630
|
|
|
18629
|
-
if (n === 0
|
|
18631
|
+
if (n === 0) {
|
|
18630
18632
|
return (0, _error.errorMessageBlock)(dom, "Can't do selector with no options, subject= " + subject + ' property = ' + predicate + '.');
|
|
18631
18633
|
}
|
|
18632
18634
|
|
|
@@ -18652,6 +18654,8 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
|
|
|
18652
18654
|
actual = getActual();
|
|
18653
18655
|
|
|
18654
18656
|
var onChange = function onChange(_e) {
|
|
18657
|
+
select.disabled = true; // until data written back - gives user feedback too
|
|
18658
|
+
|
|
18655
18659
|
var ds = [];
|
|
18656
18660
|
var is = [];
|
|
18657
18661
|
|
|
@@ -18661,43 +18665,18 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
|
|
|
18661
18665
|
}
|
|
18662
18666
|
};
|
|
18663
18667
|
|
|
18664
|
-
var newObject;
|
|
18665
|
-
|
|
18666
18668
|
for (var _i = 0; _i < select.options.length; _i++) {
|
|
18667
18669
|
var opt = select.options[_i];
|
|
18668
|
-
|
|
18669
|
-
if (opt.selected && opt.AJAR_mint) {
|
|
18670
|
-
// not sure if this 'if' is used because I cannot find mintClass
|
|
18671
|
-
if (options.mintClass) {
|
|
18672
|
-
var thisForm = promptForNew(dom, kb, subject, predicate, options.mintClass, null, dataDoc, function (ok, body) {
|
|
18673
|
-
if (!ok) {
|
|
18674
|
-
callbackFunction(ok, body, {
|
|
18675
|
-
change: 'new'
|
|
18676
|
-
}); // @@ if ok, need some form of refresh of the select for the new thing
|
|
18677
|
-
}
|
|
18678
|
-
});
|
|
18679
|
-
select.parentNode.appendChild(thisForm);
|
|
18680
|
-
newObject = thisForm.AJAR_subject;
|
|
18681
|
-
} else {
|
|
18682
|
-
newObject = newThing(dataDoc);
|
|
18683
|
-
}
|
|
18684
|
-
|
|
18685
|
-
is.push($rdf.st(subject, predicate, kb.sym(newObject), dataDoc));
|
|
18686
|
-
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
|
|
18687
|
-
|
|
18688
|
-
if (options.mintStatementsFun) {
|
|
18689
|
-
is = is.concat(options.mintStatementsFun(newObject));
|
|
18690
|
-
}
|
|
18691
|
-
|
|
18692
|
-
select.currentURI = newObject;
|
|
18693
|
-
}
|
|
18694
|
-
|
|
18695
18670
|
if (!opt.AJAR_uri) continue; // a prompt or mint
|
|
18696
18671
|
|
|
18697
18672
|
if (opt.selected && !(opt.AJAR_uri in actual)) {
|
|
18698
18673
|
// new class
|
|
18699
18674
|
is.push($rdf.st(subject, predicate, kb.sym(opt.AJAR_uri), dataDoc));
|
|
18700
|
-
|
|
18675
|
+
}
|
|
18676
|
+
|
|
18677
|
+
if (!opt.selected && opt.AJAR_uri in actual) {
|
|
18678
|
+
// old class
|
|
18679
|
+
removeValue(kb.sym(opt.AJAR_uri));
|
|
18701
18680
|
}
|
|
18702
18681
|
|
|
18703
18682
|
if (opt.selected) select.currentURI = opt.AJAR_uri;
|
|
@@ -18717,29 +18696,25 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
|
|
|
18717
18696
|
sel = sel.superSelect;
|
|
18718
18697
|
}
|
|
18719
18698
|
|
|
18720
|
-
log.info('selectForOptions: data doc = ' + dataDoc);
|
|
18699
|
+
log.info('selectForOptions: data doc = ' + dataDoc);
|
|
18700
|
+
kb.updater.update(ds, is, function (uri, ok, body) {
|
|
18701
|
+
actual = getActual(); // refresh
|
|
18721
18702
|
|
|
18722
|
-
removeNextSiblingsAfterElement(select);
|
|
18723
|
-
addSubFormChoice(dom, select.parentNode, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, function (ok, body) {
|
|
18724
18703
|
if (ok) {
|
|
18725
|
-
|
|
18726
|
-
actual = getActual(); // refresh
|
|
18727
|
-
|
|
18728
|
-
if (!success) select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating select: ' + errorBody));
|
|
18729
|
-
});
|
|
18730
|
-
if (callbackFunction) callbackFunction(ok, {
|
|
18731
|
-
widget: 'select',
|
|
18732
|
-
event: 'new'
|
|
18733
|
-
});
|
|
18704
|
+
select.disabled = false; // data written back
|
|
18734
18705
|
} else {
|
|
18735
|
-
select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in
|
|
18706
|
+
return select.parentNode.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in select: ' + body));
|
|
18736
18707
|
}
|
|
18708
|
+
|
|
18709
|
+
if (callbackFunction) callbackFunction(ok, {
|
|
18710
|
+
widget: 'select',
|
|
18711
|
+
event: 'change'
|
|
18712
|
+
});
|
|
18737
18713
|
});
|
|
18738
18714
|
};
|
|
18739
18715
|
|
|
18740
18716
|
var select = dom.createElement('select');
|
|
18741
18717
|
select.setAttribute('style', style.formSelectSTyle);
|
|
18742
|
-
if (options.multiple) select.setAttribute('multiple', 'true');
|
|
18743
18718
|
select.currentURI = null;
|
|
18744
18719
|
|
|
18745
18720
|
select.refresh = function () {
|
|
@@ -18782,22 +18757,11 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
|
|
|
18782
18757
|
select.appendChild(option);
|
|
18783
18758
|
}
|
|
18784
18759
|
|
|
18785
|
-
if (
|
|
18786
|
-
var mint = dom.createElement('option');
|
|
18787
|
-
mint.appendChild(dom.createTextNode(options.mint));
|
|
18788
|
-
mint.AJAR_mint = true; // Flag it
|
|
18789
|
-
|
|
18790
|
-
select.insertBefore(mint, select.firstChild);
|
|
18791
|
-
}
|
|
18792
|
-
|
|
18793
|
-
if (!select.currentURI && !options.multiple) {
|
|
18760
|
+
if (!select.currentURI) {
|
|
18794
18761
|
var prompt = dom.createElement('option');
|
|
18795
|
-
prompt.appendChild(dom.createTextNode(options.
|
|
18796
|
-
prompt.disabled = true;
|
|
18797
|
-
prompt.value = true;
|
|
18798
|
-
prompt.hidden = true;
|
|
18799
|
-
prompt.selected = true;
|
|
18762
|
+
prompt.appendChild(dom.createTextNode(options.nullLabel));
|
|
18800
18763
|
select.insertBefore(prompt, select.firstChild);
|
|
18764
|
+
prompt.selected = true;
|
|
18801
18765
|
}
|
|
18802
18766
|
|
|
18803
18767
|
if (editable) {
|
|
@@ -18816,27 +18780,16 @@ function makeSelectForOptions(dom, kb, subject, predicate, possible, uiFrom, opt
|
|
|
18816
18780
|
function makeSelectForCategory(dom, kb, subject, category, dataDoc, callbackFunction) {
|
|
18817
18781
|
var du = kb.any(category, ns.owl('disjointUnionOf'));
|
|
18818
18782
|
var subs;
|
|
18819
|
-
var multiple = false;
|
|
18820
18783
|
|
|
18821
18784
|
if (!du) {
|
|
18822
18785
|
subs = kb.each(undefined, ns.rdfs('subClassOf'), category);
|
|
18823
|
-
multiple = true;
|
|
18824
18786
|
} else {
|
|
18825
18787
|
subs = du.elements;
|
|
18826
18788
|
}
|
|
18827
18789
|
|
|
18828
18790
|
log.debug('Select list length ' + subs.length);
|
|
18829
|
-
|
|
18830
|
-
|
|
18831
|
-
return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiple ? 'multiple ' : '') + 'selector with no subclasses of category: ' + category);
|
|
18832
|
-
}
|
|
18833
|
-
|
|
18834
|
-
if (subs.length === 1) {
|
|
18835
|
-
return (0, _error.errorMessageBlock)(dom, "Can't do " + (multiple ? 'multiple ' : '') + 'selector with only 1 subclass of category: ' + category + ':' + subs[1]);
|
|
18836
|
-
}
|
|
18837
|
-
|
|
18838
|
-
return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, null, {
|
|
18839
|
-
multiple: multiple
|
|
18791
|
+
return makeSelectForOptions(dom, kb, subject, ns.rdf('type'), subs, {
|
|
18792
|
+
nullLabel: '* Select type *'
|
|
18840
18793
|
}, dataDoc, callbackFunction);
|
|
18841
18794
|
}
|
|
18842
18795
|
/** Make SELECT element to select subclasses recurively
|
|
@@ -18870,8 +18823,7 @@ function makeSelectForNestedCategory(dom, kb, subject, category, dataDoc, callba
|
|
|
18870
18823
|
function onChange(ok, body) {
|
|
18871
18824
|
if (ok) update();
|
|
18872
18825
|
callbackFunction(ok, body);
|
|
18873
|
-
}
|
|
18874
|
-
|
|
18826
|
+
}
|
|
18875
18827
|
|
|
18876
18828
|
var select = makeSelectForCategory(dom, kb, subject, category, dataDoc, onChange);
|
|
18877
18829
|
container.appendChild(select);
|
|
@@ -19026,6 +18978,196 @@ function newThing(doc) {
|
|
|
19026
18978
|
var now = new Date();
|
|
19027
18979
|
return $rdf.sym(doc.uri + '#' + 'id' + ('' + now.getTime()));
|
|
19028
18980
|
}
|
|
18981
|
+
/** Make SELECT element to select options
|
|
18982
|
+
//
|
|
18983
|
+
// @param subject - a term, the subject of the statement(s) being edited.
|
|
18984
|
+
// @param predicate - a term, the predicate of the statement(s) being edited
|
|
18985
|
+
// @param possible - a list of terms, the possible value the object can take
|
|
18986
|
+
// @param options.multiSelect - Boolean - Whether more than one at a time is allowed
|
|
18987
|
+
// @param options.uiMultipleInUse - signals that the ui:choise is used with a ui:multiple
|
|
18988
|
+
// @param options.mint - User may create thing if this sent to the prompt string eg "New foo"
|
|
18989
|
+
// @param options.subForm - If mint, then the form to be used for minting the new thing
|
|
18990
|
+
// @param dataDoc - The web document being edited
|
|
18991
|
+
// @param callbackFunction - takes (boolean ok, string errorBody)
|
|
18992
|
+
*/
|
|
18993
|
+
|
|
18994
|
+
|
|
18995
|
+
function makeSelectForChoice(dom, container, kb, subject, predicate, possible, uiFrom, options, dataDoc, callbackFunction) {
|
|
18996
|
+
var n = 0;
|
|
18997
|
+
var uris = {}; // Count them
|
|
18998
|
+
|
|
18999
|
+
var editable = kb.updater.editable(dataDoc.uri);
|
|
19000
|
+
|
|
19001
|
+
for (var i = 0; i < possible.length; i++) {
|
|
19002
|
+
var sub = possible[i]; // @@ Maybe; make this so it works with blank nodes too
|
|
19003
|
+
|
|
19004
|
+
if (!sub.uri) debug.warn("makeSelectForOptions: option does not have an uri: ".concat(sub, ", with predicate: ").concat(predicate));
|
|
19005
|
+
if (!sub.uri || sub.uri in uris) continue;
|
|
19006
|
+
uris[sub.uri] = true;
|
|
19007
|
+
n++;
|
|
19008
|
+
} // uris is now the set of possible options
|
|
19009
|
+
|
|
19010
|
+
|
|
19011
|
+
if (n === 0 && !options.mint) {
|
|
19012
|
+
return (0, _error.errorMessageBlock)(dom, "Can't do selector with no options, subject= " + subject + ' property = ' + predicate + '.');
|
|
19013
|
+
}
|
|
19014
|
+
|
|
19015
|
+
log.debug('makeSelectForOptions: dataDoc=' + dataDoc);
|
|
19016
|
+
|
|
19017
|
+
function determinFirstSelectOption() {
|
|
19018
|
+
var firstSelectOptionText = '--- classify ---';
|
|
19019
|
+
var option = dom.createElement('option');
|
|
19020
|
+
|
|
19021
|
+
if (predicate && !(predicate.termType === 'BlankNode')) {
|
|
19022
|
+
firstSelectOptionText = '* Select for property: ' + utils.label(predicate) + ' *';
|
|
19023
|
+
}
|
|
19024
|
+
|
|
19025
|
+
if (subject && !(subject.termType === 'BlankNode')) {
|
|
19026
|
+
firstSelectOptionText = '* Select for ' + utils.label(subject, true) + ' *';
|
|
19027
|
+
}
|
|
19028
|
+
|
|
19029
|
+
option.appendChild(dom.createTextNode(firstSelectOptionText));
|
|
19030
|
+
option.disabled = true;
|
|
19031
|
+
option.value = true;
|
|
19032
|
+
option.hidden = true;
|
|
19033
|
+
option.selected = true;
|
|
19034
|
+
return option;
|
|
19035
|
+
}
|
|
19036
|
+
|
|
19037
|
+
var onChange = function onChange(_e) {
|
|
19038
|
+
select.refresh();
|
|
19039
|
+
};
|
|
19040
|
+
|
|
19041
|
+
var select = dom.createElement('select');
|
|
19042
|
+
select.setAttribute('style', style.formSelectSTyle);
|
|
19043
|
+
if (options.multiSelect) select.setAttribute('multiSelect', 'true');
|
|
19044
|
+
select.currentURI = null;
|
|
19045
|
+
|
|
19046
|
+
for (var uri in uris) {
|
|
19047
|
+
select.appendChild(createOption(uri));
|
|
19048
|
+
}
|
|
19049
|
+
|
|
19050
|
+
if (editable && options.mint) {
|
|
19051
|
+
var mint = dom.createElement('option');
|
|
19052
|
+
mint.appendChild(dom.createTextNode(options.mint));
|
|
19053
|
+
mint.AJAR_mint = true; // Flag it
|
|
19054
|
+
|
|
19055
|
+
select.insertBefore(mint, select.firstChild);
|
|
19056
|
+
}
|
|
19057
|
+
|
|
19058
|
+
if (select.children.length === 0) select.insertBefore(determinFirstSelectOption(), select.firstChild);
|
|
19059
|
+
|
|
19060
|
+
select.refresh = function () {
|
|
19061
|
+
select.disabled = true; // unlocked any conflict we had got into
|
|
19062
|
+
|
|
19063
|
+
var ds = [];
|
|
19064
|
+
var is = [];
|
|
19065
|
+
|
|
19066
|
+
var removeValue = function removeValue(t) {
|
|
19067
|
+
if (kb.holds(subject, predicate, t, dataDoc)) {
|
|
19068
|
+
ds.push($rdf.st(subject, predicate, t, dataDoc));
|
|
19069
|
+
}
|
|
19070
|
+
};
|
|
19071
|
+
|
|
19072
|
+
var newObject;
|
|
19073
|
+
|
|
19074
|
+
for (var _i3 = 0; _i3 < select.options.length; _i3++) {
|
|
19075
|
+
var opt = select.options[_i3];
|
|
19076
|
+
|
|
19077
|
+
if (opt.selected && opt.AJAR_mint) {
|
|
19078
|
+
// not sure if this 'if' is used because I cannot find mintClass
|
|
19079
|
+
if (options.mintClass) {
|
|
19080
|
+
var thisForm = promptForNew(dom, kb, subject, predicate, options.mintClass, null, dataDoc, function (ok, body) {
|
|
19081
|
+
if (!ok) {
|
|
19082
|
+
callbackFunction(ok, body, {
|
|
19083
|
+
change: 'new'
|
|
19084
|
+
}); // @@ if ok, need some form of refresh of the select for the new thing
|
|
19085
|
+
}
|
|
19086
|
+
});
|
|
19087
|
+
select.parentNode.appendChild(thisForm);
|
|
19088
|
+
newObject = thisForm.AJAR_subject;
|
|
19089
|
+
} else {
|
|
19090
|
+
newObject = newThing(dataDoc);
|
|
19091
|
+
}
|
|
19092
|
+
|
|
19093
|
+
is.push($rdf.st(subject, predicate, kb.sym(newObject), dataDoc));
|
|
19094
|
+
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
|
|
19095
|
+
|
|
19096
|
+
if (options.mintStatementsFun) {
|
|
19097
|
+
is = is.concat(options.mintStatementsFun(newObject));
|
|
19098
|
+
}
|
|
19099
|
+
|
|
19100
|
+
select.currentURI = newObject;
|
|
19101
|
+
}
|
|
19102
|
+
|
|
19103
|
+
if (!opt.AJAR_uri) continue; // a prompt or mint
|
|
19104
|
+
|
|
19105
|
+
if (opt.selected) select.currentURI = opt.AJAR_uri;
|
|
19106
|
+
}
|
|
19107
|
+
|
|
19108
|
+
var sel = select.subSelect; // All subclasses must also go
|
|
19109
|
+
|
|
19110
|
+
while (sel && sel.currentURI) {
|
|
19111
|
+
removeValue(kb.sym(sel.currentURI));
|
|
19112
|
+
sel = sel.subSelect;
|
|
19113
|
+
}
|
|
19114
|
+
|
|
19115
|
+
sel = select.superSelect; // All superclasses are redundant
|
|
19116
|
+
|
|
19117
|
+
while (sel && sel.currentURI) {
|
|
19118
|
+
removeValue(kb.sym(sel.currentURI));
|
|
19119
|
+
sel = sel.superSelect;
|
|
19120
|
+
}
|
|
19121
|
+
|
|
19122
|
+
log.info('selectForOptions: data doc = ' + dataDoc);
|
|
19123
|
+
|
|
19124
|
+
if (select.currentURI) {
|
|
19125
|
+
removeNextSiblingsAfterElement(select);
|
|
19126
|
+
addSubFormChoice(dom, container, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, function (ok, body) {
|
|
19127
|
+
if (ok) {
|
|
19128
|
+
kb.updater.update(ds, is, function (uri, success, errorBody) {
|
|
19129
|
+
if (!success) container.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating select: ' + errorBody));
|
|
19130
|
+
});
|
|
19131
|
+
if (callbackFunction) callbackFunction(ok, {
|
|
19132
|
+
widget: 'select',
|
|
19133
|
+
event: 'new'
|
|
19134
|
+
}); // widgets.refreshTree(container)
|
|
19135
|
+
} else {
|
|
19136
|
+
container.appendChild((0, _error.errorMessageBlock)(dom, 'Error updating data in field of select: ' + body));
|
|
19137
|
+
}
|
|
19138
|
+
});
|
|
19139
|
+
}
|
|
19140
|
+
|
|
19141
|
+
select.disabled = false;
|
|
19142
|
+
};
|
|
19143
|
+
|
|
19144
|
+
function createOption(uri) {
|
|
19145
|
+
var option = dom.createElement('option');
|
|
19146
|
+
var c = kb.sym(uri);
|
|
19147
|
+
|
|
19148
|
+
if (options.disambiguate) {
|
|
19149
|
+
option.appendChild(dom.createTextNode(utils.labelWithOntology(c, true))); // Init. cap
|
|
19150
|
+
} else {
|
|
19151
|
+
option.appendChild(dom.createTextNode(utils.label(c, true))); // Init.
|
|
19152
|
+
}
|
|
19153
|
+
|
|
19154
|
+
var backgroundColor = kb.any(c, kb.sym('http://www.w3.org/ns/ui#backgroundColor'));
|
|
19155
|
+
|
|
19156
|
+
if (backgroundColor) {
|
|
19157
|
+
option.setAttribute('style', 'background-color: ' + backgroundColor.value + '; ');
|
|
19158
|
+
}
|
|
19159
|
+
|
|
19160
|
+
option.AJAR_uri = uri;
|
|
19161
|
+
if (c.toString() === '' + select.currentURI) option.selected = true;
|
|
19162
|
+
return option;
|
|
19163
|
+
}
|
|
19164
|
+
|
|
19165
|
+
if (editable) {
|
|
19166
|
+
select.addEventListener('change', onChange, false);
|
|
19167
|
+
}
|
|
19168
|
+
|
|
19169
|
+
return select;
|
|
19170
|
+
} // makeSelectForChoice
|
|
19029
19171
|
//# sourceMappingURL=forms.js.map
|
|
19030
19172
|
|
|
19031
19173
|
/***/ }),
|