From 0da8feb2955852e5d7d4b5dece37d7453c0ce18d Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Thu, 13 Sep 2018 15:02:04 +0200 Subject: [PATCH 1/7] Add show_failures partial --- .../views/webui2/webui/package/_show_failures.html.haml | 6 ++++++ .../app/views/webui2/webui/package/_side_links.html.haml | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_failures.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_failures.html.haml b/src/api/app/views/webui2/webui/package/_show_failures.html.haml new file mode 100644 index 00000000000..9112848f2a6 --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_failures.html.haml @@ -0,0 +1,6 @@ +%li + %i.fas.fa-times-circle.text-danger{ title: 'Errors' } + = failures + = link_to "error#{failures == 1 ? '' : 's'}", project_monitor_path(project: project, pkgname: package_name, succeeded: 0, + blocked: 0, finished: 0, signing: 0, dispatching: 0, + scheduled: 0, building: 0) diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index b8ef7b81718..51c6d940dca 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -1,12 +1,7 @@ -# FIXME: refactor this file %ul.list-unstyled - if failures > 0 - %li - %i.fas.fa-times-circle.text-danger{ title: 'Errors' } - = failures - = link_to "error#{failures == 1 ? '' : 's'}", project_monitor_path(project: project, pkgname: package.name, succeeded: 0, - blocked: 0, finished: 0, signing: 0, dispatching: 0, - scheduled: 0, building: 0) + = render partial: 'show_failures', locals: { failures: failures, package_name: package.name, project: project } - if devel_package %li From 2e6d8cfee8f51c3a2c58b98c266b1f8afb8dd81b Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Thu, 13 Sep 2018 15:21:38 +0200 Subject: [PATCH 2/7] Add show_devel_package partial --- .../webui2/webui/package/_show_devel_package.html.haml | 4 ++++ .../app/views/webui2/webui/package/_side_links.html.haml | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_devel_package.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_devel_package.html.haml b/src/api/app/views/webui2/webui/package/_show_devel_package.html.haml new file mode 100644 index 00000000000..ce449cdecf4 --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_devel_package.html.haml @@ -0,0 +1,4 @@ +%li + %i.fas.fa-info-circle.text-info + Developed at + = link_to(elide(devel_package.project.name, 44), package_show_path(project: devel_package.project.name, package: devel_package.name)) diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index 51c6d940dca..4dd3c8a8590 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -4,10 +4,8 @@ = render partial: 'show_failures', locals: { failures: failures, package_name: package.name, project: project } - if devel_package - %li - %i.fas.fa-info-circle.text-info - Developed at - = link_to(elide(devel_package.project.name, 44), package_show_path(project: devel_package.project.name, package: devel_package.name)) + = render partial: 'show_devel_package', locals: { devel_package: devel_package } + - if package.project != project %li %i.fas.fa-info-circle.text-info From 68e1a7cd8098d2c18b723f1a0f1229b4986bf5db Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Thu, 13 Sep 2018 16:31:28 +0200 Subject: [PATCH 3/7] Add show_inherited_from_project partial --- .../webui/package/_show_inherited_from_project.html.haml | 4 ++++ .../app/views/webui2/webui/package/_side_links.html.haml | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_inherited_from_project.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_inherited_from_project.html.haml b/src/api/app/views/webui2/webui/package/_show_inherited_from_project.html.haml new file mode 100644 index 00000000000..c39f631be38 --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_inherited_from_project.html.haml @@ -0,0 +1,4 @@ +%li + %i.fas.fa-info-circle.text-info + Sources inherited from project + = link_to(elide(project_name, 40), package_show_path(project: project_name, package: package_name)) diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index 4dd3c8a8590..0a0b28f21a6 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -7,10 +7,8 @@ = render partial: 'show_devel_package', locals: { devel_package: devel_package } - if package.project != project - %li - %i.fas.fa-info-circle.text-info - Sources inherited from project - = link_to(elide(package.project.name, 40), package_show_path(project: package.project.name, package: package.name)) + = render partial: 'show_inherited_from_project', locals: { project_name: package.project.name, package_name: package.name } + - if package.developed_packages.present? %li %i.fas.fa-info-circle.text-info From 37a1006340907f3dd7f7322cb6b8e766f690582b Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Thu, 13 Sep 2018 16:56:11 +0200 Subject: [PATCH 4/7] Add show_developed_packages partial --- .../webui/package/_show_developed_packages.html.haml | 6 ++++++ .../app/views/webui2/webui/package/_side_links.html.haml | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_developed_packages.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_developed_packages.html.haml b/src/api/app/views/webui2/webui/package/_show_developed_packages.html.haml new file mode 100644 index 00000000000..67f4d297d86 --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_developed_packages.html.haml @@ -0,0 +1,6 @@ +%li + %i.fas.fa-info-circle.text-info + Devel package for + - developed_packages.each_with_index do |pkg, index| + = ',' if index > 0 + = link_to(elide(pkg.project.name, 40), package_show_path(project: pkg.project.name, package: pkg.name)) diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index 0a0b28f21a6..a69741bce5a 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -10,12 +10,8 @@ = render partial: 'show_inherited_from_project', locals: { project_name: package.project.name, package_name: package.name } - if package.developed_packages.present? - %li - %i.fas.fa-info-circle.text-info - Devel package for - - package.developed_packages.each_with_index do |pkg, index| - = ',' if index > 0 - = link_to(elide(pkg.project.name, 40), package_show_path(project: pkg.project.name, package: pkg.name)) + = render partial: 'show_developed_packages', locals: { developed_packages: package.developed_packages } + - if package.is_patchinfo? %li %i.fas.fa-info-circle.text-info From b6b9634e510434ea98d4c29f0017398fd622369e Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Fri, 14 Sep 2018 07:30:55 +0200 Subject: [PATCH 5/7] Add show_patchinfo partial --- .../views/webui2/webui/package/_show_patchinfo.html.haml | 6 ++++++ .../app/views/webui2/webui/package/_side_links.html.haml | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_patchinfo.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_patchinfo.html.haml b/src/api/app/views/webui2/webui/package/_show_patchinfo.html.haml new file mode 100644 index 00000000000..9ac6a9bfcc1 --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_patchinfo.html.haml @@ -0,0 +1,6 @@ +%li + %i.fas.fa-info-circle.text-info + Has a + = link_to 'patchinfo', patchinfo_show_path(package: package, project: project) + for + = link_to 'maintenance updates', 'http://en.opensuse.org/Portal:Maintenance' diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index a69741bce5a..66f793dbc11 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -13,13 +13,8 @@ = render partial: 'show_developed_packages', locals: { developed_packages: package.developed_packages } - if package.is_patchinfo? - %li - %i.fas.fa-info-circle.text-info - Has a - = link_to 'patchinfo', patchinfo_show_path(package: package, project: project) - for - = link_to 'maintenance updates', 'http://en.opensuse.org/Portal:Maintenance' - //TODO: Fix this hard link + = render partial: 'show_patchinfo', locals: { package: package, project: project } + - if package.linking_packages.present? %li %i.fas.fa-info-circle.text-info From ce943d0ed2cd78c44884127ee74b558594388d49 Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Fri, 14 Sep 2018 07:34:24 +0200 Subject: [PATCH 6/7] Add show_derived_packages partial --- .../webui2/webui/package/_show_derived_packages.html.haml | 4 ++++ .../app/views/webui2/webui/package/_side_links.html.haml | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_derived_packages.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_derived_packages.html.haml b/src/api/app/views/webui2/webui/package/_show_derived_packages.html.haml new file mode 100644 index 00000000000..350282b037b --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_derived_packages.html.haml @@ -0,0 +1,4 @@ +%li + %i.fas.fa-info-circle.text-info + = package.linking_packages.size + = link_to('derived packages', linking_packages_path(project: project, package: package), remote: true) diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index 66f793dbc11..f319d984fa7 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -16,10 +16,8 @@ = render partial: 'show_patchinfo', locals: { package: package, project: project } - if package.linking_packages.present? - %li - %i.fas.fa-info-circle.text-info - = package.linking_packages.size - = link_to('derived packages', linking_packages_path(project: project, package: package), remote: true) + = render partial: 'show_derived_packages', locals: { package: package, project: project } + - if linkinfo - linked_package = linkinfo[:package] %li From bd6f5250cb08609e849d0ca07bd595abbb3e1772 Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Fri, 14 Sep 2018 07:37:25 +0200 Subject: [PATCH 7/7] Add show_linkinfo partial --- .../webui/package/_show_linkinfo.html.haml | 23 ++++++++++++++++++ .../webui/package/_side_links.html.haml | 24 +------------------ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 src/api/app/views/webui2/webui/package/_show_linkinfo.html.haml diff --git a/src/api/app/views/webui2/webui/package/_show_linkinfo.html.haml b/src/api/app/views/webui2/webui/package/_show_linkinfo.html.haml new file mode 100644 index 00000000000..f1f90ad51d6 --- /dev/null +++ b/src/api/app/views/webui2/webui/package/_show_linkinfo.html.haml @@ -0,0 +1,23 @@ +- linked_package = linkinfo[:package] +%li + %i.fas.fa-link.text-dark + Links to + - if linkinfo[:remote_project] + remote + %i + = linkinfo[:remote_project] + \/ + = linked_package + - else + = project_or_package_link(project: linked_package.project.name, package: linked_package.name, short: true) +- if linkinfo[:error] + %li + %i.fas.fa-times-circle.text-danger + Link has errors: + %i= linkinfo[:error] +- elsif linkinfo[:diff] + %li + %i.fas.fa-info-circle.text-info + Has a + = link_to('link diff', package_rdiff_path(oproject: linked_package.project.name, opackage: linked_package.name, + project: project, package: package, rev: revision)) diff --git a/src/api/app/views/webui2/webui/package/_side_links.html.haml b/src/api/app/views/webui2/webui/package/_side_links.html.haml index f319d984fa7..88d41d5f1b9 100644 --- a/src/api/app/views/webui2/webui/package/_side_links.html.haml +++ b/src/api/app/views/webui2/webui/package/_side_links.html.haml @@ -19,28 +19,6 @@ = render partial: 'show_derived_packages', locals: { package: package, project: project } - if linkinfo - - linked_package = linkinfo[:package] - %li - %i.fas.fa-link.text-dark - Links to - - if linkinfo[:remote_project] - remote - %i - = linkinfo[:remote_project] - \/ - = linked_package - - else - = project_or_package_link(project: linked_package.project.name, package: linked_package.name, short: true) - - if linkinfo[:error] - %li - %i.fas.fa-times-circle.text-danger - Link has errors: - %i= linkinfo[:error] - - elsif linkinfo[:diff] - %li - %i.fas.fa-info-circle.text-info - Has a - = link_to('link diff', package_rdiff_path(oproject: linked_package.project.name, opackage: linked_package.name, - project: project, package: package, rev: revision)) + = render partial: 'show_linkinfo', locals: { package: package, project: project, linkinfo: linkinfo, revision: revision } = render partial: 'extra_actions', locals: { project: project, package: package }