snitch_reporting 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c842988f84c5f628e15f57cc36835b85fed9cec880b7d2fb2e6b137d9a74cbd
-  data.tar.gz: 77290e2cf520feb8d711cf9f1d45df0a9f43d4b5ae93a071d1aba56e61c2fd42
+  metadata.gz: ea0cf12cf265e5dbdaeb502ce609cda532d5905041ec0f2ec96cde59cedeedcb
+  data.tar.gz: e22d3a0e011b516fd2f69ca487a674bcefbfbb5722940920c8f1e2cceb1108fa
 SHA512:
-  metadata.gz: e21a8a1e211bdba81d0af8bdb98948d396013337a98c6c1a624318444634c0be43e767b4a0b7dbdc08892af50580662be3c5ed9c12a9bc68aa53da3dfafb2a6f
-  data.tar.gz: 26b836607918d65d06c165422dded336808a8cf09bc154feded8a5985b64d844ed2878519ca5ffe8d1257a5c79c3d927be15b7c112539fdfa6a92eb883220dcb
+  metadata.gz: ed3dfb3a37fea761142366b66b1e3f2afa3e5bcb8fffb0227991fb0c2f4da3cdc3145b5cfa7e63d0ce42f13ee1e8c14c468b385ad8c856fa833e4e027345ac93
+  data.tar.gz: 909ba5d52e8585fd1e46944bf3a4d390d1e8d81035587d8194a6ba92dde0c2fb9b82bb13cb4565354aaff1259482a0f159e6370519c3e472a6f55511f5acdc70

data/app/assets/javascripts/snitch_reporting/search_bar.js

@@ -0,0 +1,74 @@
+document.addEventListener("DOMContentLoaded", function(){
+  document.querySelector("[name=filter_string]").addEventListener("focus", function(event) {
+    document.querySelector(".filters").classList.add("open")
+  })
+
+  setNewFilters(document.querySelector("[name=filter_string]").value)
+});
+
+document.addEventListener("click", function(event) {
+  if (event.target.matches(".filters") || event.target.matches("[name=filter_string]")) {
+    return event.stopPropagation()
+  }
+
+  if (event.target.matches(".filter-cell")) {
+    event.preventDefault()
+    return applyFilter(event.target)
+  }
+
+  document.querySelector(".filters").classList.remove("open")
+})
+
+function applyFilter(selected_cell) {
+  var filter_field = document.querySelector("[name=filter_string]")
+  var filter_string = filter_field.value
+
+  var matched_filters = filter_string.match(new RegExp(selected_cell.dataset.filterName + ":" + "\\w+"))
+  var current_filter = (matched_filters || [])[0]
+
+  if (current_filter == undefined) {
+    current_filter = selected_cell.dataset.filterName + ":" + selected_cell.dataset.filterValue
+
+    if (!filter_string.slice(-1) == " ") { filter_string = filter_string + " " }
+    filter_string = filter_string + current_filter
+  } else {
+    var filter_values = current_filter.split(":")
+    var filter_name = filter_values[0]
+    var filter_value = filter_values[1]
+    var filter_sort = filter_values[2]
+
+    var new_filter = current_filter.replace(filter_value, selected_cell.dataset.filterValue)
+
+    filter_string = filter_string.replace(current_filter, new_filter)
+  }
+
+  setNewFilters(filter_string)
+}
+
+function setNewFilters(filter_string) {
+  var filter_field = document.querySelector("[name=filter_string]")
+  filter_field.value = filter_string
+
+  var filters = {}, filter_strings = filter_string.match(/\w+\:\w+/g) || []
+  filter_strings.forEach(function(filter) {
+    var filter_values = filter.split(":")
+    var filter_name = filter_values[0]
+    var filter_value = filter_values[1]
+    var filter_sort = filter_values[2]
+
+    filters[filter_name] = filter_value
+  })
+
+  document.querySelectorAll(".filters .snitch-table").forEach(function(filter_table) {
+    var current_filter = filters[filter_table.dataset.filterName]
+    current_filter = current_filter || filter_table.dataset.default
+
+    filter_table.querySelectorAll(".filter-cell").forEach(function(filter_cell) {
+      if (filter_cell.dataset.filterValue == current_filter) {
+        filter_cell.classList.add("selected")
+      } else {
+        filter_cell.classList.remove("selected")
+      }
+    })
+  })
+}

data/app/assets/javascripts/snitch_reporting/snitch_report.js

@@ -1,3 +1,5 @@
+//= require_tree .
+
 document.addEventListener("change", function(evt) {
   if (evt.target && evt.target.hasAttribute("data-mark-resolution-url")) {
     var report_url = evt.target.getAttribute("data-mark-resolution-url")

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

@@ -78,6 +78,7 @@ todo {
   border-radius: 4px;
   background: $border-grey;
   padding: 3px 5px;
+  line-height: 2;
   white-space: nowrap;
 }
 

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

@@ -33,5 +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%;
+      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/assets/stylesheets/snitch_reporting/snitch_report.scss

@@ -1 +1 @@
-@import "*";
+@import "*";

data/app/controllers/snitch_reporting/snitch_reports_controller.rb

@@ -14,6 +14,10 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
       # sort_reports
     end
 
+    def interpret_search
+      redirect_to snitch_reports_path(filter_string: params[:filter_string])
+    end
+
     def show
       @report = ::SnitchReporting::SnitchReport.find(params[:id])
       occurrences = @report.occurrences.order(created_at: :asc)
@@ -93,8 +97,8 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
   #   end
   #
   #   def set_report_preferences
-  #     @report_preferences = begin
-  #       preferences = JSON.parse(session[:report_preferences].presence || "{}").symbolize_keys
+  #     @filters = begin
+  #       preferences = JSON.parse(session[:filters].presence || "{}").symbolize_keys
   #
   #       available_preferences = [:level_tags, :severity_tags, :source_tags, :resolved, :ignored]
   #       available_preferences.each do |pref_key|
@@ -103,7 +107,7 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
   #         preferences.delete(pref_key) if pref_val == "all"
   #       end
   #
-  #       session[:report_preferences] = preferences.to_json
+  #       session[:filters] = preferences.to_json
   #       preferences
   #     end
   #   end
@@ -112,28 +116,30 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
         status: {
           default: :unresolved,
           values: [:all, :resolved, :unresolved]
-        }
+        },
         # assignee: {
         #   default: :any,
         #   values: [:any, :me, :not_me, :not_assigned]
         # },
-        # log_level: {
-        #   default: :any,
-        #   values: [:any] + ::SnitchReporting::SnitchReport.log_levels.keys.map(&:to_sym)
-        # },
+        log_level: {
+          default: :any,
+          values: [:any] + ::SnitchReporting::SnitchReport.log_levels.keys.map(&:to_sym)
+        },
         # ignored: {
         #   default: :not_ignored,
         #   values: [:all, :ignored, :not_ignored]
         # }
       }
 
-      @filters = @filter_sets.each_with_object({set_filters: {}}) do |(filter_name, filter_set), filters|
-        filters[filter_name] = filter_set[:default]
-        filter_in_param = params[filter_name].try(:to_sym)
-        next unless filter_in_param && filter_set[:values].include?(filter_in_param)
-        filters[filter_name] = filter_in_param
-        filters[:set_filters][filter_name] = filter_in_param
-      end
+      set_filter_string
+
+      # @filters = @filter_sets.each_with_object({set_filters: {}}) do |(filter_name, filter_set), filters|
+      #   filters[filter_name] = filter_set[:default]
+      #   filter_in_param = params[filter_name].try(:to_sym)
+      #   next unless filter_in_param && filter_set[:values].include?(filter_in_param)
+      #   filters[filter_name] = filter_in_param
+      #   filters[:set_filters][filter_name] = filter_in_param
+      # end
     end
 
     def filter_reports
@@ -141,14 +147,87 @@ class ::SnitchReporting::SnitchReportsController < ApplicationController
 
       @reports = @reports.resolved if @filters[:status] == :resolved
       @reports = @reports.unresolved if @filters[:status] == :unresolved
-      # @reports = @reports.search(@report_preferences[:by_fuzzy_text]) if @report_preferences[:by_fuzzy_text].present?
+      @reports = @reports.search(@filters[:search]) if @filters[:search].present?
       #
-      # @reports = @reports.by_level(@report_preferences[:level_tags]) if @report_preferences[:level_tags].present?
-      # @reports = @reports.by_severity(@report_preferences[:severity_tags]) if @report_preferences[:severity_tags].present?
-      # @reports = @reports.by_source(@report_preferences[:source_tags]) if @report_preferences[:source_tags].present?
+      @reports = @reports.by_level(@filters[:log_level]) if @filters[:log_level].present?
+      # @reports = @reports.by_severity(@filters[:severity_tags]) if @filters[:severity_tags].present?
+      # @reports = @reports.by_source(@filters[:source_tags]) if @filters[:source_tags].present?
       #
-      # @reports = @report_preferences[:resolved].present? && truthy?(@report_preferences[:resolved]) ? @reports.resolved : @reports.unresolved
-      # @reports = @report_preferences[:ignored].present? && truthy?(@report_preferences[:ignored]) ? @reports.ignored : @reports.unignored
+      # @reports = @filters[:resolved].present? && truthy?(@filters[:resolved]) ? @reports.resolved : @reports.unresolved
+      # @reports = @filters[:ignored].present? && truthy?(@filters[:ignored]) ? @reports.ignored : @reports.unignored
+    end
+
+    def encode_string(token, str)
+      @interpolated_strings ||= []
+
+      @interpolated_strings << str
+      "#{token}(#{@interpolated_strings.length})"
+    end
+
+    def decode_string(token, encoded_str)
+      @interpolated_strings ||= []
+
+      encoded_str.gsub(/(\w+)\((\d+)\)/) do |found|
+        token = Regexp.last_match(1)
+        idx = Regexp.last_match(2)
+
+        if idx.to_i.to_s == idx
+          @interpolated_strings[idx.to_i - 1]
+        else
+          found
+        end
+      end
+    end
+
+    def param_safe_value(str)
+      return str unless str.include?(" ")
+
+      "\"#{str}\""
+    end
+
+    def set_filter_string
+      @filter_string = params[:filter_string] || session[:snitch_filter_string] || "status:unresolved"
+      @unknown_strings = []
+      @filters = {}
+
+      secret_key = loop do
+        token = SecureRandom.hex(10)
+        break token unless @filter_string.include?(token)
+      end
+
+      temp_filter_string = @filter_string.gsub(/\"(.*?)\"/) do |found|
+        encode_string(secret_key, Regexp.last_match(1))
+      end
+
+      search_strings = []
+      filter_strings = temp_filter_string.split(" ").select do |filter_string|
+        search_strings << filter_string unless filter_string.include?(":")
+        filter_string.include?(":")
+      end
+
+      filter_strings.each do |filter_string|
+        filter, value, * = filter_string.split(":")
+        if value.blank?
+          # Search pure text by itself
+          search_strings << value
+        elsif @filter_sets.keys.include?(filter.to_s.to_sym)
+          value = decode_string(secret_key, value)
+          @filters[filter.to_sym] = value.to_sym
+        elsif filter == "search"
+          search_strings << decode_string(secret_key, value)
+        else
+          @unknown_strings << filter_string
+        end
+      end
+
+      @filters[:search] = "\"#{search_strings.join(' ')}\"" if search_strings.any?
+
+      new_filter_strings = @filters.each_with_object([]) do |(filter_string, filter_value), filter_array|
+        filter_array << "#{filter_string}:#{filter_value}" if filter_value.present?
+      end
+
+      @filter_string = new_filter_strings.join(" ")
+      session[:snitch_filter_string] = @filter_string.dup
     end
   #
   #   def sort_reports

data/app/models/snitch_reporting/snitch_occurrence.rb

@@ -55,10 +55,10 @@ class SnitchReporting::SnitchOccurrence < ApplicationRecord
   def backtrace=(trace_lines)
     already_traced = []
     self.backtrace_data = trace_lines.map do |trace_line|
-      next unless trace_line.include?("/app/") # && trace_line.exclude?("app/models/snitch_reporting")
+      next unless trace_line.include?("/app/")
 
       joined_path = file_lines_from_backtrace(trace_line)
-      next if joined_path.include?(joined_path)
+      next if already_traced.include?(joined_path)
       already_traced << joined_path
 
       file_path, line_number = joined_path.split(":", 2)

data/app/models/snitch_reporting/snitch_report.rb

@@ -20,7 +20,6 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   has_many :histories, class_name: "SnitchReporting::SnitchHistory", foreign_key: :report_id
 
   # belongs_to :assigned_to
-  def assigned_to; end
   # belongs_to :resolved_by
   # belongs_to :ignored_by
 
@@ -31,6 +30,7 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   scope :ignored,       -> { where.not(ignored_at: nil) }
   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}%") }
 
   enum log_level: {
     debug:   1,
@@ -271,7 +271,7 @@ class SnitchReporting::SnitchReport < ApplicationRecord
   end
 
   def tags=(new_tags)
-    super((new_tags.try(:to_a) || [new_tags]).compact.flatten)
+    super((new_tags.try(:to_a) || [new_tags]).compact.flatten.uniq)
   end
 
   def add_tags(new_tags)

data/app/views/snitch_reporting/snitch_reports/index.html.erb

@@ -1,27 +1,26 @@
 <div class="snitch-reporting">
-  <!--
-    <div class="nav-tab">
-      <input type="search" name="search" value="<%= params[:search] %>" placeholder="Search">
-    </div>
-   -->
-  <div class="filters">
-    <% @filter_sets.each do |filter_name, filter_set| %>
-      <div class="snitch-table filter-table">
-        <div class="snitch-tr">
-          <div class="snitch-th"><%= filter_name.to_s.titleize %></div>
-        </div>
 
-        <% selected_filter_value = @filters[filter_name] %>
-        <% default_filter_value = filter_set[:default] %>
-        <% filter_set[:values].each do |filter_value| %>
-          <div class="snitch-tr">
-            <% url_value = filter_value == default_filter_value ? @filters[:set_filters].except(filter_name) : @filters[:set_filters].merge(filter_name => filter_value) %>
-            <%= link_to filter_value.to_s.titleize, url_value, class: "snitch-td link-cell #{'selected' if selected_filter_value == filter_value}" %>
+  <%= form_tag interpret_search_path, class: "snitch-search-area" do %>
+    <button type="submit" name="button">Filter</button>
+    <input type="text" name="filter_string" value="<%= @filter_string %>">
+    <label for="search">
+      <div class="filters">
+        <% @filter_sets.each do |filter_name, filter_set| %>
+          <div class="snitch-table filter-table" data-filter-name="<%= filter_name %>" data-default="<%= filter_set[:default] %>">
+            <div class="snitch-tr">
+              <div class="snitch-th"><%= filter_name.to_s.titleize %></div>
+            </div>
+
+            <% filter_set[:values].each do |filter_value| %>
+              <div class="snitch-tr">
+                <%= link_to filter_value.to_s.titleize, {}, class: "snitch-td link-cell filter-cell", data: { filter_name: filter_name, filter_value: filter_value } %>
+              </div>
+            <% end %>
           </div>
         <% end %>
       </div>
-    <% end %>
-  </div>
+    </label>
+  <% end %>
 
   <div class="snitch-index">
     <div class="snitch-title-section">
@@ -63,7 +62,6 @@
                   <span class="snitch-tag"><%= tag %></span><%= ', ' if idx < report.tags.length - 1 %>
                 <% end %>
               </div>
-              <!-- <div class="snitch-td"><%= report.assigned_to.try(:name).presence || "-" %></div> -->
               <div class="snitch-td">
                 <%= content_tag :input, "", type: :checkbox, name: :resolved, class: "snitch-resolution-switch", checked: report.resolved?, data: { mark_resolution_url: snitch_report_url(report) } %>
               </div>

data/app/views/snitch_reporting/snitch_reports/show.html.erb

@@ -126,7 +126,7 @@
   <div id="params" class="snitch-section">
     <h3>Params</h3>
     <div class="line-trace">
-      <span class="snitch-code"><%= JSON.pretty_generate(@occurrence.params) %></span>
+      <span class="snitch-code"><%= JSON.pretty_generate(@occurrence.params.presence || {}) %></span>
     </div>
   </div>
 

data/config/routes.rb

@@ -2,4 +2,5 @@ SnitchReporting::Engine.routes.draw do
   root to: "snitch_reports#index"
 
   resources :snitch_reports, path: "/", only: [:index, :show, :update, :edit]
+  post :interpret_search, controller: :snitch_reports
 end

data/lib/snitch_reporting/version.rb

@@ -1,3 +1,3 @@
 module SnitchReporting
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snitch_reporting
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,6 +78,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/snitch_reporting_manifest.js
+- app/assets/javascripts/snitch_reporting/search_bar.js
 - app/assets/javascripts/snitch_reporting/snitch_report.js
 - app/assets/stylesheets/snitch_reporting/_variables.scss
 - app/assets/stylesheets/snitch_reporting/components.scss