Organization index and show

app/controllers/organizations/gems_controller.rb

@@ -0,0 +1,22 @@
+class Organizations::GemsController < ApplicationController
+  before_action :redirect_to_signin, unless: :signed_in?
+  before_action :redirect_to_new_mfa, if: :mfa_required_not_yet_enabled?
+  before_action :redirect_to_settings_strong_mfa_required, if: :mfa_required_weak_level_enabled?
+
+  before_action :find_organization, only: %i[index]
+
+  layout "subject"
+
+  # GET /organizations/organization_id/gems
+
+  def index
+    @gems = @organization.rubygems.with_versions.by_downloads.preload(:most_recent_version, :gem_download).load_async
+    @gems_count = @organization.rubygems.with_versions.count
+  end
+
+  private
+
+  def find_organization
+    @organization = Organization.find_by_handle!(params[:organization_id])
+  end
+end

app/controllers/organizations/members_controller.rb

@@ -0,0 +1,66 @@
+class Organizations::MembersController < ApplicationController
+  before_action :redirect_to_signin, only: :index, unless: :signed_in?
+  before_action :redirect_to_new_mfa, only: :index, if: :mfa_required_not_yet_enabled?
+  before_action :redirect_to_settings_strong_mfa_required, only: :index, if: :mfa_required_weak_level_enabled?
+
+  before_action :find_organization, only: %i[create update destroy]
+  before_action :find_membership, only: %i[update destroy]
+
+  layout "subject"
+
+  def index
+    @organization = Organization.find_by_handle!(params[:organization_id])
+    authorize @organization, :list_memberships?
+
+    @memberships = @organization.memberships.includes(:user)
+    @memberships_count = @organization.memberships.count
+  end
+
+  def create
+    membership = @organization.memberships.new(create_membership_params)
+    authorize membership
+
+    if membership.save
+      redirect_to organization_members_path(@organization)
+    else
+      render :index
+    end
+  end
+
+  def update
+    @membership.attributes = update_membership_params
+    authorize @membership
+
+    if @membership.save
+      redirect_to organization_members_path(@organization)
+    else
+      redirect_to organization_members_path(@organization), error: "Failed to update membership"
+    end
+  end
+
+  def destroy
+    authorize @membership
+    @membership.destroy
+
+    redirect_to organization_members_path(@organization)
+  end
+
+  private
+
+  def find_organization
+    @organization = Organization.find_by_handle!(params[:organization_id])
+    authorize @organization, :manage_memberships?
+  end
+
+  def find_membership
+    @membership = @organization.memberships.find(params.permit(:id).require(:id))
+  end
+
+  def create_membership_params
+    params.require(:membership).permit(:user_id, :role)
+  end
+
+  def update_membership_params
+    params.require(:membership).permit(:role)
+  end
+end

app/controllers/organizations_controller.rb

@@ -1,10 +1,55 @@
 class OrganizationsController < ApplicationController
+  before_action :redirect_to_signin, only: :index, unless: :signed_in?
+  before_action :redirect_to_new_mfa, only: :index, if: :mfa_required_not_yet_enabled?
+  before_action :redirect_to_settings_strong_mfa_required, only: :index, if: :mfa_required_weak_level_enabled?
+
+  before_action :find_organization, only: %i[show edit update]
+
+  layout "subject"
+
+  # GET /organizations
+  def index
+    @memberships = current_user.memberships.includes(:organization)
+  end
+
+  # GET /organizations/1
   def show
-    render plain: flash[:notice] # HACK: for tests until this view is ready
+    @latest_events = [] # @organization.latest_events
+    @gems = @organization
+      .rubygems
+      .with_versions
+      .by_downloads
+      .preload(:most_recent_version, :gem_download)
+      .load_async
+    @gems_count = @organization.rubygems.with_versions.count
+    @memberships = @organization.memberships
+    @memberships_count = @organization.memberships.count
+  end
+
+  def edit
+    add_breadcrumb t("breadcrumbs.org_name", name: @organization.handle), organization_path(@organization)
+    add_breadcrumb t("breadcrumbs.settings")
+
+    authorize @organization
+  end
+
+  def update
+    authorize @organization
+
+    if @organization.update(organization_params)
+      redirect_to organization_path(@organization)
+    else
+      render :edit
+    end
   end
 
   private
 
+  def find_organization
+    @organization = Organization.find_by_handle!(params.permit(:id).require(:id))
+  end
+
   def organization_params
+    params.permit(organization: [:name]).require(:organization)
   end
 end

app/controllers/rubygems_controller.rb

@@ -14,7 +14,7 @@
         @gems   = Rubygem.letter(@letter).includes(:latest_version, :gem_download).page(@page)
       end
       format.atom do
-        @versions = Version.published.limit(Gemcutter::DEFAULT_PAGINATION)
+        @versions = Version.published.limit(Gemcutter::DEFAULT_PAGINATION).includes(:rubygem)
         render "versions/feed"
       end
     end

app/helpers/layout_hepler.rb

@@ -0,0 +1,10 @@
+module LayoutHelper
+  # <%= layout_section "Footer Nav", class: "py-8 bg-orange-100 dark:bg-orange-950 text-neutral-800 dark:text-neutral-200 flex-col items-center">
+  def layout_section(_name, **options, &)
+    options[:class] = "w-full px-8 #{options[:class]}"
+
+    tag.div(**options) do
+      tag.div(class: "max-w-screen-xl mx-auto flex flex-col", &)
+    end
+  end
+end

app/helpers/organizations_helper.rb

@@ -0,0 +1,2 @@
+module OrganizationsHelper
+end

app/models/organization.rb

@@ -13,9 +13,23 @@
   has_many :rubygems, dependent: :nullify
   has_one :organization_onboarding, foreign_key: :onboarded_organization_id, inverse_of: :organization, dependent: :destroy
 
-  scope :deleted, -> { where.not(deleted_at: nil) }
+  default_scope { where(deleted_at: nil) }
+
+  scope :deleted, -> { unscoped.where.not(deleted_at: nil) }
 
   after_create do
     record_event!(Events::OrganizationEvent::CREATED, actor_gid: memberships.first&.to_gid)
   end
+
+  def self.find_by_handle(handle)
+    find_by("lower(handle) = lower(?)", handle)
+  end
+
+  def self.find_by_handle!(handle)
+    find_by_handle(handle) || raise(ActiveRecord::RecordNotFound)
+  end
+
+  def to_param
+    handle
+  end
 end

app/policies/organization_policy.rb

@@ -12,6 +12,8 @@
     organization_member_with_role?(user, :owner) || deny(t(:forbidden))
   end
 
+  alias edit? update?
+
   def create?
     true
   end

app/views/components/card/timeline_component.rb

@@ -2,6 +2,7 @@
 
 class Card::TimelineComponent < ApplicationComponent
   include Phlex::Rails::Helpers::LinkTo
+  include Phlex::Rails::Helpers::ImageTag
   include Phlex::Rails::Helpers::TimeAgoInWords
 
   def view_template(&)
@@ -20,11 +21,40 @@
       div(class: "flex-1 flex-col ml-5 md:ml-7 pb-4 border-b border-neutral-300 dark:border-neutral-700") do
         div(class: "flex items-center justify-between") do
           span(class: "text-b3 text-neutral-600") { t("time_ago", duration: time_ago_in_words(datetime)) }
-          span(class: "text-b3 text-neutral-800") { user_link } if user_link
+          span(class: "text-b3 text-neutral-800 dark:text-white max-h-6") { user_link } if user_link
         end
 
         div(class: "flex flex-wrap w-full items-center justify-between", &)
       end
     end
   end
+
+  def link_to_user(user)
+    link_to(profile_path(user.display_id), alt: user.display_handle, title: user.display_handle, class: "flex items-center") do
+      span(class: "w-6 h-6 inline-block mr-2 rounded") { helpers.avatar(48, "gravatar-#{user.id}", user) }
+      span { user.display_handle }
+    end
+  end
+
+  def link_to_api_key(api_key_owner)
+    case api_key_owner
+    when OIDC::TrustedPublisher::GitHubAction
+      div(class: "flex items-center") do
+        span(class: "w-6 h-6 inline-block mr-2 rounded") do
+          image_tag "github_icon.png", width: 48, height: 48, theme: :light, alt: "GitHub", title: api_key_owner.name
+        end
+        span { "GitHub Actions" }
+      end
+    else
+      raise ArgumentError, "unknown api_key_owner type #{api_key_owner.class}"
+    end
+  end
+
+  def link_to_pusher(version)
+    if version.pusher.present?
+      link_to_user(version.pusher)
+    elsif version.pusher_api_key&.owner.present?
+      link_to_api_key(version.pusher_api_key.owner)
+    end
+  end
 end

app/views/dashboards/_subject.html.erb

@@ -3,40 +3,47 @@
   current ||= :dashboard
 %>
 
-<div class="flex flex-wrap lg:flex-col items-start mb-6 lg:mb-10">
-  <%= avatar 328, "user_gravatar", theme: :dark, class: "h-24 w-24 lg:h-40 lg:w-40 rounded-lg object-cover mr-4" %>
+<div class="mb-8 space-y-4">
+  <div class="flex flex-wrap lg:flex-col items-start mb-6 lg:mb-10">
+    <%= avatar 328, "user_gravatar", theme: :dark, class: "h-24 w-24 lg:h-40 lg:w-40 rounded-lg object-cover mr-4" %>
 
-  <div class="lg:w-full lg:mt-2">
-    <h2 class="font-bold text-h4"><%= user.display_handle %></h2>
-    <% if user.full_name.present? %>
-      <p class="text-neutral-500 text-b3"><%= user.full_name %></p>
-    <% end %>
+    <div class="lg:w-full lg:mt-2">
+      <h2 class="font-bold text-h4"><%= user.display_handle %></h2>
+      <% if user.full_name.present? %>
+        <p class="text-neutral-500 text-b3"><%= user.full_name %></p>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<% if user.public_email? || user == current_user %>
-  <div class="flex items-center mb-4 text-b3 lg:text-b2">
-    <%= icon_tag("mail", color: :primary, class: "h-6 w-6 text-orange mr-3") %>
-    <p class="text-neutral-800 dark:text-white"><%=
-      mail_to(user.email, encode: "hex")
-    %></p>
-  </div>
-<% end %>
+  <% if user.public_email? || user == current_user %>
+    <div class="flex items-center mb-4 text-b3 lg:text-b2">
+      <%= icon_tag("mail", color: :primary, class: "h-6 w-6 text-orange mr-3") %>
+      <p class="text-neutral-800 dark:text-white"><%=
+        mail_to(user.email, encode: "hex")
+      %></p>
+    </div>
+  <% end %>
 
-<% if user.twitter_username.present? %>
-  <div class="flex items-center mb-4 text-b3 lg:text-b2">
-    <%= icon_tag("x-twitter", color: :primary, class: "w-6 text-orange mr-3") %>
-    <p class="text-neutral-800 dark:text-white"><%=
-      link_to(
-        twitter_username(user),
-        twitter_url(user)
-      )
-    %></p>
-  </div>
-<% end %>
+  <% if user.twitter_username.present? %>
+    <div class="flex items-center mb-4 text-b3 lg:text-b2">
+      <%= icon_tag("x-twitter", color: :primary, class: "w-6 text-orange mr-3") %>
+      <p class="text-neutral-800 dark:text-white"><%=
+        link_to(
+          twitter_username(user),
+          twitter_url(user)
+        )
+      %></p>
+    </div>
+  <% end %>
+</div>
+
+<hr class="hidden lg:block lg:mb-6 border-neutral-400 dark:border-neutral-600" />
 
 <%= render Subject::NavComponent.new(current:) do |nav| %>
   <%= nav.link t("layouts.application.header.dashboard"), dashboard_path, name: :dashboard, icon: "space-dashboard" %>
   <%= nav.link t("dashboards.show.my_subscriptions"), subscriptions_path, name: :subscriptions, icon: "notifications" %>
+  <% if current_user.memberships.any? %>
+    <%= nav.link t("dashboards.show.organizations"), organizations_path, name: :organizations, icon: "organizations" %>
+  <% end %>
   <%= nav.link t("layouts.application.header.settings"), edit_settings_path, name: :settings, icon: "settings" %>
 <% end %>

app/views/dashboards/show.html.erb

@@ -1,7 +1,7 @@
 <% @title = t('.title') %>
 
 <% content_for :subject do %>
-  <% render "dashboards/subject", user: current_user %>
+  <%= render "dashboards/subject", user: current_user, current: :dashboard %>
 <% end %>
 
 <!-- Main Content -->
@@ -27,14 +27,7 @@
     <%= c.scrollable do %>
       <%= render Card::TimelineComponent.new do |t| %>
         <% @latest_updates.each do |version| %>
-          <%
-            pusher_link = if version.pusher.present?
-              link_to_user(version.pusher)
-            elsif version.pusher_api_key&.owner.present?
-              link_to_pusher(version.pusher_api_key.owner)
-            end
-          %>
-          <%= t.timeline_item(version.authored_at, pusher_link) do %>
+          <%= t.timeline_item(version.authored_at, t.link_to_pusher(version)) do %>
               <div class="flex text-b1 text-neutral-800 dark:text-white"><%= link_to version.rubygem.name, rubygem_path(version.rubygem.slug) %></div>
               <%= version_number(version) %>
           <% end %>
@@ -101,9 +94,12 @@
     <% end %>
     <%= c.divided_list do %>
       <% current_user.memberships.preload(:organization).each do |membership| %>
-        <%= c.list_item_to("#") do %>
-          <div class="flex justify-between">
-            <p class="text-neutral-800 dark:text-white"><%= membership.organization.name %></p>
+        <%= c.list_item_to(organization_path(membership.organization)) do %>
+          <div class="flex flex-row w-full justify-between items-center">
+            <div class="flex flex-col">
+              <p class="text-neutral-800 dark:text-white"><%= membership.organization.name %></p>
+              <p class="text-b3 text-neutral-600"><%= membership.organization.handle %></p>
+            </div>
             <p class="text-neutral-500 capitalize"><%= membership.role %></p>
           </div>
         <% end %>