integral 1.4.0 → 1.5.0

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

@@ -29,45 +29,24 @@ module Integral
       # GET /:id
       # Show resource
       def show
-        add_breadcrumb I18n.t('integral.navigation.list'), "list_backend_#{controller_name}_path".to_sym
-        add_breadcrumb I18n.t('integral.actions.view'), "backend_#{controller_name.singularize}_path".to_sym
+        add_breadcrumb I18n.t('integral.navigation.list'), list_backend_resources_url
+        add_breadcrumb I18n.t('integral.actions.view')
       end
 
       # GET /
-      # Lists all resources
-      def index
-        # TODO: This default behaviour will switch to 'list' action
-
-        respond_to do |format|
-          format.html do
-            set_grid
-          end
-
-          format.json do
-            if params[:gridview].present?
-              set_grid
-              render json: { content: render_to_string(partial: "integral/backend/#{controller_name}/grid", locals: { grid: @grid }) }
-            else
-              respond_to_record_selector
-            end
-          end
-        end
-      end
+      # Resource dashboard
+      def index; end
 
       # GET /list
       # Lists all resources
       def list
-        add_breadcrumb I18n.t('integral.navigation.list'), "new_backend_#{controller_name.singularize}_path".to_sym
+        add_breadcrumb I18n.t('integral.navigation.list'), list_backend_resources_url
 
         respond_to do |format|
-          format.html do
-            set_grid
-          end
-
+          format.html
           format.json do
             if params[:gridview].present?
-              set_grid
-              render json: { content: render_to_string(partial: "integral/backend/#{controller_name}/grid", locals: { grid: @grid }) }
+              render json: { content: render_to_string(partial: "integral/backend/shared/grid/grid") }
             else
               respond_to_record_selector
             end
@@ -85,13 +64,13 @@ module Integral
       # POST /
       # Resource creation
       def create
-        add_breadcrumb I18n.t('integral.navigation.create'), "new_backend_#{controller_name.singularize}_path".to_sym
+        add_breadcrumb I18n.t('integral.navigation.create')
         @resource = resource_klass.new(resource_params)
 
         yield if block_given?
 
         if @resource.save
-          respond_successfully(notification_message('creation_success'), send("edit_backend_#{controller_name.singularize}_path", @resource.id))
+          respond_successfully(notification_message('creation_success'), edit_backend_resource_url(@resource))
         else
           respond_failure(notification_message('creation_failure'), :new)
         end
@@ -100,8 +79,8 @@ module Integral
       # GET /:id/edit
       # Resource edit screen
       def edit
-        add_breadcrumb I18n.t('integral.actions.view'), "backend_#{controller_name.singularize}_path".to_sym
-        add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
+        add_breadcrumb I18n.t('integral.actions.view'), backend_resource_url(@resource)
+        add_breadcrumb I18n.t('integral.actions.edit')
       end
 
       # PUT /:id
@@ -153,7 +132,7 @@ module Integral
       def activities
         authorize Version
 
-        add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
+        add_breadcrumb I18n.t('integral.actions.view'), backend_resource_url(@resource)
         add_breadcrumb I18n.t('integral.navigation.activity')
 
         @grid = Integral::Grids::ActivitiesGrid.new(activity_grid_options.except('page')) do |scope|
@@ -161,7 +140,7 @@ module Integral
         end
 
         respond_to do |format|
-          format.html { render template: 'integral/backend/activities/shared/index', locals: { form_url: send("activities_backend_#{controller_name.singularize}_url", @resource.id) } }
+          format.html { render template: 'integral/backend/activities/shared/index', locals: { form_url: activities_backend_resource_url(@resource) } }
           format.json { render json: { content: render_to_string(partial: 'integral/backend/activities/shared/grid', locals: { grid: @grid }) } }
         end
       end
@@ -170,7 +149,7 @@ module Integral
       def activity
         authorize Version
 
-        add_breadcrumb I18n.t('integral.navigation.activity'), "activities_backend_#{controller_name.singularize}_url".to_sym
+        add_breadcrumb I18n.t('integral.navigation.activity'), activities_backend_resource_url(@resource)
         add_breadcrumb I18n.t('integral.actions.view')
 
         @activity = resource_version_klass.find(params[:activity_id]).decorate
@@ -180,6 +159,13 @@ module Integral
 
       private
 
+      # Redirect user to integral dashboard after successful signup
+      def after_accept_path_for(user)
+        user.active!
+
+        integral.backend_dashboard_path
+      end
+
       # Redirect user to integral dashboard after successful login
       def after_sign_in_path_for(_resource)
         integral.backend_dashboard_path
@@ -246,17 +232,81 @@ module Integral
                default: I18n.t("integral.backend.notifications.#{type_namespace}", type: resource_klass.model_name.human))
       end
 
-      def set_grid
-        @grid = resource_grid_klass.new(grid_options.except('page')) do |scope|
+      helper_method :decorated_resource
+      def decorated_resource
+        @decorated_resource ||= @resource.decorate
+      end
+
+      helper_method :resource_grid
+      def resource_grid
+        @resource_grid ||= resource_grid_klass.new(grid_options.except('page')) do |scope|
           scope.page(grid_options['page']).per_page(25)
         end
       end
 
+      helper_method :resource_grid_columns
+      def resource_grid_columns
+        []
+      end
+
+      helper_method :render_default_action_bar?
+      def render_default_action_bar?
+        action_name == 'index' || action_name == 'show'
+      end
+
+      helper_method :new_backend_resource_url
+      def new_backend_resource_url
+        send("new_backend_#{resource_klass.model_name.singular_route_key}_url")
+      end
+
+      helper_method :list_backend_resources_url
+      def list_backend_resources_url
+        send("list_backend_#{resource_klass.model_name.route_key}_url")
+      end
+
+      helper_method :activities_backend_resource_url
+      def activities_backend_resource_url(resource)
+        send("activities_backend_#{controller_name.singularize}_url", resource.id)
+      end
+
+      helper_method :backend_resource_url
+      def backend_resource_url(resource)
+        send("backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :edit_backend_resource_url
+      def edit_backend_resource_url(resource)
+        send("edit_backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :duplicate_backend_resource_url
+      def duplicate_backend_resource_url(resource)
+        send("duplicate_backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :activities_backend_resource_url
+      def activities_backend_resource_url(resource)
+        send("activities_backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
       helper_method :resource_klass
       def resource_klass
         controller_name.classify.constantize
       end
 
+      helper_method :dataset_at_a_glance
+      def dataset_at_a_glance
+        if resource_klass.respond_to?(:statuses)
+          resource_klass.statuses.keys.map do |status|
+            { scope: resource_klass.send(status), label: t("integral.statuses.#{status}") }
+          end
+        else
+          [
+            { scope: resource_klass.all, label: "All #{resource_klass.model_name.human.pluralize}" }
+          ]
+        end
+      end
+
       helper_method :cast_activities
       def cast_activities(activites)
         activites.map do |version|

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

@@ -2,8 +2,8 @@ module Integral
   module Backend
     # Images controller
     class ImagesController < BaseController
-      before_action :authorize_with_klass
-      before_action :set_resource, only: %i[edit update destroy show activities activity]
+      before_action :set_resource, except: %i[create index new list]
+      before_action :authorize_with_klass, except: %i[activities activity]
 
       # GET /new
       # Image creation form
@@ -32,12 +32,6 @@ module Integral
         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
@@ -64,6 +58,30 @@ module Integral
         Integral::Image
       end
 
+      def new_backend_resource_url
+        new_backend_img_url
+      end
+
+      def activities_backend_resource_url(resource)
+        activities_backend_img_url(resource)
+      end
+
+      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

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

@@ -2,20 +2,8 @@ module Integral
   module Backend
     # List controller
     class ListsController < BaseController
-      before_action :set_resource, only: %i[edit update destroy duplicate]
-      before_action :authorize_with_klass
-      before_action -> { set_grid }, 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
+      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

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

@@ -22,10 +22,6 @@ module Integral
       end
       helper_method :current_policy
 
-      # GET /
-      # Page dashboard screen
-      def index; end
-
       private
 
       def resource_params

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

@@ -25,10 +25,6 @@ module Integral
         @resource.user = current_user
       end
 
-      # GET /
-      # Post dashboard screen
-      def index; end
-
       private
 
       def resource_params

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

@@ -43,6 +43,10 @@ module Integral
 
         params[:settings].permit(*permitted_settings_params)
       end
+
+      def render_default_action_bar?
+        false
+      end
     end
   end
 end

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

@@ -12,6 +12,12 @@ module Integral
 
       private
 
+      def dataset_at_a_glance
+        ActsAsIntegral.backend_at_a_glance_card_items.map do |item|
+          { scope: item, label: "Total #{item.model_name.human.pluralize}" }
+        end
+      end
+
       def set_breadcrumbs; end
     end
   end

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

@@ -2,28 +2,9 @@ module Integral
   module Backend
     # Users controller
     class UsersController < BaseController
-      before_action :set_resource, except: %i[create new index list]
-      before_action :authorize_with_klass, except: %i[activities activity show edit update]
+      before_action :set_resource, except: %i[create new index list account]
+      before_action :authorize_with_klass, except: %i[activities activity show edit update account notifications read_notification]
       before_action :authorize_with_instance, only: %i[show edit update]
-      before_action -> { set_grid }, only: [:index]
-
-      # GET /
-      # Lists all users
-      def index
-        respond_to do |format|
-          format.html
-          format.json do
-            render json: { content: render_to_string(partial: 'integral/backend/users/grid', locals: { grid: @grid }) }
-          end
-        end
-      end
-
-      # GET /:id
-      # Show specific user
-      #
-      def show
-        add_breadcrumb @resource.name, :backend_user_path
-      end
 
       # GET /:id/edit
       # Resource edit screen
@@ -34,7 +15,6 @@ module Integral
 
       # GET /account
       # Show specific users account page
-      #
       def account
         @resource = current_user
         add_breadcrumb @resource.name, :backend_account_path
@@ -67,8 +47,47 @@ module Integral
         end
       end
 
+      # GET /:id/notifications
+      def notifications
+        load_more_url = notifications_backend_user_url(current_user, page: current_page+1) if current_user.notifications.count > current_page * Notification::Notification.per_page
+        render json: { content: render_to_string(current_user.notifications.recent.page(current_page).decorate, cached: true), load_more_url: load_more_url }
+      end
+
+      # PUT /:id/read_notification
+      def read_notification
+        if current_user.notifications.find(params[:notification_id]).read!
+          head :ok
+        else
+          head :unprocessable_entity
+        end
+      end
+
+      # PUT /:id/block
+      # Block a user
+      def block
+        if @resource.blocked!
+          respond_successfully(notification_message('edit_success'), backend_user_path(@resource))
+        else
+          respond_failure(notification_message('edit_failure'), 'edit')
+        end
+      end
+
+      # PUT /:id/unblock
+      # Unblock a user
+      def unblock
+        if @resource.active!
+          respond_successfully(notification_message('edit_success'), backend_user_path(@resource))
+        else
+          respond_failure(notification_message('edit_failure'), 'edit')
+        end
+      end
+
       private
 
+      def current_page
+        params[:page].to_i
+      end
+
       def white_listed_grid_params
         %i[descending order page user action object name status]
       end
@@ -79,10 +98,10 @@ module Integral
 
       def resource_params
         unless params[:user][:password].present?
-          return params.require(:user).permit(:name, :email, :avatar, :locale, role_ids: [])
+          return params.require(:user).permit(:name, :email, :avatar, :locale, :notify_me, role_ids: [])
         end
 
-        params.require(:user).permit(:name, :email, :avatar, :locale, :password, :password_confirmation, role_ids: [])
+        params.require(:user).permit(:name, :email, :avatar, :locale, :notify_me, :password, :password_confirmation, role_ids: [])
       end
 
       def authorize_with_instance