Merge pull request #2494 from opencb/TASK-6636

TASK-6636 - Job Kill method in JavaScript client of OpenCGA sends the params as POST body data
opencb · Aug 13, 2024 · bf2a0d8 · bf2a0d8
2 parents 0415a51 + 5c8c214
commit bf2a0d8
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml
@@ -15,5 +15,5 @@ jobs:
     uses: ./.github/workflows/test-analysis.yml
     needs: build
     with:
-      test_profile: runShortTests,runMediumTests,runLongTests
+      test_profile: runShortTests,runMediumTests
     secrets: inherit
diff --git a/opencga-app/app/misc/clients/javascript_client_generator.py b/opencga-app/app/misc/clients/javascript_client_generator.py
@@ -116,7 +116,7 @@ def get_method_definition(self, category, endpoint):
             f'"{self.get_endpoint_subcategory()}"' if self.subcategory else "null",
             self.get_endpoint_id2() if self.get_endpoint_id2() else "null",
             f'"{self.get_endpoint_action()}"' if self.get_endpoint_action() else "null",
-            "data" if self.has_body() else False,
+            "data" if self.has_body() else ("null" if self.get_endpoint_method(endpoint).lower() == "post" else False),
             query_string_params
         ] if s)
         return (f' {self.get_method_doc(endpoint)}'

diff --git a/opencga-client/src/main/javascript/ClinicalAnalysis.js b/opencga-client/src/main/javascript/ClinicalAnalysis.js
@@ -834,7 +834,7 @@ export default class ClinicalAnalysis extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     clearInterpretation(clinicalAnalysis, interpretations, params) {
-        return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretations, "clear", params);
+        return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretations, "clear", null, params);
     }
 
     /** Delete interpretation
@@ -859,7 +859,7 @@ export default class ClinicalAnalysis extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     revertInterpretation(clinicalAnalysis, interpretation, version, params) {
-        return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretation, "revert", {version, ...params});
+        return this._post("analysis/clinical", clinicalAnalysis, "interpretation", interpretation, "revert", null, {version, ...params});
     }
 
     /** Update interpretation fields

diff --git a/opencga-client/src/main/javascript/File.js b/opencga-client/src/main/javascript/File.js
@@ -266,7 +266,7 @@ export default class File extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     upload(params) {
-        return this._post("files", null, null, null, "upload", params);
+        return this._post("files", null, null, null, "upload", null, params);
     }
 
     /** Return the acl defined for the file or folder. If member is provided, it will only return the acl for the member.

diff --git a/opencga-client/src/main/javascript/GA4GH.js b/opencga-client/src/main/javascript/GA4GH.js
@@ -39,7 +39,7 @@ export default class GA4GH extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     searchReads() {
-        return this._post("ga4gh", null, "reads", null, "search");
+        return this._post("ga4gh", null, "reads", null, "search", null);
     }
 
     /** Fetch alignment files using HTSget protocol
@@ -78,7 +78,7 @@ export default class GA4GH extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     searchVariants() {
-        return this._post("ga4gh", null, "variants", null, "search");
+        return this._post("ga4gh", null, "variants", null, "search", null);
     }
 
 }
diff --git a/opencga-client/src/main/javascript/Job.js b/opencga-client/src/main/javascript/Job.js
@@ -213,7 +213,7 @@ export default class Job extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     kill(job, params) {
-        return this._post("jobs", job, null, null, "kill", params);
+        return this._post("jobs", job, null, null, "kill", null, params);
     }
 
     /** Show the first lines of a log file (up to a limit)

diff --git a/opencga-client/src/main/javascript/Project.js b/opencga-client/src/main/javascript/Project.js
@@ -85,7 +85,7 @@ export default class Project extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     incRelease(project) {
-        return this._post("projects", project, null, null, "incRelease");
+        return this._post("projects", project, null, null, "incRelease", null);
     }
 
     /** Fetch all the studies contained in the project

diff --git a/opencga-client/src/main/javascript/Study.js b/opencga-client/src/main/javascript/Study.js
@@ -281,7 +281,7 @@ export default class Study extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     uploadTemplates(study, params) {
-        return this._post("studies", study, "templates", null, "upload", params);
+        return this._post("studies", study, "templates", null, "upload", null, params);
     }
 
     /** Delete template

diff --git a/opencga-client/src/main/javascript/User.js b/opencga-client/src/main/javascript/User.js
@@ -39,7 +39,7 @@ export default class User extends OpenCGAParentClass {
     * @returns {Promise} Promise object in the form of RestResponse instance.
     */
     anonymous(organization) {
-        return this._post("users", null, null, null, "anonymous", organization);
+        return this._post("users", null, null, null, "anonymous", null, organization);
     }
 
     /** Create a new user