baculum: Unify /jobs/{jobid}/files endpoint output for detailed and normal modes

diff --git a/gui/baculum/protected/API/Pages/API/JobListFiles.php b/gui/baculum/protected/API/Pages/API/JobListFiles.php
index 716b80ed0694c0d860822cdf181e373906b85eb7..a01cfe3d5ce7043a7e73b70a5ba2634656469673 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/JobListFiles.php
+++ b/gui/baculum/protected/API/Pages/API/JobListFiles.php
@@ -63,11 +63,13 @@ class JobListFiles extends BaculumAPIServer {
                                                'limit' => $limit,
                                                'search' => $search
                                        ]);
-                                       //NOTE: Standarize raw and json output in new version API v2
-                                       $result = [
-                                               'items' => $result,
-                                               'totals' => count($result)
-                                       ];
+                                       if (APIServer::getVersion() === 1) {
+                                               // TODO: Remove it when APIv1 will not be used
+                                               $result = [
+                                                       'items' => $result,
+                                                       'totals' => count($result)
+                                               ];
+                                       }
                                }
                                $this->output = $result;
                                $this->error = GenericError::ERROR_NO_ERRORS;

diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index af963dca8404b7060ca332b919cbb58d5f448673..909a293bf13276567c5ae9ef03ab9a11a467e2bd 100644 (file)
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -1031,19 +1031,10 @@
                                                                        "type": "object",
                                                                        "properties": {
                                                                                "output": {
-                                                                                       "type": "object",
-                                                                                       "properties": {
-                                                                                               "items": {
-                                                                                                       "type": "array",
-                                                                                                       "items": {
-                                                                                                               "type": "string",
-                                                                                                               "description": "Show job files output list"
-                                                                                                       }
-                                                                                               },
-                                                                                               "total": {
-                                                                                                       "type": "integer",
-                                                                                                       "description": "Total number of items"
-                                                                                               }
+                                                                                       "type": "array",
+                                                                                       "items": {
+                                                                                               "type": "string",
+                                                                                               "description": "Job files output list"
                                                                                        }
                                                                                },
                                                                                "error": {