pact_broker 2.79.1 → 2.80.0

data/lib/pact_broker/ui/controllers/groups.rb

@@ -1,6 +1,6 @@
-require 'pact_broker/ui/controllers/base_controller'
-require 'pact_broker/ui/view_models/index_items'
-require 'haml'
+require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/view_models/index_items"
+require "haml"
 
 module PactBroker
   module UI
@@ -19,7 +19,7 @@ module PactBroker
                 base_url: base_url
               }
             }, {
-              layout: 'layouts/main',
+              layout: "layouts/main",
             }
         end
 

data/lib/pact_broker/ui/controllers/index.rb

@@ -1,6 +1,6 @@
-require 'pact_broker/ui/controllers/base_controller'
-require 'pact_broker/ui/view_models/index_items'
-require 'haml'
+require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/view_models/index_items"
+require "haml"
 
 module PactBroker
   module UI
@@ -10,35 +10,48 @@ module PactBroker
 
         get "/" do
           set_headers
-          tags = nil
-          if params[:tags]
-            tags = params[:tags] == 'true' ? true : [*params[:tags]].compact
-          end
+          tags = if params[:tags]
+                   params[:tags] == "true" ? true : [*params[:tags]].compact
+                 end
+          search = params[:search].present? ? params[:search] : nil
           page_number = params[:page]&.to_i || 1
           # Make page size smaller for data intensive query
           page_size = params[:pageSize]&.to_i || (tags == true ? 30 : 100)
           options = {
             tags: tags,
             page_number: page_number,
-            page_size: page_size
-          }
+            page_size: page_size,
+            search: search
+          }.compact
+          error_messages = []
+
+          index_items = index_service.find_index_items(options)
 
-          index_items = ViewDomain::IndexItems.new(index_service.find_index_items(options), base_url: base_url)
+          if index_items.blank? && !search.blank?
+            error_messages << "No pacticipants found matching: \"#{search}\""
+          end
+
+          view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url)
 
           page = tags ? :'index/show-with-tags' : :'index/show'
           locals = {
-            title: "Pacts",
-            index_items: index_items,
+            title: PactBroker::Messages.message("messages.index.title"),
+            index_items: view_index_items,
             page_number: page_number,
             page_size: page_size,
-            pagination_record_count: index_items.pagination_record_count,
-            current_page_size: index_items.size,
-            base_url: base_url
+            pagination_record_count: view_index_items.pagination_record_count,
+            current_page_size: view_index_items.size,
+            base_url: base_url,
+            errors: error_messages,
+            tags: tags,
+            search: search
           }
 
           haml page, { locals: locals, layout: :'layouts/main', escape_html: true }
         end
 
+        private
+
         def set_headers
           response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"
           response.headers["Pragma"] = "no-cache"

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -1,11 +1,11 @@
-require 'pact_broker/ui/controllers/base_controller'
-require 'pact_broker/ui/view_models/matrix_lines'
-require 'pact_broker/matrix/unresolved_selector'
-require 'pact_broker/matrix/parse_query'
-require 'pact_broker/logging'
-require 'pact_broker/api/pact_broker_urls'
-require 'pact_broker/ui/helpers/matrix_helper'
-require 'haml'
+require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/view_models/matrix_lines"
+require "pact_broker/matrix/unresolved_selector"
+require "pact_broker/matrix/parse_query"
+require "pact_broker/logging"
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/matrix_helper"
+require "haml"
 
 module PactBroker
   module UI
@@ -26,10 +26,10 @@ module PactBroker
           }
           begin
             if params[:q]
-              selectors, options = PactBroker::Matrix::ParseQuery.call(request.env['QUERY_STRING'])
+              selectors, options = PactBroker::Matrix::ParseQuery.call(request.env["QUERY_STRING"])
               locals[:selectors] = create_selector_objects(selectors)
               locals[:options] = create_options_model(options)
-              errors = matrix_service.validate_selectors(selectors)
+              errors = matrix_service.validate_selectors(selectors, options)
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
                 locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
@@ -47,7 +47,7 @@ module PactBroker
 
         get "/provider/:provider_name/consumer/:consumer_name" do
           selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:consumer_name]), PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:provider_name]) ]
-          options = {latestby: 'cvpv', limit: 100}
+          options = {latestby: "cvpv", limit: 100}
           lines = matrix_service.find(selectors, options)
           lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
           locals = {

data/lib/pact_broker/ui/controllers/pacts.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/ui/controllers/base_controller'
+require "pact_broker/ui/controllers/base_controller"
 
 module PactBroker
   module UI

data/lib/pact_broker/ui/helpers/matrix_helper.rb

@@ -5,23 +5,26 @@ module PactBroker
 
         extend self
 
+        # rubocop: disable Metrics/CyclomaticComplexity
         def create_selector_objects(selector_hashes)
           selector_hashes.collect do | selector_hash |
             o = OpenStruct.new(selector_hash)
-            o.specify_latest_tag = o.tag && o.latest ? 'checked' : nil
-            o.specify_all_tagged = o.tag && !o.latest ? 'checked' : nil
-            o.specify_latest = o.latest ? 'checked' : nil
-            o.specify_version = o.pacticipant_version_number ? 'checked' : nil
-            o.specify_all_versions = !(o.tag || o.pacticipant_version_number) ? 'checked' : nil
+            o.specify_latest_tag = (o.tag && o.latest) ? "checked" : nil
+            o.specify_latest_branch = (o.branch && o.latest) ? "checked" : nil
+            o.specify_environment = o.environment_name ? "checked" : nil
+            o.specify_all_tagged = (o.tag && !o.latest) ? "checked" : nil
+            o.specify_latest = o.latest ? "checked" : nil
+            o.specify_version = o.pacticipant_version_number ? "checked" : nil
+            o.specify_all_versions = !(o.tag || o.pacticipant_version_number || o.branch) ? "checked" : nil
             o
           end
         end
 
         def create_options_model(options)
           o = OpenStruct.new(options)
-          o.cvpv_checked = o.latestby == 'cvpv' ? 'checked' : nil
-          o.cvp_checked = o.latestby == 'cvp' ? 'checked' : nil
-          o.all_rows_checked = o.latestby.nil? ? 'checked' : nil
+          o.cvpv_checked = o.latestby == "cvpv" ? "checked" : nil
+          o.cvp_checked = o.latestby == "cvp" ? "checked" : nil
+          o.all_rows_checked = o.latestby.nil? ? "checked" : nil
           o
         end
 
@@ -34,6 +37,7 @@ module PactBroker
             end
           end
         end
+        # rubocop: enable Metrics/CyclomaticComplexity
       end
     end
   end

data/lib/pact_broker/ui/helpers/url_helper.rb

@@ -1,4 +1,4 @@
-require 'erb'
+require "erb"
 
 module PactBroker
   module UI
@@ -7,11 +7,11 @@ module PactBroker
 
         extend self
 
-        def group_url pacticipant_name, base_url = ''
+        def group_url pacticipant_name, base_url = ""
           "#{base_url}/groups/#{ERB::Util.url_encode(pacticipant_name)}"
         end
 
-        def matrix_url consumer_name, provider_name, base_url = ''
+        def matrix_url consumer_name, provider_name, base_url = ""
           "#{base_url}/matrix/provider/#{ERB::Util.url_encode(provider_name)}/consumer/#{ERB::Util.url_encode(consumer_name)}"
         end
       end

data/lib/pact_broker/ui/view_models/index_item.rb

@@ -1,9 +1,9 @@
-require 'pact_broker/api/pact_broker_urls'
-require 'pact_broker/ui/helpers/url_helper'
-require 'pact_broker/date_helper'
-require 'pact_broker/versions/abbreviate_number'
-require 'pact_broker/configuration'
-require 'forwardable'
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+require "pact_broker/versions/abbreviate_number"
+require "pact_broker/configuration"
+require "forwardable"
 
 module PactBroker
   module UI
@@ -11,7 +11,13 @@ module PactBroker
       class IndexItem
         extend Forwardable
 
-        delegate [:consumer_version_branch, :provider_version_branch, :latest_for_branch?] => :relationship
+        delegate [
+          :consumer_version_branch,
+          :provider_version_branch,
+          :latest_for_branch?,
+          :consumer_version_environment_names,
+          :provider_version_environment_names
+        ] => :relationship
 
 
         include PactBroker::Api::PactBrokerUrls
@@ -127,11 +133,11 @@ module PactBroker
 
         def webhook_url
           url = case @relationship.webhook_status
-            when :none
-              PactBroker::Api::PactBrokerUrls.webhooks_for_consumer_and_provider_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
-            else
-              PactBroker::Api::PactBrokerUrls.webhooks_status_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
-          end
+                when :none
+                  PactBroker::Api::PactBrokerUrls.webhooks_for_consumer_and_provider_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
+                else
+                  PactBroker::Api::PactBrokerUrls.webhooks_status_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
+                end
           PactBroker::Api::PactBrokerUrls.hal_browser_url(url, base_url)
         end
 
@@ -163,7 +169,7 @@ module PactBroker
         end
 
         def warning?
-          pseudo_branch_verification_status == 'warning'
+          pseudo_branch_verification_status == "warning"
         end
 
         def verification_tooltip

data/lib/pact_broker/ui/view_models/index_items.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/ui/view_models/index_item'
+require "pact_broker/ui/view_models/index_item"
 
 module PactBroker
   module UI
@@ -33,4 +33,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/ui/view_models/matrix_deployed_version.rb

@@ -0,0 +1,37 @@
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class MatrixDeployedVersion
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize deployed_version
+          @deployed_version = deployed_version
+        end
+
+        def environment_name
+          deployed_version.environment.name
+        end
+
+        def tooltip
+          "Currently deployed to #{deployed_version.environment.display_name} (#{relative_date(deployed_version.created_at)})"
+        end
+
+        def url
+          hal_browser_url(deployed_version_url(deployed_version))
+        end
+
+        private
+
+        attr_reader :deployed_version
+
+        def relative_date date
+          DateHelper.distance_of_time_in_words(date, DateTime.now) + " ago"
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/view_models/matrix_line.rb

@@ -1,10 +1,12 @@
-require 'pact_broker/api/pact_broker_urls'
-require 'pact_broker/ui/helpers/url_helper'
-require 'pact_broker/date_helper'
-require 'pact_broker/ui/view_models/matrix_tag'
-require 'pact_broker/versions/abbreviate_number'
-require 'pact_broker/messages'
-require 'forwardable'
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+require "pact_broker/ui/view_models/matrix_tag"
+require "pact_broker/ui/view_models/matrix_deployed_version"
+require "pact_broker/ui/view_models/matrix_released_version"
+require "pact_broker/versions/abbreviate_number"
+require "pact_broker/messages"
+require "forwardable"
 
 module PactBroker
   module UI
@@ -131,6 +133,14 @@ module PactBroker
             .collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
         end
 
+        def consumer_versions_in_environments
+          consumer_deployed_versions + consumer_released_versions
+        end
+
+        def provider_versions_in_environments
+          provider_deployed_versions + provider_released_versions
+        end
+
         def latest_provider_version_tags
           @line.provider_version_tags
             .select(&:latest)
@@ -157,7 +167,7 @@ module PactBroker
           if @line.verification_executed_at
             DateHelper.distance_of_time_in_words(@line.verification_executed_at, DateTime.now) + " ago"
           else
-            ''
+            ""
           end
           # case @line.success
           #   when true then "Verified"
@@ -188,9 +198,9 @@ module PactBroker
 
         def verification_status_class
           case @line.success
-            when true then 'table-success'
-            when false then 'table-danger'
-            else ''
+            when true then "table-success"
+            when false then "table-danger"
+            else ""
           end
         end
 
@@ -223,6 +233,30 @@ module PactBroker
             "A more recent version of #{pacticipant_name} from branch \"#{branch}\" exists."
           end
         end
+
+        def consumer_deployed_versions
+          @line.consumer_version.current_deployed_versions.collect do | deployed_version |
+            MatrixDeployedVersion.new(deployed_version)
+          end
+        end
+
+        def consumer_released_versions
+          @line.consumer_version.current_supported_released_versions.collect do | released_version |
+            MatrixReleasedVersion.new(released_version)
+          end
+        end
+
+        def provider_deployed_versions
+          (@line.provider_version&.current_deployed_versions || []).collect do | deployed_version |
+            MatrixDeployedVersion.new(deployed_version)
+          end
+        end
+
+        def provider_released_versions
+          (@line.provider_version&.current_supported_released_versions || []).collect do | released_version |
+            MatrixReleasedVersion.new(released_version)
+          end
+        end
       end
     end
   end

data/lib/pact_broker/ui/view_models/matrix_lines.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/ui/view_models/matrix_line'
+require "pact_broker/ui/view_models/matrix_line"
 
 module PactBroker
   module UI

data/lib/pact_broker/ui/view_models/matrix_released_version.rb

@@ -0,0 +1,37 @@
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class MatrixReleasedVersion
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize released_version
+          @released_version = released_version
+        end
+
+        def environment_name
+          released_version.environment.name
+        end
+
+        def tooltip
+          "Currently released and supported in #{released_version.environment.display_name} (#{relative_date(released_version.created_at)})"
+        end
+
+        def url
+          hal_browser_url(released_version_url(released_version))
+        end
+
+        private
+
+        attr_reader :released_version
+
+        def relative_date date
+          DateHelper.distance_of_time_in_words(date, DateTime.now) + " ago"
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/view_models/matrix_tag.rb

@@ -1,6 +1,6 @@
-require 'pact_broker/api/pact_broker_urls'
-require 'pact_broker/ui/helpers/url_helper'
-require 'pact_broker/date_helper'
+require "pact_broker/api/pact_broker_urls"
+require "pact_broker/ui/helpers/url_helper"
+require "pact_broker/date_helper"
 
 module PactBroker
   module UI