Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

schema.enum enhancement for issue #85 and #22 #114

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

schema.enum enhancement for issue #85 and #22 #114

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
328b1e4
schema.enum enhancement for issue #85
hxh-robb Jan 15, 2018
faba401
appendedProperties feature
hxh-robb Jan 17, 2018
8c5735d
fix bug
hxh-robb Jan 18, 2018
088dc56
fix bug
hxh-robb Jan 18, 2018
da51438
fix bug
hxh-robb Jan 18, 2018
2559396
remove useless code
hxh-robb Jan 18, 2018
cc1e3e9
Ignore file type value
hxh-robb Jan 25, 2018
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
176 changes: 156 additions & 20 deletions src/js/brutusin-json-forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,25 @@ if (typeof brutusin === "undefined") {
var selectedIndex = 0;
for (var i = 0; i < s.enum.length; i++) {
var option = document.createElement("option");
var textNode = document.createTextNode(s.enum[i]);
option.value = s.enum[i];

var optionText = undefined;
var optionValue = undefined;
if( typeof s.enum[i] === 'object'){
optionText = s.enum[i]['text'];
optionValue = s.enum[i]['value'];
}
optionText = optionText !== undefined ? optionText : s.enum[i];
optionValue = optionValue !== undefined ? optionValue : optionText;

// var textNode = document.createTextNode(s.enum[i]);
// option.value = s.enum[i];
var textNode = document.createTextNode(optionText);
option.value = optionValue;

appendChild(option, textNode, s);
appendChild(input, option, s);
if (value && s.enum[i] === value) {
// if (value && s.enum[i] === value) {
if (value && optionValue === value) {
selectedIndex = i;
if (!s.required) {
selectedIndex++;
Expand Down Expand Up @@ -303,18 +317,20 @@ if (typeof brutusin === "undefined") {
};

input.onchange = function () {
var value;
var value, old;
try {
value = getValue(s, input);
} catch (error) {
value = null;
}
if (parentObject) {
old = parentObject[propertyProvider.getValue()];
parentObject[propertyProvider.getValue()] = value;
} else {
data = value;
}
onDependencyChanged(schemaId, input);
renderAppendedProperties(schemaId, old, value);
};

if (s.description) {
Expand Down Expand Up @@ -439,17 +455,7 @@ if (typeof brutusin === "undefined") {
};

renderers["object"] = function (container, id, parentObject, propertyProvider, value) {

function createStaticPropertyProvider(propname) {
var ret = new Object();
ret.getValue = function () {
return propname;
};
ret.onchange = function (oldName) {
};
return ret;
}


function addAdditionalProperty(current, table, id, name, value, pattern) {
var schemaId = getSchemaId(id);
var s = getSchema(schemaId);
Expand Down Expand Up @@ -848,7 +854,7 @@ if (typeof brutusin === "undefined") {
return clone;
} else if (object === "") {
return null;
} else if (object instanceof Object) {
} else if (object instanceof Object && !(object instanceof File)) {
var clone = new Object();
var nonEmpty = false;
for (var prop in object) {
Expand Down Expand Up @@ -1062,6 +1068,7 @@ if (typeof brutusin === "undefined") {
populateSchemaMap(childProp, subSchema);
}
}

if (schema.patternProperties) {
pseudoSchema.patternProperties = new Object();
for (var pat in schema.patternProperties) {
Expand All @@ -1077,6 +1084,7 @@ if (typeof brutusin === "undefined") {
}
}
}

if (schema.additionalProperties) {
var childProp = name + "[*]";
pseudoSchema.additionalProperties = childProp;
Expand All @@ -1087,6 +1095,21 @@ if (typeof brutusin === "undefined") {
populateSchemaMap(childProp, SCHEMA_ANY);
}
}

if (schema.appendedProperties && schema.appendedProperties.hasOwnProperty("dependsOn") && schema.appendedProperties.hasOwnProperty("appendix")) {
pseudoSchema.appendedProperties = new Object();
var dependsOnProp = schema.appendedProperties.dependsOn;
var appendix = schema.appendedProperties.appendix;

for (var option in appendix) {
var optionSchemaId = name + "{" + dependsOnProp + "}" + "[\'" + option + "\']";
pseudoSchema.appendedProperties[option] = optionSchemaId;
populateSchemaMap(optionSchemaId, appendix[option]);
for (var appendedProp in appendix[option]) {
populateSchemaMap(optionSchemaId + "." + appendedProp, appendix[option][appendedProp]);
}
}
}
} else if (schema.type === "array") {
pseudoSchema.items = name + "[#]";
populateSchemaMap(pseudoSchema.items, schema.items);
Expand Down Expand Up @@ -1324,11 +1347,10 @@ if (typeof brutusin === "undefined") {
}

function onDependencyChanged(name, source) {

var arr = dependencyMap[name];
if (!arr || !obj.schemaResolver) {
return;
}
}
var cb = function (schemas) {
if (schemas) {
for (var id in schemas) {
Expand All @@ -1347,8 +1369,6 @@ if (typeof brutusin === "undefined") {
};
BrutusinForms.onResolutionStarted(source);
obj.schemaResolver(arr, obj.getData(), cb);


}

function Expression(exp) {
Expand Down Expand Up @@ -1406,6 +1426,18 @@ if (typeof brutusin === "undefined") {
name = "$";
var currentToken = queue.shift();
}

// processing appendedProperties schemaId
if( /^\$\{(.+)\}$/.test(currentToken) ) {
var optionToken = queue.shift();
if( !/^\[(.+)\]$/.test(optionToken) ) {
queue.splice(0,0,optionToken);
} else {
name = currentToken + optionToken;
currentToken = queue.shift();
}
}

if (!currentToken) {
visitor(data, parentData, property);
} else if (Array.isArray(data)) {
Expand Down Expand Up @@ -1526,6 +1558,110 @@ if (typeof brutusin === "undefined") {
return ret;
}
}

function createStaticPropertyProvider(propname) {
var ret = new Object();
ret.getValue = function () {
return propname;
};
ret.onchange = function (oldName) {
};
return ret;
}

function appendProperty(current, tbody, id, name, value){
var propId = getSchemaId(id);
var propSchema = getSchema(propId);
if( !propSchema )
return;

var tr = document.createElement("tr");
var td1 = document.createElement("td");
td1.className = "prop-name";
var td2 = document.createElement("td");
td2.className = "prop-value";

appendChild(tbody, tr, propSchema);
appendChild(tr, td1, propSchema);
appendChild(tr, td2, propSchema);
render(td1, td2, propId, current, createStaticPropertyProvider(name), value);
}

function renderAppendedProperties(schemaId, oldValue, newValue){
var schemaIdRegex = /^(.+)\.(.+)$/;
var matches = schemaIdRegex.exec(schemaId);
if( !matches ) {
return;
}

var parentSchemaId = matches[1];
var dependsOnProp = matches[2];

var appendedPropPrefix = parentSchemaId + "{" + dependsOnProp + "}"
var parentSchema = getSchema(parentSchemaId);
if(!parentSchema || !parentSchema.appendedProperties) {
return;
}
var isAppendedDependency = false;
for(var key in parentSchema.appendedProperties) {
if(parentSchema.appendedProperties[key].startsWith(appendedPropPrefix)){
isAppendedDependency = true;
break;
}
}
if(!isAppendedDependency){
return;
}

var oldAppendedPropSchemaId = parentSchema.appendedProperties[oldValue];
var newAppendedPropSchemaId = parentSchema.appendedProperties[newValue];
if( !oldAppendedPropSchemaId && !newAppendedPropSchemaId ) {
return;
}

try {
var tbody = renderInfoMap[schemaId].container.parentElement.parentElement;
var current = renderInfoMap[schemaId].parentObject;
} catch (err) {
return;
}

// Clear old appended properties
if( oldAppendedPropSchemaId !== undefined ) {
for(var renderInfoKey in renderInfoMap) {
if( renderInfoKey.startsWith(oldAppendedPropSchemaId) ) {
var renderInfo = renderInfoMap[renderInfoKey];
if(renderInfo){
var tr = renderInfo.container.parentElement;
tbody.removeChild(tr);
delete renderInfoMap[renderInfoKey];
cleanData(renderInfoKey);
}
}
}
}

// Render new appended properties
if( newAppendedPropSchemaId !== undefined ) {
var rendered = [];
var value = tbody.getRootNode() !== document && initialValue ? initialValue : data;

if( !value ){
value = {};
value[dependsOnProp] = newValue;
}

// data = value;
for( var p in schemaMap[newAppendedPropSchemaId] ) {
if( ( parentSchema.properties && parentSchema.properties.hasOwnProperty(p) ) || rendered.indexOf(p) >= 0){
continue;
}

appendProperty(data, tbody, newAppendedPropSchemaId + "." + p , p, value[p]);
rendered.push(p);
}
}
}
};
brutusin["json-forms"] = BrutusinForms;
}());