Changeset 985 for trunk/zoo-project/zoo-services

Timestamp:

Mar 9, 2021, 10:00:04 AM (4 years ago)

Author:

djay

Message:

Move jobs management and execution endpoint from /processes/{procssId}/jobs to /jobs

Location:

trunk/zoo-project/zoo-services/utils/open-api

Files:

• static/openapi.js (modified) (3 diffs)
• templates/index.html (modified) (5 diffs)

trunk/zoo-project/zoo-services/utils/open-api/static/openapi.js

@@ -37 +37 @@
 function loadRequest(){
     var requestObject={
+        "id": System["JSON_STR"]["id"],
         "inputs":{},
         "outputs":{},
@@ -62 +63 @@
                     if($('input[name="oapi_ioAsArray"]').val()=="true"){
                         cInput["input"]["format"]={
-                            "mimeType": $(this).parent().prev().find("select").val()
+                            "mediaType": $(this).parent().prev().find("select").val()
                         };
                         cInput["input"]["href"]=$(this).val();
                     }else{
                         cInput["format"]={
-                            "mimeType": $(this).parent().prev().find("select").val()
+                            "mediaType": $(this).parent().prev().find("select").val()
                         };
                         cInput["href"]=$(this).val();
@@ -115 +116 @@
             var selector="select[name='format_"+cName+"']";
             cOutput["format"]={
-                "mimeType": $(selector).val()
+                "mediaType": $(selector).val()
             };
         }

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

@@ -160 +160 @@
  #set cFormats=[]
   #for j in range(len($obj["input"]["formats"]))
-  #set $cFormats+=[$obj["input"]["formats"][$j]["mimeType"]]
+  #set $cFormats+=[$obj["input"]["formats"][$j]["mediaType"]]
   #end for
   $printControl({"title": "format","type": "input_format","name": $cName,"options":$cFormats})
@@ -272 +272 @@
           <input type="hidden" name="oapi_ioAsArray" value="#if "io_as_array" in $openapi["openapi"]#$openapi["openapi"]["io_as_array"]#else#false#end if#" />
           <input type="hidden" name="oapi_wsUrl" value="$openapi["openapi"]["wsurl"]" />
-          <input type="hidden" name="oapi_jobUrl" value="$openapi["openapi"]["rootUrl"]$(currentUrl)/jobs" />
+          <input type="hidden" name="oapi_jobUrl" value="$openapi["openapi"]["rootUrl"]/jobs" />
           <input type="hidden" name="oapi_reqID" value="$cid" />
           <h3>Inputs</h3>
@@ -291 +291 @@
             #if "formats" in $cOutput["output"]
             #for j in range(len($cOutput["output"]["formats"]))
-            #set cFormats+=[$cOutput["output"]["formats"][$j]["mimeType"]]
+            #set cFormats+=[$cOutput["output"]["formats"][$j]["mediaType"]]
             #end for
             #end if
@@ -424 +424 @@
           * Jobs list
           *#
-          #set cValue=$values[$i]["infos"]
+          #set cValue=$values[$i]
           <th scope="row">
             #if "status" in $cValue and $cValue["status"]=="successful"
@@ -526 +526 @@
       <hr>
       <address>$openapi["openapi"]["rootUrl"]$(currentUrl).html</address>
-      <!-- hhmts start -->Last modified: Mon Mar  1 17:01:50 CET 2021 <!-- hhmts end -->
+      <!-- hhmts start -->Last modified: Thu Mar  4 10:51:46 CET 2021 <!-- hhmts end -->
     </main>
 #if $currentKey=="root"