Skip to content

Commit

Permalink
[frontend] Use Backend::Api
Browse files Browse the repository at this point in the history
We replaced the use of ActiveXML and PackageFile in favour of
Backend::Api.
  • Loading branch information
David Kang committed Jun 21, 2018
1 parent a299d1c commit d72d56c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ def index
@staging_projects = ::ObsFactory::StagingProjectPresenter.sort(@distribution.staging_projects_all)
@backlog_requests = ::ObsFactory::Request.with_open_reviews_for(by_group: @distribution.staging_manager, target_project: @distribution.name)
@requests_state_new = ::ObsFactory::Request.in_state_new(by_group: @distribution.staging_manager, target_project: @distribution.name)
file = PackageFile.new(
project_name: "#{params[:project]}:Staging",
package_name: "dashboard",
name: "ignored_requests")
unless file.to_s.nil?
@ignored_requests = YAML.load(file.to_s)

staging_project = Project.find_by_name("#{@distribution.project}:Staging")
dashboard_package = Package.find_by_project_and_name(staging_project.name, 'dashboard')

if dashboard_package && dashboard_package.file_exists?('ignored_requests')
file = ::Backend::Api::Sources::Package.file(staging_project.name, dashboard_package.name, 'ignored_requests')
@ignored_requests = YAML.load(file)
end
if !@ignored_requests.nil? and @ignored_requests

if @ignored_requests
@backlog_requests_ignored = @backlog_requests.select { |req| @ignored_requests.key?(req.number) }
@backlog_requests = @backlog_requests.select { |req| !@ignored_requests.key?(req.number) }
@requests_state_new = @requests_state_new.select { |req| !@ignored_requests.key?(req.number) }
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/obs_factory/distribution.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Distribution
extend ActiveModel::Naming
extend Forwardable

SOURCE_VERSION_FILE = "000product/openSUSE.product"
SOURCE_VERSION_FILE = { package_name: '000product', filename: 'openSUSE.product' }
RINGS_PREFIX = ":Rings"

attr_accessor :project, :strategy
Expand Down Expand Up @@ -109,7 +109,7 @@ def staging_projects_all
def source_version
Rails.cache.fetch("source_version_for_#{name}", expires_in: 10.minutes) do
begin
p = Xmlhash.parse(ActiveXML::backend.direct_http "/source/#{name}/#{SOURCE_VERSION_FILE}?expand=1")
p = Xmlhash.parse(Backend::Api::Sources::Package.file(name, SOURCE_VERSION_FILE[:package_name], SOURCE_VERSION_FILE[:filename]))
p.get('products').get('product').get('version')
rescue ActiveXML::Transport::NotFoundError
nil
Expand Down

0 comments on commit d72d56c

Please sign in to comment.