From dd96e1e2da15820c870379eaa509277f6b08aebb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 6 Mar 2024 10:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/projects/actions/runs_controller.rb    |  2 +-
 .../projects/actions/runs/index.json.jbuilder | 34 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/v1/projects/actions/runs_controller.rb b/app/controllers/api/v1/projects/actions/runs_controller.rb
index b9eb9ff06..05918dbe2 100644
--- a/app/controllers/api/v1/projects/actions/runs_controller.rb
+++ b/app/controllers/api/v1/projects/actions/runs_controller.rb
@@ -2,11 +2,11 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B
 
   def index 
     @result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
+    puts @result_object
   end
 
   def job_show 
     @result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token)
-    puts @result_object
   end
 
 end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
index e21d86dc3..ae8041ce1 100644
--- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder
+++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder
@@ -1,19 +1,23 @@
 json.total_data @result_object[:total_data].to_i
-json.runs @result_object[:data]["Runs"].each do |run| 
-  json.workflow run["WorkflowID"]
-  json.index run["Index"]
-  json.title run["Title"]
-  json.trigger_user do 
-    json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
-  end
+if @result_object[:data]["Runs"].present?
+  json.runs @result_object[:data]["Runs"].each do |run| 
+    json.workflow run["WorkflowID"]
+    json.index run["Index"]
+    json.title run["Title"]
+    json.trigger_user do 
+      json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
+    end
 
-  if run["Ref"].starts_with?("refs/tags")
-    json.ref run["Ref"].gsub!("/refs/tags/", "")
-  else 
-    json.ref run["Ref"].gsub!("refs/heads/", "")
-  end
+    if run["Ref"].starts_with?("refs/tags")
+      json.ref run["Ref"].gsub!("/refs/tags/", "")
+    else 
+      json.ref run["Ref"].gsub!("refs/heads/", "")
+    end
 
-  json.status run["Status"]
-  json.time_ago time_from_now(run["Stopped"])
-  json.holding_time run["Stopped"]-run["Started"]
+    json.status run["Status"]
+    json.time_ago time_from_now(run["Stopped"])
+    json.holding_time run["Stopped"]-run["Started"]
+  end
+else
+  json.runs [] 
 end
\ No newline at end of file