lib/pact_broker/ui/views/matrix/show.haml in pact_broker-2.15.0 vs lib/pact_broker/ui/views/matrix/show.haml in pact_broker-2.16.0

- old
+ new

@@ -54,62 +54,93 @@ %div.top-of-group .input-group %input{type: 'radio', name: "latestby", class: '', value: 'cvpv', id: 'cvpv', checked: options.cvpv_checked} %label{for: 'cvpv'} - Show latest row for each consumer version/provider version + Show latest result for each consumer version/provider version %div .input-group %input{type: 'radio', name: "latestby", class: '', value: 'cvp', id: 'cvp', checked: options.cvp_checked} %label{for: 'cvp'} - Show latest row for each consumer version/provider + Show latest result for each consumer version/provider %div .input-group %input{type: 'radio', name: "latestby", class: '', value: '', id: 'all_rows', checked: options.all_rows_checked} %label{for: 'all_rows'} - Show all rows + Show all results %div.top-of-group %label{for: "limit"} Limit %input{name: 'limit', id: "limit", value: options.limit} %div.top-of-group %input{type: 'submit'} - + %p{style: 'text-align:right'} + = "#{lines.size} rows" %table.table.table-bordered.table-striped{id: 'matrix'} %thead %th.consumer = "Consumer" %span.glyphicon.glyphicon-sort.sort %th.consumer-version - = "Version" + = "Consumer Version" %span.glyphicon.glyphicon-sort.sort %th.pact-published = "Pact Published" %span.glyphicon.glyphicon-sort.sort %th.provider = "Provider" %span.glyphicon.glyphicon-sort.sort %th.provider-version - = "Version" + = "Provider Version" %span.glyphicon.glyphicon-sort.sort %th.verification-result Pact verified %span.glyphicon.glyphicon-sort.sort %tbody - lines.each do | line | %tr %td.consumer{'data-sort-value' => line.consumer_name} - = line.consumer_name + %a{href: line.consumer_name_url} + = line.consumer_name %td.consumer-version{'data-sort-value' => line.consumer_version_order} - %a{href: line.consumer_version_number_url} - = line.consumer_version_number + %div + %a{href: line.consumer_version_number_url} + = line.display_consumer_version_number + - line.latest_consumer_version_tags.each do | tag | + .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"} + %a{href: tag.url} + .tag.label.label-primary + = tag.name + - line.other_consumer_version_tags.each do | tag | + .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"} + %a{href: tag.url} + .tag.label.label-default + = tag.name %td.pact-published{'data-sort-value' => line.pact_published_order} - = line.pact_publication_date - %td.provider{'data-sort-value' => line.provider_version_order} - = line.provider_name + %a{href: line.pact_publication_date_url} + - if options.all_rows_checked + = "#{line.pact_publication_date} (revision #{line.pact_revision_number})" + - else + = line.pact_publication_date + + %td.provider{'data-sort-value' => line.provider_name} + %a{href: line.provider_name_url} + = line.provider_name %td.provider-version{'data-sort-value' => line.provider_version_order} - %a{href: line.provider_version_number_url} - = line.provider_version_number + %div + %a{href: line.provider_version_number_url} + = line.display_provider_version_number + - line.latest_provider_version_tags.each do | tag | + .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"} + %a{href: tag.url} + .tag.label.label-primary + = tag.name + - line.other_provider_version_tags.each do | tag | + .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"} + %a{href: tag.url} + .tag.label.label-default + = tag.name %td.verification-result{class: line.verification_status_class} - = line.verification_status + %a{href: line.verification_status_url} + = line.verification_status