Show profile badges publicly

Author: ciembor

app/views/profiles/organization_repository.erb

@@ -38,3 +38,15 @@
   record: @organization_repository,
   heading_id: 'organization-repository-star-history-heading'
 } %>
+
+<% if @organization_repository[:polish_repo_badge] && @organization_repository[:polish_repo_badge][:value] %>
+  <section class="profile-section profile-section--alt" aria-labelledby="organization-repository-badge-heading">
+    <div class="content">
+      <h2 id="organization-repository-badge-heading"><%= h t('repositories.badge.title') %></h2>
+      <%= erb :"profiles/inline_badge_preview", locals: {
+        badge_path: repository_badge_path(@organization_repository),
+        alt_text: t('repositories.badge.alt')
+      } %>
+    </div>
+  </section>
+<% end %>

app/views/profiles/repository.erb

@@ -22,7 +22,7 @@
       { label: t('rankings.metric.stars'), value: "⭐ #{number(@repository[:stargazers_count])}" },
       { label: t('rankings.metric.new_stars'), value: "⭐ #{number(@repository[:monthly_stars_delta])}" }
     ] %>
-    <% if @show_repository_badge && @repository[:polish_repo_badge] && @repository[:polish_repo_badge][:value] %>
+    <% if @repository[:polish_repo_badge] && @repository[:polish_repo_badge][:value] %>
       <% metric_items << { label: @repository[:polish_repo_badge].fetch(:label), value: @repository[:polish_repo_badge].fetch(:value) } %>
     <% end %>
     <%= erb :"profiles/metric_card", locals: {
@@ -36,7 +36,7 @@
 
 <%= erb :"profiles/star_history", locals: { record: @repository, heading_id: 'repository-star-history-heading' } %>
 
-<% if @show_repository_badge && @repository[:polish_repo_badge] && @repository[:polish_repo_badge][:value] %>
+<% if @repository[:polish_repo_badge] && @repository[:polish_repo_badge][:value] %>
   <section class="profile-section profile-section--alt" aria-labelledby="repository-badge-heading">
     <div class="content">
       <h2 id="repository-badge-heading"><%= h t('repositories.badge.title') %></h2>

app/views/profiles/user.erb

@@ -25,7 +25,7 @@
   top_repository_path: top_repository ? repository_profile_path(top_repository) : nil
 } %>
 
-<% profile_badge_visible = @show_profile_badges && @profile.fetch(:badges, []).any? %>
+<% profile_badge_visible = @profile.fetch(:badges, []).any? %>
 <% if @discord_panel %>
   <section class="profile-section" aria-label="<%= h t('users.profile_access.title') %>">
     <div class="content profile-discord-panel">
@@ -58,10 +58,8 @@
     <% metric_items = [] %>
     <% metric_items << { label: t('rankings.metric.stars'), value: "⭐ #{number(@profile[:total_stars])}" } unless @profile[:total_stars].nil? %>
     <% metric_items << { label: t('rankings.metric.new_stars'), value: "⭐ #{number(@profile[:monthly_stars_delta])}" } unless @profile[:monthly_stars_delta].nil? %>
-    <% if @show_profile_badges %>
-      <% @profile.fetch(:badges, []).each do |badge| %>
-        <% metric_items << { label: badge.fetch(:label), value: (badge[:value] || t('users.metrics.outside_ranking')) } %>
-      <% end %>
+    <% @profile.fetch(:badges, []).each do |badge| %>
+      <% metric_items << { label: badge.fetch(:label), value: (badge[:value] || t('users.metrics.outside_ranking')) } %>
     <% end %>
     <%= erb :"profiles/metric_card", locals: {
       title: t('users.metrics.title'),
@@ -79,7 +77,7 @@
       repositories: @repositories,
       empty_translation_key: 'users.repositories.empty',
       path_builder: method(:repository_profile_path),
-      badge_path_builder: (@show_profile_badges ? method(:repository_badge_path) : nil),
+      badge_path_builder: method(:repository_badge_path),
       badge_alt_text: t('repositories.badge.alt'),
       show_homepage: true
     } %>

lib/polish_open_source_rank/web/controllers/public_controller.rb

@@ -63,9 +63,7 @@ def render_repository_profile(platform, owner, name)
                                                                  period_start: @period)
           halt 404 unless @repository
           repository_profile_cache!(@repository)
-          assign_public_page(
-            public_page_state.repository_profile(repository: @repository, own_repository: own_repository?(@repository))
-          )
+          assign_public_page(public_page_state.repository_profile(repository: @repository))
           erb :'profiles/repository'
         end
 

lib/polish_open_source_rank/web/presentation/public_page_state.rb

@@ -47,19 +47,17 @@ def user_profile(profile:, own_profile:)
             canonical_path: call_view(:user_profile_path, profile),
             discord_panel: private_controls ? call_view(:show_discord_panel_for, profile) : nil,
             discord_error: private_controls ? view_context.session.delete(:discord_error) : nil,
-            show_profile_badges: private_controls,
             show_profile_delete_control: private_controls
           }
         end
 
-        def repository_profile(repository:, own_repository:)
+        def repository_profile(repository:)
           source_name = call_view(:platform_name, repository.fetch(:platform))
 
           {
             title: repository_profile_seo_title(repository, source_name),
             description: repository_profile_seo_description(repository, source_name),
-            canonical_path: call_view(:repository_profile_path, repository),
-            show_repository_badge: own_repository
+            canonical_path: call_view(:repository_profile_path, repository)
           }
         end
 

spec/polish_open_source_rank/web/app_spec.rb

@@ -340,6 +340,11 @@ def user(_access_token)
     expect(organization_repository.body).to include('"@type": "SoftwareSourceCode"')
     expect(organization_repository.body).to include('id="organization-repository-star-history-heading"')
     expect(organization_repository.body).to include('>Historia gwiazdek</h2>')
+    expect(organization_repository.body).to include(
+      '<h2 id="organization-repository-badge-heading">Odznaka</h2>'
+    )
+    expect(organization_repository.body).to include('/badges/repositories/github/polish-org/toolkit.svg')
+    expect(organization_repository.body).to include('class="badge-markdown__copy js-copy-badge-markdown"')
     expect(organization_repository.body).to include('href="https://www.star-history.com/polish-org/toolkit"')
     expect(organization_repository.body).to include(
       'src="https://api.star-history.com/chart?repos=polish-org%2Ftoolkit&amp;type=date&amp;legend=top-left"'
@@ -2098,10 +2103,14 @@ def expect_user_profile_page(ranking_response:, profile_response:, badge_respons
       '#1',
       'Najlepsze projekty',
       'alice/app',
-      '12 345'
+      '12 345',
+      '<h2 id="profile-badge-heading">Odznaka</h2>',
+      '/badges/users/github/alice.svg',
+      '/badges/repositories/github/alice/app.svg',
+      'class="badge-markdown__copy js-copy-badge-markdown"'
     )
     expect(profile_response.body).not_to include('class="ranking-action"')
-    expect(profile_response.body).not_to include('/badges/users/github/alice.svg')
+    expect(profile_response.body).not_to include('Twój dostęp Discord')
     expect(badge_response.status).to eq(200)
     expect(badge_response.content_type).to include('image/svg+xml')
     expect_body_to_include(badge_response, 'Polish Open Source', '1st', 'href="https://rank.example/people"')
@@ -2199,12 +2208,11 @@ def expect_repository_profile_page(**responses)
       'src="https://api.star-history.com/chart?repos=alice%2Fapp&amp;type=date&amp;legend=top-left"'
     )
     expect(profile_response.body).not_to include('Odznaka na GitHub')
-    expect(profile_response.body).not_to include('/badges/repositories/github/alice/app.svg')
-    expect(owner_profile_response.body).to include('<h2 id="repository-badge-heading">Odznaka</h2>')
+    expect(profile_response.body).to include('<h2 id="repository-badge-heading">Odznaka</h2>')
     expect(owner_profile_response.body).not_to include('Odznaka na GitHub')
-    expect(owner_profile_response.body).to include('class="badge-markdown__copy js-copy-badge-markdown"')
-    expect(owner_profile_response.body).to include('/badges/repositories/github/alice/app.svg')
-    expect(owner_profile_response.body).to include(
+    expect(profile_response.body).to include('class="badge-markdown__copy js-copy-badge-markdown"')
+    expect(profile_response.body).to include('/badges/repositories/github/alice/app.svg')
+    expect(profile_response.body).to include(
       '[![Badge Polish Repo](https://rank.example/badges/repositories/github/alice/app.svg)]'
     )
     expect(badge_response.status).to eq(200)

spec/polish_open_source_rank/web/presentation/public_page_state_spec.rb

@@ -262,7 +262,6 @@ def path_with_optional_slug(path, resource)
         canonical_path: '/users/github/ciembor',
         discord_panel: :discord_panel,
         discord_error: 'Sync failed',
-        show_profile_badges: true,
         show_profile_delete_control: true
       )
       expect(view_context.session).to be_empty
@@ -279,7 +278,6 @@ def path_with_optional_slug(path, resource)
         description: 'users.seo.description|location=Poznan, Poland|platform=GitHub|user=Maciej (ciembor)',
         discord_panel: nil,
         discord_error: nil,
-        show_profile_badges: false,
         show_profile_delete_control: false
       )
     end
@@ -290,7 +288,6 @@ def path_with_optional_slug(path, resource)
       expect(state).to include(
         discord_panel: nil,
         discord_error: nil,
-        show_profile_badges: false,
         show_profile_delete_control: false
       )
     end
@@ -309,8 +306,8 @@ def path_with_optional_slug(path, resource)
       }
     end
 
-    it 'builds repository page state and ownership flag' do
-      state = page_state.repository_profile(repository: repository, own_repository: true)
+    it 'builds repository page state' do
+      state = page_state.repository_profile(repository: repository)
 
       expect(state).to include(
         title: 'repositories.seo.title|language=Ruby|platform=GitHub|repository=polish-open-source-rank',
@@ -319,8 +316,7 @@ def path_with_optional_slug(path, resource)
           'repository=polish-open-source-rank|summary=repositories.seo.summary_language|' \
           'language=Ruby Ranking for Polish open source repositories. ' \
           'repositories.seo.summary_stars|stars=1234',
-        canonical_path: '/repositories/github/ciembor/polish-open-source-rank',
-        show_repository_badge: true
+        canonical_path: '/repositories/github/ciembor/polish-open-source-rank'
       )
     end
   end