Commit bf27639b authored by Kushal Pandya's avatar Kushal Pandya Committed by Gabriel Mazetto

Show full project name, show `Never` when values aren't available

parent 221715f1
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.card-header{ id: "project-#{project_registry.project.id}-header" } .card-header{ id: "project-#{project_registry.project.id}-header" }
.d-flex .d-flex
%strong.header-text-primary.flex-fill %strong.header-text-primary.flex-fill
= project_registry.project.name = project_registry.project.full_name
= link_to(recheck_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline btn-sm mr-2') do = link_to(recheck_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline btn-sm mr-2') do
= s_('Geo|Recheck') = s_('Geo|Recheck')
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline-primary btn-sm') do
...@@ -15,17 +15,23 @@ ...@@ -15,17 +15,23 @@
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Status') = s_('Geo|Status')
.project-status-content.status-type-failure .project-status-content
= s_('Geo|In sync') = s_('Geo|In sync')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Last successful sync') = s_('Geo|Last successful sync')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project_registry.last_repository_successful_sync_at) if project_registry.last_repository_successful_sync_at - if project_registry.last_repository_successful_sync_at
= distance_of_time_in_words(Time.now, project_registry.last_repository_successful_sync_at)
- else
= s_('Geo|Never')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Last time verified') = s_('Geo|Last time verified')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project_registry.last_repository_check_at) if project_registry.last_repository_check_at - if project_registry.last_repository_check_at
= distance_of_time_in_words(Time.now, project_registry.last_repository_check_at)
- else
= s_('Geo|Never')
= paginate @registries, theme: 'gitlab' = paginate @registries, theme: 'gitlab'
- @registries.each do |project_registry| - @registries.each do |project_registry|
.card.project-card.prepend-top-15 .card.project-card.prepend-top-15
.card-header{ id: "project-#{project_registry.project.id}-header" } .card-header{ id: "project-#{project_registry.project.id}-header" }
%h5.mb-0.mt-0.p-2.d-flex .d-flex
%button.btn.btn-link.btn-card-header.d-flex.flex-fill{ type: 'button', data: { toggle: 'collapse', target: "#project-#{project_registry.project.id}" }, 'aria-expanded' => 'true', 'aria-controls' => "project-#{project_registry.project.id}" } %strong.header-text-primary.flex-fill
= sprite_icon('chevron-down', size: 18, css_class: 'card-expand-icon') = project_registry.project.full_name
= sprite_icon('chevron-up', size: 18, css_class: 'card-collapse-icon')
%strong.header-text-primary
= project_registry.project.name
- if project_registry.candidate_for_redownload? - if project_registry.candidate_for_redownload?
= link_to(force_redownload_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline btn-sm mr-2') do = link_to(force_redownload_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline btn-sm mr-2') do
= s_('Geo|Redownload') = s_('Geo|Redownload')
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
.collapse.show{ id: "project-#{project_registry.project.id}", 'aria-labelledby' => "project-#{project_registry.project.id}-header" }
.card-body .card-body
.container .container
.row .row
...@@ -26,12 +22,18 @@ ...@@ -26,12 +22,18 @@
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Next sync scheduled at') = s_('Geo|Next sync scheduled at')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project_registry.repository_retry_at) if project_registry.repository_retry_at - if project_registry.repository_retry_at
= distance_of_time_in_words(Time.now, project_registry.repository_retry_at)
- else
= s_('Geo|Never')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Last sync attempt') = s_('Geo|Last sync attempt')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project_registry.last_repository_synced_at) if project_registry.last_repository_synced_at - if project_registry.last_repository_synced_at
= distance_of_time_in_words(Time.now, project_registry.last_repository_synced_at)
- else
= s_('Geo|Never')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Retry counts') = s_('Geo|Retry counts')
......
- @projects.each do |project| - @projects.each do |project|
.card.project-card.prepend-top-15 .card.project-card.prepend-top-15
.card-header{ id: "project-#{project.id}-header" } .card-header{ id: "project-#{project.id}-header" }
%h5.mb-0.mt-0.p-2.d-flex .d-flex
%button.btn.btn-link.btn-card-header.d-flex.flex-fill{ type: 'button', data: { toggle: 'collapse', target: "#project-#{project.id}" }, 'aria-expanded' => 'true', 'aria-controls' => "project-#{project.id}" } %strong.header-text-primary.flex-fill
= sprite_icon('chevron-down', size: 18, css_class: 'card-expand-icon') = project.full_name
= sprite_icon('chevron-up', size: 18, css_class: 'card-collapse-icon')
%strong.header-text-primary
= project.name
.collapse.show{ id: "project-#{project.id}", 'aria-labelledby' => "project-#{project.id}-header" }
.card-body .card-body
.container .container
.row .row
...@@ -16,12 +12,18 @@ ...@@ -16,12 +12,18 @@
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Next sync scheduled at') = s_('Geo|Next sync scheduled at')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project.project_registry.repository_retry_at) if project.project_registry&.repository_retry_at - if project.project_registry&.repository_retry_at
= distance_of_time_in_words(Time.now, project.project_registry.repository_retry_at)
- else
= s_('Geo|Never')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Last sync attempt') = s_('Geo|Last sync attempt')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project.project_registry.last_repository_synced_at) if project.project_registry&.last_repository_synced_at - if project.project_registry&.last_repository_synced_at
= distance_of_time_in_words(Time.now, project.project_registry.last_repository_synced_at)
- else
= s_('Geo|Never')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Retry counts') = s_('Geo|Retry counts')
...@@ -31,6 +33,9 @@ ...@@ -31,6 +33,9 @@
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Error message') = s_('Geo|Error message')
.project-status-content.font-weight-bold .project-status-content.font-weight-bold
= project.project_registry.last_repository_sync_failure if project.project_registry - if project.project_registry
= project.project_registry.last_repository_sync_failure
- else
= s_('Geo|No errors')
= paginate @projects, theme: 'gitlab' = paginate @projects, theme: 'gitlab'
- @registries.each do |project_registry| - @registries.each do |project_registry|
.card.project-card.prepend-top-15 .card.project-card.prepend-top-15
.card-header{ id: "project-#{project_registry.project.id}-header" } .card-header{ id: "project-#{project_registry.project.id}-header" }
%h5.mb-0.mt-0.p-2.d-flex .d-flex
%button.btn.btn-link.btn-card-header.d-flex.flex-fill{ type: 'button', data: { toggle: 'collapse', target: "#project-#{project_registry.project.id}" }, 'aria-expanded' => 'true', 'aria-controls' => "project-#{project_registry.project.id}" } %strong.header-text-primary.flex-fill
= sprite_icon('chevron-down', size: 18, css_class: 'card-expand-icon') = project_registry.project.full_name
= sprite_icon('chevron-up', size: 18, css_class: 'card-collapse-icon')
%strong.header-text-primary
= project_registry.project.name
= link_to(recheck_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline btn-sm mr-2') do = link_to(recheck_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline btn-sm mr-2') do
= s_('Geo|Recheck') = s_('Geo|Recheck')
= link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline-primary btn-sm') do = link_to(resync_admin_geo_project_path(project_registry), method: :post, class: 'btn btn-outline-primary btn-sm') do
= s_('Geo|Resync') = s_('Geo|Resync')
.collapse.show{ id: "project-#{project_registry.project.id}", 'aria-labelledby' => "project-#{project_registry.project.id}-header" }
.card-body .card-body
.container .container
.row .row
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Status') = s_('Geo|Status')
.project-status-content.status-type-failure .project-status-content
= s_('Geo|Pending') = s_('Geo|Pending')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Next sync scheduled at') = s_('Geo|Next sync scheduled at')
.project-status-content .project-status-content
= distance_of_time_in_words(Time.now, project_registry.repository_retry_at) if project_registry.repository_retry_at - if project_registry.repository_retry_at
= distance_of_time_in_words(Time.now, project_registry.repository_retry_at)
- else
= s_('Geo|Never')
.col-sm.project-status-container .col-sm.project-status-container
.project-status-title.text-muted .project-status-title.text-muted
= s_('Geo|Last sync attempt') = s_('Geo|Last sync attempt')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment