canvas_sync 0.18.9 → 0.18.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490c7e8d4a1b61e5bd17dd938a0387f68718789bb05ad8c071d1a7dca83374ac
-  data.tar.gz: 06e933489bb8fd39f8af4a2c8498032faf7edf064a1df5cf882659823fa0f597
+  metadata.gz: 1223506dbbaaa180f70770aaabd92c3ffe931ae491bd392b2bbaa2ce520de2c8
+  data.tar.gz: b0b5bc307fe639c3281f51658e995e2fc661186cd5b73918027e0fe01f7487e6
 SHA512:
-  metadata.gz: 43fb1c9a539c970093c742ef2dd8cb1737a46f3b47ed1958b25fb3e3703ca3195677024d62d438d101ac913a53dbd86291fdaa3bd290c78e0b318064f6c27ddf
-  data.tar.gz: a08e7076c32de83470a32d2238ed0ac77055d3afa65411c0663330803e58b7edf2c9fa6a3b121c2835ec2347a23c40499248d35199c83de3f99347c71d7e77c9
+  metadata.gz: 40d9c62d733a904611600f4fe6d37e0eecf956d835fb0db31d10e40af8d0bed2269a72b386ae9135a2b8dc05219df80002497cf19ab88d6e579be81d80180c42
+  data.tar.gz: 659c99a14af5f186b3df3522642fec00b6ce7e3337a01e23e11f8c261208065834b9754d6d619b7445209dd2ed8a0eddbaabdc257a90038399a00de48eae88a1

data/lib/canvas_sync/concerns/ability_helper.rb

@@ -21,7 +21,7 @@ module CanvasSync::Concerns
     end
 
     def get_lti_cust_param(key)
-      nkey = key.gsub(/^custom_/, '')
+      nkey = key.to_s.gsub(/^custom_/, '')
 
       launch_params.dig("https://purl.imsglobal.org/spec/lti/claim/custom", nkey) || launch_params[nkey] || launch_params["custom_#{nkey}"]
     end

data/lib/canvas_sync/job_batches/batch.rb

@@ -376,6 +376,7 @@ module CanvasSync
               "BID-#{bid}-callbacks-complete",
               "BID-#{bid}-callbacks-success",
               "BID-#{bid}-failed",
+              "BID-#{bid}-dead",
 
               "BID-#{bid}-batches-success",
               "BID-#{bid}-batches-complete",

data/lib/canvas_sync/job_batches/chain_builder.rb

@@ -98,6 +98,10 @@ module CanvasSync
         end
       end
 
+      def empty?
+        self.class.get_chain_parameter(self).empty?
+      end
+
       def get_sub_chain(sub_type)
         matching_jobs = find_matching_jobs(sub_type).to_a
         raise "Found multiple \"#{sub_type}\" jobs in the chain" if matching_jobs.count > 1

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

@@ -1,6 +1,7 @@
 
 @color-green: #25c766;
-@color-red: #c7254e;
+@color-darkred: #8f0000;
+@color-red: #e03963;
 @color-yellow: #c4c725;
 
 .code-wrap.batch-context .args-extended {
@@ -30,6 +31,9 @@
             &.failed {
                 color: @color-red;
             }
+            &.dead {
+                color: @color-darkred;
+            }
             &.success {
                 color: @color-green;
             }
@@ -156,7 +160,7 @@
             }
 
             .status-block {
-                width: 10em;
+                width: 12em;
                 text-align: center;
             }
         }

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

@@ -12,6 +12,8 @@ const StatusBlock = (props) => html`
     |
     <span class="tree-stat failed">${props.failed_count}</span>
     |
+    <span class="tree-stat dead">${props.dead_count}</span>
+    |
     <span class="tree-stat success">${props.successful_count}</span>
     /
     <span class="tree-stat total">${props.total_count}</span>
@@ -96,7 +98,7 @@ class TreeRoot extends Component {
     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" />
+        <${StatusBlock} pending_count="pending" failed_count="failed" dead_count="dead" successful_count="successful" total_count="total" />
       </div>
       <${TreeLevel} data=${tree_data} />
     `;

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

@@ -5,12 +5,13 @@
             <th rowspan="2"><%= t('BID') %></th>
             <th rowspan="2"><%= t('Description') %></th>
 
-            <th colspan="4"><%= t('Jobs') %></th>
+            <th colspan="5"><%= t('Jobs') %></th>
             <th colspan="4"><%= t('Sub-Batches') %></th>
         </tr>
         <tr>
             <th><%= t('Pending') %></th>
             <th><%= t('Failed') %></th>
+            <th><%= t('Dead') %></th>
             <th><%= t('Complete') %></th>
             <th><%= t('Total') %></th>
 
@@ -30,6 +31,7 @@
 
             <td><%= status.pending %></th>
             <td><%= status.failures %></th>
+            <td><%= status.dead %></th>
             <td><%= status.completed_count %></th>
             <td><%= status.job_count %></th>
 

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

@@ -68,6 +68,7 @@ module CanvasSync::JobBatches::Sidekiq
               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_dead = r.scard("BID-#{bid}-dead").to_i
               jobs_success = jobs_total - jobs_pending
 
               batches_total = r.hget("BID-#{bid}", 'children').to_i
@@ -90,6 +91,7 @@ module CanvasSync::JobBatches::Sidekiq
                   pending_count: jobs_pending,
                   successful_count: jobs_success,
                   failed_count: jobs_failed,
+                  dead_count: jobs_dead,
                   total_count: jobs_total,
                   # items: batches.map{|b| layer_data[b] },
                 },

data/lib/canvas_sync/job_batches/status.rb

@@ -21,6 +21,10 @@ module CanvasSync
           Batch.redis { |r| r.scard("BID-#{bid}-failed") }.to_i
         end
 
+        def dead
+          Batch.redis { |r| r.scard("BID-#{bid}-dead") }.to_i
+        end
+
         def completed_count
           job_count - pending
         end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.18.9".freeze
+  VERSION = "0.18.12".freeze
 end

data/lib/canvas_sync.rb

@@ -170,9 +170,6 @@ module CanvasSync
       # General provisioning jobs (not term-scoped)
       ##############################
 
-      # Terms are always synced regardless of the models option
-      models -= ['terms']
-
       # Accounts, users, roles, and admins cannot be scoped to term
       try_add_model_job.call('accounts')
 
@@ -194,9 +191,10 @@ module CanvasSync
       # Per-term provisioning jobs
       ###############################
 
+      term_parent_chain = current_chain
+
       per_term_chain = JobBatches::ChainBuilder.new(model_job_map[:terms])
       per_term_chain.params[:term_scope] = term_scope
-      current_chain << per_term_chain
       current_chain = per_term_chain
 
       term_scoped_models.each do |mdl|
@@ -207,6 +205,11 @@ module CanvasSync
         generate_provisioning_jobs(models, options)
       )
 
+      # Skip syncing terms if not required
+      if !current_chain.empty? || (models & ['terms']).present?
+        term_parent_chain << per_term_chain
+      end
+
       ###############################
       # Wrap it all up
       ###############################