fixed 组织流水线运行数据判断是否有文件存在

This commit is contained in:
xxq250 2025-04-21 16:05:29 +08:00
parent 88415e256d
commit 7ff07e9c29
2 changed files with 30 additions and 22 deletions

View File

@ -1,9 +1,12 @@
class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController
def index def index
@result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token) @files = $gitea_client.get_repos_contents_by_owner_repo_filepath(@project&.owner&.login, @project&.identifier, ".gitea/workflows/#{params[:workflow]}") rescue []
@begin_num = (page.to_i - 1) * limit.to_i @has_file = @files.select { |i| i['name'] == params[:workflow] }.present?
# puts @result_object if @has_file
@result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
@begin_num = (page.to_i - 1) * limit.to_i
end
end end
def create def create

View File

@ -1,24 +1,29 @@
json.total_data @result_object[:total_data].to_i if @has_file
if @result_object[:data]["Runs"].present? json.total_data @result_object[:total_data].to_i
json.runs @result_object[:data]["Runs"].each_with_index.to_a do |run, index| if @result_object[:data]["Runs"].present?
json.num @result_object[:total_data].to_i - @begin_num - index json.runs @result_object[:data]["Runs"].each_with_index.to_a do |run, index|
json.workflow run["WorkflowID"] json.num @result_object[:total_data].to_i - @begin_num - index
json.index run["Index"] json.workflow run["WorkflowID"]
json.title run["Title"] json.index run["Index"]
json.trigger_user do json.title run["Title"]
json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] } json.trigger_user do
end 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") if run["Ref"].starts_with?("refs/tags")
json.ref run["Ref"].gsub!("/refs/tags/", "") json.ref run["Ref"].gsub!("/refs/tags/", "")
else else
json.ref run["Ref"].gsub!("refs/heads/", "") json.ref run["Ref"].gsub!("refs/heads/", "")
end end
json.status run["Status"] json.status run["Status"]
json.time_ago time_from_now(run["Created"]) json.time_ago time_from_now(run["Created"])
json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Created"] : run["Stopped"] - run["Created"] json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Created"] : run["Stopped"] - run["Created"]
end
else
json.runs []
end end
else else
json.total_data 0
json.runs [] json.runs []
end end