review comments

cloud-bulldozer · Dec 9, 2024 · 2a086b0 · 2a086b0
1 parent 23ece7e
commit 2a086b0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/backend/app/api/v1/commons/hce.py b/backend/app/api/v1/commons/hce.py
@@ -20,8 +20,10 @@ async def getData(
     await es.close()
     tasks = [item["_source"] for item in response["data"]]
     jobs = pd.json_normalize(tasks)
+    if len(jobs) == 0:
+        return {"data": jobs, "total": response["total"]}
+
     jobs[["group"]] = jobs[["group"]].fillna(0)
     jobs.fillna("", inplace=True)
-    if len(jobs) == 0:
-        return {"data": jobs, "total": 0}
+
     return {"data": jobs, "total": response["total"]}
diff --git a/backend/app/api/v1/commons/ocm.py b/backend/app/api/v1/commons/ocm.py
@@ -28,7 +28,7 @@ async def getData(
     tasks = [item["_source"] for item in response["data"]]
     jobs = pd.json_normalize(tasks)
     if len(jobs) == 0:
-        return {"data":jobs,"total": 0}
+        return {"data":jobs,"total": response["total"]}
 
     if "buildUrl" not in jobs.columns:
         jobs.insert(len(jobs.columns), "buildUrl", "")

diff --git a/backend/app/api/v1/commons/ocp.py b/backend/app/api/v1/commons/ocp.py
@@ -27,7 +27,8 @@ async def getData(
     tasks = [item["_source"] for item in response["data"]]
     jobs = pd.json_normalize(tasks)
     if len(jobs) == 0:
-        return {"data": jbs, "total": 0}
+        return {"data": jobs, "total": response["total"]}
+
     jobs[
         ["masterNodesCount", "workerNodesCount", "infraNodesCount", "totalNodesCount"]
     ] = jobs[

diff --git a/backend/app/api/v1/commons/quay.py b/backend/app/api/v1/commons/quay.py
@@ -26,7 +26,7 @@ async def getData(
     tasks = [item["_source"] for item in response["data"]]
     jobs = pd.json_normalize(tasks)
     if len(jobs) == 0:
-        return {"data": jbs, "total": 0}
+        return {"data": jobs, "total": response["total"]}
 
     jobs[
         ["masterNodesCount", "workerNodesCount", "infraNodesCount", "totalNodesCount"]

diff --git a/backend/app/api/v1/commons/telco.py b/backend/app/api/v1/commons/telco.py
@@ -87,7 +87,5 @@ async def getData(
         )
 
     jobs = pd.json_normalize(mapped_list)
-    if len(jobs) == 0:
-        return {'data':jobs, 'total': 0}
 
     return {"data": jobs, "total": response["total"]}