Skip to content

Commit 720c3c3

Browse files
codymwalkercodymwalker
committed
Remove CollFormat from UI for schema params
Fixes #20
1 parent 95894f3 commit 720c3c3

File tree

2 files changed

+38
-48
lines changed

2 files changed

+38
-48
lines changed

‎swagger/swagger-ui/swagger-ui.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
} else{
3131
$('.empty-swagger-doc').hide(1000);
3232
}
33-
console.log(window.swaggerUi.api.apisArray.length);
3433
},
3534
onFailure: function(data) {
3635
console.log("Unable to Load SwaggerUI");

‎swagger/swagger.html‎

Lines changed: 38 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249
*/
250250
var generateTypeRow = function(opts, top) {
251251
var row = $("<div/>");
252-
253252
row.addClass('node-swagger-type-row');
254253
row.css('margin-top', '3px');
255254
if(top){
@@ -281,7 +280,7 @@
281280
}
282281
typeSelect.val(opts.type);
283282
var formatLabel = $("<label/>", {
284-
class: "node-swgger-type-format-label",
283+
class: "node-swagger-type-format-label",
285284
style: "width: auto; margin-left:20px; margin-right: 10px;"
286285
}).text(formatText).appendTo(row);
287286
formatLabel.popover({
@@ -296,37 +295,48 @@
296295
style: "width: 150px;",
297296
type: "text"
298297
}).val(opts.format).appendTo(row);
299-
var collFormatSelect = $('<select/>', {
300-
class: "node-swagger-type-collection-format",
301-
style: "width: 150px;",
302-
type: "text"
303-
}).appendTo(row);
304-
var collformatoptions = ["csv", "ssv", "tsv", "pipes"];
305-
if (top) {
306-
collformatoptions.push("multi");
307-
}
308-
for (var i = 0; i < collformatoptions.length; i++) {
309-
collFormatSelect.append($("<option/>").val(collformatoptions[i]).text(collformatoptions[i]));
298+
299+
if(!opts.propertyRow){
300+
var collFormatSelect = $('<select/>', {
301+
class: "node-swagger-type-collection-format",
302+
style: "width: 150px;",
303+
type: "text"
304+
}).appendTo(row);
305+
var collformatoptions = ["csv", "ssv", "tsv", "pipes"];
306+
if (top) {
307+
collformatoptions.push("multi");
308+
}
309+
for (var i = 0; i < collformatoptions.length; i++) {
310+
collFormatSelect.append($("<option/>").val(collformatoptions[i]).text(collformatoptions[i]));
311+
}
312+
collFormatSelect.val(opts.collectionFormat || "csv");
310313
}
311-
collFormatSelect.val(opts.collectionFormat || "csv");
312314

313315
typeSelect.change(function() {
314316
var t = $(this).val();
315317
if (t != "array") {
316318
$(this).parent().find(".node-swagger-type-row").remove();
317319
$(this).parent().find(".node-swagger-type-format").show();
320+
$(this).parent().find(".node-swagger-type-format-label").text(formatText);
318321
$(this).parent().find(".node-swagger-type-collection-format").hide();
319-
322+
320323
if (t == "ref") {
321-
$(this).parent().find(".node-swgger-type-format-label").text("");
324+
$(this).parent().find(".node-swagger-type-format-label").text("");
322325
} else {
323-
$(this).parent().find(".node-swgger-type-format-label").text(formatText);
326+
$(this).parent().find(".node-swagger-type-format-label").text(formatText);
324327
}
325328

326329

327330
} else {
328331
$(this).parent().find(".node-swagger-type-format").hide();
329332
$(this).parent().find(".node-swagger-type-collection-format").show();
333+
if(opts.propertyRow){
334+
$(this).parent().find(".node-swagger-type-format-label").text("");
335+
if(!opts.items){
336+
opts.items = {};
337+
}
338+
opts.items.propertyRow = true;
339+
}
330340
generateTypeRow(opts.items || {}, false).appendTo($(this).parent());
331341
}
332342
});
@@ -374,6 +384,7 @@
374384
style: "margin-top: 3px; margin-left: 10px;"
375385
});
376386
propList.appendTo(row);
387+
opts.propertyRow = true;
377388
var typeRow = generateTypeRow(opts, true).appendTo(propList);
378389
return row;
379390
}
@@ -854,33 +865,13 @@
854865
Recursive function used to generate the items object that is required for array objects
855866
*/
856867
var getArrayItems = function (row){
857-
console.log(row);
858868
var items = {};
859869
var type = row.find('.node-swagger-type-select').val();
860870
items.type = type;
861871
if(type == 'array'){
862872
var collFormat = row.find('.node-swagger-type-collection-format').val();
863-
items.collectionFormat = collFormat;
864-
var nextRow = row.children(".node-swagger-type-row");
865-
items.items = getArrayItems(nextRow);
866-
} else{
867-
var format = row.find('.node-swagger-type-format').val();
868-
items.format = format;
869-
}
870-
return items;
871-
}
872-
873-
/**
874-
Temporary placeholder to remove collectionFormat since swagger does not allow it
875-
*/
876-
var getArrayItemsSchema = function (row){
877-
console.log(row);
878-
var items = {};
879-
var type = row.find('.node-swagger-type-select').val();
880-
items.type = type;
881-
if(type == 'array'){
882-
//var collFormat = row.find('.node-swagger-type-collection-format').val();
883-
//items.collectionFormat = collFormat;
873+
if(collFormat)
874+
items.collectionFormat = collFormat;
884875
var nextRow = row.children(".node-swagger-type-row");
885876
items.items = getArrayItems(nextRow);
886877
} else{
@@ -922,13 +913,13 @@
922913
current.type = ctype;
923914
if (current.type == "array") {
924915

925-
//commented out until we figure out what to do with collectionFormat in schema objects
926-
//var collFormat = row.children(".node-swagger-type-collection-format").val();
927-
//current.collectionFormat = collFormat;
916+
var collFormat = row.children(".node-swagger-type-collection-format").val();
917+
if(collFormat)
918+
current.collectionFormat = collFormat;
928919

929920
var nextRow = row.children(".node-swagger-type-row");
930921

931-
current.items = getArrayItemsSchema(nextRow);
922+
current.items = getArrayItems(nextRow);
932923

933924
} else {
934925
var format = row.children(".node-swagger-type-format").val();
@@ -1012,13 +1003,13 @@
10121003
current.type = ctype;
10131004
if (current.type == "array") {
10141005

1015-
//commented out until we figure out what to do with collectionFormat in schema objects
1016-
//var collFormat = row.children(".node-swagger-type-collection-format").val();
1017-
//current.collectionFormat = collFormat;
1006+
var collFormat = row.children(".node-swagger-type-collection-format").val();
1007+
if(collFormat)
1008+
current.collectionFormat = collFormat;
10181009

10191010
var nextRow = row.children(".node-swagger-type-row");
10201011

1021-
current.items = getArrayItemsSchema(nextRow);
1012+
current.items = getArrayItems(nextRow);
10221013

10231014
} else {
10241015
var format = row.children(".node-swagger-type-format").val();

0 commit comments

Comments
 (0)