canvas_sync 0.17.15 → 0.17.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace82ecc5e7e541a763a459e209058e3c08e4f0e9fb340796d604364fed3f612
-  data.tar.gz: 63fa9684557f40172f59a551912907618fc87ce8cfc63f461e2f0ef885994e8a
+  metadata.gz: d995ce469310b7b54158745305c968edd4c7a910bcad87891ffabfa29cd22a30
+  data.tar.gz: 83a0bb75ceb290402137f2531e1925d4872a0e272fcabf75a6c3451b3de5f721
 SHA512:
-  metadata.gz: c87187f0881a49323df67c73d5ce46e15d279513e2dd2d02919c2eec1be36b955d587d2f7df3052eb34da3388d7e7286e74fe8031dd2b8ad79a4b462ec0f1b76
-  data.tar.gz: 7256ab41fc3a60271a81413b8cbfad401ea731068fc962fd2a645c4f16e4ce690367bfe3d50d6575d4aae936bdbfa9ed4a6450c3401e94347941fd04383f4bcb
+  metadata.gz: 9287196092064977d34259de638cfd41cf189f6dc9b6a97c6fd507d2555f8f3b0527643d38991765d56bf428856407608ef0c1834b48b6a6dd3201ed232b9879
+  data.tar.gz: a751ad1e08d3feb2716e41d4c552f983f2d83590321dc4d1cc2a18d2f800859587fa1884272bbdbaff0cc4aefe867c0af8f0dfb24c2dc6aba25190e7a190449a

data/lib/canvas_sync/batch_processor.rb

@@ -2,7 +2,7 @@ module CanvasSync
   # An array that "processes" after so many items are added.
   #
   # Example Usage:
-  #   batches = BatchProcessor.new(of: 1000) do |batch|
+  #   batches = CanvasSync::BatchProcessor.new(of: 1000) do |batch|
   #     # Process the batch somehow
   #   end
   #   enumerator_of_some_kind.each { |item| batches << item }

data/lib/canvas_sync/concerns/api_syncable.rb

@@ -30,27 +30,27 @@ module CanvasSync::Concerns
       end
 
       def bulk_sync_from_api_result(api_array, conflict_target: :canvas_id, import_args: {}, all_pages: true, batch_size: 1000)
-        columns = api_sync_options.keys
+        columns = api_sync_options[:field_map].keys
 
         update_conditions = {
-          condition: Importers::BulkImporter.condition_sql(self, columns),
+          condition: CanvasSync::Importers::BulkImporter.condition_sql(self, columns),
           columns: columns,
         }
         update_conditions[:conflict_target] = conflict_target if conflict_target.present?
         options = { validate: false, on_duplicate_key_update: update_conditions }.merge(import_args)
 
         if all_pages
-          batcher = BatchProcessor.new(of: batch_size) do |batch|
+          batcher = CanvasSync::BatchProcessor.new(of: batch_size) do |batch|
             import(columns, batch, options)
           end
           api_array.all_pages_each do |api_item|
-            item = new.assign_from_api_params(api_items)
+            item = new.assign_from_api_params(api_item)
             batcher << item
           end
           batcher.flush
         else
           items = api_array.map do |api_item|
-            new.assign_from_api_params(api_items)
+            new.assign_from_api_params(api_item)
           end
           import(columns, batch, options)
         end

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -26,18 +26,24 @@ module CanvasSync
       def self.perform_in_batches(report_file_path, mapping, klass, conflict_target, import_args: {})
         csv_column_names = mapping.keys
         database_column_names = mapping.values.map { |value| value[:database_column_name] }
-        database_conflict_column_name = conflict_target ? mapping[conflict_target][:database_column_name] : nil
+
+        puts mapping.inspect
+
+        conflict_target = Array(conflict_target).map(&:to_sym)
+        database_conflict_column_name = conflict_target.map{|ct| mapping[ct][:database_column_name] }
 
         row_ids = {}
-        batcher = BatchProcessor.new(of: batch_size) do |batch|
+        batcher = CanvasSync::BatchProcessor.new(of: batch_size) do |batch|
           row_ids = {}
           perform_import(klass, database_column_names, batch, database_conflict_column_name, import_args)
         end
 
         row_buffer_out = ->(row) {
-          if conflict_target
-            next if row_ids[row[conflict_target]]
-            row_ids[row[conflict_target]] = true
+          if conflict_target.present?
+            key = conflict_target.map{|ct| row[ct] }
+            next if row_ids[key]
+
+            row_ids[key] = true
           end
 
           formatted_row = csv_column_names.map do |column|
@@ -79,7 +85,7 @@ module CanvasSync
           condition: condition_sql(klass, columns, import_args[:sync_start_time]),
           columns: columns
         }
-        update_conditions[:conflict_target] = conflict_target if conflict_target
+        update_conditions[:conflict_target] = conflict_target if conflict_target.present?
 
         options = { validate: false, on_duplicate_key_update: update_conditions }.merge(import_args)
         options.delete(:on_duplicate_key_update) if options.key?(:on_duplicate_key_ignore)
@@ -96,7 +102,7 @@ module CanvasSync
       # started_at = Time.now
       # run_the_users_sync!
       # changed = User.where("updated_at >= ?", started_at)
-      def self.condition_sql(klass, columns, report_start)
+      def self.condition_sql(klass, columns, report_start = nil)
         columns_str = columns.map { |c| "#{klass.quoted_table_name}.#{c}" }.join(", ")
         excluded_str = columns.map { |c| "EXCLUDED.#{c}" }.join(", ")
         condition_sql = "(#{columns_str}) IS DISTINCT FROM (#{excluded_str})"

data/lib/canvas_sync/job_batches/batch.rb

@@ -28,6 +28,7 @@ module CanvasSync
 
       BID_EXPIRE_TTL = 2_592_000
       SCHEDULE_CALLBACK = RedisScript.new(Pathname.new(__FILE__) + "../schedule_callback.lua")
+      BID_HIERARCHY = RedisScript.new(Pathname.new(__FILE__) + "../hier_batch_ids.lua")
 
       attr_reader :bid
 
@@ -423,6 +424,14 @@ module CanvasSync
         def push_callbacks(args, queue)
           Batch::Callback::worker_class.enqueue_all(args, queue)
         end
+
+        def bid_hierarchy(bid, depth: 4, per_depth: 5, slice: nil)
+          args = [bid, depth, per_depth]
+          args << slice if slice
+          redis do |r|
+            BID_HIERARCHY.call(r, [], args)
+          end
+        end
       end
     end
 

data/lib/canvas_sync/job_batches/chain_builder.rb

@@ -172,6 +172,14 @@ module CanvasSync
           mapper[key] ||= []
         end
 
+        # TODO: Add a Chain progress web View
+        # Augment Batch tree-view with Chain data
+        #   > [DONE] Tree view w/o Chain will only show Parent/Current batches and Job Counts
+        #   > If augmented with Chain data, the above will be annotated with Chain-related info and will be able to show Jobs defined in the Chain
+        #     > Chain-jobs will be supplied chain_id and chain_step_id metadata
+        #     > Using server-middleware, if a Chain-job (has chain_id and chain_step_id) creates a Batch, tag the Batch w/ the chain_id and chain_step_id
+        #     > UI will map Batches to Chain-steps using the chain_step_id. UI will add entries for any Chain-steps that were not tied to a Batch
+        #   > [DONE] Use a Lua script to find child batch IDs. Support max_depth, items_per_depth, top_depth_slice parameters
         def enqueue_job(job_def)
           job_class = job_def[:job].constantize
           job_options = job_def[:parameters] || []

data/lib/canvas_sync/job_batches/hier_batch_ids.lua

@@ -0,0 +1,25 @@
+
+local function add_bids(root, depth)
+    local result_data = {}
+
+    if depth > 0 then
+        local sbids
+        if depth == tonumber(ARGV[2]) and ARGV[4] then
+            local min, max = ARGV[4]:match('(%d+):(%d+)')
+            sbids = redis.call('ZRANGE', 'BID-' .. root .. '-bids', min, max)
+        else
+            sbids = redis.call('ZRANGE', 'BID-' .. root .. '-bids', 0, tonumber(ARGV[3]) - 1)
+        end
+
+        local sub_data = {}
+        for _,v in ipairs(sbids) do
+            table.insert(sub_data, add_bids(v, depth - 1))
+        end
+
+        return { root, sub_data }
+    end
+
+    return { root, result_data}
+end
+
+return add_bids(ARGV[1], tonumber(ARGV[2]))

data/lib/canvas_sync/job_batches/sidekiq/web.rb

@@ -9,11 +9,19 @@ require_relative "web/helpers"
 
 module CanvasSync::JobBatches::Sidekiq
   module Web
+    DEV_MODE = (defined?(Rails) && !Rails.env.production?) || !!ENV["SIDEKIQ_WEB_TESTING"]
+
     def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       app.helpers do
         include Web::Helpers
+
+        def dev_mode?
+          DEV_MODE
+        end
       end
 
+      # =============== BATCHES =============== #
+
       app.get "/batches" do
         @count = (params['count'] || 25).to_i
         @current_page, @total_size, @batches = page('batches', params['page'], @count)
@@ -26,6 +34,8 @@ module CanvasSync::JobBatches::Sidekiq
         @bid = params[:bid]
         @batch = CanvasSync::JobBatches::Batch.new(@bid)
 
+        @tree_data = tree_data(@bid)
+
         @count = (params['count'] || 25).to_i
         @current_batches_page, @total_batches_size, @sub_batches = page("BID-#{@batch.bid}-bids", params['batch_page'], @count)
         @sub_batches = @sub_batches.map {|b, score| CanvasSync::JobBatches::Batch.new(b) }
@@ -36,6 +46,81 @@ module CanvasSync::JobBatches::Sidekiq
         erb(get_template(:batch))
       end
 
+      app.get "/batches/:bid/tree" do
+        @bid = params[:bid]
+
+        json(tree_data(@bid, slice: params[:slice]))
+      end
+
+      app.helpers do
+        def tree_data(root_bid, slice: nil)
+          tree_bids = CanvasSync::JobBatches::Batch.bid_hierarchy(root_bid, slice: slice)
+
+          CanvasSync::JobBatches::Batch.redis do |r|
+            layer_data = ->(layer, parent = nil) {
+              bid = layer[0]
+              batch = CanvasSync::JobBatches::Batch.new(bid)
+
+              jobs_total = r.hget("BID-#{bid}", "job_count").to_i
+              jobs_pending = r.hget("BID-#{bid}", 'pending').to_i
+              jobs_failed = r.scard("BID-#{bid}-failed").to_i
+              jobs_success = jobs_total - jobs_pending
+
+              batches_total = r.hget("BID-#{bid}", 'children').to_i
+              batches_success = r.scard("BID-#{bid}-batches-success").to_i
+              batches_pending = batches_total - batches_success
+              batches_failed = r.scard("BID-#{bid}-batches-failed").to_i
+
+              status = 'in_progress'
+              status = 'complete' if batches_pending == batches_failed && jobs_pending == jobs_failed
+              status = 'success' if batches_pending == 0 && jobs_pending == 0
+              status = 'deleted' if bid != root_bid && !batch.parent_bid
+
+              {
+                bid: bid,
+                created_at: r.hget("BID-#{bid}", 'created_at'),
+                status: status,
+                parent_bid: parent ? parent.bid : batch.parent_bid,
+                description: batch.description,
+                jobs: {
+                  pending_count: jobs_pending,
+                  successful_count: jobs_success,
+                  failed_count: jobs_failed,
+                  total_count: jobs_total,
+                  # items: batches.map{|b| layer_data[b] },
+                },
+                batches: {
+                  pending_count: batches_pending,
+                  successful_count: batches_success,
+                  failed_count: batches_failed,
+                  total_count: batches_total,
+                  items: layer[1].map{|b| layer_data[b, batch] },
+                },
+              }
+            }
+
+            data = layer_data[tree_bids]
+            data[:batches][:slice] = slice if slice
+            data
+          end
+        end
+
+        def format_context(batch)
+          bits = []
+          own_keys = batch.context.own.keys
+          batch.context.flatten.each do |k,v|
+            added = own_keys.include? k
+            bits << "  <span class=\"key #{added ? 'own' : 'inherited'}\">\"#{k}\": #{v.to_json},</span>"
+          end
+          bits = [
+            "{ // <span class=\"own\">Added</span> / <span class=\"inherited\">Inherited</span>",
+            *bits,
+            '}'
+          ]
+          bits.join("\n")
+        end
+      end
+
       app.post "/batches/all" do
         if params['delete']
           drain_zset('batches') do |batches|
@@ -107,6 +192,14 @@ module CanvasSync::JobBatches::Sidekiq
 end
 
 if defined?(::Sidekiq::Web)
+  rules = []
+  rules = [[:all, {"Cache-Control" => "public, max-age=86400"}]] unless CanvasSync::JobBatches::Sidekiq::Web::DEV_MODE
+
+  ::Sidekiq::Web.use Rack::Static, urls: ["/batches_assets"],
+                                   root: File.expand_path("#{File.dirname(__FILE__)}/web"),
+                                   cascade: true,
+                                   header_rules: rules
+
   ::Sidekiq::Web.register CanvasSync::JobBatches::Sidekiq::Web
   ::Sidekiq::Web.tabs["Batches"] = "batches"
   ::Sidekiq::Web.tabs["Pools"] = "pools"

data/lib/canvas_sync/job_batches/sidekiq/web/batches_assets/css/styles.less

@@ -0,0 +1,178 @@
+
+@color-green: #25c766;
+@color-red: #c7254e;
+@color-yellow: #c4c725;
+
+.code-wrap.batch-context .args-extended {
+    white-space: pre;
+
+    .key {
+        white-space: pre-wrap;
+        margin-left: 2em;
+        text-indent: -2em;
+        display: inline-block;
+    }
+
+    .own {
+        color: @color-green;
+    }
+}
+
+
+.batch-tree {
+    .status-block {
+        .tree-stat {
+            margin: 0 4px;
+    
+            &.pending {
+                color: @color-yellow;
+            }
+            &.failed {
+                color: @color-red;
+            }
+            &.success {
+                color: @color-green;
+            }
+            &.total {
+    
+            }
+        }
+    }
+
+    .text-inactive {
+        color: darken(#fff, 35%);
+        font-size: 80%;
+    }
+
+    .tree-header {
+        position: relative;
+
+        .status-block {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+
+            margin-right: 8px;
+            font-size: 90%;
+            text-align: right;
+
+            .tree-stat {
+                font-style: italic;
+            }
+        }
+    }
+
+    .tree-entry {
+        > .header {
+            display: flex;
+            align-items: center;
+
+            .header-inner {
+                padding: 4px 0;
+                border-bottom: 1px dashed white;
+                display: flex;
+                align-items: center;
+                flex: 1;
+            }
+
+            &:hover {
+                background-color: rgba(0,0,0,0.20);
+                border-radius: 3px;
+            }
+
+            .row-toggle {
+                width: 16px;
+                height: 16px;
+                text-align: center;
+                align-self: center;
+                border-radius: 50%;
+                border: 1px solid #999;
+                text-decoration: none;
+                margin: 0 4px;
+                font-size: 16px;
+                line-height: 15px;
+
+                &.not_applicable {
+                    opacity: 0;
+                    pointer-events: none;
+                }
+            }
+
+            .main {
+                flex: 1;
+                display: flex;
+                align-items: baseline;
+
+                .bid {
+                    font-family: monospace;
+                    padding: 3px 6px;
+                    background: rgba(0,0,0,0.2);
+                    border-radius: 3px;
+                    font-size: 12px;
+                    margin: 0 12px 0 0;
+
+                    &:hover {
+                        .bid-goto {
+                            display: inline-block;
+                            padding: 0 0 0 4px;
+                            font-size: 200%;
+                            line-height: 10px;
+                            vertical-align: sub;
+                            text-decoration: dotted;
+                        }
+                    }
+
+                    .bid-goto {
+                        display: none;
+                    }
+                }
+            }
+
+            .goto-link {
+                margin: 0 8px;
+                display: inline-block;
+                height: 16px;
+                font-size: 90%;
+                border-bottom: 1px dotted white;
+            }
+
+            .status-label {
+                font-family: monospace;
+                padding: 3px 6px;
+                background: rgba(0,0,0,0.2);
+                border-radius: 3px;
+                font-size: 12px;
+                margin: 0 12px 0 0;
+
+                &.deleted {
+                    background: #99999933;
+                }
+                &.failed, &.complete {
+                    background: #99000033;
+                }
+                &.success {
+                    background: #00990033;
+                }
+            }
+
+            .status-block {
+                width: 10em;
+                text-align: center;
+            }
+        }
+
+        > .subitems {
+            padding-left: 16px;
+
+            >.load-more {
+                padding: 4px 0;
+                text-align: center;
+                border-bottom: 1px dashed white;
+                a {
+                    border-bottom: 1px dotted white;
+                    text-decoration: none;
+                }
+            }
+        }
+    }
+}

data/lib/canvas_sync/job_batches/sidekiq/web/batches_assets/js/batch_tree.js

@@ -0,0 +1,106 @@
+import { h, Component, render } from 'https://unpkg.com/preact?module';
+import htm from 'https://unpkg.com/htm?module';
+import { root_url } from './util.js';
+
+// Initialize htm with Preact
+const html = htm.bind(h);
+
+const StatusBlock = (props) => html`
+  <div class="status-block ${props.class || ''}">
+    ${props.title && props.title + ':'}
+    <span class="tree-stat pending">${props.pending_count}</span>
+    |
+    <span class="tree-stat failed">${props.failed_count}</span>
+    |
+    <span class="tree-stat success">${props.successful_count}</span>
+    /
+    <span class="tree-stat total">${props.total_count}</span>
+  </div>
+`
+
+class TreeLevel extends Component {
+  get bid() {
+    return this.props.data.bid;
+  }
+
+  get batch() {
+    return this.props.data;
+  }
+
+  load_more = async (event) => {
+    event.preventDefault();
+    const l = this.batch.batches.items.length;
+    const resp = await fetch(`${root_url}batches/${this.bid}/tree?slice=${l}:${l + 5 - 1}`)
+    const result = await resp.json()
+    const newEntries = result.batches.items;
+    for (let ent of newEntries) {
+      this.batch.batches.items.push(ent)
+    }
+    this.forceUpdate()
+  }
+
+  toggle = (event) => {
+    event.preventDefault();
+    this.setState({ collapsed: !this.state.collapsed })
+  }
+
+  render() {
+    const { data: bd } = this.props;
+
+    let sub_entries = [];
+    let sub_batches = bd.batches.items;
+    for (let b of sub_batches) {
+      sub_entries.push(html`<${TreeLevel} data=${b} />`)
+    }
+
+    let fully_loaded = !(sub_batches.length < bd.batches.total_count);
+
+    const load_more_elem = html`<div class="load-more">
+      ${sub_entries.length} / ${bd.batches.total_count} Items Loaded - <a href="#" onClick=${this.load_more}>Load More</a>
+    </div>`
+
+    return html`<div class="tree-entry tree-batch">
+      <div class="header">
+        <a class="row-toggle ${!bd.batches.total_count && 'not_applicable'}" onClick=${this.toggle} href="#">
+          ${this.state.collapsed ? '+' : '-'}
+        </a>
+
+        <div class="header-inner">
+          <div class="main">
+            <span class="bid">
+              ${bd.bid}
+              <a class="bid-goto" href="${root_url}batches/${bd.bid}">⇢</a>
+            </span>
+            ${bd.description || (bd.status == 'deleted' && html`<i class="text-inactive">Deleted</i>`) || html`<i class="text-inactive">No Description</i>`}
+          </div>
+
+          <span class="status-label ${bd.status}">${bd.status}</span>
+
+          ${bd.status != 'deleted' && html`
+            <${StatusBlock} class="job-status" title="Jobs" ...${bd.jobs} />
+            <${StatusBlock} class="batch-status" title="Batches" ...${bd.batches} />
+          `}
+        </div>
+      </div>
+
+      <div class="subitems ${this.state.collapsed ? 'hidden' : ''}">
+        ${sub_entries}
+        ${!fully_loaded && load_more_elem}
+      </div>
+    </div>`
+  }
+}
+
+class TreeRoot extends Component {
+  render() {
+    const tree_data = JSON.parse(document.querySelector('#batch-tree #initial-data').innerHTML);
+    return html`
+      <div class="tree-header">
+        <${StatusBlock} pending_count="pending" failed_count="failed" successful_count="successful" total_count="total" />
+      </div>
+      <${TreeLevel} data=${tree_data} />
+    `;
+  }
+}
+
+render(html`<${TreeRoot} />`, document.querySelector('#batch-tree'));

data/lib/canvas_sync/job_batches/sidekiq/web/batches_assets/js/util.js

@@ -0,0 +1,2 @@
+
+export const root_url = (document.querySelector('meta[name="sidekiq-baseurl"]')).content;

data/lib/canvas_sync/job_batches/sidekiq/web/views/_batch_tree.erb

@@ -0,0 +1,6 @@
+
+<div id="batch-tree" class="batch-tree">
+    <script id="initial-data" type="application/json"><%= @tree_data.to_json %></script>
+</div>
+
+<script type="module" src="<%= root_path %>batches_assets/js/batch_tree.js"></script>

data/lib/canvas_sync/job_batches/sidekiq/web/views/_common.erb

@@ -0,0 +1,13 @@
+
+<% add_to_head do %>
+    <meta name="sidekiq-baseurl" content="<%= root_path %>" />
+    <% if dev_mode? %>
+        <link href="<%= root_path %>batches_assets/css/styles.less" media="screen" rel="stylesheet/less" type="text/css" />
+        <script async type="text/javascript" src="https://unpkg.com/less@4.1.1/dist/less.js" data-async="true"></script>
+    <% else %>
+        <link href="<%= root_path %>batches_assets/css/styles.less" media="screen" rel="stylesheet/less" type="text/css" />
+        <script async type="text/javascript" src="https://unpkg.com/less@4.1.1/dist/less.js" data-async="true"></script>
+        <%# TODO: Pre-compile LESS %>
+        <!-- <link href="<%= root_path %>batches_assets/css/styles.css" media="screen" rel="stylesheet" type="text/css" /> -->
+    <% end %>
+<% end %>

data/lib/canvas_sync/job_batches/sidekiq/web/views/batch.erb

@@ -1,3 +1,5 @@
+<%= erb get_template(:_common) %>
+
 <h3><%= t('Batch') %></h3>
 <% status = CanvasSync::JobBatches::Batch::Status.new(@batch) %>
 
@@ -17,70 +19,13 @@
                 <td><%= @batch.description %></td>
             </tr>
             <tr>
-                <th colspan="2" scope=row><%= t('Added Context') %></td>
+                <th colspan="2" scope=row><%= t('Context') %></td>
                 <td>
-                    <code class="code-wrap">
-                        <div class="args-extended"><%= @batch.context.own.to_json %></div>
+                    <code class="code-wrap batch-context">
+                        <div class="args-extended"><%= format_context(@batch) %></div>
                     </code>
                 </td>
             </tr>
-            <tr>
-                <th colspan="2" scope=row><%= t('Full Context') %></td>
-                <td>
-                    <code class="code-wrap">
-                        <div class="args-extended"><%= @batch.context.flatten.to_json %></div>
-                    </code>
-                </td>
-            </tr>
-
-            <tr>
-                <th colspan="3">Jobs</th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Pending') %></th>
-                <td><%= status.pending %></th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Failed') %></th>
-                <td><%= status.failures %></th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Complete') %></th>
-                <td><%= status.completed_count %></th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Total') %></th>
-                <td><%= status.job_count %></th>
-            </tr>
-
-            <tr>
-                <th colspan="3">Batches</th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Pending') %></th>
-                <td><%= status.child_count - status.successful_children_count %></th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Failed') %></th>
-                <td><%= status.failed_children_count %></th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Success') %></th>
-                <td><%= status.successful_children_count %></th>
-            </tr>
-            <tr>
-                <th></th>
-                <th><%= t('Total') %></th>
-                <td><%= status.child_count %></th>
-            </tr>
-
         </tbody>
     </table>
 </div>
@@ -88,51 +33,33 @@
 <header class="row">
     <div class="col-sm-5">
         <h3>
-            <%= t('Jobs') %>
+            <%= t('Child Batches') %>
         </h3>
     </div>
-    <%
-        @current_page = @current_jobs_page
-        @total_size = @total_jobs_size
-    %>
-    <% if @jobs.any? && @total_size > @count.to_i %>
-        <div class="col-sm-4">
-            <%= erb get_template(:_pagination), locals: { url: "#{root_path}batches/#{@batch.bid}", page_key: :job_page } %>
-        </div>
-    <% end %>
 </header>
 
-<% if @jobs.any? %>
-<div class="table_container">
-    <%= erb get_template(:_jobs_table), locals: { jobs: @jobs } %>
-</div>
-<% end %>
+<%= erb get_template(:_batch_tree), locals: { } %>
 
 <header class="row">
     <div class="col-sm-5">
         <h3>
-            <%= t('Child Batches') %>
+            <%= t('Jobs') %>
+            <i>(Queued and Current)</i>
         </h3>
     </div>
     <%
-        @current_page = @current_batches_page
-        @total_size = @total_batches_size
+        @current_page = @current_jobs_page
+        @total_size = @total_jobs_size
     %>
-    <% if @sub_batches.any? && @total_size > @count.to_i %>
+    <% if @jobs.any? && @total_size > @count.to_i %>
         <div class="col-sm-4">
-            <%= erb get_template(:_pagination), locals: { url: "#{root_path}batches/#{@batch.bid}", page_key: :batch_page } %>
+            <%= erb get_template(:_pagination), locals: { url: "#{root_path}batches/#{@batch.bid}", page_key: :job_page } %>
         </div>
     <% end %>
 </header>
 
-<% if @sub_batches.any? %>
+<% if @jobs.any? %>
 <div class="table_container">
-    <%= erb get_template(:_batches_table), locals: { batches: @sub_batches } %>
+    <%= erb get_template(:_jobs_table), locals: { jobs: @jobs } %>
 </div>
 <% end %>
-
-<form class="form-horizontal" action="<%= root_path %>batches/<%= @batch.bid %>" method="post">
-    <%= csrf_tag %>
-    <a class="btn btn-default" href="<%= root_path %>batches"><%= t('GoBack') %></a>
-    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
-</form>

data/lib/canvas_sync/jobs/begin_sync_chain_job.rb

@@ -46,7 +46,7 @@ module CanvasSync
           m = Regexp.last_match
           day = m[1]
           skip = m[2] || "1"
-          Date.new.send(:"#{day}?") && last_full_sync.end_of_day <= (skip.to_i.weeks.ago.end_of_day)
+          DateTime.now.send(:"#{day}?") && last_full_sync.end_of_day <= (skip.to_i.weeks.ago.end_of_day)
         when opt.match?(%r{^(\d+)\%$})
           m = Regexp.last_match
           rand(100) < m[1].to_i

data/lib/canvas_sync/jobs/report_processor_job.rb

@@ -12,7 +12,7 @@ module CanvasSync
       # @param options [Hash] hash of options that will be passed to the job processor
       # @return [nil]
       def perform(report_name, report_url, processor, options, report_id)
-        @job_log.update_attributes(job_class: processor)
+        @job_log.update(job_class: processor)
         download(report_name, report_url) do |file_path|
           options = batch_context.merge(options).merge({
             report_processor_job_id: @job_log.job_id

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.15".freeze
+  VERSION = "0.17.19".freeze
 end

data/spec/canvas_sync/models/assignment_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Assignment, type: :model do
       let!(:matching_course) { FactoryGirl.create(:course) }
 
       before do
-        subject.update_attributes(canvas_context_type: "Course", canvas_context_id: matching_course.canvas_id)
+        subject.update(canvas_context_type: "Course", canvas_context_id: matching_course.canvas_id)
       end
 
       it "should belong to courses where the canvas_context_type is Course and canvas_context_id is the canvas_course_id" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.15
+  version: 0.17.19
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -442,6 +442,7 @@ files:
 - lib/canvas_sync/job_batches/callback.rb
 - lib/canvas_sync/job_batches/chain_builder.rb
 - lib/canvas_sync/job_batches/context_hash.rb
+- lib/canvas_sync/job_batches/hier_batch_ids.lua
 - lib/canvas_sync/job_batches/hincr_max.lua
 - lib/canvas_sync/job_batches/jobs/base_job.rb
 - lib/canvas_sync/job_batches/jobs/concurrent_batch_job.rb
@@ -453,8 +454,13 @@ files:
 - lib/canvas_sync/job_batches/schedule_callback.lua
 - lib/canvas_sync/job_batches/sidekiq.rb
 - lib/canvas_sync/job_batches/sidekiq/web.rb
+- lib/canvas_sync/job_batches/sidekiq/web/batches_assets/css/styles.less
+- lib/canvas_sync/job_batches/sidekiq/web/batches_assets/js/batch_tree.js
+- lib/canvas_sync/job_batches/sidekiq/web/batches_assets/js/util.js
 - lib/canvas_sync/job_batches/sidekiq/web/helpers.rb
+- lib/canvas_sync/job_batches/sidekiq/web/views/_batch_tree.erb
 - lib/canvas_sync/job_batches/sidekiq/web/views/_batches_table.erb
+- lib/canvas_sync/job_batches/sidekiq/web/views/_common.erb
 - lib/canvas_sync/job_batches/sidekiq/web/views/_jobs_table.erb
 - lib/canvas_sync/job_batches/sidekiq/web/views/_pagination.erb
 - lib/canvas_sync/job_batches/sidekiq/web/views/batch.erb
@@ -677,7 +683,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem for generating Canvas models and migrations and syncing data from Canvas