Changeset 965 for trunk

Timestamp:

Oct 23, 2020, 6:28:11 PM (4 years ago)

Author:

djay

Message:

Display inputs when not valid properly. Add element for list of values. Add required operationId and summary for every request, useful to validate the APIusing openapi-cli.

Location:

trunk/zoo-project

Files:

• zoo-kernel/service_json.c (modified) (4 diffs)
• zoo-services/utils/open-api/templates/index.html (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/service_json.c

@@ -1375 +1375 @@
     }
     if (tok->char_offset < slen){
+      fprintf(stderr, "Error parsing json\n");
       return NULL;
     }
@@ -1814 +1815 @@
               json_object_array_add(cc,json_object_new_string(vMap->value));
               json_object_object_add(methodc,"tags",cc);
+              json_object_object_add(methodc,"operationId",json_object_new_string(vMap->value));
+
             }
             json_object *responses=json_object_new_object();
@@ -1924 +1927 @@
                   
                   json_object *pajDescription=json_object_new_object();
-                  if(pmTitle!=NULL)
+                  json_object *pajPost=json_object_new_object();
+                  if(pmTitle!=NULL){
                     json_object_object_add(pajDescription,"description",json_object_new_string(pmTitle->value));
+                    json_object_object_add(pajPost,"summary",json_object_new_string(pmTitle->value));
+                  }
                   json_object *pajResponse=json_object_new_object();
                   json_object_object_add(pajResponse,"200",pajDescription);
 
-                  json_object *pajPost=json_object_new_object();
                   json_object_object_add(pajPost,"requestBody",pajRBody);
                   json_object_object_add(pajPost,"responses",pajResponse);
+                  json_object_object_add(pajPost,"operationId",json_object_new_string(pmState->value));
 
                   json_object *pajMethod=json_object_new_object();
@@ -1942 +1948 @@
                   json_object *pajFinal=json_object_new_object();
                   json_object_object_add(pajFinal,pacUri,pajMethod);
-
                   json_object_object_add(pajRes,pmState->value,pajFinal);
 

trunk/zoo-project/zoo-services/utils/open-api/templates/index.html

@@ -202 +202 @@
  #end if
 #end if
+#if $obj["maxOccurs"]>1
+        <div class="btn-group" role="group" aria-label="Basic example">
+          <button type="button" class="btn btn-secondary" onclick="addElementToList(\$(this));">Add</button>
+          <button type="button" class="btn btn-secondary" onclick="delElementToList(\$(this));">Delete</button>
+        </div>
+#end if
 #end def
 #def printProvider(conf)
@@ -339 +345 @@
     <script>
       var socket;
+      function addElementToList(){
+        var lClosure=arguments[0];
+        var isOver=false;
+        var cnt=0;
+        lClosure.parent().parent().find("div").each(function(){
+          if(isOver) return;
+          if(\$(this).hasClass("btn-group")) isOver=true;
+          if(\$(this).hasClass("input-group")){
+            lClosure.parent().parent().append(\$(this)[0].outerHTML);
+            cnt++;
+          }
+        });
+        if(lClosure.parent().parent().find(".input-group").length>cnt)
+          lClosure.next().attr("disabled",false);
+        else
+          lClosure.next().attr("disabled",true);
+      }
+      function delElementToList(){
+        var lClosure=arguments[0];
+        var isOver=false;
+        var cnt=0;
+        lClosure.parent().parent().find("div").each(function(){
+          if(isOver) return;
+          if(\$(this).hasClass("btn-group")) isOver=true;
+          if(\$(this).hasClass("input-group")) cnt++;
+        });
+        if(lClosure.parent().parent().find(".input-group").length>cnt)
+        for(var i=0;i<cnt;i++)
+          lClosure.parent().parent().find(".input-group").last().remove();
+        if(lClosure.parent().parent().find(".input-group").length==cnt)
+          lClosure.attr("disabled",true);
+        else
+          lClosure.attr("disabled",false);
+      }
+      
       function loadRequest(){
         var requestObject={
@@ -348 +389 @@
         }
         for(var i=0;i < System["JSON_STR"]["inputs"].length;i++){
-          var cInput={"id": System["JSON_STR"]["inputs"][i]["id"]};
           var cName=System["JSON_STR"]["inputs"][i]["id"].replace(".","_");
           var selector="input[name='input_value_"+cName+"'],"+
                        "select[name='input_value_"+cName+"']";
           if(\$(selector).val()!=""){
-            cInput["input"]={};
-          if(System["JSON_STR"]["inputs"][i]["input"]["formats"]){
-            var selector1="input[name='input_format_"+cName+"'],"+
-              "select[name='input_format_"+cName+"']";
-            cInput["input"]["format"]={
-              "mimeType": \$(selector1).val()
-            };
-            cInput["input"]["value"]={
-              "href": \$(selector).val()
-            };
-          }
-          else{
-            if(System["JSON_STR"]["inputs"][i]["input"]["literalDataDomains"]){
-              console.log(System["JSON_STR"]["inputs"][i]["input"]["literalDataDomains"]);
-              cInput["input"]["dataType"]={
-                "name": System["JSON_STR"]["inputs"][i]["input"]["literalDataDomains"][0]["dataType"]["name"]
+            \$(selector).each(function(){
+            var cInput={"id": System["JSON_STR"]["inputs"][i]["id"], "input": {}};
+            if(System["JSON_STR"]["inputs"][i]["input"]["formats"]){
+              var selector1="input[name='input_format_"+cName+"'],"+
+                "select[name='input_format_"+cName+"']";
+              console.log(\$(this).parent().prev().find("select").val());
+              cInput["input"]["format"]={
+                "mimeType": \$(this).parent().prev().find("select").val()
               };
-              cInput["input"]["value"]=\$(selector).val();
+              cInput["input"]["value"]={
+                "href": \$(this).val()
+              };
             }
-            }
+            else{
+              if(System["JSON_STR"]["inputs"][i]["input"]["literalDataDomains"]){
+                console.log(System["JSON_STR"]["inputs"][i]["input"]["literalDataDomains"]);
+                cInput["input"]["dataType"]={
+                  "name": System["JSON_STR"]["inputs"][i]["input"]["literalDataDomains"][0]["dataType"]["name"]
+                };
+                cInput["input"]["value"]=\$(this).val();
+              }
+            }console.log(cInput);
             requestObject["inputs"].push(cInput);
+            });
           }
         }
@@ -628 +671 @@
                 if(\$(selector).length>0){
                   \$(selector).each(function(){
-                    \$(this).parent().parent().parent().parent().find(".btn").first().click();
+                    if(!\$(this).parent().parent().parent().hasClass("show"))
+                      \$(this).parent().parent().parent().parent().find(".btn").first().click();
                   });
-                  console.log(System["JSON_STR"]["inputs"][i]["id"]);
                 }
               }              
@@ -644 +687 @@
       <hr>
       <address>$openapi["openapi"]["rootUrl"]$(currentUrl).html</address>
-      <!-- hhmts start -->Last modified: Thu Oct 22 14:21:02 CEST 2020 <!-- hhmts end -->
+      <!-- hhmts start -->Last modified: Fri Oct 23 18:25:03 CEST 2020 <!-- hhmts end -->
     </main>
 #if $currentKey=="root"