Fix rendering of oneOf patterns, and add selection by "type" for speedier selection.

Author: Omri Schwarz

src/js/brutusin-json-forms.js

@@ -345,13 +345,23 @@ if (typeof brutusin === "undefined") {
             appendChild(input, noption, s);
             for (var i = 0; i < s.oneOf.length; i++) {		
                 var option = document.createElement("option");
-		var propId = id + "."+i;
+		var propId = schemaId + "."+i;
 		var ss = getSchema(propId);
-		//console.log(s,i,id,ss);
+		//console.log(s,i,id,ss,schemaMap,propId);
                 var textNode = document.createTextNode(ss.title);
                 option.value = s.oneOf[i];
                 appendChild(option, textNode, s);
                 appendChild(input, option, s);
+		if (value.hasOwnProperty("type")) {
+		    if (ss.hasOwnProperty("properties") ){
+			if (ss.properties.hasOwnProperty("type")){
+			    var tryit = getSchema(ss.properties.type);
+			    if (value.type == tryit.enum[0]){
+				input.selectedIndex = i+1;
+				render(null, display, id + "." + (input.selectedIndex-1), parentObject, propertyProvider, value) ;			    }
+			}
+		    }
+		}
 	    }
 	    input.onchange=function(){
 		render(null, display, id + "." + (input.selectedIndex-1), parentObject, propertyProvider, value) ;
@@ -762,6 +772,12 @@ if (typeof brutusin === "undefined") {
             }
             return pseudoSchema;
         }
+	function getDefinition(path) {
+	    // Translate the path to schema standard.
+	    // $/definitions/ from #/definitions/
+	    // fetch that schema.
+	    
+	}
 
         function populateSchemaMap(name, schema) {
             var pseudoSchema = createPseudoSchema(schema);
@@ -771,18 +787,22 @@ if (typeof brutusin === "undefined") {
                 pseudoSchema.oneOf = new Array();
 		pseudoSchema.type = "oneOf";		
 		for (var i in schema.oneOf) {
-		    //console.log(schema.oneOf[i]);
+		    console.log("ONEOF",name,schema.oneOf[i]);
                     var childProp = name + "." + i;
                     pseudoSchema.oneOf[i] = childProp;
                     populateSchemaMap(childProp, schema.oneOf[i]);
 		}
+	    } else if (schema.hasOwnProperty("$ref")){
+		console.log("REFERENTIAL");
+		var newschema = getDefinition(schema["$ref"]);
+		populateSchemaMap(name,newSchema);
 	    } else if (schema.type === "object") {
                 if (schema.properties) {
                     pseudoSchema.properties = new Object();
                     for (var prop in schema.properties) {			
                         var childProp = name + "." + prop;
                         pseudoSchema.properties[prop] = childProp;
-			console.log(prop,childProp,schema);
+			//console.log(prop,childProp,schema);
                         populateSchemaMap(childProp, schema.properties[prop]);
                     }
                 }
@@ -795,6 +815,16 @@ if (typeof brutusin === "undefined") {
                         populateSchemaMap(childProp, SCHEMA_ANY);
                     }
                 }
+		if (schema.hasOwnProperty("definitions")){
+		    console.log(schema.definitions);
+		    pseudoSchema.definitions = new Object();
+		    for (var def in schema.definitions){
+			continue;
+                        var childProp = name + "/" + prop;
+                        pseudoSchema.definitions[prop] = childProp;
+                        populateSchemaMap(childProp, schema.definitions[prop]);
+		    }
+		}
             } else if (schema.type === "array") {
                 pseudoSchema.items = name + "[#]";
                 populateSchemaMap(pseudoSchema.items, schema.items);