command_proposal 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0271a9e0e80bf0df78d8284cc8e13d292ef2254ab57180b1434f50b351dcb7
-  data.tar.gz: 21b077ee6cfa9ede8ea83315523297ff9268bf5236de797c9f3acae9f1ef3910
+  metadata.gz: d57823efe2c4175b2786f8346a67ea68e96804bc980f06fc4afb0feb30a8dc9a
+  data.tar.gz: 212e7e868bf94fe559701ee696fc5487a9a17bcc3b549f35880843d8564f927d
 SHA512:
-  metadata.gz: 52a46842e394c99d8dbb4527c222ab93e93dc437992996b3b9af3850a9bc6571bac4e472268c7f821d6b541c17074d21954d0b18e5e15d2109141a4f04179491
-  data.tar.gz: eb670b929efd2d6c612997e569276fac67aa494325db38d357a5589496bdba19b0d5335d68696d715022b45e9ed13eae4e2245d4ddc12f53371ad3d611e4987b
+  metadata.gz: 96795b4fff0569ca5ed7c965cc1d27dcaa2fd753301a62cee0da1a0e7f684daa9489b5ca5f51f195bd58a8a86c3f9f77aea2b9e21017fc6c14c5ee61b73169e3
+  data.tar.gz: 6e15d7c2aeadeb488bfc35784cdeb2626a29cfa18f6a98264af30d35e45ecc7b8df8d8356d70ef4e7b07ca2228c78149dfd3a0bd7bc77e6ad00a3d17df2d63b1

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

@@ -35,3 +35,20 @@
     background: lightgrey;
   }
 }
+
+.cmd-pagination {
+  text-align: center;
+  margin-top: 10px;
+
+  .cmd-pagination-link {
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+
+    &.current-page {
+      font-weight: bold;
+    }
+  }
+}

data/app/controllers/command_proposal/iterations_controller.rb

@@ -33,8 +33,13 @@ class ::CommandProposal::IterationsController < ::CommandProposal::EngineControl
     @iteration = @task.current_iteration
     @iteration.update(status: :approved) # Task was already approved, and this is line-by-line
 
-    # in-sync
-    runner.execute(@iteration)
+    # async, but wait for the job to finish
+    ::CommandProposal::CommandRunnerJob.perform_later(@iteration.id)
+    loop do
+      sleep 0.2
+
+      break if @iteration.reload.complete?
+    end
 
     render json: {
       result: @iteration.result

data/app/controllers/command_proposal/tasks_controller.rb

@@ -17,7 +17,8 @@ class ::CommandProposal::TasksController < ::CommandProposal::EngineController
     @tasks = ::CommandProposal::Task.includes(:iterations)
     @tasks = @tasks.order(Arel.sql("COALESCE(command_proposal_tasks.last_executed_at, command_proposal_tasks.created_at) DESC"))
     @tasks = @tasks.search(params[:search]) if params[:search].present?
-    @tasks = @tasks.where(session_type: params[:filter]) if params[:filter].present?
+    @tasks = @tasks.by_session(params[:filter])
+    @tasks = @tasks.cmd_page(params[:page])
   end
 
   def show
@@ -37,7 +38,8 @@ class ::CommandProposal::TasksController < ::CommandProposal::EngineController
   end
 
   def new
-    @task = ::CommandProposal::Task.new(session_type: params[:session_type])
+    @task = ::CommandProposal::Task.new
+    @task.session_type = params[:session_type] if params[:session_type].in?(::CommandProposal::Task.session_types)
 
     render "form"
   end

data/app/helpers/command_proposal/params_helper.rb

@@ -22,6 +22,15 @@ module ::CommandProposal::ParamsHelper
     end
   end
 
+  def current_path(new_params={})
+    if @task.present?
+      new_params.merge!(iteration: @iteration.id) if @iteration.present? && !@iteration.primary_iteration?
+      cmd_path(@task, new_params)
+    else
+      cmd_path(:tasks, current_params(new_params))
+    end
+  end
+
   def truthy?(val)
     val.to_s.downcase.in?(["true", "t", "1"])
   end
@@ -60,4 +69,38 @@ module ::CommandProposal::ParamsHelper
     return "< 1s" if str_parts.none?
     str_parts.join(" ")
   end
+
+  def div(opts={}, &block)
+    "<div #{opts.map { |k, v| "#{k}=\"#{v}\"" }.join(" ")}>#{yield}</div>".html_safe
+  end
+
+  def command_paginate(paged_collection)
+    collection = paged_collection.unscope(:limit, :offset)
+
+    per = ::CommandProposal::PAGINATION_PER
+    total_pages = (collection.count / per.to_f).ceil
+    current_page = params[:page].presence&.to_i || 1
+
+    return if total_pages <= 1
+
+    div(class: "cmd-pagination") do
+      links = []
+      links << ["<<", { page: 1 }] if current_page > 1
+      links << ["<", { page: current_page - 1 }] if current_page > 1
+
+      (current_page-2..current_page+2).each do |page_window|
+        next if page_window < 1
+        next if page_window > total_pages
+
+        links << [page_window, { page: page_window }]
+      end
+
+      links << [">", page: current_page + 1] if current_page < total_pages
+      links << [">>", page: total_pages] if current_page < total_pages
+
+      links.map do |link_text, link_params|
+        "<a class=\"cmd-pagination-link #{'current-page' if link_params[:page] == current_page}\" href=\"#{current_path(link_params)}\">#{link_text}</a>"
+      end.join("\n")
+    end
+  end
 end

data/app/models/command_proposal/iteration.rb

@@ -23,6 +23,7 @@ class ::CommandProposal::Iteration < ApplicationRecord
 
   TRUNCATE_COUNT = 2000
   # Also hardcoded in JS: app/assets/javascripts/command_proposal/console.js
+  PAGINATION_PER = 2
 
   has_many :comments
   belongs_to :task
@@ -40,6 +41,12 @@ class ::CommandProposal::Iteration < ApplicationRecord
     terminated: 7, # Closed via server restart
   }
 
+  scope :cmd_page, ->(page=nil) {
+    page = page.presence&.to_i || 1
+    per = ::CommandProposal::PAGINATION_PER
+    limit(per).offset(per * (page - 1))
+  }
+
   delegate :name, to: :task
   delegate :description, to: :task
   delegate :session_type, to: :task
@@ -55,6 +62,10 @@ class ::CommandProposal::Iteration < ApplicationRecord
     ::CommandProposal::Task.module.where(friendly_id: bring_str.scan(/\s+\:(\w+),?/).flatten)
   end
 
+  def primary_iteration?
+    task.primary_iteration == self
+  end
+
   def complete?
     success? || failed? || cancelled? || terminated?
   end

data/app/models/command_proposal/task.rb

@@ -15,12 +15,24 @@ class ::CommandProposal::Task < ApplicationRecord
   scope :search, ->(text) {
     where("name ILIKE :q OR description ILIKE :q", q: "%#{text}%")
   }
+  scope :by_session, ->(filter) {
+    if filter.present?
+      where(session_type: filter) if filter.to_s.in?(session_types.keys)
+    else
+      where(session_type: :function)
+    end
+  }
+  scope :cmd_page, ->(page=nil) {
+    page = page.presence&.to_i || 1
+    per = ::CommandProposal::PAGINATION_PER
+    limit(per).offset(per * (page - 1))
+  }
 
   enum session_type: {
-    # Task will have multiple iterations that are all essentially the same just with code changes
-    task:     0,
     # Function iterations are much like tasks
     function: 1,
+    # Task will have multiple iterations that are all essentially the same just with code changes
+    task:     0,
     # Console iterations are actually line by line, so order matters
     console:  2,
     # Modules are included in tasks and not run independently

data/app/views/command_proposal/tasks/_past_iterations_list.html.erb

@@ -7,15 +7,12 @@
       <!-- <th>Diff</th> -->
     </thead>
     <tbody>
-      <% primary_iteration = @task.primary_iteration %>
-      <% @task.iterations.where.not(id: @iteration&.id).order(created_at: :desc).each do |iteration| %>
+      <% paginated_iterations = @task.iterations.cmd_page(params[:page]) %>
+      <% paginated_iterations.order(created_at: :desc).each do |iteration| %>
         <tr>
           <td>
-            <% if iteration.id == primary_iteration&.id %>
-              <%= link_to iteration.created_at.strftime("%b %-d, %Y at %H:%M"), cmd_path(@task) %>
-            <% else %>
-              <%= link_to iteration.created_at.strftime("%b %-d, %Y at %H:%M"), cmd_path(@task, iteration: iteration.id) %>
-            <% end %>
+            <%= ">" if iteration == @iteration %>
+            <%= link_to iteration.created_at.strftime("%b %-d, %Y at %H:%M"), cmd_path(@task, iteration: iteration.id) %>
           </td>
           <td><%= iteration.status.capitalize %></td>
           <!-- <td><%#= iteration.comments.count %></td> -->
@@ -24,4 +21,6 @@
       <% end %>
     </tbody>
   </table>
+
+  <%= command_paginate paginated_iterations %>
 <% end %>

data/app/views/command_proposal/tasks/index.html.erb

@@ -1,9 +1,11 @@
 <div class="cmd-wrapper">
-  <%= link_to "New #{params[:filter].presence&.capitalize || 'Command'}", cmd_path(:new, :task, session_type: params[:filter] || :task) %> <br>
+  <% filter_name = params[:filter].presence&.capitalize %>
+  <% filter_name = filter_name.blank? || filter_name == "All" ? "Command" : filter_name %>
+  <%= link_to "New #{filter_name}", cmd_path(:new, :task, session_type: params[:filter] || :task) %> <br>
   <br>
-  <%= link_to "All", cmd_path(:tasks, current_params.except(:filter)), class: "cmd-tab #{:active unless params.key?(:filter)}"
+  <%= link_to "All", toggled_param(filter: :all), class: "cmd-tab #{:active if params[:filter] == "all"}"
   %><% ::CommandProposal::Task.session_types.each_with_index do |(session_type, _session_enum), idx| %><%=
-    selected = params[:filter] == session_type.to_s
+    selected = params[:filter] == session_type.to_s || (!params.key?(:filter) && session_type == "function")
     # Offset closing RB tags to fix spacing issues
     link_to session_type.capitalize, toggled_param(filter: session_type), class: "cmd-tab #{:active if selected}"
   %><% end %>
@@ -42,4 +44,6 @@
       <% end %>
     <% end %>
   </div>
+
+  <%= command_paginate @tasks %>
 </div>

data/lib/command_proposal/services/runner.rb

@@ -76,7 +76,11 @@ module CommandProposal
 
       def run
         begin
-          @session.eval("#{bring_function};params = #{@iteration.args || {}}.with_indifferent_access")
+          params_str = ""
+          unless @iteration.task.console? # Don't bring params into the console
+            params_str = "params = #{@iteration.args || {}}.with_indifferent_access"
+          end
+          @session.eval("#{bring_function};#{params_str}")
         rescue Exception => e # rubocop:disable Lint/RescueException - Yes, rescue full Exception so that we can catch typos in evals as well
           return @iteration.result = results_from_exception(e)
         end
@@ -88,7 +92,7 @@ module CommandProposal
 
         running_thread = Thread.new do
           begin
-            # Run bring functions in here so we can capture any string outputs
+            # Run `bring` functions in here so we can capture any string outputs
             # OR! Run the full runner and instead of saving to an iteration, return the string for prepending here
             result = @session.eval("_ = (#{@iteration.code})").inspect # rubocop:disable Security/Eval - Eval is scary, but in this case it's exactly what we need.
             result = nil unless @iteration.task.console? # Only store final result for consoles

data/lib/command_proposal/version.rb

@@ -1,3 +1,3 @@
 module CommandProposal
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

data/lib/command_proposal.rb

@@ -6,6 +6,8 @@ require "command_proposal/services/shut_down"
 
 module CommandProposal
   class Error < StandardError; end
+  PAGINATION_PER = 10
+
   def self.sessions
     @sessions ||= {}
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails