canvas_sync 0.18.10 → 0.18.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 911b4fffbc2c21c25f32b45c0c90419dddcef40497b63c5d5757ec0e12544e36
-  data.tar.gz: 90377a8facd25b77726ab82754a50c7aa3a9851c1012801496e19d6258ea7275
+  metadata.gz: 1223506dbbaaa180f70770aaabd92c3ffe931ae491bd392b2bbaa2ce520de2c8
+  data.tar.gz: b0b5bc307fe639c3281f51658e995e2fc661186cd5b73918027e0fe01f7487e6
 SHA512:
-  metadata.gz: 5186a70509b324acdd5e8a8e023fdfb9503b7e899894938944632759eeb0bf362cd467f30700f3d8ba02a0ee06476c7646b83acf34ea3eeae5d0375a518d1096
-  data.tar.gz: 11812e324c87f8055baaade4a36a822b090b66c95691521a32eb89855c51ceddeaee417f87aae9f5b5c5401c1fe3a6433d102b4a5d9948f5278835ce71f8530d
+  metadata.gz: 40d9c62d733a904611600f4fe6d37e0eecf956d835fb0db31d10e40af8d0bed2269a72b386ae9135a2b8dc05219df80002497cf19ab88d6e579be81d80180c42
+  data.tar.gz: 659c99a14af5f186b3df3522642fec00b6ce7e3337a01e23e11f8c261208065834b9754d6d619b7445209dd2ed8a0eddbaabdc257a90038399a00de48eae88a1

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/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.10".freeze
+  VERSION = "0.18.12".freeze
 end

data/lib/canvas_sync.rb

@@ -206,7 +206,7 @@ module CanvasSync
       )
 
       # Skip syncing terms if not required
-      unless current_chain.empty? || (models & ['terms']).present?
+      if !current_chain.empty? || (models & ['terms']).present?
         term_parent_chain << per_term_chain
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.18.10
+  version: 0.18.12
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails