WIP: Add initial community hub and display public activity (initially just pages)

rsmithlal · rsmithlal · commit babf10d5226d · 2025-06-07T13:08:56.000-02:30
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,6 +47,7 @@ PATH
       mobility-actiontext (~> 1.1)
       noticed
       premailer-rails
+      public_activity
       pundit (>= 2.1, < 2.6)
       pundit-resources
       rack-attack
@@ -502,6 +503,11 @@ GEM
     psych (5.2.6)
       date
       stringio
+    public_activity (3.0.1)
+      actionpack (>= 6.1.0)
+      activerecord (>= 6.1)
+      i18n (>= 0.5.0)
+      railties (>= 6.1.0)
     public_suffix (6.0.1)
     puma (6.6.0)
       nio4r (~> 2.0)
diff --git a/app/controllers/better_together/application_controller.rb b/app/controllers/better_together/application_controller.rb
@@ -4,9 +4,11 @@ module BetterTogether
   # Base application controller for engine
   class ApplicationController < ActionController::Base # rubocop:todo Metrics/ClassLength
     include ActiveStorage::SetCurrent
+    include PublicActivity::StoreController
     include Pundit::Authorization
 
     protect_from_forgery with: :exception
+
     before_action :check_platform_setup
     before_action :set_locale
     before_action :store_user_location!, if: :storable_location?
diff --git a/app/controllers/better_together/hub_controller.rb b/app/controllers/better_together/hub_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # Internal hub for logged-in users to see relevant platform & community information
+  class HubController < ApplicationController
+    def index
+      authorize :'better_together/hub', :index?
+      @activities = helpers.activities
+    end
+  end
+end
diff --git a/app/helpers/better_together/hub_helper.rb b/app/helpers/better_together/hub_helper.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # Helper methods used for displaying the Community Hub
+  module HubHelper
+    def activities
+      BetterTogether::ActivityPolicy::Scope.new(current_user, PublicActivity::Activity).resolve
+    end
+
+    # For generating time tags calculated using jquery.timeago
+    def timeago(time, options = {})
+      options[:class] ||= 'timeago'
+      content_tag(:abbr, time.to_s, options.merge(title: time.getutc.iso8601)) if time
+    end
+
+    # Shortcut for outputing proper ownership of objects,
+    # depending on who is looking
+    # rubocop:todo Naming/PredicateMethod
+    def whose?(user, object) # rubocop:todo Metrics/MethodLength, Naming/PredicateMethod
+      # rubocop:enable Naming/PredicateMethod
+      owner = case object
+              when Page
+                object.creator
+              end
+      if user && owner
+        if user.id == owner.id
+          'his'
+        else
+          "#{owner.nickname}'s"
+        end
+      else
+        ''
+      end
+    end
+
+    # Check if object still exists in the database and display a link to it,
+    # otherwise display a proper message about it.
+    # This is used in activities that can refer to
+    # objects which no longer exist, like removed posts.
+    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
+      else
+        "a #{object_type.downcase} which does not exist anymore"
+      end
+    end
+  end
+end
diff --git a/app/helpers/better_together/navigation_items_helper.rb b/app/helpers/better_together/navigation_items_helper.rb
@@ -133,7 +133,7 @@ def route_names_for_select(nav_item = nil)
         BetterTogether::NavigationItem.route_names.map do |name, route|
           [I18n.t("better_together.navigation_items.route_names.#{name}"), route]
         end,
-        (nav_item ? nav_item.route_name : nil)
+        nav_item&.route_name
       )
     end
 
diff --git a/app/helpers/better_together/sidebar_nav_helper.rb b/app/helpers/better_together/sidebar_nav_helper.rb
@@ -100,7 +100,7 @@ def render_nav_item(nav_item:, current_page:, level:, parent_id:, index:) # rubo
     # rubocop:enable Metrics/CyclomaticComplexity
 
     # Memoized method to check if any descendants are active
-    def has_active_descendants?(nav_item_id, current_page) # rubocop:todo Naming/PredicateName
+    def has_active_descendants?(nav_item_id, current_page) # rubocop:todo Naming/PredicatePrefix
       @active_descendant_cache ||= {}
       return @active_descendant_cache[nav_item_id] if @active_descendant_cache.key?(nav_item_id)
 
diff --git a/app/models/better_together/contact_detail.rb b/app/models/better_together/contact_detail.rb
@@ -30,7 +30,7 @@ def self.permitted_attributes(id: false, destroy: false, exclude_extra: false) #
       ] + super
     end
 
-    def has_contact_details? # rubocop:todo Naming/PredicateName
+    def has_contact_details? # rubocop:todo Naming/PredicatePrefix
       # rubocop:todo Layout/LineLength
       phone_numbers.size.positive? || email_addresses.size.positive? || addresses.size.positive? || social_media_accounts.size.positive? || website_links.size.positive?
       # rubocop:enable Layout/LineLength
diff --git a/app/models/better_together/navigation_item.rb b/app/models/better_together/navigation_item.rb
@@ -20,6 +20,7 @@ class NavigationItem < ApplicationRecord # rubocop:todo Metrics/ClassLength
       geography_regions: 'geography_regions_url',
       geography_settlements: 'geography_settlements_url',
       host_dashboard: 'host_dashboard_url',
+      hub: 'hub_url',
       metrics_reports: 'metrics_reports_url',
       navigation_areas: 'navigation_areas_url',
       pages: 'pages_url',
diff --git a/app/models/better_together/page.rb b/app/models/better_together/page.rb
@@ -9,6 +9,7 @@ class Page < ApplicationRecord
     include Protected
     include Privacy
     include Searchable
+    include TrackedActivity
 
     categorizable
 
diff --git a/app/models/concerns/better_together/content/block_attributes.rb b/app/models/concerns/better_together/content/block_attributes.rb
@@ -163,9 +163,8 @@ def block_styles # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
       # rubocop:todo Metrics/PerceivedComplexity
       # rubocop:todo Metrics/AbcSize
-      # rubocop:todo Naming/PredicateName
-      def has_custom_styling? # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Naming/PredicateName
-        # rubocop:enable Naming/PredicateName
+      # rubocop:todo Naming/PredicatePrefix
+      def has_custom_styling? # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
         BACKGROUND_ATTRIBUTES.any? { |attr| send(attr).present? } ||
           BORDER_ATTRIBUTES.any? { |attr| send(attr).present? } ||
           MARGIN_PADDING_ATTRIBUTES.any? { |attr| send(attr).present? } ||
@@ -174,6 +173,7 @@ def has_custom_styling? # rubocop:todo Metrics/CyclomaticComplexity, Metrics/Abc
       end
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Naming/PredicatePrefix
 
       def inline_block_styles
         inline_styles(block_styles)
diff --git a/app/models/concerns/better_together/primary_community.rb b/app/models/concerns/better_together/primary_community.rb
@@ -20,7 +20,7 @@ def self.primary_community_delegation_attrs
     end
 
     class_methods do
-      def has_community(class_name: community_class_name) # rubocop:todo Naming/PredicateName
+      def has_community(class_name: community_class_name) # rubocop:todo Naming/PredicatePrefix
         self.community_class_name = class_name
 
         belongs_to :community, class_name: community_class_name, dependent: :destroy, autosave: true
diff --git a/app/models/concerns/better_together/primary_flag.rb b/app/models/concerns/better_together/primary_flag.rb
@@ -19,7 +19,7 @@ def extra_permitted_attributes
         super + [:primary_flag]
       end
 
-      def has_primary_for(parent_id) # rubocop:todo Naming/PredicateName
+      def has_primary_for(parent_id) # rubocop:todo Naming/PredicatePrefix
         return false unless parent_id && primary_flag_scope_key
 
         where(primary_flag: true, primary_flag_scope_key => parent_id).exists?
diff --git a/app/models/concerns/better_together/tracked_activity.rb b/app/models/concerns/better_together/tracked_activity.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # Represents a class that has control over the actions of other classes.
+  # Meant to be used with user login classes
+  module TrackedActivity
+    extend ActiveSupport::Concern
+
+    included do
+      include PublicActivity::Model
+
+      tracked owner: proc { |controller, _model| controller&.helpers&.current_person }
+    end
+
+    def self.included_in_models
+      Rails.application.eager_load! if Rails.env.development? # Ensure all models are loaded
+      ActiveRecord::Base.descendants.select { |model| model.included_modules.include?(BetterTogether::TrackedActivity) }
+    end
+  end
+end
diff --git a/app/policies/better_together/activity_policy.rb b/app/policies/better_together/activity_policy.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # Access control fro PublicActivity::Activity records
+  class ActivityPolicy < ApplicationPolicy
+    def index?
+      permitted_to?('manage_platform')
+    end
+
+    def show?
+      permitted_to?('manage_platform')
+    end
+
+    # Filter and sort public activity results
+    class Scope < ApplicationPolicy::Scope
+      def resolve
+        scope.order(updated_at: :desc)
+      end
+    end
+  end
+end
diff --git a/app/policies/better_together/hub_policy.rb b/app/policies/better_together/hub_policy.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  class HubPolicy < ApplicationPolicy # rubocop:todo Style/Documentation
+    def index?
+      permitted_to?('manage_platform')
+    end
+  end
+end
diff --git a/app/views/better_together/hub/index.html.erb b/app/views/better_together/hub/index.html.erb
@@ -0,0 +1,62 @@
+<% content_for :page_title do %>
+  <%= t('.page_title', default: 'Community Hub') %>
+<% end %>
+
+<div class="container my-3">
+  <h1 class="mb-4"><%= t('.page_title', default: 'Community Hub') %></h1>
+
+  <div class="row">
+    <!-- User-specific section -->
+    <div class="col-md-6">
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5><%= t('.your_activity', default: 'Your Activity') %></h5>
+        </div>
+        <div class="card-body">
+          <%= render_activities(@activities, :layout => "layouts/better_together/activity_wrapper") %>
+        </div>
+      </div>
+    </div>
+
+    <!-- Platform-wide section -->
+    <div class="col-md-6">
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5><%= t('.platform_updates', default: 'Platform Updates') %></h5>
+        </div>
+        <div class="card-body">
+          <ul>
+            <li><%= t('.announcements', default: 'Announcements') %>: <em>Placeholder content</em></li>
+            <li><%= t('.trending_topics', default: 'Trending topics') %>: <em>Placeholder content</em></li>
+            <li><%= t('.new_members', default: 'New members') %>: <em>Placeholder content</em></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <!-- Additional sections -->
+    <div class="col-md-6">
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5><%= t('.recommended_communities', default: 'Recommended Communities') %></h5>
+        </div>
+        <div class="card-body">
+          <p><em>Placeholder content for recommended communities</em></p>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-6">
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5><%= t('.upcoming_events', default: 'Upcoming Events') %></h5>
+        </div>
+        <div class="card-body">
+          <p><em>Placeholder content for upcoming events</em></p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/layouts/better_together/_activity_wrapper.html.erb b/app/views/layouts/better_together/_activity_wrapper.html.erb
@@ -0,0 +1,28 @@
+<div class="card mb-3 activity <%= dom_class(a.trackable, :activity) %>">
+  <div class="card-body">
+    <div class="d-flex align-items-center mb-2">
+      <span class="me-2 text-primary">
+        <i class="fas fa-bolt fa-2x"></i>
+      </span>
+      <small class="text-muted"><%= timeago a.created_at %></small>
+    </div>
+    <h5 class="card-title mb-2">
+      <% 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 %>
+        <% end %>
+      <% else %>
+        <span class="fw-bold">someone</span>
+      <% end %>
+      <% content_for :action %>
+    </h5>
+    <div class="d-flex align-items-start">
+      <div class="flex-grow-1">
+        <%= yield %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/public_activity/better_together_page/_create.html.erb b/app/views/public_activity/better_together_page/_create.html.erb
@@ -0,0 +1,5 @@
+
+  created a new 
+  <%= link_to_trackable a.trackable, a.trackable_type %>
+
+<%= p[:summary] %>
diff --git a/app/views/public_activity/better_together_page/_update.html.erb b/app/views/public_activity/better_together_page/_update.html.erb
@@ -0,0 +1,5 @@
+
+updated 
+<%= link_to_trackable a.trackable, a.trackable_type %>
+
+<%= p[:summary] %>
diff --git a/better_together.gemspec b/better_together.gemspec
@@ -55,6 +55,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mobility-actiontext', '~> 1.1'
   spec.add_dependency 'noticed'
   spec.add_dependency 'premailer-rails'
+  spec.add_dependency 'public_activity'
   spec.add_dependency 'pundit', '>= 2.1', '< 2.6'
   spec.add_dependency 'pundit-resources'
   spec.add_dependency 'rack-attack'
diff --git a/config/initializers/public_activity.rb b/config/initializers/public_activity.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# config/initializers/public_activity.rb
+
+PublicActivity::Activity.table_name = :better_together_activities
diff --git a/config/routes.rb b/config/routes.rb
@@ -47,6 +47,8 @@
           resources :maps, only: %i[show update create index] # these are needed by the polymorphic url helper
         end
 
+        get 'hub', to: 'hub#index'
+
         resources :notifications, only: %i[index] do
           member do
             post :mark_as_read
@@ -106,7 +108,7 @@
             resources :resource_permissions
             resources :roles
 
-            resources :pages, except: %i[show] do
+            resources :pages do
               scope module: 'content' do
                 resources :page_blocks, only: %i[new destroy], defaults: { format: :turbo_stream }
               end
diff --git a/db/migrate/20250607130736_create_activities.rb b/db/migrate/20250607130736_create_activities.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Migration responsible for creating a table with activities
+class CreateActivities < ActiveRecord::Migration[7.1]
+  def change
+    create_bt_table :activities do |t|
+      t.bt_references :trackable, polymorphic: true, index: { name: 'bt_activities_by_trackable' }
+      t.bt_references :owner, polymorphic: true, index: { name: 'bt_activities_by_owner' }
+      t.string :key
+      t.jsonb :parameters
+      t.bt_references :recipient, polymorphic: true, index: { name: 'bt_activities_by_recipient' }
+    end
+  end
+end
diff --git a/lib/better_together/engine.rb b/lib/better_together/engine.rb
@@ -57,6 +57,7 @@ class Engine < ::Rails::Engine
       require_dependency 'friendly_id/mobility'
       require_dependency 'jsonapi-resources'
       require_dependency 'importmap-rails'
+      require_dependency 'public_activity'
       require_dependency 'pundit'
       require_dependency 'rack/cors'
     end
diff --git a/lib/tasks/data_migration.rake b/lib/tasks/data_migration.rake
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
diff --git a/spec/helpers/better_together/hub_helper_spec.rb b/spec/helpers/better_together/hub_helper_spec.rb
diff --git a/spec/requests/better_together/hub_spec.rb b/spec/requests/better_together/hub_spec.rb
diff --git a/spec/views/better_together/hub/index.html.erb_spec.rb b/spec/views/better_together/hub/index.html.erb_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ def route_names_for_select(nav_item = nil)`
`133`	`133`	`BetterTogether::NavigationItem.route_names.map do \|name, route\|`
`134`	`134`	`[I18n.t("better_together.navigation_items.route_names.#{name}"), route]`
`135`	`135`	`end,`
`136`		`- (nav_item ? nav_item.route_name : nil)`
	`136`	`+ nav_item&.route_name`
`137`	`137`	`)`
`138`	`138`	`end`
`139`	`139`