catpm 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b1f8ad18b14d62b8ace369a8d064396ff4fc2988f1dc4eb911c71278c05766
-  data.tar.gz: f6153a851adc6ff5dd810cf648b069b512117bd25ae87f6e7715382ea6c43960
+  metadata.gz: 77d3e9a9e80a64c61ba1cbc9f400f9b53cb774c2eee0cf1fc807952bf1b81c39
+  data.tar.gz: 3364e29476e9a6f77494f86c0fb00932c70a84eb90067df86e8455a00608930b
 SHA512:
-  metadata.gz: 485696711db8a1ed56901065ee90b151292a466c4a21bf6585e63e36a0ee6f873a14584b229f1963bd9fa14ac5143d4fbc3641763177dec0ec2fc5c5421ba11d
-  data.tar.gz: c6e0dd6391af5921e4fa79ad77a69fe7d637adf77f714cf19eb66182dbac128c7c45d75ee1ac7365620824afc34d6672d788169c230c72d8ac0af27460167eff
+  metadata.gz: 52c5cb2542feabdb2a493390e1fd0c42bef5e5ea8c8d89bb71115f774b790e88b8c8f253402e47835da8190a4113d3ed7302398f59a2ce2841df2576018a20cb
+  data.tar.gz: be688f7c4ce207e04d09fb1ac30b390bc7f2ea8b050120bc46929a952a632d17e63ffc110950907ee37e60aa62f8f7400a3d982acfc568dd2392d01fe9841c91

data/app/controllers/catpm/errors_controller.rb

@@ -28,7 +28,7 @@ module Catpm
 
       @total_count = scope.count
       @page = [params[:page].to_i, 1].max
-      @errors = scope.order(@sort => @dir).offset((@page - 1) * PER_PAGE).limit(PER_PAGE)
+      @errors = scope.order(pinned: :desc, @sort => @dir).offset((@page - 1) * PER_PAGE).limit(PER_PAGE)
     end
 
     def show
@@ -106,19 +106,41 @@ module Catpm
     def resolve
       error = Catpm::ErrorRecord.find(params[:id])
       error.resolve!
-      redirect_to catpm.error_path(error), notice: 'Marked as resolved'
+      if request.xhr?
+        render json: { resolved: true }
+      else
+        redirect_to catpm.error_path(error), notice: 'Marked as resolved'
+      end
     end
 
     def unresolve
       error = Catpm::ErrorRecord.find(params[:id])
       error.unresolve!
-      redirect_to catpm.error_path(error), notice: 'Reopened'
+      if request.xhr?
+        render json: { resolved: false }
+      else
+        redirect_to catpm.error_path(error), notice: 'Reopened'
+      end
+    end
+
+    def toggle_pin
+      error = Catpm::ErrorRecord.find(params[:id])
+      error.update!(pinned: !error.pinned)
+      if request.xhr?
+        render json: { pinned: error.pinned }
+      else
+        redirect_back fallback_location: catpm.error_path(error)
+      end
     end
 
     def destroy
       error = Catpm::ErrorRecord.find(params[:id])
       error.destroy!
-      redirect_to catpm.errors_path, notice: 'Error deleted'
+      if request.xhr?
+        render json: { deleted: true }
+      else
+        redirect_to catpm.errors_path, notice: 'Error deleted'
+      end
     end
 
     def resolve_all

data/app/controllers/catpm/events_controller.rb

@@ -64,9 +64,10 @@ module Catpm
       # Sort (pinned always on top)
       @sort = %w[name total_count last_seen].include?(params[:sort]) ? params[:sort] : 'total_count'
       @dir = params[:dir] == 'asc' ? 'asc' : 'desc'
-      events_list = events_list.sort_by { |e| e[@sort.to_sym] || '' }
-      events_list = events_list.reverse if @dir == 'desc'
-      events_list = events_list.sort_by { |e| e[:pinned] ? 0 : 1 }
+      sorted = events_list.sort_by { |e| e[@sort.to_sym] || '' }
+      sorted = sorted.reverse if @dir == 'desc'
+      pinned, unpinned = sorted.partition { |e| e[:pinned] }
+      events_list = pinned + unpinned
 
       @total_event_names = events_list.size
 
@@ -153,6 +154,16 @@ module Catpm
       end
     end
 
+    def destroy_sample
+      sample = Catpm::EventSample.find(params[:sample_id])
+      sample.destroy
+      if request.xhr?
+        render json: { deleted: true }
+      else
+        redirect_back fallback_location: catpm.events_path, notice: 'Sample deleted'
+      end
+    end
+
     def ignored
       @range, period, _bucket_seconds = helpers.parse_range(remembered_range)
       ignored_prefs = Catpm::EventPref.ignored

data/app/controllers/catpm/samples_controller.rb

@@ -17,7 +17,9 @@ module Catpm
       sample = Catpm::Sample.find(params[:id])
       bucket = sample.bucket
       sample.destroy
-      if bucket
+      if request.xhr?
+        render json: { deleted: true }
+      elsif bucket
         redirect_to catpm.endpoint_path(kind: bucket.kind, target: bucket.target, operation: bucket.operation), notice: 'Sample deleted'
       else
         redirect_to catpm.status_index_path, notice: 'Sample deleted'

data/app/controllers/catpm/status_controller.rb

@@ -85,9 +85,10 @@ module Catpm
       # Server-side sort (pinned always on top)
       @sort = %w[target total_count avg_duration max_duration total_failures last_seen].include?(params[:sort]) ? params[:sort] : 'last_seen'
       @dir = params[:dir] == 'asc' ? 'asc' : 'desc'
-      endpoints = endpoints.sort_by { |e| e[@sort.to_sym] || '' }
-      endpoints = endpoints.reverse if @dir == 'desc'
-      endpoints = endpoints.sort_by { |e| e[:pinned] ? 0 : 1 }
+      sorted = endpoints.sort_by { |e| e[@sort.to_sym] || '' }
+      sorted = sorted.reverse if @dir == 'desc'
+      pinned, unpinned = sorted.partition { |e| e[:pinned] }
+      endpoints = pinned + unpinned
 
       @total_endpoint_count = endpoints.size
 

data/app/models/catpm/error_record.rb

@@ -10,6 +10,7 @@ module Catpm
     scope :by_kind, ->(kind) { where(kind: kind) }
     scope :unresolved, -> { where(resolved_at: nil) }
     scope :resolved, -> { where.not(resolved_at: nil) }
+    scope :pinned, -> { where(pinned: true) }
     scope :recent, ->(period = 24.hours) { where(last_occurred_at: period.ago..) }
 
     def resolved?

data/app/views/catpm/endpoints/_sample_table.html.erb

@@ -7,6 +7,7 @@
         <th>Duration</th>
         <th>Segments</th>
         <th>Time</th>
+        <th></th>
       </tr>
     </thead>
     <tbody>
@@ -24,6 +25,12 @@
             <% end %>
           </td>
           <td><%= time_with_tooltip(s.recorded_at) %></td>
+          <td style="position:relative; z-index:2; width:28px; padding:4px 2px; text-align:center">
+            <button class="action-menu-btn">&#x22EE;</button>
+            <div class="action-menu">
+              <button class="menu-danger" data-action="delete" data-url="<%= catpm.sample_path(s) %>">Delete</button>
+            </div>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/app/views/catpm/errors/index.html.erb

@@ -27,6 +27,7 @@
   <table id="errors-table">
     <thead>
       <tr>
+        <th></th>
         <th>Kind</th>
         <th><%= sort_header("Error Class", "error_class", @sort, @dir, extra_params: extra) %></th>
         <th>Message</th>
@@ -34,11 +35,13 @@
         <th>Trend</th>
         <th><%= sort_header("Last Seen", "last_occurred_at", @sort, @dir, extra_params: extra) %></th>
         <% if @tab == "resolved" %><th>Resolved</th><% end %>
+        <th></th>
       </tr>
     </thead>
     <tbody>
       <% @errors.each do |e| %>
         <tr class="linked">
+          <td style="position:relative; z-index:1; width:28px; padding:4px 2px; text-align:center"><button class="star-btn<%= ' pinned' if e.pinned %>" data-pin-url="<%= catpm.toggle_pin_error_path(e) %>"><%= e.pinned ? "&#x2605;".html_safe : "&#x2606;".html_safe %></button></td>
           <td><a href="<%= catpm.error_path(e) %>" class="row-link"><%= type_badge(e.kind) %></a></td>
           <td class="mono"><%= e.error_class %></td>
           <td style="color:var(--text-1)"><%= truncate(e.message, length: 60) %></td>
@@ -46,6 +49,17 @@
           <td><%= trend_indicator(e) %></td>
           <td><%= time_with_tooltip(e.last_occurred_at) %></td>
           <% if @tab == "resolved" %><td><%= time_with_tooltip(e.resolved_at) %></td><% end %>
+          <td style="position:relative; z-index:2; width:28px; padding:4px 2px; text-align:center">
+            <button class="action-menu-btn">&#x22EE;</button>
+            <div class="action-menu">
+              <% if e.resolved? %>
+                <button data-action="unresolve" data-url="<%= catpm.unresolve_error_path(e) %>">Reopen</button>
+              <% else %>
+                <button data-action="resolve" data-url="<%= catpm.resolve_error_path(e) %>">Resolve</button>
+              <% end %>
+              <button class="menu-danger" data-action="delete" data-url="<%= catpm.error_path(e) %>">Delete</button>
+            </div>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/app/views/catpm/errors/show.html.erb

@@ -106,17 +106,24 @@
         <th>Status</th>
         <th>Target</th>
         <th>Segments</th>
+        <th></th>
       </tr>
     </thead>
     <tbody>
       <% @samples.each do |sample| %>
         <% ctx = sample.parsed_context %>
-        <tr class="clickable-row" onclick="window.location='<%= catpm.sample_path(sample) %>';" style="cursor:pointer">
-          <td><%= time_with_tooltip(sample.recorded_at) %></td>
+        <tr class="linked">
+          <td><a href="<%= catpm.sample_path(sample) %>" class="row-link"><%= time_with_tooltip(sample.recorded_at) %></a></td>
           <td class="mono"><%= format_duration(sample.duration) %></td>
           <td><%= status_badge(ctx["status"] || ctx[:status]) %></td>
           <td class="mono"><%= sample.bucket&.target || "—" %></td>
           <td class="mono text-muted"><%= segment_count_summary(ctx["segment_summary"] || ctx[:segment_summary]).presence || "—" %></td>
+          <td style="position:relative; z-index:2; width:28px; padding:4px 2px; text-align:center">
+            <button class="action-menu-btn">&#x22EE;</button>
+            <div class="action-menu">
+              <button class="menu-danger" data-action="delete" data-url="<%= catpm.sample_path(sample) %>">Delete</button>
+            </div>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/app/views/catpm/events/show.html.erb

@@ -63,11 +63,13 @@
     <colgroup>
       <col style="width:120px">
       <col>
+      <col style="width:36px">
     </colgroup>
     <thead>
       <tr>
         <th>Recorded At</th>
         <th>Payload</th>
+        <th></th>
       </tr>
     </thead>
     <tbody>
@@ -87,6 +89,12 @@
               <span class="text-muted">—</span>
             <% end %>
           </td>
+          <td style="position:relative; z-index:2; width:28px; padding:4px 2px; text-align:center; vertical-align:top">
+            <button class="action-menu-btn">&#x22EE;</button>
+            <div class="action-menu">
+              <button class="menu-danger" data-action="delete" data-url="<%= catpm.destroy_sample_events_path(sample_id: sample.id) %>">Delete</button>
+            </div>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/app/views/layouts/catpm/application.html.erb

@@ -3,6 +3,10 @@
 <head>
   <title>catpm<%= " — #{yield :title}" if content_for?(:title) %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/png" sizes="32x32" href="<%= image_path('catpm/favicon-32.png') %>">
+  <link rel="icon" type="image/png" sizes="512x512" href="<%= image_path('catpm/favicon-512.png') %>">
+  <link rel="icon" type="image/x-icon" href="<%= image_path('catpm/favicon.ico') %>">
+  <link rel="apple-touch-icon" href="<%= image_path('catpm/favicon-512.png') %>">
   <%= csrf_meta_tags %>
   <%= yield :head_extra if content_for?(:head_extra) %>
   <style>
@@ -541,10 +545,14 @@
         if (action === 'ignore') {
           apiRequest(url, 'PATCH').then(function(data) { if (data.ignored && row) fadeOutRow(row); });
         } else if (action === 'delete') {
-          if (!confirm('Delete this endpoint and all its data?')) return;
+          if (!confirm('Delete this and all its data?')) return;
           apiRequest(url, 'DELETE').then(function(data) { if (data.deleted && row) fadeOutRow(row); });
         } else if (action === 'unignore') {
           apiRequest(url, 'PATCH').then(function(data) { if (!data.ignored && row) fadeOutRow(row); });
+        } else if (action === 'resolve') {
+          apiRequest(url, 'PATCH').then(function(data) { if (data.resolved && row) fadeOutRow(row); });
+        } else if (action === 'unresolve') {
+          apiRequest(url, 'PATCH').then(function(data) { if (!data.resolved && row) fadeOutRow(row); });
         }
         return;
       }

data/config/routes.rb

@@ -10,7 +10,11 @@ Catpm::Engine.routes.draw do
   patch 'endpoint/ignore', to: 'endpoints#toggle_ignore', as: :endpoint_ignore
   get 'endpoints/ignored', to: 'endpoints#ignored', as: :ignored_endpoints
   resources :samples, only: [:show, :destroy]
-  resources :events, only: [:index, :show, :destroy], param: :name
+  resources :events, only: [:index, :show, :destroy], param: :name do
+    collection do
+      delete 'samples/:sample_id', to: 'events#destroy_sample', as: :destroy_sample
+    end
+  end
   patch 'events/:name/pin', to: 'events#toggle_pin', as: :event_pin
   patch 'events/:name/ignore', to: 'events#toggle_ignore', as: :event_ignore
   get 'events_ignored', to: 'events#ignored', as: :ignored_events
@@ -21,6 +25,7 @@ Catpm::Engine.routes.draw do
     member do
       patch :resolve
       patch :unresolve
+      patch :toggle_pin
     end
   end
 end

data/db/migrate/20250601000001_create_catpm_tables.rb

@@ -50,6 +50,7 @@ class CreateCatpmTables < ActiveRecord::Migration[8.0]
       t.json :contexts
       t.json :occurrence_buckets
       t.datetime :resolved_at
+      t.boolean :pinned, null: false, default: false
     end
 
     add_index :catpm_errors, :fingerprint, unique: true, name: 'idx_catpm_errors_fingerprint'

data/lib/catpm/middleware.rb

@@ -53,6 +53,7 @@ module Catpm
         duration: elapsed_ms(env),
         started_at: Time.current,
         status: 500,
+        sample_type: 'error',
         error_class: exception.class.name,
         error_message: exception.message,
         backtrace: exception.backtrace,

data/lib/catpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Catpm
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/tasks/catpm_tasks.rake

@@ -35,6 +35,13 @@ namespace :catpm do
       puts '[catpm] catpm_endpoint_prefs table already exists, skipping'
     end
 
+    unless connection.column_exists?(:catpm_errors, :pinned)
+      connection.add_column :catpm_errors, :pinned, :boolean, null: false, default: false
+      puts '[catpm] Added pinned column to catpm_errors'
+    else
+      puts '[catpm] catpm_errors.pinned already exists, skipping'
+    end
+
     unless connection.table_exists?(:catpm_event_prefs)
       connection.create_table :catpm_event_prefs do |t|
         t.string :name, null: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catpm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ''
@@ -33,6 +33,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/images/catpm/favicon-32.png
+- app/assets/images/catpm/favicon-512.png
+- app/assets/images/catpm/favicon.ico
 - app/assets/stylesheets/catpm/application.css
 - app/controllers/catpm/application_controller.rb
 - app/controllers/catpm/endpoints_controller.rb