WIP: category list and editing translatable fields

Author: rsmithlal

app/concerns/better_together/translatable.rb

@@ -29,6 +29,10 @@ def self.localized_attribute_list
 
         localized_attributes.flatten
       end
+
+      def self.extra_permitted_attributes
+        super + localized_attribute_list
+      end
     end
   end
 end

app/controllers/better_together/categories_controller.rb

@@ -1,10 +1,13 @@
 module BetterTogether
-  class CategoriesController < ApplicationController
-    before_action :set_category, only: %i[ show edit update destroy ]
+  class CategoriesController < FriendlyResourceController
+    before_action :set_model_instance, only: %i[show edit update destroy]
+    before_action :authorize_category, only: %i[show edit update destroy]
+    after_action :verify_authorized, except: :index
 
     # GET /categories
     def index
-      @categories = Category.all
+      authorize resource_class
+      @categories = resource_class.all
     end
 
     # GET /categories/1
@@ -13,7 +16,8 @@ def show
 
     # GET /categories/new
     def new
-      @category = Category.new
+      @category = resource_class.new
+      authorize_category
     end
 
     # GET /categories/1/edit
@@ -22,7 +26,8 @@ def edit
 
     # POST /categories
     def create
-      @category = Category.new(category_params)
+      @category = resource_class.new(category_params)
+      authorize_category
 
       if @category.save
         redirect_to @category, notice: "Category was successfully created."
@@ -46,15 +51,32 @@ def destroy
       redirect_to categories_url, notice: "Category was successfully destroyed.", status: :see_other
     end
 
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_category
-        @category = Category.find(params[:id])
-      end
+    protected
 
-      # Only allow a list of trusted parameters through.
-      def category_params
-        params.fetch(:category, {})
-      end
+    # Adds a policy check for the category
+    def authorize_category
+      authorize @category
+    end
+
+    def set_model_instance
+      @category = set_resource_instance
+    end
+
+    # Only allow a list of trusted parameters through.
+    def category_params
+      permitted = [
+        *resource_class.extra_permitted_attributes
+      ]
+
+      params.require(resource_class.name.demodulize.underscore.to_sym).permit(permitted)
+    end
+
+    def resource_class
+      ::BetterTogether::Category
+    end
+
+    def resource_collection
+      resource_class.with_translations
+    end
   end
 end

app/mailers/better_together/application_mailer.rb

@@ -5,7 +5,7 @@ module BetterTogether
   class ApplicationMailer < ActionMailer::Base
     default from: ENV.fetch(
       'DEFAULT_FROM_EMAIL',
-      '[email protected]'
+      'Better Together Community <[email protected]>'
     )
     layout 'better_together/mailer'
 

app/models/better_together/category.rb

@@ -9,7 +9,7 @@ class Category < ApplicationRecord
     has_many :pages, through: :categorizations, source: :categorizable, source_type: 'BetterTogether::Page'
 
     translates :name, type: :string
-    translates :description, type: :text
+    translates :description, backend: :action_text
 
     validates :name, presence: true
     validates :type, presence: true

app/policies/better_together/category_policy.rb

@@ -2,8 +2,24 @@
 module BetterTogether
   class CategoryPolicy < ApplicationPolicy
 
+    def index?
+      permitted_to?('manage_platform')
+    end
+
+    def create?
+      permitted_to?('manage_platform')
+    end
+
+    def update?
+      permitted_to?('manage_platform')
+    end
+
+    def show?
+      permitted_to?('manage_platform')
+    end
+
     class Scope < ApplicationPolicy::Scope
-    
+
     end
   end
 end

app/policies/better_together/conversation_policy.rb

@@ -3,7 +3,7 @@ module BetterTogether
   class ConversationPolicy < ApplicationPolicy
 
     class Scope < ApplicationPolicy::Scope
-      
+
     end
   end
 end

app/views/better_together/categories/_category.html.erb

@@ -1,2 +1,7 @@
-<div id="<%= dom_id category %>">
+<div id="<%= dom_id category %>" class="col mb-3">
+  <div class="card h-100">
+    <div class="card-body">
+      <h3 class="card-title"><%= link_to category, category, class: "text-decoration-none" %></h3>
+    </div>
+  </div>
 </div>

app/views/better_together/categories/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_with(model: category) do |form| %>
+<%= form_with(model: category, class: 'form') do |form| %>
   <% if category.errors.any? %>
     <div style="color: red">
       <h2><%= pluralize(category.errors.count, "error") %> prohibited this category from being saved:</h2>
@@ -11,6 +11,18 @@
     </div>
   <% end %>
 
+  <%= form.text_field :identifier, class: 'form-control' %>
+
+  <div class="mb-3">
+    <%= render partial: 'better_together/shared/translated_string_field', locals: { model: category, form: form, attribute: 'name' } %>
+  </div>
+
+  <div class="mb-3">
+    <%= render partial: 'better_together/shared/translated_rich_text_field', locals: { model: category, form: form, attribute: 'description' } %>
+  </div>
+  <%= form.text_field :icon, class: 'form-control' %>
+  <%= form.number_field :position, class: 'form-control' %>
+
   <div>
     <%= form.submit %>
   </div>

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

@@ -2,13 +2,8 @@
 
 <h1>Categories</h1>
 
-<div id="categories">
-  <% @categories.each do |category| %>
-    <%= render category %>
-    <p>
-      <%= link_to "Show this category", category %>
-    </p>
-  <% end %>
+<div id="categories" class="row row-cols-1 row-cols-sm-2 row-cols-lg-3 row-cols-xl-4">
+ <%= render partial: 'better_together/categories/category', collection: @categories %>
 </div>
 
-<%= link_to "New category", new_category_path %>
+<%= link_to "New topic", new_topic_path %>

app/views/better_together/categories/show.html.erb

@@ -1,6 +1,6 @@
 <p style="color: green"><%= notice %></p>
 
-<%= render @category %>
+<%= render partial: 'better_together/categories/category', object: @category %>
 
 <div>
   <%= link_to "Edit this category", edit_category_path(@category) %> |