Refine scatter method to exclude Docker packages and ensure downloads…

… are not null; update view formatting for clarity
ecosyste-ms · Jan 30, 2025 · ff33903 · ff33903
1 parent 0684317
commit ff33903
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/app/controllers/critical_controller.rb b/app/controllers/critical_controller.rb
@@ -27,7 +27,7 @@ def index
   end
 
   def scatter
-    scope = Package.critical.includes(:registry)
+    scope = Package.critical.not_docker.where('packages.downloads is not null').includes(:registry)
 
     @registry = Registry.find_by_name!(params[:registry]) if params[:registry]
 
@@ -44,10 +44,10 @@ def scatter
         scope = scope.order(Arel.sql(sort).desc.nulls_last)
       end
     else
-      scope = scope.order('downloads DESC nulls last')
+      scope = scope.order('packages.downloads DESC nulls last')
     end
 
-    @packages = scope.limit(1000)
+    @packages = scope.limit(9000)
 
     @comparison_field = params[:comparison_field].presence || 'dependent_repos_count'
     @valid_fields = ['dependent_repos_count', 'stargazers_count', 'forks_count', 'dependent_packages_count', 'docker_downloads_count', 'docker_dependents_count']
@@ -72,7 +72,7 @@ def scatter
       @correlation_coefficient = nil
     end
 
-    @registries = Package.critical.group(:registry).count.sort_by{|r, c| c}
+    @registries = Package.not_docker.critical.group(:registry).count.sort_by{|r, c| c}
   end
 
   def permit_scatter_params

diff --git a/app/views/critical/scatter.html.erb b/app/views/critical/scatter.html.erb
@@ -20,21 +20,21 @@
       </div>
 
       <div class="mb-4">
-<%= scatter_chart @packages.map { |p| [p.downloads, p.send(@comparison_field)] }.reject { |x, y| x.nil? || y.nil? },
-  xtitle: "Downloads",
-  ytitle: @comparison_field.humanize.gsub(' count', ''),
-  height: "700px",
-  library: {
-    elements: {
-      point: {
-        backgroundColor: "#7878EF",  # Blue color for points
-        borderColor: "#7878EF",
-        radius: 2,
-        hoverRadius: 8
-      }
-    }
-  }
-%>
+        <%= scatter_chart @packages.map { |p| [p.downloads, p.send(@comparison_field)] }.reject { |x, y| x.nil? || y.nil? },
+          xtitle: "Downloads",
+          ytitle: @comparison_field.humanize.gsub(' count', ''),
+          height: "700px",
+          library: {
+            elements: {
+              point: {
+                backgroundColor: "#7878EF",  # Blue color for points
+                borderColor: "#7878EF",
+                radius: 2,
+                hoverRadius: 8
+              }
+            }
+          }
+        %>
       </div>
 
       <% if @correlation_coefficient %>