sage-rails 0.0.6 → 0.0.8

data/app/views/sage/_variables.html.erb

@@ -0,0 +1,168 @@
+<% if @bind_vars.any? %>
+  <% var_params = request.query_parameters %>
+  <%= javascript_tag nonce: true do %>
+    <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
+    var now = moment.tz(timeZone)
+    var format = "YYYY-MM-DD"
+
+    function toDate(time) {
+      return moment.tz(time.format(format), timeZone)
+    }
+  <% end %>
+  <div data-controller="sage--variables" data-sage--variables-form-target="form">
+    <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;">
+      <% date_vars = ["start_time", "end_time"] %>
+      <% if (date_vars - @bind_vars).empty? %>
+        <% @bind_vars = @bind_vars - date_vars %>
+      <% else %>
+        <% date_vars = nil %>
+      <% end %>
+
+      <% @bind_vars.each_with_index do |var, i| %>
+        <div style="margin-bottom: 10px;">
+          <div style="margin-bottom: 3px;">
+            <small class="text-muted"><code>{{<%= var %>}}</code></small>
+          </div>
+        </div>
+        <% if (data = @smart_vars[var]) %>
+          <%= select_tag var, options_for_select([[nil, nil]] + data, selected: var_params[var]), style: "margin-right: 20px; width: 200px; display: none;", data: { "sage--variables-target": "variable" } %>
+          <%= javascript_tag nonce: true do %>
+            $("#<%= var %>").selectize({
+              create: true
+            });
+          <% end %>
+        <% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>
+          <%= hidden_field_tag var, var_params[var], data: { "sage--variables-target": "variable" } %>
+
+          <div class="selectize-control single" style="width: 200px;">
+            <div id="<%= var %>-select" class="selectize-input" style="display: inline-block;">
+              <span>Select a date</span>
+            </div>
+          </div>
+
+          <%= javascript_tag nonce: true do %>
+            (function() {
+              var input = $("#<%= var %>")
+              var datePicker = $("#<%= var %>-select")
+              datePicker.daterangepicker({
+                singleDatePicker: true,
+                locale: {format: format},
+                autoUpdateInput: false,
+                autoApply: true,
+                startDate: input.val().length > 0 ? moment.tz(input.val(), timeZone) : now
+              })
+              // hack to start with empty date
+              datePicker.on("apply.daterangepicker", function(ev, picker) {
+                datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
+                input.val(toDate(picker.startDate).utc().format())
+                
+                // Trigger our custom variable controller instead of submitIfCompleted
+                var controller = document.querySelector('[data-controller*="sage--variables"]')
+                if (controller && window.Stimulus) {
+                  var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+                  if (controllerInstance) {
+                    controllerInstance.handleDateRangeChange(input[0], picker)
+                  }
+                }
+              })
+              if (input.val().length > 0) {
+                var picker = datePicker.data("daterangepicker")
+                datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
+              }
+            })()
+          <% end %>
+        <% else %>
+          <%= text_field_tag var, var_params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !var_params[var], class: "form-control", data: { "sage--variables-target": "variable" } %>
+        <% end %>
+      <% end %>
+
+      <% if date_vars %>
+        <% date_vars.each do |var| %>
+          <%= hidden_field_tag var, var_params[var], data: { "sage--variables-target": "variable" } %>
+        <% end %>
+
+        <div style="margin-bottom: 5px; text-align: left;">
+          <small class="text-muted"><code>{{<%= date_vars.join('}}, {{') %>}}</code></small>
+        </div>
+        <div class="selectize-control single" style="width: 300px;">
+          <div id="reportrange" class="selectize-input" style="display: inline-block;">
+            <span>Select a time range</span>
+          </div>
+        </div>
+
+        <%= javascript_tag nonce: true do %>
+          function dateStr(daysAgo) {
+            return now.clone().subtract(daysAgo || 0, "days").format(format)
+          }
+
+          function setTimeInputs(start, end) {
+            $("#start_time").val(toDate(start).utc().format())
+            $("#end_time").val(toDate(end).endOf("day").utc().format())
+          }
+
+          $("#reportrange").daterangepicker(
+            {
+              ranges: {
+               "Today": [dateStr(), dateStr()],
+               "Last 7 Days": [dateStr(6), dateStr()],
+               "Last 30 Days": [dateStr(29), dateStr()]
+              },
+              locale: {
+                format: format
+              },
+              startDate: dateStr(29),
+              endDate: dateStr(),
+              opens: "right",
+              alwaysShowCalendars: true
+            },
+            function(start, end) {
+              setTimeInputs(start, end)
+              
+              // Trigger our custom variable controller instead of submitIfCompleted
+              var controller = document.querySelector('[data-controller*="sage--variables"]')
+              if (controller && window.Stimulus) {
+                var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+                if (controllerInstance) {
+                  controllerInstance.triggerSubmit()
+                }
+              }
+            }
+          ).on("apply.daterangepicker", function(ev, picker) {
+            setTimeInputs(picker.startDate, picker.endDate)
+            $("#reportrange span").html(toDate(picker.startDate).format("MMMM D, YYYY") + " - " + toDate(picker.endDate).format("MMMM D, YYYY"))
+            
+            // Trigger our custom variable controller
+            var controller = document.querySelector('[data-controller*="sage--variables"]')
+            if (controller && window.Stimulus) {
+              var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+              if (controllerInstance) {
+                controllerInstance.handleDateRangeChange(document.getElementById('start_time'), picker)
+              }
+            }
+          })
+
+          if ($("#start_time").val().length > 0) {
+            var picker = $("#reportrange").data("daterangepicker")
+            picker.setStartDate(moment.tz($("#start_time").val(), timeZone))
+            picker.setEndDate(moment.tz($("#end_time").val(), timeZone))
+            $("#reportrange").trigger("apply.daterangepicker", picker)
+          } else {
+            var picker = $("#reportrange").data("daterangepicker")
+            $("#reportrange").trigger("apply.daterangepicker", picker)
+            
+            // Initial trigger for our custom controller
+            var controller = document.querySelector('[data-controller*="sage--variables"]')
+            if (controller && window.Stimulus) {
+              var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+              if (controllerInstance) {
+                controllerInstance.triggerSubmit()
+              }
+            }
+          }
+        <% end %>
+      <% end %>
+
+      <button type='submit' class='btn btn-primary'>Run</button>
+    </form>
+  </div>
+<% end %>

data/app/views/sage/dashboards/show.html.erb

@@ -22,7 +22,7 @@
 <% end %>
 
 <% if @bind_vars.any? %>
-  <%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %>
+  <%= render partial: "sage/variables", locals: {action: dashboard_path(@dashboard)} %>
 <% else %>
   <div style="padding-bottom: 15px;"></div>
 <% end %>

data/app/views/sage/queries/show.html.erb

@@ -28,12 +28,12 @@
   <p style="white-space: pre-line;"><%= @query.description %></p>
 <% end %>
 
-<%= render partial: "blazer/variables", locals: { action: query_path(@query) } %>
+<%= render partial: "sage/variables", locals: { action: query_path(@query) } %>
 
 <pre id="code"><code><%= @statement.display_statement %></code></pre>
 
 <% if @success %>
-  <%= turbo_frame_tag dom_id(@query, 'results'), src: run_query_path(@query.id, from_show: true) do  %>
+  <%= turbo_frame_tag dom_id(@query, 'results'), src: run_query_path(@query.id, from_show: true, variables: variable_params(@query)) do  %>
     loading...
   <% end %>
 <% end %>

data/config/initializers/ransack.rb

@@ -1,17 +1,17 @@
-require 'ransack'
+require "ransack"
 
 # Configure Ransack for Blazer models
 Rails.application.config.after_initialize do
   # Ensure Blazer is loaded first
-  require 'blazer' if defined?(Blazer)
-  
+  require "blazer" if defined?(Blazer)
+
   # Extend Blazer::Query with Ransack capabilities
   if defined?(Blazer::Query)
     # First, ensure Ransack is included in the model
     unless Blazer::Query.respond_to?(:ransack)
       Blazer::Query.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     Blazer::Query.class_eval do
       # Define which attributes can be searched
       def self.ransackable_attributes(auth_object = nil)
@@ -21,7 +21,7 @@ Rails.application.config.after_initialize do
       # Define which associations can be searched
       def self.ransackable_associations(auth_object = nil)
         associations = %w[checks audits dashboard_queries dashboards]
-        associations << 'creator' if Blazer.user_class
+        associations << "creator" if Blazer.user_class
         associations
       end
 
@@ -37,14 +37,14 @@ Rails.application.config.after_initialize do
       end
     end
   end
-  
+
   # Extend Blazer::Dashboard with Ransack capabilities
   if defined?(Blazer::Dashboard)
     # First, ensure Ransack is included in the model
     unless Blazer::Dashboard.respond_to?(:ransack)
       Blazer::Dashboard.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     Blazer::Dashboard.class_eval do
       # Define which attributes can be searched
       def self.ransackable_attributes(auth_object = nil)
@@ -54,7 +54,7 @@ Rails.application.config.after_initialize do
       # Define which associations can be searched
       def self.ransackable_associations(auth_object = nil)
         associations = %w[dashboard_queries queries]
-        associations << 'creator' if Blazer.user_class
+        associations << "creator" if Blazer.user_class
         associations
       end
     end
@@ -68,7 +68,7 @@ Rails.application.config.to_prepare do
     unless Blazer::Query.respond_to?(:ransack)
       Blazer::Query.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     unless Blazer::Query.respond_to?(:ransackable_attributes)
       Blazer::Query.class_eval do
         def self.ransackable_attributes(auth_object = nil)
@@ -85,13 +85,13 @@ Rails.application.config.to_prepare do
       end
     end
   end
-  
+
   if defined?(Blazer::Dashboard)
     # Ensure Ransack is included
     unless Blazer::Dashboard.respond_to?(:ransack)
       Blazer::Dashboard.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     unless Blazer::Dashboard.respond_to?(:ransackable_attributes)
       Blazer::Dashboard.class_eval do
         def self.ransackable_attributes(auth_object = nil)
@@ -100,19 +100,19 @@ Rails.application.config.to_prepare do
 
         def self.ransackable_associations(auth_object = nil)
           associations = %w[dashboard_queries queries]
-          associations << 'creator' if Blazer.user_class
+          associations << "creator" if Blazer.user_class
           associations
         end
       end
     end
   end
-  
+
   if defined?(Blazer::Check)
     # Ensure Ransack is included
     unless Blazer::Check.respond_to?(:ransack)
       Blazer::Check.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     unless Blazer::Check.respond_to?(:ransackable_attributes)
       Blazer::Check.class_eval do
         def self.ransackable_attributes(auth_object = nil)
@@ -121,20 +121,20 @@ Rails.application.config.to_prepare do
 
         def self.ransackable_associations(auth_object = nil)
           associations = %w[query]
-          associations << 'creator' if Blazer.user_class
+          associations << "creator" if Blazer.user_class
           associations
         end
       end
     end
   end
-  
+
   # Extend Blazer::Check with Ransack capabilities
   if defined?(Blazer::Check)
     # First, ensure Ransack is included in the model
     unless Blazer::Check.respond_to?(:ransack)
       Blazer::Check.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     Blazer::Check.class_eval do
       # Define which attributes can be searched
       def self.ransackable_attributes(auth_object = nil)
@@ -144,9 +144,9 @@ Rails.application.config.to_prepare do
       # Define which associations can be searched
       def self.ransackable_associations(auth_object = nil)
         associations = %w[query]
-        associations << 'creator' if Blazer.user_class
+        associations << "creator" if Blazer.user_class
         associations
       end
     end
   end
-end
+end

data/config/routes.rb

@@ -5,7 +5,7 @@ Sage::Engine.routes.draw do
     post :refresh, on: :member
     get :run, on: :member
 
-    resources :messages, only: [:index, :create], controller: 'queries/messages'
+    resources :messages, only: [ :index, :create ], controller: "queries/messages"
 
     collection do
       post :run

data/lib/generators/sage/install/install_generator.rb

@@ -20,7 +20,6 @@ module Sage
       end
 
       def add_routes
-        # Remove existing Blazer route if present
         routes_file = "config/routes.rb"
         if File.exist?(routes_file)
           routes_content = File.read(routes_file)
@@ -29,15 +28,19 @@ module Sage
           blazer_route_pattern = /^\s*mount\s+Blazer::Engine\s*,\s*at:\s*['"]blazer['"]\s*$/
 
           if routes_content.match?(blazer_route_pattern)
-            # Remove the Blazer route
-            gsub_file routes_file, blazer_route_pattern, ""
-            say "Removed existing Blazer route", :yellow
+            # Replace the Blazer route with Sage route
+            gsub_file routes_file, blazer_route_pattern, '  mount Sage::Engine => "/sage"'
+            say "Replaced Blazer route with Sage route at /sage", :green
+          else
+            # No existing Blazer route, add Sage route
+            route 'mount Sage::Engine => "/sage"'
+            say "Mounted Sage at /sage", :green
           end
+        else
+          # No routes file, add Sage route
+          route 'mount Sage::Engine => "/sage"'
+          say "Mounted Sage at /sage", :green
         end
-
-        # Mount Sage (which includes Blazer functionality)
-        route 'mount Sage::Engine => "/sage"'
-        say "Mounted Sage at /sage", :green
       end
 
       def create_initializer
@@ -72,31 +75,6 @@ module Sage
         say "Created migration for sage_messages table", :green
       end
 
-      def add_javascript_integration
-        say "Configuring JavaScript integration...", :green
-
-        # Update controllers/index.js to register Sage controllers
-        controllers_index_path = "app/javascript/controllers/index.js"
-        if File.exist?(controllers_index_path)
-          controllers_content = File.read(controllers_index_path)
-          unless controllers_content.include?("sage")
-            append_to_file controllers_index_path do
-              <<~JS
-
-                // Import and register Sage controllers
-                import { registerControllers } from "sage"
-                registerControllers(application)
-              JS
-            end
-            say "Updated controllers/index.js to register Sage controllers", :green
-          else
-            say "Sage controllers already registered in controllers/index.js", :yellow
-          end
-        else
-          say "Could not find app/javascript/controllers/index.js - you'll need to manually import Sage controllers", :yellow
-        end
-      end
-
       def add_stylesheets
         # Stylesheets are served directly from the engine via the asset pipeline
         # No need to copy or require them - they're automatically available

data/lib/sage/engine.rb

@@ -141,8 +141,8 @@ module Sage
     end
 
     initializer "sage.assets" do |app|
-      # Add JavaScript path for Propshaft
-      if defined?(Propshaft::Railtie)
+      # Add JavaScript paths based on asset pipeline
+      if app.config.respond_to?(:assets)
         app.config.assets.paths << Engine.root.join("app/javascript")
         app.config.assets.paths << Engine.root.join("app/javascript/sage")
       end

data/lib/sage/model_scopes_context.rb

@@ -43,20 +43,20 @@ module Sage
 
     def collect_models_with_scopes
       models_with_scopes = []
-      
+
       # Find all model files in the app/models directory
       model_files = Dir.glob(Rails.root.join("app/models/**/*.rb"))
-      
+
       model_files.each do |file_path|
         # Skip concern files and other non-model files
         next if file_path.include?("/concerns/")
-        
+
         # Read the file content
         file_content = File.read(file_path)
-        
+
         # Extract model name from file path
         model_name = File.basename(file_path, ".rb").camelize
-        
+
         # Find all scope definitions using regex
         # Match various scope patterns:
         # scope :active, -> { where(active: true) }
@@ -70,7 +70,7 @@ module Sage
           # Pattern 3: Simple one-liner scopes
           /scope\s+:(\w+)\s*,\s*(.+?)$/
         ]
-        
+
         scope_matches = []
         scope_patterns.each do |pattern|
           matches = file_content.scan(pattern)
@@ -79,11 +79,11 @@ module Sage
             scope_body = match[1] || ""
             # Avoid duplicate entries
             unless scope_matches.any? { |s| s[0] == scope_name }
-              scope_matches << [scope_name, scope_body]
+              scope_matches << [ scope_name, scope_body ]
             end
           end
         end
-        
+
         if scope_matches.any?
           # Try to get the actual model class and table name
           begin
@@ -93,17 +93,17 @@ module Sage
             table_name = model_name.tableize
             model_class = nil
           end
-          
+
           model_info = {
             name: model_name,
             table: table_name,
             scopes: []
           }
-          
+
           scope_matches.each do |match|
             scope_name = match[0]
             scope_body = match[1]
-            
+
             if scope_body
               # Try to extract SQL-like patterns from the scope body
               # Look for where conditions, joins, etc.
@@ -114,20 +114,20 @@ module Sage
               model_info[:scopes] << "  • `#{scope_name}` → (check model file for implementation)"
             end
           end
-          
+
           models_with_scopes << model_info if model_info[:scopes].any?
         end
       end
 
       models_with_scopes
     end
-    
+
     def extract_sql_from_scope_body(scope_body)
       # Clean up the scope body
       cleaned = scope_body.strip
-      
+
       sql_parts = []
-      
+
       # Extract WHERE conditions
       if cleaned =~ /where\s*\(["']([^"']+)["'](?:,\s*(.+?))?\)/
         # String SQL with potential parameters
@@ -146,14 +146,14 @@ module Sage
         not_conditions = not_conditions.gsub(/(\w+):\s*/, '\1 != ')
         sql_parts << "WHERE NOT (#{not_conditions})"
       end
-      
+
       # Extract JOINs
       if cleaned =~ /joins?\s*\(:?(\w+)\)/
         sql_parts << "JOIN #{$1}"
       elsif cleaned =~ /includes?\s*\(:?(\w+)\)/
         sql_parts << "LEFT JOIN #{$1}"
       end
-      
+
       # Extract ORDER
       if cleaned =~ /order\s*\(["']([^"']+)["']\)/
         sql_parts << "ORDER BY #{$1}"
@@ -162,12 +162,12 @@ module Sage
         order_clause = order_clause.gsub(/(\w+):\s*:?(asc|desc)/i, '\1 \2')
         sql_parts << "ORDER BY #{order_clause}"
       end
-      
+
       # Extract LIMIT
       if cleaned =~ /limit\s*\((\d+)\)/
         sql_parts << "LIMIT #{$1}"
       end
-      
+
       # If we found SQL parts, join them
       if sql_parts.any?
         sql_parts.join(" ")

data/lib/sage/version.rb

@@ -1,3 +1,3 @@
 module Sage
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sage-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Nathan Jones
@@ -140,6 +140,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CONTRIBUTING.md
 - README.md
 - app/assets/images/chevron-down-zinc-500.svg
 - app/assets/images/chevron-right.svg
@@ -147,7 +148,14 @@ files:
 - app/assets/images/sage/chevron-down-zinc-500.svg
 - app/assets/images/sage/chevron-right.svg
 - app/assets/images/sage/loading.svg
+- app/assets/javascripts/sage.js
 - app/assets/javascripts/sage/application.js
+- app/assets/javascripts/sage/controllers/clipboard_controller.js
+- app/assets/javascripts/sage/controllers/dashboard_controller.js
+- app/assets/javascripts/sage/controllers/reverse_infinite_scroll_controller.js
+- app/assets/javascripts/sage/controllers/search_controller.js
+- app/assets/javascripts/sage/controllers/select_controller.js
+- app/assets/javascripts/sage/controllers/variables_controller.js
 - app/assets/stylesheets/sage/application.css
 - app/controllers/sage/actions_controller.rb
 - app/controllers/sage/application_controller.rb
@@ -165,6 +173,7 @@ files:
 - app/javascript/sage/controllers/reverse_infinite_scroll_controller.js
 - app/javascript/sage/controllers/search_controller.js
 - app/javascript/sage/controllers/select_controller.js
+- app/javascript/sage/controllers/variables_controller.js
 - app/jobs/sage/application_job.rb
 - app/jobs/sage/process_report_job.rb
 - app/mailers/sage/application_mailer.rb
@@ -173,6 +182,7 @@ files:
 - app/schemas/sage/report_response_schema.rb
 - app/views/layouts/application.html.erb
 - app/views/layouts/sage/application.html.erb
+- app/views/sage/_variables.html.erb
 - app/views/sage/checks/_form.html.erb
 - app/views/sage/checks/_search.html.erb
 - app/views/sage/checks/edit.html.erb