snitch_reporting 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7c6a29f299f8c00142069303e84a5a52d627855bdafbbfeb28fdada01f5269
-  data.tar.gz: a77a3f866addcb8c687562fab7e52efb8f062ffe444276211830dd11781939a5
+  metadata.gz: 64846e2c242ccd9b84512b6089c287128f336ce364a6b771fd4d08d0a03f4676
+  data.tar.gz: 7fbcec2fc85da6b4c8e8690c2794a2271a0f4ba2e192458f1778ae99af59c9a9
 SHA512:
-  metadata.gz: 7c498d316d61f1d62781e733cd434286f94622f83f6e8341a011671eb4321302902576e6cefbffe5d8b11245750ba183da418f17bc61608d0d040253352ba09c
-  data.tar.gz: 11c83a1f7db7b824fb4e8fe750d023fbb5eaa5a24156bcb7a48f98394e686cfd1585062eddd14c084daed7ad09de4660d130507652728995c4a0780e5f9f35b2
+  metadata.gz: fccfce35ca00431986d349ec8e5e2cc092d7c80534f9d687d41a5718ebee87bab1145fec6a425e9b8360501c39bfc4acddbed5fa4ca46e3afdf29cf4f441b5ee
+  data.tar.gz: ad39ef70738ab939e0bd49a62f46b30299287b82bb78ef4f07da3f672a78c9671e088a2986a75b6b46930f5f5fbc97b7908bce0e644fb90777fbef753ffe7f27

data/app/assets/stylesheets/snitch_reporting/forms.scss

@@ -33,4 +33,54 @@
       }
     }
   }
+
+  .snitch-search-area {
+    display: flex;
+    position: relative;
+    flex-direction: row-reverse;
+
+    .filters {
+      display: none;
+      position: absolute;
+      top: 60px;
+      right: 0;
+      left: 0;
+      z-index: 100;
+      transition: all 0.3s;
+      box-shadow: 2px 2px 4px $border-grey;
+      border: 3px solid $border-grey;
+      border-radius: 4px;
+      background: white;
+      padding: 20px;
+    }
+
+    input[name=filter_string] {
+      box-shadow: 2px 2px 4px $border-grey;
+      border: 2px solid $border-grey;
+      border-radius: 4px;
+      padding: 10px;
+      width: 100%;
+      height: auto;
+      font-size: 32px;
+    }
+
+    button[type=submit] {
+      cursor: pointer;
+      box-shadow: 2px 2px 4px $border-grey;
+      border: 1px solid $border-grey;
+      border-radius: 6px;
+      background: linear-gradient($snitch-blue, darken($snitch-blue, 15%));
+      padding: 0 12px;
+      color: white;
+      font-size: 18px;
+
+      &:hover {
+        background: linear-gradient(darken($snitch-blue, 15%), $snitch-blue, $snitch-blue);
+      }
+    }
+
+    .filters.open {
+      display: block;
+    }
+  }
 }

data/app/assets/stylesheets/snitch_reporting/navigation.scss

@@ -33,54 +33,5 @@
     }
   }
 
-  .snitch-search-area {
-    display: flex;
-    position: relative;
-    flex-direction: row-reverse;
-
-    .filters {
-      display: none;
-      position: absolute;
-      top: 60px;
-      right: 0;
-      left: 0;
-      z-index: 100;
-      transition: all 0.3s;
-      box-shadow: 2px 2px 4px $border-grey;
-      border: 3px solid $border-grey;
-      border-radius: 4px;
-      background: white;
-      padding: 20px;
-    }
-
-    input[name=filter_string] {
-      box-shadow: 2px 2px 4px $border-grey;
-      border: 2px solid $border-grey;
-      border-radius: 4px;
-      padding: 10px;
-      width: 100%;
-      font-size: 32px;
-    }
-
-    button[type=submit] {
-      cursor: pointer;
-      box-shadow: 2px 2px 4px $border-grey;
-      border: 1px solid $border-grey;
-      border-radius: 6px;
-      background: linear-gradient($snitch-blue, darken($snitch-blue, 15%));
-      padding: 0 12px;
-      color: white;
-      font-size: 18px;
-
-      &:hover {
-        background: linear-gradient(darken($snitch-blue, 15%), $snitch-blue, $snitch-blue);
-      }
-    }
-
-    .filters.open {
-      display: block;
-    }
-  }
-
   .snitch-breadcrumbs {}
 }

data/app/controllers/snitch_reporting/snitch_reports_controller.rb

@@ -148,8 +148,9 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
       @reports = @reports.resolved if @filters[:status] == :resolved
       @reports = @reports.unresolved if @filters[:status] == :unresolved
       @reports = @reports.search(@filters[:search]) if @filters[:search].present?
-      #
       @reports = @reports.by_level(@filters[:log_level]) if @filters[:log_level].present?
+
+      @reports = @reports.by_tag(*@filters[:tag]) if @filters[:tag].any?
       # @reports = @reports.by_severity(@filters[:severity_tags]) if @filters[:severity_tags].present?
       # @reports = @reports.by_source(@filters[:source_tags]) if @filters[:source_tags].present?
       #
@@ -200,6 +201,7 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
       end
 
       search_strings = []
+      tag_strings = []
       filter_strings = temp_filter_string.split(" ").select do |filter_string|
         search_strings << filter_string unless filter_string.include?(":")
         filter_string.include?(":")
@@ -215,15 +217,25 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
           @filters[filter.to_sym] = value.to_sym
         elsif filter == "search"
           search_strings << decode_string(secret_key, value)
+        elsif filter == "tag" || filter == "tags"
+          tag_strings << decode_string(secret_key, value)
         else
           @unknown_strings << filter_string
         end
       end
 
       @filters[:search] = "\"#{search_strings.join(' ')}\"" if search_strings.any?
+      @filters[:tag] = tag_strings
 
       new_filter_strings = @filters.each_with_object([]) do |(filter_string, filter_value), filter_array|
-        filter_array << "#{filter_string}:#{filter_value}" if filter_value.present?
+        next unless filter_value.present?
+        if filter_value.is_a?(Array)
+          filter_value.each do |filter_value_i|
+            filter_array << "#{filter_string}:#{filter_value_i}"
+          end
+        else
+          filter_array << "#{filter_string}:#{filter_value}"
+        end
       end
 
       @filter_string = new_filter_strings.join(" ")

data/app/models/snitch_reporting/snitch_report.rb

@@ -31,6 +31,18 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   scope :unignored,     -> { where(ignored_at: nil) }
   scope :by_level,      ->(*level_tags) { where(log_level: level_tags) }
   scope :search,        ->(text) { where("CONCAT(error, ' ', message) ILIKE :text", text: "%#{text}%") }
+  scope :by_tag, lambda { |*tags|
+    scopes = []
+    tags.each do |tag|
+      if tag[0] == "!"
+        tag[0] = ""
+        scopes << "tags !~* '(\\[|,).*\"#{tag}\".*(,|\\])'"
+      else
+        scopes << "tags ~* '(\\[|,).*\"#{tag}\".*(,|\\])'"
+      end
+    end
+    where(scopes.join(" AND "))
+  }
 
   enum log_level: {
     debug:   1,
@@ -54,7 +66,7 @@ class SnitchReporting::SnitchReport < ApplicationRecord
       env, klass, base_exception = extract_base_variables(exceptions, arg_hash, arg_values)
       always_notify = arg_hash.delete(:always_notify)
 
-      report_title = retrieve_report_title(base_exception, arg_hash)
+      report_title = retrieve_report_title(base_exception, arg_hash, arg_values)
       report = retrieve_or_create_existing_report(log_level, santize_title(report_title), env, base_exception, arg_hash)
       return SnitchReporting::SnitchReport.error("Failed to save report.", report.errors.full_messages) unless report.persisted?
 
@@ -160,13 +172,14 @@ class SnitchReporting::SnitchReport < ApplicationRecord
       end
     end
 
-    def retrieve_report_title(exception, arg_hash)
+    def retrieve_report_title(exception, arg_hash, arg_values)
       report_title = arg_hash[:title].presence
       report_title ||= exception.try(:message).presence
       report_title ||= exception.try(:body).presence
-      report_title ||= exception.try(:class).presence
+      report_title ||= arg_values&.find { |arg_value| arg_value.is_a?(String) }
       report_title ||= (arg_hash[:klass] || arg_hash[:class]).presence
       report_title ||= trace_from_exception(exception).find { |row| row.include?("/app/") }
+      report_title ||= exception.try(:class).presence
       report_title
     end
 
@@ -267,7 +280,7 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   end
 
   def tags
-    super || []
+    (super || []).uniq
   end
 
   def tags=(new_tags)
@@ -277,7 +290,7 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   def add_tags(new_tags)
     return if new_tags.blank?
 
-    update(tags: tags + [new_tags])
+    update(tags: (tags + [new_tags]).compact.flatten.uniq)
   end
 
   def resolved?; resolved_at?; end

data/lib/snitch_reporting/version.rb

@@ -1,3 +1,3 @@
 module SnitchReporting
-  VERSION = '1.1.4'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snitch_reporting
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Rocco Nicholls