Refactor code for projects with multiple repositories

Add org_owner? method to Collective model Update navigation in index and show views
ecosyste-ms · Jan 23, 2024 · f3b159d · f3b159d
1 parent 03a96a8
commit f3b159d
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 59 deletions.
diff --git a/app/controllers/collectives_controller.rb b/app/controllers/collectives_controller.rb
@@ -24,10 +24,10 @@ def show
     @range = range
     @period = period
     start_date = params[:start_date].presence || range.days.ago
-    if @collective.projects_count > 1
+    if @collective.projects_with_repository.length > 1
       projects_scope = @collective.projects_with_repository.active.source
     else
-      projects_scope = @collective.projects_with_repository.active  
+      projects_scope = @collective.projects_with_repository  
     end
     @pagy, @projects = pagy(projects_scope.order_by_stars)
     @transactions = @collective.transactions.created_after(start_date).any?

diff --git a/app/models/collective.rb b/app/models/collective.rb
@@ -75,6 +75,11 @@ def no_license?
     projects_with_repository.all?{|p| p.no_license? }
   end
 
+  def org_owner?
+    return false if owner.nil?
+    owner['kind'] == 'organization'
+  end
+
   def sync_async
     SyncCollectiveWorker.perform_async(id)
   end

diff --git a/app/views/collectives/_audit.html.erb b/app/views/collectives/_audit.html.erb
@@ -0,0 +1,40 @@
+<h3>Audit</h3>
+
+<div class='row'>
+  <div class='col-12'>
+    <ul>
+      <li>
+        <strong>Owned by an org:</strong>
+        <%= @collective.org_owner? ? '✅' : '❌' %>
+      </li>
+      <li>
+        <strong>Repositories found:</strong>
+        <%= @collective.projects_with_repository.any? ? '✅' : '❌' %>
+      </li>
+      <li>
+        <strong>Open Source License:</strong>
+        <%= !@collective.no_license? ? '✅' : '❌' %>
+      </li>
+      <li>
+        <strong>Active Repositories:</strong>
+        <%= !@collective.inactive? ? '✅' : '❌' %>
+      </li>
+      <% if @collective.archived? %>
+      <li>
+        <strong>Unarchived Repositories:</strong>
+        <%= !@collective.archived? ? '✅' : '❌' %>
+      </li>
+      <% end %>
+      <li>
+        <strong>Funding links:</strong>
+        <%= !@collective.no_funding? ? '✅' : '❌' %>
+      </li>
+      <% if @collective.missing_s? %>
+      <li>
+        <strong>Missing s:</strong>
+        <%= !@collective.missing_s? ? '✅' : '❌' %>
+      </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
diff --git a/app/views/collectives/_nav.html.erb b/app/views/collectives/_nav.html.erb
@@ -0,0 +1,23 @@
+  <ul class="nav nav-tabs my-3">
+    <li class="nav-item">
+      <a class="nav-link active" href='/'>
+        Collectives
+        <span class="badge text-bg-secondary">
+          <%= number_with_delimiter Collective.all.count %>
+        </span>
+      </a>
+    </li>    
+    <li class="nav-item">
+      <a class="nav-link" href='/projects'>
+        Projects
+        <span class="badge text-bg-secondary">
+          <%= number_with_delimiter Project.with_repository.active.count %>
+        </span>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href='/audit'>
+        Audit
+      </a>
+    </li>
+  </ul>
diff --git a/app/views/collectives/index.html.erb b/app/views/collectives/index.html.erb
@@ -1,28 +1,6 @@
 <div class="container-md">
 
-  <ul class="nav nav-tabs my-3">
-    <li class="nav-item">
-      <a class="nav-link active" href='/'>
-        Collectives
-        <span class="badge text-bg-secondary">
-          <%= number_with_delimiter @pagy.count %>
-        </span>
-      </a>
-    </li>    
-    <li class="nav-item">
-      <a class="nav-link" href='/projects'>
-        Projects
-        <span class="badge text-bg-secondary">
-          <%= number_with_delimiter Project.with_repository.active.count %>
-        </span>
-      </a>
-    </li>
-    <li class="nav-item">
-      <a class="nav-link" href='/audit'>
-        Audit
-      </a>
-    </li>
-  </ul>
+  <%= render 'nav' %>
 
   <%= form_with url: request.path, method: :get do |form| %>
     <%= form.label :range, 'Select range:' %>

diff --git a/app/views/collectives/show.html.erb b/app/views/collectives/show.html.erb
@@ -1,6 +1,8 @@
 <% @meta_title = "#{@collective}" %>
 
 <div class="container-md">
+    <%= render 'nav' %>
+
   <h1>
     <%= @collective.to_s %><br/>
   </h1>
@@ -25,6 +27,8 @@
 
   <%= render 'stats' %>
 
+  <%= render 'audit' %>
+
   <h2>Transactions</h2>
 
   <% if @transactions %>

diff --git a/app/views/projects/_nav.html.erb b/app/views/projects/_nav.html.erb
@@ -0,0 +1,34 @@
+  <ul class="nav nav-tabs my-3">
+    <li class="nav-item">
+      <a class="nav-link" href='/'>
+        Collectives
+        <span class="badge text-bg-secondary">
+          <%= number_with_delimiter Collective.all.count %>
+        </span>
+      </a>
+    </li>    
+    <li class="nav-item">
+      <a class="nav-link active" href='/projects'>
+        Projects
+        <span class="badge text-bg-secondary">
+          <%= number_with_delimiter Project.with_repository.active.count %>
+        </span>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link" href='/audit'>
+        Audit
+      </a>
+    </li>
+    <li class="nav-item ms-auto">
+      <div class="dropdown">
+        <button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+          Sort
+        </button>
+        <ul class="dropdown-menu">
+          <li><a class="dropdown-item <%= 'active' if params[:sort] == 'last_synced_at' %>" href="<%= url_for(sort: 'last_synced_at', order: 'desc') %>">Recently synced</a></li>
+          <li><a class="dropdown-item <%= 'active' if params[:stars] == 'stars' %>" href="<%= url_for(sort: 'stars', order: 'desc') %>">Stars</a></li>
+        </ul>
+      </div>
+    </li>
+  </ul>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
@@ -1,39 +1,6 @@
 <div class="container-md">
 
-  <ul class="nav nav-tabs my-3">
-    <li class="nav-item">
-      <a class="nav-link" href='/'>
-        Collectives
-        <span class="badge text-bg-secondary">
-          <%= number_with_delimiter Collective.all.count %>
-        </span>
-      </a>
-    </li>    
-    <li class="nav-item">
-      <a class="nav-link active" href='/projects'>
-        Projects
-        <span class="badge text-bg-secondary">
-          <%= number_with_delimiter @pagy.count %>
-        </span>
-      </a>
-    </li>
-    <li class="nav-item">
-      <a class="nav-link" href='/audit'>
-        Audit
-      </a>
-    </li>
-    <li class="nav-item ms-auto">
-      <div class="dropdown">
-        <button class="btn btn-light dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-          Sort
-        </button>
-        <ul class="dropdown-menu">
-          <li><a class="dropdown-item <%= 'active' if params[:sort] == 'last_synced_at' %>" href="<%= url_for(sort: 'last_synced_at', order: 'desc') %>">Recently synced</a></li>
-          <li><a class="dropdown-item <%= 'active' if params[:stars] == 'stars' %>" href="<%= url_for(sort: 'stars', order: 'desc') %>">Stars</a></li>
-        </ul>
-      </div>
-    </li>
-  </ul>
+  <%= render 'nav' %>
 
   <%= render @projects %>
   <%== pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %>  

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
@@ -1,6 +1,9 @@
 <% @meta_title = "#{@project}" %>
 
 <div class="container-md">
+
+  <%= render 'nav' %>
+
   <h1>
     <%= @project.to_s %><br/>
   </h1>