dbwatcher 1.1.4 → 1.1.6

data/app/views/dbwatcher/sessions/index.html.erb

@@ -41,46 +41,39 @@
   </div>
 
   <!-- Content Area -->
-  <div class="flex-1 overflow-auto p-4">
-
-  <% if @sessions.empty? %>
-    <div class="flex items-center justify-center h-full text-gray-500">
-      <div class="text-center">
-        <svg class="mx-auto h-8 w-8 text-gray-400 mb-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1"
-                d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"/>
-        </svg>
-        <p class="text-xs">No tracking sessions yet</p>
-        <p class="text-xs text-gray-400">Start tracking with <code class="bg-gray-200 px-1 rounded">Dbwatcher.track { ... }</code></p>
+  <div class="flex-1 overflow-auto">
+    <% if @sessions.empty? %>
+      <div class="p-8 text-center text-gray-500">
+        <%= image_tag "dbwatcher/dbwatcher-tranparent_512x512.png", 
+              alt: "DBWatcher Logo", 
+              class: "mx-auto w-12 h-12 opacity-30 mb-3" %>
+        <p class="text-sm font-medium text-gray-600 mb-2">No tracking sessions yet</p>
+        <p class="text-xs text-gray-400">Start tracking with <code class="bg-gray-100 px-1 rounded text-xs">Dbwatcher.track { ... }</code></p>
+        <p class="text-xs text-gray-400 mt-1">or add <code class="bg-gray-100 px-1 rounded text-xs">?dbwatch=true</code> to any URL</p>
       </div>
-    </div>
-  <% else %>
-    <div class="bg-white border border-gray-300 rounded shadow-sm">
-      <table class="compact-table sessions-table w-full">
+    <% else %>
+      <table class="compact-table w-full">
         <thead>
           <tr>
-            <th class="text-left" style="min-width:180px; max-width:260px; width:18%">Session ID</th>
-            <th class="text-left" style="min-width:160px; max-width:260px; width:22%">Name</th>
-            <th class="text-center" style="width:100px">Status</th>
-            <th class="text-center" style="width:100px">Changes</th>
-            <th class="text-right" style="width:120px">Started</th>
-            <th class="text-right" style="width:120px">Duration</th>
-            <th class="text-center" style="width:80px">Actions</th>
+            <th class="text-left" style="width: 18%; min-width: 180px">Session ID</th>
+            <th class="text-left" style="width: 22%; min-width: 160px">Name</th>
+            <th class="text-center" style="width: 100px">Status</th>
+            <th class="text-center" style="width: 100px">Changes</th>
+            <th class="text-right" style="width: 120px">Started</th>
+            <th class="text-right" style="width: 120px">Duration</th>
+            <th class="text-center" style="width: 80px">Actions</th>
           </tr>
         </thead>
         <tbody>
           <% @sessions.each do |session| %>
             <tr class="session-row">
-              <td style="min-width:180px; max-width:260px; width:18%">
-                <span class="font-mono text-xs">
-                  <%= safe_value(session, :id) %>
-                </span>
+              <td class="font-mono text-xs">
+                <%= safe_value(session, :id) %>
               </td>
-              <td style="min-width:160px; max-width:260px; width:22%" title="<%= safe_value(session, :name) %>">
+              <td title="<%= safe_value(session, :name) %>">
                 <%= link_to display_session_name(safe_value(session, :name)),
                     session_path(safe_value(session, :id)),
-                    class: "text-navy-dark hover:text-blue-medium whitespace-normal break-words inline-block",
-                    style: "max-width:260px; overflow-x:auto; display:inline-block;" %>
+                    class: "text-navy-dark hover:text-blue-medium" %>
               </td>
               <td class="text-center">
                 <%= render 'dbwatcher/shared/badge',
@@ -106,44 +99,34 @@
                     ) rescue 'N/A' %>
                 <% end %>
               </td>
-              <td class="text-center actions-cell">
-                <div class="flex gap-1 justify-end">
-                  <%= link_to session_path(safe_value(session, :id)),
-                      class: "compact-button bg-navy-dark text-white hover:bg-blue-medium",
-                      title: "View session details" do %>
-                    <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                            d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                            d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"/>
-                    </svg>
-                  <% end %>
-                </div>
+              <td class="text-center">
+                <%= link_to "View", session_path(safe_value(session, :id)),
+                    class: "compact-button bg-navy-dark text-white hover:bg-blue-medium",
+                    title: "View session details" %>
               </td>
             </tr>
           <% end %>
         </tbody>
       </table>
-    </div>
 
-    <!-- No Results Message -->
-    <div
-      x-show="filterText && document.querySelectorAll('.session-row:not(.hidden)').length === 0"
-      x-cloak
-      class="mt-4 text-center py-8 bg-gray-50 border border-gray-200 rounded">
-      <p class="text-gray-500">No sessions match your filter criteria</p>
-      <button
-        @click="filterText = ''"
-        class="mt-2 text-blue-medium hover:text-blue-700 text-sm">
-        Clear filter
-      </button>
-    </div>
-  <% end %>
+      <!-- No Results Message -->
+      <div
+        x-show="filterText && document.querySelectorAll('.session-row:not(.hidden)').length === 0"
+        x-cloak
+        class="p-8 text-center text-gray-500 bg-gray-50">
+        <p class="mb-2">No sessions match your filter criteria</p>
+        <button
+          @click="filterText = ''"
+          class="compact-button bg-gray-500 text-white hover:bg-gray-600">
+          Clear filter
+        </button>
+      </div>
+    <% end %>
+  </div>
 
   <!-- Status Bar -->
-  <div class="h-6 bg-gray-100 border-t border-gray-300 flex items-center px-4 text-xs text-gray-600 mt-4">
-    <span x-show="!filterText"><%= @sessions.count %> sessions total •
-    <%= @sessions.count { |s| session_active?(s) } %> active</span>
+  <div class="h-6 bg-gray-100 border-t border-gray-300 flex items-center px-4 text-xs text-gray-600">
+    <span x-show="!filterText"><%= @sessions.count %> sessions total • <%= @sessions.count { |s| session_active?(s) } %> active</span>
     <span x-show="filterText" x-text="`${document.querySelectorAll('.session-row:not(.hidden)').length} of ${<%= @sessions.count %>} sessions shown`"></span>
     <span class="ml-auto">Last updated: <%= Time.current.strftime("%H:%M:%S") %></span>
   </div>

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

@@ -5,6 +5,14 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= csrf_meta_tags %>
 
+    <!-- Favicon -->
+    <%= favicon_link_tag asset_path('dbwatcher/favicon.ico') %>
+    <%= favicon_link_tag asset_path('dbwatcher/favicon-96x96.png'), sizes: '96x96', type: 'image/png' %>
+    <%= favicon_link_tag asset_path('dbwatcher/apple-touch-icon.png'), rel: 'apple-touch-icon', sizes: '180x180' %>
+    <%= favicon_link_tag asset_path('dbwatcher/web-app-manifest-192x192.png'), sizes: '192x192', type: 'image/png' %>
+    <%= favicon_link_tag asset_path('dbwatcher/web-app-manifest-512x512.png'), sizes: '512x512', type: 'image/png' %>
+    <link rel="manifest" href="<%= asset_path('dbwatcher/site.webmanifest') %>"
+
     <!-- Alpine.js and Plugins - ensure plugins load BEFORE Alpine.js core -->
     <script defer src="https://unpkg.com/@alpinejs/collapse@3.x.x/dist/cdn.min.js"></script>
     <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
@@ -119,12 +127,20 @@
              :style="{ width: sidebarCollapsed ? '48px' : sidebarWidth + 'px' }">
         <div class="flex flex-col h-full">
           <!-- Logo -->
-          <div class="h-10 flex items-center justify-between px-3 border-b border-gray-700">
-            <div class="flex items-center gap-2" x-show="!sidebarCollapsed">
-              <svg class="w-5 h-5 text-gold-light" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
-              </svg>
-              <span class="text-sm font-medium text-white">DB Watcher</span>
+          <div class="h-12 flex items-center justify-between px-3 border-b border-gray-700 bg-gray-800">
+            <div class="flex items-center gap-3" x-show="!sidebarCollapsed">
+              <%= image_tag "dbwatcher/dbwatcher-tranparent_512x512.png",
+                    alt: "DBWatcher Logo",
+                    class: "w-10 h-10" %>
+              <div class="flex flex-col">
+                <span class="text-base font-bold text-white">dbwatcher</span>
+              </div>
+            </div>
+            <!-- Collapsed state logo -->
+            <div class="flex items-center justify-center w-full" x-show="sidebarCollapsed">
+              <%= image_tag "dbwatcher/dbwatcher-tranparent_512x512.png",
+                    alt: "dbwatcher Logo",
+                    class: "w-8 h-8" %>
             </div>
             <button @click="sidebarCollapsed = !sidebarCollapsed"
                     class="p-1 hover:bg-gray-800 rounded text-gray-400">

data/lib/dbwatcher/configuration.rb

@@ -3,104 +3,84 @@
 module Dbwatcher
   # Configuration class for DBWatcher
   #
-  # This class manages all configuration options for DBWatcher, including
-  # storage, tracking, and diagram visualization settings.
+  # Simplified configuration with logical groupings and sensible defaults
   class Configuration
-    # Storage configuration
-    attr_accessor :storage_path, :enabled, :max_sessions, :auto_clean_after_days
+    # Core settings - what users need most
+    attr_accessor :enabled, :storage_path
 
-    # Query tracking configuration
-    attr_accessor :track_queries, :slow_query_threshold, :max_query_logs_per_day
+    # Session management - how data is stored and cleaned
+    attr_accessor :max_sessions, :auto_clean_days
 
-    # Routing configuration
-    attr_accessor :mount_path
+    # Query tracking - performance monitoring
+    attr_accessor :track_queries
 
-    # Diagram configuration
-    attr_accessor :diagram_show_attributes, :diagram_show_methods, :diagram_show_cardinality,
-                  :diagram_max_attributes, :diagram_attribute_types, :diagram_relationship_labels,
-                  :diagram_preserve_table_case, :diagram_direction, :diagram_cardinality_format,
-                  :diagram_show_attribute_count, :diagram_show_method_count
+    # System info - debugging and monitoring
+    attr_accessor :system_info, :debug_mode
 
-    # System information configuration
-    attr_accessor :collect_system_info, :system_info_refresh_interval,
-                  :collect_sensitive_env_vars, :system_info_cache_duration,
-                  :system_info_include_performance_metrics
-
-    # Logging configuration
-    attr_accessor :debug_logging
+    # Advanced diagram options - available but not commonly needed
+    attr_accessor :diagram_show_methods, :diagram_max_attributes,
+                  :diagram_attribute_types, :diagram_relationship_labels,
+                  :diagram_show_attributes, :diagram_show_cardinality
 
     # Initialize with default values
     def initialize
-      # Storage configuration defaults
-      @storage_path = default_storage_path
+      # Core settings
       @enabled = true
+      @storage_path = default_storage_path
+
+      # Session management
       @max_sessions = 50
-      @auto_clean_after_days = 7
+      @auto_clean_days = 7
 
-      # Query tracking configuration defaults
+      # Query tracking
       @track_queries = false
-      @slow_query_threshold = 200 # milliseconds
-      @max_query_logs_per_day = 1000
-
-      # Routing configuration defaults
-      @mount_path = "/dbwatcher"
 
-      # Initialize diagram configuration with defaults
-      initialize_diagram_config
+      # System info
+      @system_info = true
+      @debug_mode = false
 
-      # Initialize system information configuration with defaults
-      initialize_system_info_config
+      # Advanced diagram options - sensible defaults
+      @diagram_show_methods = false
+      @diagram_max_attributes = 10
+      @diagram_attribute_types = true
+      @diagram_relationship_labels = true
+      @diagram_show_attributes = true
+      @diagram_show_cardinality = true
+    end
 
-      # Initialize logging configuration with defaults
-      initialize_logging_config
+    # Fixed defaults for options that are still used in codebase but not configurable
+    def slow_query_threshold
+      200 # Fixed default value
     end
 
-    # Initialize diagram configuration with default values
-    def initialize_diagram_config
-      @diagram_show_attributes = true
-      @diagram_show_methods = false # Hide methods by default
-      @diagram_show_cardinality = true
-      @diagram_max_attributes = 10
-      @diagram_attribute_types = true # Changed from array to boolean
-      @diagram_relationship_labels = true # Changed from symbol to boolean
-      @diagram_preserve_table_case = false # Changed from true to false
-      @diagram_direction = "LR" # Left to right by default
-      @diagram_cardinality_format = :simple # Use simpler 1:N format
-      @diagram_show_attribute_count = true
-      @diagram_show_method_count = true
+    def diagram_direction
+      "LR" # Fixed default value
     end
 
-    # Initialize system information configuration with default values
-    def initialize_system_info_config
-      @collect_system_info = true
-      @system_info_refresh_interval = 5 * 60 # 5 minutes in seconds
-      @collect_sensitive_env_vars = false
-      @system_info_cache_duration = 60 * 60 # 1 hour in seconds
-      @system_info_include_performance_metrics = true
+    # Fixed defaults for complex options that are still used in codebase but not configurable
+    def max_query_logs_per_day = 1000
+    def system_info_refresh_interval = 5 * 60
+    def system_info_cache_duration = 60 * 60
+
+    def collect_sensitive_env_vars?
+      false
     end
 
-    # Initialize logging configuration with default values
-    def initialize_logging_config
-      @debug_logging = false
+    def system_info_include_performance_metrics?
+      true
     end
 
     # Validate configuration
-    #
-    # @return [Boolean] true if configuration is valid
     def valid?
       validate_storage_path
       validate_max_sessions
-      validate_auto_clean_after_days
-      validate_slow_query_threshold
-      validate_max_query_logs_per_day
+      validate_auto_clean_days
       true
     end
 
     private
 
     # Default storage path based on Rails or current directory
-    #
-    # @return [String] default storage path
     def default_storage_path
       if defined?(Rails) && Rails.respond_to?(:root) && Rails.root
         Rails.root.join("tmp", "dbwatcher").to_s
@@ -127,25 +107,11 @@ module Dbwatcher
       raise ConfigurationError, "max_sessions must be a positive integer"
     end
 
-    # Validate auto clean after days
-    def validate_auto_clean_after_days
-      return if auto_clean_after_days.is_a?(Integer) && auto_clean_after_days.positive?
-
-      raise ConfigurationError, "auto_clean_after_days must be a positive integer"
-    end
-
-    # Validate slow query threshold
-    def validate_slow_query_threshold
-      return if slow_query_threshold.is_a?(Integer) && slow_query_threshold.positive?
-
-      raise ConfigurationError, "slow_query_threshold must be a positive integer"
-    end
-
-    # Validate max query logs per day
-    def validate_max_query_logs_per_day
-      return if max_query_logs_per_day.is_a?(Integer) && max_query_logs_per_day.positive?
+    # Validate auto clean days
+    def validate_auto_clean_days
+      return if auto_clean_days.is_a?(Integer) && auto_clean_days.positive?
 
-      raise ConfigurationError, "max_query_logs_per_day must be a positive integer"
+      raise ConfigurationError, "auto_clean_days must be a positive integer"
     end
   end
 

data/lib/dbwatcher/logging.rb

@@ -40,8 +40,8 @@ module Dbwatcher
     # Check if debug logging is enabled
     # @return [Boolean] true if debug logging is enabled
     def debug_enabled?
-      return Dbwatcher.configuration.debug_logging if defined?(Dbwatcher.configuration) &&
-                                                      Dbwatcher.configuration.respond_to?(:debug_logging)
+      return Dbwatcher.configuration.debug_mode if defined?(Dbwatcher.configuration) &&
+                                                   Dbwatcher.configuration.respond_to?(:debug_mode)
       return Rails.env.development? if defined?(Rails)
 
       false

data/lib/dbwatcher/services/diagram_analyzers/concerns/activerecord_introspection.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Dbwatcher
+  module Services
+    module DiagramAnalyzers
+      module Concerns
+        # Concern for ActiveRecord introspection utilities
+        #
+        # This module provides common methods for checking ActiveRecord availability
+        # and performing model introspection operations.
+        module ActiverecordIntrospection
+          extend ActiveSupport::Concern if defined?(ActiveSupport)
+
+          private
+
+          # Check if ActiveRecord is available
+          #
+          # @return [Boolean]
+          def activerecord_available?
+            defined?(ActiveRecord::Base)
+          end
+
+          # Check if models analysis is available
+          #
+          # @return [Boolean] true if models can be analyzed
+          def models_available?
+            unless activerecord_available?
+              Rails.logger.warn "#{self.class.name}: ActiveRecord not available"
+              return false
+            end
+
+            true
+          end
+
+          # Eagerly load all models including those from gems
+          #
+          # @return [void]
+          def eager_load_models
+            return unless defined?(Rails) && Rails.respond_to?(:application)
+
+            begin
+              # Force eager loading of application models
+              Rails.application.eager_load!
+
+              # Also load models from engines/gems if any are configured
+              Rails::Engine.descendants.each do |engine|
+                engine.eager_load! if engine.respond_to?(:eager_load!)
+              rescue StandardError => e
+                error_message = "#{self.class.name}: Could not eager load engine #{engine.class.name}: #{e.message}"
+                Rails.logger.debug error_message
+              end
+            rescue StandardError => e
+              Rails.logger.debug "#{self.class.name}: Could not eager load models: #{e.message}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dbwatcher/services/diagram_analyzers/concerns/association_scope_filtering.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Dbwatcher
+  module Services
+    module DiagramAnalyzers
+      module Concerns
+        # Concern for filtering associations based on scope
+        #
+        # This module provides methods for determining which associations
+        # should be included in the analysis based on session context.
+        module AssociationScopeFiltering
+          extend ActiveSupport::Concern if defined?(ActiveSupport)
+
+          private
+
+          # Check if target model is in analysis scope
+          #
+          # @param association [Object] association object
+          # @param session_tables [Array<String>] tables from session context
+          # @return [Boolean] true if target model should be included
+          def target_model_in_scope?(association, session_tables = [])
+            target_table = get_association_table_name(association)
+
+            # If analyzing session, both tables must be in session
+            # If analyzing globally, include all
+            return true if session_tables.empty?
+
+            # Skip if target table is not in session
+            return false if target_table && !session_tables.include?(target_table)
+
+            true
+          end
+
+          # Get table name for association target
+          #
+          # @param association [Object] association object
+          # @return [String, nil] table name
+          def get_association_table_name(association)
+            association.table_name
+          rescue StandardError => e
+            Rails.logger.warn "#{self.class.name}: Could not get table name for #{association.name}: #{e.message}"
+            nil
+          end
+
+          # Extract tables that were involved in the session
+          #
+          # @param session [Object] session object with changes
+          # @return [Array<String>] unique table names
+          def extract_session_tables(session)
+            return [] unless session&.changes
+
+            session.changes.map do |change|
+              change[:table_name] || change["table_name"]
+            end.compact.uniq
+          end
+        end
+      end
+    end
+  end
+end