Merge branch 'main' into feature/github-integration

Author: rsmithlal

Gemfile.lock

@@ -174,18 +174,18 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1120.0)
-    aws-sdk-core (3.226.1)
+    aws-partitions (1.1124.0)
+    aws-sdk-core (3.226.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.105.0)
+    aws-sdk-kms (1.106.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.191.0)
+    aws-sdk-s3 (1.192.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -318,7 +318,7 @@ GEM
     factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.5.1)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
     faraday (2.13.0)
       faraday-net_http (>= 2.0, < 3.5)
@@ -472,7 +472,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.8)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -484,7 +484,7 @@ GEM
     nio4r (2.7.4)
     nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    noticed (2.7.0)
+    noticed (2.7.1)
       rails (>= 6.1.0)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -607,7 +607,7 @@ GEM
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
-    rdoc (6.14.0)
+    rdoc (6.14.1)
       erb
       psych (>= 4.0.0)
     redis (5.4.0)
@@ -727,16 +727,16 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
-    selenium-webdriver (4.33.0)
+    selenium-webdriver (4.34.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.25.0)
+    sentry-rails (5.26.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.25.0)
-    sentry-ruby (5.25.0)
+      sentry-ruby (~> 5.26.0)
+    sentry-ruby (5.26.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-callback-matchers (1.1.4)
@@ -822,7 +822,7 @@ GEM
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
     websocket (1.2.11)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

app/controllers/better_together/hub_controller.rb

@@ -4,7 +4,7 @@ module BetterTogether
   # Internal hub for logged-in users to see relevant platform & community information
   class HubController < ApplicationController
     def index
-      authorize :'better_together/hub', :index?
+      authorize PublicActivity::Activity
       @activities = helpers.activities
     end
   end

app/helpers/better_together/hub_helper.rb

@@ -40,8 +40,8 @@ def whose?(user, object) # rubocop:todo Metrics/MethodLength, Naming/PredicateMe
     def link_to_trackable(object, object_type)
       if object
         object_url = object.respond_to?(:url) ? object.url : object
-        trackable_name = "#{object.class.model_name.human}: #{object}"
-        link_to trackable_name, object_url
+        trackable_name = "#{object.class.model_name.human}: "
+        (trackable_name + link_to(object, object_url, class: 'text-decoration-none')).html_safe
       else
         "a #{object_type.downcase} which does not exist anymore"
       end

app/models/concerns/better_together/tracked_activity.rb

@@ -9,7 +9,12 @@ module TrackedActivity
     included do
       include PublicActivity::Model
 
-      tracked owner: proc { |controller, _model| controller&.helpers&.current_person }
+      tracked owner: proc { |controller, _model| controller&.helpers&.current_person },
+              # rubocop:todo Lint/UnderscorePrefixedVariableName
+              privacy: proc { |_controller, _model| _model.privacy if _model.respond_to?(:privacy) }
+      # rubocop:enable Lint/UnderscorePrefixedVariableName
+
+      has_many :activities, as: :trackable, class_name: 'PublicActivity::Activity', dependent: :destroy
     end
 
     def self.included_in_models

app/policies/better_together/activity_policy.rb

@@ -4,7 +4,7 @@ module BetterTogether
   # Access control fro PublicActivity::Activity records
   class ActivityPolicy < ApplicationPolicy
     def index?
-      permitted_to?('manage_platform')
+      user.present?
     end
 
     def show?
@@ -14,7 +14,15 @@ def show?
     # Filter and sort public activity results
     class Scope < ApplicationPolicy::Scope
       def resolve
-        scope.order(updated_at: :desc)
+        results = scope.order(updated_at: :desc)
+
+        query = table[:privacy].eq('public')
+
+        results.where(query)
+      end
+
+      def table
+        scope.arel_table
       end
     end
   end

app/views/better_together/hub/index.html.erb

@@ -10,7 +10,7 @@
     <div class="col-md-6">
       <div class="card mb-4">
         <div class="card-header">
-          <h5><%= t('.your_activity', default: 'Your Activity') %></h5>
+          <h5><%= t('.activity', default: 'Activity') %></h5>
         </div>
         <div class="card-body">
           <%= render_activities(@activities, :layout => "layouts/better_together/activity_wrapper") %>
@@ -19,7 +19,7 @@
     </div>
 
     <!-- Platform-wide section -->
-    <div class="col-md-6">
+    <!-- <div class="col-md-6">
       <div class="card mb-4">
         <div class="card-header">
           <h5><%= t('.platform_updates', default: 'Platform Updates') %></h5>
@@ -32,11 +32,10 @@
           </ul>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 
-  <div class="row">
-    <!-- Additional sections -->
+  <!-- <div class="row">
     <div class="col-md-6">
       <div class="card mb-4">
         <div class="card-header">
@@ -58,5 +57,5 @@
         </div>
       </div>
     </div>
-  </div>
+  </div> -->
 </div>

app/views/layouts/better_together/_activity_wrapper.html.erb

@@ -10,9 +10,16 @@
       <% if a.owner %>
         <div class="me-3">
         </div>
-        <%= link_to(a.owner, class: "fw-bold text-decoration-none") do %>
-          <%= profile_image_tag(a.owner, class: 'rounded-circle border activity', style: "height: 30px; width: 30px;") %>
-          <%= a.owner %>
+        <% if policy(a.owner).show? %>
+          <%= link_to(a.owner, class: "fw-bold text-decoration-none") do %>
+        <%= profile_image_tag(a.owner, class: 'rounded-circle border activity', style: "height: 30px; width: 30px;") %>
+        <%= a.owner %>
+          <% end %>
+        <% else %>
+          <span class="fw-bold">
+        <%= profile_image_tag(a.owner, class: 'rounded-circle border activity', style: "height: 30px; width: 30px;") %>
+        <%= a.owner %>
+          </span>
         <% end %>
       <% else %>
         <span class="fw-bold">someone</span>

config/initializers/public_activity.rb

@@ -2,4 +2,17 @@
 
 # config/initializers/public_activity.rb
 
-PublicActivity::Activity.table_name = :better_together_activities
+# require 'better_togehter/privacy'
+
+ActiveSupport::Reloader.to_prepare do
+  PublicActivity::Config.set do
+    table_name 'better_together_activities'
+  end
+
+  # PublicActivity::Activity.include BetterTogether::Privacy
+  PublicActivity::Activity.class_eval do
+    def self.policy_class
+      BetterTogether::ActivityPolicy
+    end
+  end
+end

db/migrate/20250703214031_add_default_activity_parameters.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDefaultActivityParameters < ActiveRecord::Migration[7.1] # rubocop:todo Style/Documentation
+  def change
+    change_column_default :better_together_activities, :parameters, from: nil, to: '{}'
+  end
+end

db/migrate/20250703215419_add_privacy_to_activities.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPrivacyToActivities < ActiveRecord::Migration[7.1] # rubocop:todo Style/Documentation
+  def change
+    change_table :better_together_activities, &:bt_privacy
+  end
+end