integral 1.1.0 → 1.5.1

data/app/controllers/integral/backend/categories_controller.rb

@@ -0,0 +1,49 @@
+module Integral
+  module Backend
+    # Categories controller
+    class CategoriesController < BaseController
+      before_action :authorize_with_klass, except: %i[activities activity]
+      before_action :set_resource, except: %i[create new index list]
+
+      # PUT /:id
+      # Updating a resource
+      def update
+        if @resource.update(resource_params)
+          flash.now[:notice] = notification_message('edit_success')
+          render json: { redirect_url: request.referrer }, status: :created
+        else
+          render json: { message: notification_message('edit_failure') }, status: :unprocessable_entity
+        end
+      end
+
+      # GET /:id/edit
+      # Category update screen
+      def edit
+        render json: { content: render_to_string(partial: 'integral/backend/categories/modal', locals: { category: @resource, title: 'Edit Category', modal_id: "modal--category-edit-#{@resource.id}" }) }
+      end
+
+      # POST /
+      # Category creation
+      def create
+        @resource = Integral::Category.new(resource_params)
+
+        if @resource.save
+          flash.now[:notice] = notification_message('creation_success')
+          render json: { redirect_url: request.referrer }, status: :created
+        else
+          render json: { message: notification_message('creation_failure') }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def resource_params
+        params.require(:category).permit(:title, :slug, :description, :image_id)
+      end
+
+      def resource_klass
+        Integral::Category
+      end
+    end
+  end
+end

data/app/controllers/integral/backend/images_controller.rb

@@ -2,74 +2,49 @@ module Integral
   module Backend
     # Images controller
     class ImagesController < BaseController
-      before_action :set_image, only: %i[edit update destroy show]
-      before_action :authorize_with_klass
-
-      # GET /
-      # Lists all images
-      def index
-        respond_to do |format|
-          format.html do
-            set_grid(Integral::Grids::ImagesGrid)
-          end
-
-          format.json do
-            if params[:gridview].present?
-              set_grid(Integral::Grids::ImagesGrid)
-              render json: { content: render_to_string(partial: 'integral/backend/images/grid', locals: { grid: @grid }) }
-            else
-              respond_to_record_selector(Integral::Image)
-            end
-          end
-        end
-      end
+      before_action :set_resource, except: %i[create index new list]
+      before_action :authorize_with_klass, except: %i[activities activity]
 
       # GET /new
       # Image creation form
       def new
         add_breadcrumb I18n.t('integral.navigation.new'), :new_backend_img_path
-        @image = Image.new
+        @resource = Image.new
       end
 
       # POST /
       # Image creation
       def create
-        @image = Image.new(image_params)
+        @resource = Image.new(resource_params)
 
         if remote_request?
-          if @image.save
+          if @resource.save
             flash.now[:notice] = notification_message('creation_success')
-            render json: @image.to_list_item, status: :created
+            render json: @resource.to_list_item, status: :created
           else
             flash.now[:error] = notification_message('creation_failure')
             head :unprocessable_entity
           end
-        elsif @image.save
-          respond_successfully(notification_message('creation_success'), edit_backend_img_path(@image))
+        elsif @resource.save
+          respond_successfully(notification_message('creation_success'), edit_backend_img_path(@resource))
         else
-          respond_failure(notification_message('creation_failure'), @image, :new)
+          respond_failure(notification_message('creation_failure'), :new)
         end
       end
 
-      # GET /:id/edit
-      # Image edit form
-      def edit
-        add_breadcrumb I18n.t('integral.navigation.edit'), :edit_backend_img_path
-      end
-
       # PUT /:id
       # Updating an image
       def update
-        if @image.update(image_params)
+        if @resource.update(resource_params)
           respond_successfully(notification_message('edit_success'), backend_img_index_path)
         else
-          respond_failure(notification_message('edit_failure'), @image, :edit)
+          respond_failure(notification_message('edit_failure'), :edit)
         end
       end
 
       # DELETE /:id
       def destroy
-        if @image.destroy
+        if @resource.destroy
           respond_successfully(notification_message('delete_success'), backend_img_index_path)
         else
           flash[:error] = notification_message('delete_failure')
@@ -79,29 +54,39 @@ module Integral
 
       private
 
-      def grid_options
-        default_grid_options = { 'order' => 'updated_at',
-                                 'page' => 1,
-                                 'descending' => true }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :title) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
+      def resource_klass
+        Integral::Image
       end
-      helper_method :grid_options
 
-      def remote_request?
-        params[:image][:remote].present?
+      def new_backend_resource_url
+        new_backend_img_url
       end
 
-      def authorize_with_klass
-        authorize Image
+      def activities_backend_resource_url(resource)
+        activities_backend_img_url(resource)
       end
 
-      def set_image
-        @image = Image.find(params[:id])
+      def list_backend_resources_url
+        list_backend_img_index_url
+      end
+
+      def backend_resources_url
+        backend_img_index_url
+      end
+
+      def backend_resource_url(resource)
+        backend_img_url(resource)
+      end
+
+      def edit_backend_resource_url(resource)
+        edit_backend_img_url(resource)
+      end
+
+      def remote_request?
+        params[:image][:remote].present?
       end
 
-      def image_params
+      def resource_params
         params.require(:image).permit(:title, :description, :file, :lock_version)
       end
 
@@ -110,8 +95,8 @@ module Integral
         add_breadcrumb I18n.t('integral.navigation.images'), :backend_img_index_path
       end
 
-      def notification_message(namespace_type)
-        super('images', namespace_type)
+      def white_listed_grid_params
+        %i[descending order page user action object title]
       end
     end
   end

data/app/controllers/integral/backend/lists_controller.rb

@@ -2,106 +2,33 @@ module Integral
   module Backend
     # List controller
     class ListsController < BaseController
-      before_action :set_list, only: %i[edit update destroy clone]
-      before_action :authorize_with_klass
-      before_action -> { set_grid(Integral::Grids::ListsGrid) }, only: [:index]
-
-      # GET /
-      # Lists all lists
-      def index
-        respond_to do |format|
-          format.html
-          format.json do
-            render json: { content: render_to_string(partial: 'integral/backend/lists/grid', locals: { grid: @grid }) }
-          end
-        end
-      end
-
-      # GET /new
-      # List creation form
-      def new
-        add_breadcrumb I18n.t('integral.breadcrumbs.new'), :new_backend_list_path
-        @list = List.new
-      end
-
-      # POST /
-      # List creation
-      def create
-        @list = List.new(list_params)
-
-        if @list.save
-          respond_successfully(notification_message('creation_success'), edit_backend_list_path(@list))
-        else
-          respond_failure(notification_message('creation_failure'), @list, :new)
-        end
-      end
-
-      # GET /:id/edit
-      # List edit form
-      def edit
-        @list = List.find(params[:id])
-
-        add_breadcrumb I18n.t('integral.breadcrumbs.edit'), :edit_backend_list_path
-      end
-
-      # GET /:id/clone
-      # Clone a list
-      def clone
-        title = params[:title].present? ? params[:title] : "#{@list.title} Copy"
-        title = "#{title} #{SecureRandom.hex[1..5]}" if Integral::List.find_by_title(title).present?
-
-        cloned_list = @list.dup(title)
-
-        if cloned_list.save
-          respond_successfully(notification_message('creation_success'), backend_list_path(cloned_list))
-        else
-          respond_failure(notification_message('creation_failure'), @list, :edit)
-        end
-      end
-
-      # PUT /:id
-      # Updating an list
-      def update
-        if @list.update(list_params)
-          respond_successfully(notification_message('edit_success'), edit_backend_list_path(@list))
-        else
-          respond_failure(notification_message('edit_failure'), @list, :edit)
-        end
-      end
-
-      # DELETE /:id
-      def destroy
-        if @list.destroy
-          respond_successfully(notification_message('delete_success'), backend_lists_path)
-        else
-          error_message = @list.errors.full_messages.to_sentence
-          flash[:error] = "#{notification_message('delete_failure')} - #{error_message}"
-          redirect_to backend_lists_path
+      before_action :set_resource, except: %i[create index new list]
+      before_action :authorize_with_klass, except: %i[activities activity]
+
+      # POST /:id/duplicate
+      # Duplicate a resource
+      def duplicate
+        super do |cloned_resource|
+          cloned_resource.title = "Copy #{@resource.title}"
         end
       end
 
       private
 
-      def grid_options
-        default_grid_options = { 'order' => 'updated_at',
-                                 'page' => 1,
-                                 'descending' => true }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :title) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
+      def white_listed_grid_params
+        %i[descending order page user action object title]
       end
-      helper_method :grid_options
 
-      def authorize_with_klass
-        authorize List
+      def resource_klass
+        Integral::List
       end
 
-      def set_list
-        @list = List.find(params[:id])
-        @list.list_items&.order(:priority)
+      def set_resource
+        @resource = List.find(params[:id])
+        @resource.list_items&.order(:priority)
       end
 
-      def list_params
+      def resource_params
         params.require(:list).permit(
           :title, :description, :html_id, :html_classes, :lock_version, :children, :list_item_limit,
           list_items_attributes: [
@@ -118,15 +45,6 @@ module Integral
           target priority description subtitle html_classes _destroy
         ]
       end
-
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.breadcrumbs.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.breadcrumbs.lists'), :backend_lists_path
-      end
-
-      def notification_message(namespace_type)
-        super('lists', namespace_type)
-      end
     end
   end
 end

data/app/controllers/integral/backend/notification_subscriptions_controller.rb

@@ -0,0 +1,23 @@
+module Integral
+  module Backend
+    class NotificationSubscriptionsController < BaseController
+      def update
+        subscription = current_user.own_notification_subscriptions.find_or_initialize_by(resource_params.except('state'))
+        subscription.state = resource_params['state']
+
+        if subscription.save
+          head :ok
+        else
+          head :unprocessable_entity
+        end
+      end
+
+      private
+
+      def resource_params
+        # Must be nicer way to do this, just want to switch out empty subscribable_id for nil
+        params[:subscription].permit(:state, :subscribable_type, :subscribable_id).to_h.inject({}) { |h, (k, v)| k == 'subscribable_id' && v =='' ? h[k] = nil : h[k] = v; h }
+      end
+    end
+  end
+end

data/app/controllers/integral/backend/pages_controller.rb

@@ -2,140 +2,38 @@ module Integral
   module Backend
     # Pages controller
     class PagesController < BaseController
-      before_action :set_page, only: %i[edit update destroy activities activity]
-      before_action :authorize_with_klass, only: %i[index new create edit update destroy]
-
-      # GET /
-      # Lists all pages
-      def index
-        respond_to do |format|
-          format.html do
-            set_grid(Integral::Grids::PagesGrid)
-          end
-
-          format.json do
-            if params[:gridview].present?
-              set_grid(Integral::Grids::PagesGrid)
-              render json: { content: render_to_string(partial: 'integral/backend/pages/grid', locals: { grid: @grid }) }
-            else
-              respond_to_record_selector(Integral::Page)
-            end
-          end
-        end
-      end
-
-      # GET /new
-      # Page creation form
-      def new
-        add_breadcrumb I18n.t('integral.navigation.new'), :new_backend_page_path
-        @page = Page.new
-      end
-
-      # POST /
-      # Page creation
-      def create
-        @page = Page.new(page_params)
-
-        if @page.save
-          respond_successfully(notification_message('creation_success'), edit_backend_page_path(@page))
-        else
-          respond_failure(notification_message('creation_failure'), @page, :new)
-        end
-      end
-
-      # GET /:id/edit
-      # Page edit form
-      def edit
-        # add_breadcrumb @page.title, backend_page_url(@page)
-        add_breadcrumb I18n.t('integral.navigation.edit'), :edit_backend_page_path
-      end
-
-      # PUT /:id
-      # Updating an page
-      def update
-        if @page.update(page_params)
-          respond_successfully(notification_message('edit_success'), edit_backend_page_path(@page))
-        else
-          respond_failure(notification_message('edit_failure'), @page, :edit)
-        end
-      end
-
-      # DELETE /:id
-      def destroy
-        if @page.destroy
-          respond_successfully(notification_message('delete_success'), backend_pages_path)
-        else
-          error_message = @page.errors.full_messages.to_sentence
-          flash[:error] = "#{notification_message('delete_failure')} - #{error_message}"
-          redirect_to backend_pages_path
+      before_action :authorize_with_klass, except: %i[activities activity]
+      before_action :set_resource, except: %i[create new index list]
+
+      # POST /:id/duplicate
+      # Duplicate a resource
+      def duplicate
+        super do |cloned_resource|
+          cloned_resource.title = "Copy #{@resource.title[0...Integral.title_length_maximum - 5]}"
+          cloned_resource.path += "-#{SecureRandom.hex[1..5]}"
         end
       end
 
-      # GET /:id/activities
-      def activities
-        respond_with_activities(:edit_backend_page_url)
-      end
-
-      # GET /:id/activities/:id
-      def activity
-        authorize Version
-
-        add_breadcrumb I18n.t('integral.navigation.activity'), :activities_backend_page_url
-        add_breadcrumb I18n.t('integral.actions.view')
-
-        @activity = PageVersion.find(params[:activity_id]).decorate
-      end
-
       # @return [BasePolicy] current authorization policy
       def current_policy
         return policy(@page) if @page
+
         policy(Integral::Page.new)
       end
       helper_method :current_policy
 
       private
 
-      def grid_options
-        default_grid_options = { 'order' => 'updated_at',
-                                 'page' => 1,
-                                 'descending' => true }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :title, :status) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
-      end
-      helper_method :grid_options
-
-      def activity_grid_options
-        default_grid_options = { 'order' => 'date',
-                                 'page' => 1,
-                                 'descending' => true,
-                                 'item_id' => @page&.id,
-                                 'object' => 'Integral::Page' }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :user, :action, :object) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
-      end
-      helper_method :activity_grid_options
-
-      def authorize_with_klass
-        authorize Page
-      end
-
-      def set_page
-        @page = Page.find(params[:id])
-      end
-
-      def page_params
+      def resource_params
         params.require(:page).permit(current_policy.permitted_attributes)
       end
 
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.navigation.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.navigation.pages'), :backend_pages_path
+      def white_listed_grid_params
+        %i[descending order page user action object title status]
       end
 
-      def notification_message(namespace_type)
-        super('pages', namespace_type)
+      def resource_klass
+        Integral::Page
       end
     end
   end