dbwatcher 1.1.0 → 1.1.2

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

@@ -29,6 +29,7 @@
     <%= javascript_include_tag "dbwatcher/components/changes_table_hybrid" %>
     <%= javascript_include_tag "dbwatcher/components/diagrams" %>
     <%= javascript_include_tag "dbwatcher/components/summary" %>
+    <%= javascript_include_tag "dbwatcher/components/dashboard" %>
 
     <!-- DBWatcher Services -->
     <%= javascript_include_tag "dbwatcher/core/alpine_store" %>
@@ -56,9 +57,9 @@
         }
       });
 
-      // Fallback initialization with better error handling
+      // Improved initialization with safety checks
       document.addEventListener('DOMContentLoaded', function() {
-        // Small delay to ensure Alpine is available
+        // Prevent immediate DOM access conflicts
         setTimeout(() => {
           try {
             if (window.DBWatcher && !DBWatcher.initialized) {
@@ -68,16 +69,22 @@
           } catch (error) {
             console.error('❌ Error during DBWatcher fallback initialization:', error);
           }
-        }, 100);
+        }, 150);
 
-        // Plugin verification
+        // Plugin verification with safety checks
         setTimeout(() => {
-          if (window.Alpine && !window.Alpine.directive('collapse')) {
-            console.warn('⚠️ Alpine.js Collapse plugin may not be properly loaded');
-          } else if (window.Alpine && window.Alpine.directive('collapse')) {
-            console.log('✅ Alpine.js Collapse plugin verified');
+          try {
+            if (window.Alpine && typeof window.Alpine.directive === 'function') {
+              if (!window.Alpine.directive('collapse')) {
+                console.warn('⚠️ Alpine.js Collapse plugin may not be properly loaded');
+              } else {
+                console.log('✅ Alpine.js Collapse plugin verified');
+              }
+            }
+          } catch (error) {
+            console.warn('⚠️ Alpine.js plugin verification failed:', error);
           }
-        }, 200);
+        }, 300);
       });
     </script>
 
@@ -129,7 +136,7 @@
 
           <!-- Navigation -->
           <nav class="flex-1 py-2 overflow-y-auto">
-            <%= link_to root_path, class: "sidebar-item #{current_page?(root_path) ? 'active' : ''}" do %>
+            <%= link_to root_path, class: "sidebar-item #{current_page?(root_path) || (params[:tab] == 'system_info') ? 'active' : ''}" do %>
               <svg class="w-4 h-4 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                       d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"/>
@@ -160,6 +167,8 @@
               </svg>
               <span x-show="!sidebarCollapsed">SQL Logs</span>
             <% end %>
+
+
           </nav>
 
           <!-- Actions -->
@@ -176,6 +185,42 @@
               <span x-show="!sidebarCollapsed" class="text-xs">Clear All</span>
             <% end %>
           </div>
+
+          <!-- Gem Info Section -->
+          <div class="mt-auto pt-4 border-t border-gray-700">
+            <div class="px-3 py-2">
+              <div class="text-xs text-gray-400 mb-2 font-medium" x-show="!sidebarCollapsed">
+                dbwatcher v<%= Dbwatcher::VERSION %>
+              </div>
+              <div class="flex items-center gap-2 text-xs text-gray-400" x-show="!sidebarCollapsed">
+                <a href="https://github.com/patrick204nqh/dbwatcher"
+                   target="_blank"
+                   rel="noopener noreferrer"
+                   class="hover:text-blue-400 transition-colors duration-200 flex items-center gap-1"
+                   title="View on GitHub">
+                  <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 24 24">
+                    <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+                  </svg>
+                  <span>GitHub</span>
+                </a>
+                <span class="text-gray-600">•</span>
+                <a href="https://rubydoc.info/gems/dbwatcher/<%= Dbwatcher::VERSION %>"
+                   target="_blank"
+                   rel="noopener noreferrer"
+                   class="hover:text-red-400 transition-colors duration-200 flex items-center gap-1"
+                   title="View Documentation">
+                  <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 24 24">
+                    <path d="M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20Z"/>
+                  </svg>
+                  <span>Docs</span>
+                </a>
+              </div>
+              <!-- Collapsed state - just show version -->
+              <div class="text-xs text-gray-400 text-center" x-show="sidebarCollapsed" title="DBWatcher v<%= Dbwatcher::VERSION %>">
+                v<%= Dbwatcher::VERSION %>
+              </div>
+            </div>
+          </div>
         </div>
       </aside>
 
@@ -211,50 +256,57 @@
     <!-- Initialize DBWatcher system -->
     <script>
       document.addEventListener('DOMContentLoaded', function() {
-        // Initialize DBWatcher if available
-        if (window.DBWatcher) {
-          // Ensure BaseComponent is available
-          if (!window.DBWatcher.BaseComponent && typeof DBWatcher.BaseComponent !== 'function') {
-            window.DBWatcher.BaseComponent = function(config = {}) {
-              return {
-                init() {
-                  if (this.componentInit) {
-                    try {
-                      this.componentInit();
-                    } catch (error) {
-                      console.error("Error during component initialization:", error);
+        // Add delay to prevent timing conflicts
+        setTimeout(() => {
+          try {
+            // Initialize DBWatcher if available
+            if (window.DBWatcher) {
+              // Ensure BaseComponent is available
+              if (!window.DBWatcher.BaseComponent && typeof DBWatcher.BaseComponent !== 'function') {
+                window.DBWatcher.BaseComponent = function(config = {}) {
+                  return {
+                    init() {
+                      if (this.componentInit) {
+                        try {
+                          this.componentInit();
+                        } catch (error) {
+                          console.error("Error during component initialization:", error);
+                        }
+                      }
                     }
+                  };
+                };
+                console.log('Added fallback BaseComponent');
+              }
+
+              // Register legacy components with Alpine directly if ComponentRegistry isn't available
+              if (!window.DBWatcher.ComponentRegistry) {
+                console.log('ComponentRegistry not available, using direct Alpine registration');
+
+                // Ensure Alpine is available with safety checks
+                if (window.Alpine && typeof window.Alpine.data === 'function') {
+                  // Direct registration of components with Alpine
+                  if (!window.Alpine.data('changesTable') && window.DBWatcher.components && window.DBWatcher.components.changesTable) {
+                    window.Alpine.data('changesTable', (config = {}) => {
+                      const component = window.DBWatcher.components.changesTable(config);
+                      return component;
+                    });
+                    console.log('Registered changesTable component with Alpine');
                   }
                 }
-              };
-            };
-            console.log('Added fallback BaseComponent');
-          }
-
-          // Register legacy components with Alpine directly if ComponentRegistry isn't available
-          if (!window.DBWatcher.ComponentRegistry) {
-            console.log('ComponentRegistry not available, using direct Alpine registration');
-
-            // Ensure Alpine is available
-            if (window.Alpine) {
-              // Direct registration of components with Alpine
-              if (!window.Alpine.data('changesTable') && window.DBWatcher.components && window.DBWatcher.components.changesTable) {
-                window.Alpine.data('changesTable', (config = {}) => {
-                  const component = window.DBWatcher.components.changesTable(config);
-                  return component;
-                });
-                console.log('Registered changesTable component with Alpine');
               }
-            }
-          }
 
-          console.log('✅ DBWatcher initialized (fallback)');
-        }
+              console.log('✅ DBWatcher initialized (fallback)');
+            }
 
-        // Verify Alpine.js plugins
-        if (window.Alpine && window.Alpine.directive && window.Alpine.directive('collapse')) {
-          console.log('✅ Alpine.js Collapse plugin verified');
-        }
+            // Verify Alpine.js plugins with safety checks
+            if (window.Alpine && typeof window.Alpine.directive === 'function' && window.Alpine.directive('collapse')) {
+              console.log('✅ Alpine.js Collapse plugin verified');
+            }
+          } catch (error) {
+            console.error('❌ Error during DBWatcher system initialization:', error);
+          }
+        }, 200);
       });
     </script>
   </body>

data/config/routes.rb

@@ -3,16 +3,20 @@
 Dbwatcher::Engine.routes.draw do
   root to: "dashboard#index"
 
-  # Dashboard clear all action
+  # Dashboard actions
   delete :clear_all, to: "dashboard#clear_all"
 
-  resources :sessions do
-    member do
-      get :changes
-      get :summary
-      get :diagrams
+  # Dashboard system info actions
+  namespace :dashboard do
+    resources :system_info, only: [] do
+      collection do
+        post :refresh
+        delete :clear_cache
+      end
     end
+  end
 
+  resources :sessions do
     collection do
       delete :clear
     end
@@ -32,6 +36,19 @@ Dbwatcher::Engine.routes.draw do
           get :diagram_types
         end
       end
+
+      # System information API routes
+      resources :system_info, only: [:index] do
+        collection do
+          post :refresh
+          get :machine
+          get :database
+          get :runtime
+          get :summary
+          delete :clear_cache
+          get :cache_status
+        end
+      end
     end
   end
 

data/lib/dbwatcher/configuration.rb

@@ -21,6 +21,11 @@ module Dbwatcher
                   :diagram_preserve_table_case, :diagram_direction, :diagram_cardinality_format,
                   :diagram_show_attribute_count, :diagram_show_method_count
 
+    # 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
+
     # Initialize with default values
     def initialize
       # Storage configuration defaults
@@ -30,7 +35,7 @@ module Dbwatcher
       @auto_clean_after_days = 7
 
       # Query tracking configuration defaults
-      @track_queries = true
+      @track_queries = false
       @slow_query_threshold = 200 # milliseconds
       @max_query_logs_per_day = 1000
 
@@ -39,6 +44,9 @@ module Dbwatcher
 
       # Initialize diagram configuration with defaults
       initialize_diagram_config
+
+      # Initialize system information configuration with defaults
+      initialize_system_info_config
     end
 
     # Initialize diagram configuration with default values
@@ -56,6 +64,15 @@ module Dbwatcher
       @diagram_show_method_count = true
     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
+    end
+
     # Validate configuration
     #
     # @return [Boolean] true if configuration is valid

data/lib/dbwatcher/services/base_service.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../logging"
+
 module Dbwatcher
   module Services
     # Base class for all service objects