decidim-admin 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae578c5b5087d3e005a7216cd75b4231041c2572
-  data.tar.gz: 43e84e9529896d1a143e33fa1f0d3bb436586cab
+  metadata.gz: 453c1956a164da5d0e33cb0bb83bf80b5e98af5b
+  data.tar.gz: 392bb84e1a55a2ff9091b7d31787df52c31b867c
 SHA512:
-  metadata.gz: 2c505c94e7f607153ce8f8db38e319886393abd5c3460eab9bf111de20f025a78bdd545bbfe8e3d9688c891de4e6f86dd73646379d9b7cee36721a5d8b22ce3b
-  data.tar.gz: 4404856289d63a285fc84ba7f7c7f964d44df6909f726a2081728e0c345c57218e0ee0fd373fd113febc3d7cd244bbbe5c7b15ddfa59f67c28457641883f3733
+  metadata.gz: b4de3b16e2c4cdb283bbd914af8302b1a1802b2a6823a9b3e741ed2feb2dca233d44d6dee6a59c84bb68ffc7f9d35ff316f450e5bc01409826bc27d5f0795ba4
+  data.tar.gz: d8c631dc2ae0a6138e5b40e11ce79b32eae1daf4a5ad1d2df456dac2ab7410db255e930e5cb3901e1ed256c442da3c8b9b55953f7f03038f7b2b0b03d5761994

data/README.md

@@ -1,6 +1,6 @@
 # Decidim::Admin
 
-This library adds and administration dashboard so users can manage their
+This library adds an administration dashboard so users can manage their
 organization, participatory processes and all other entities.
 
 ## Usage

data/app/assets/stylesheets/decidim/admin/_sidebar.scss

@@ -60,6 +60,7 @@
 
   .session-box {
     padding: $global-padding 0;
+    border-bottom: 1px solid black;
 
     @include grid-row;
 
@@ -69,5 +70,33 @@
       overflow: hidden;
     }
     .sign-out{ @include grid-column(4); }
+
   }
-}
+}
+
+.dropdown > li > a{
+  padding-left: 0;
+}
+.dropdown{
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.is-dropdown-submenu{
+  z-index: 2;
+  text-align: left;
+  background: lighten($black, 5) !important;
+  border: none !important;
+  box-shadow: 0 3px 5px rgba(0, 0, 0, .3) !important;;
+  min-width: 250px !important;
+  a{
+    color: $light-gray;
+    padding: .5rem;
+  }
+  a:hover{
+    color: lighten($light-gray, 20);
+  }
+  li:hover{
+    background: lighten($black, 10);
+  }
+}

data/app/assets/stylesheets/decidim/admin/_tables.scss

@@ -2,6 +2,9 @@ table{
   td.actions, th.actions{
     text-align: right;
   }
+  td.center, th.center{
+    text-align: center;
+  }
 }
 
 tbody.sortable tr {

data/app/assets/stylesheets/decidim/admin/application.scss

@@ -11,6 +11,9 @@
 @import "decidim/editor";
 @import "decidim/utils/fontface";
 
+@import "foundation";
+@include foundation-everything;
+
 body {
   font-family: 'Source Sans Pro', sans-serif;
 }

data/app/commands/decidim/admin/create_participatory_process.rb

@@ -46,7 +46,10 @@ module Decidim
             hero_image: form.hero_image,
             banner_image: form.banner_image,
             promoted: form.promoted,
-            organization: form.current_organization
+            meta_scope: form.meta_scope,
+            scope: form.scope,
+            organization: form.current_organization,
+            participatory_process_group: form.participatory_process_group
           )
 
           return process unless process.valid?

data/app/commands/decidim/admin/create_participatory_process_admin.rb

@@ -9,8 +9,9 @@ module Decidim
       # form - A form object with the params.
       # participatory_process - The ParticipatoryProcess that will hold the
       #   user role
-      def initialize(form, participatory_process)
+      def initialize(form, current_user, participatory_process)
         @form = form
+        @current_user = current_user
         @participatory_process = participatory_process
       end
 
@@ -24,7 +25,7 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
         return broadcast(:invalid) unless user
 
-        create_participatory_process_admin
+        create_role
         broadcast(:ok)
       rescue ActiveRecord::RecordInvalid
         form.errors.add(:email, :taken)
@@ -33,21 +34,39 @@ module Decidim
 
       private
 
-      attr_reader :form, :participatory_process
+      attr_reader :form, :participatory_process, :current_user
 
-      def create_participatory_process_admin
+      def create_role
         ParticipatoryProcessUserRole.create!(
-          role: :admin,
+          role: form.role.to_sym,
           user: user,
           participatory_process: @participatory_process
         )
       end
 
       def user
-        User.where(
+        @user ||= User.where(
           email: form.email,
           organization: participatory_process.organization
-        ).first
+        ).first || InviteUser.call(user_form) do
+          on(:ok) do |user|
+            return user
+          end
+        end
+      end
+
+      def user_form
+        OpenStruct.new(name: form.name,
+                       email: form.email.downcase,
+                       organization: participatory_process.organization,
+                       roles: [form.role.to_sym],
+                       invited_by: current_user,
+                       invitation_instructions: invitation_instructions)
+      end
+
+      def invitation_instructions
+        return "invite_admin" if form.role == "admin"
+        "invite_collaborator"
       end
     end
   end

data/app/commands/decidim/admin/create_participatory_process_group.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when creating a new participatory
+    # process group in the system.
+    class CreateParticipatoryProcessGroup < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - A form object with the params.
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+        group = create_participatory_process_group
+
+        if group.persisted?
+          broadcast(:ok, group)
+        else
+          form.errors.add(:hero_image, group.errors[:hero_image]) if group.errors.include? :hero_image
+          form.errors.add(:banner_image, group.errors[:banner_image]) if group.errors.include? :banner_image
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      attr_reader :form
+
+      def create_participatory_process_group
+        transaction do
+          group = ParticipatoryProcessGroup.create(
+            name: form.name,
+            description: form.description,
+            hero_image: form.hero_image,
+            participatory_processes: participatory_processes,
+            organization: form.current_organization
+          )
+        end
+      end
+
+      def participatory_processes
+        Decidim::ParticipatoryProcess.where(id: form.participatory_process_ids)
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/create_participatory_process_step.rb

@@ -35,7 +35,6 @@ module Decidim
         ParticipatoryProcessStep.create!(
           title: form.title,
           description: form.description,
-          short_description: form.short_description,
           start_date: form.start_date,
           end_date: form.end_date,
           participatory_process: @participatory_process

data/app/commands/decidim/admin/destroy_participatory_process_step.rb

@@ -29,8 +29,10 @@ module Decidim
       private
 
       def reorder_steps
+        steps = @participatory_process.steps.reload
+
         ReorderParticipatoryProcessSteps
-          .new(@participatory_process.steps, @participatory_process.steps.map(&:id))
+          .new(steps, steps.map(&:id))
           .call
       end
     end

data/app/commands/decidim/admin/hide_resource.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when a user hides a resource.
+    class HideResource < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # reportable - A Decidim::Reportable
+      def initialize(reportable)
+        @reportable = reportable
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the resource.
+      # - :invalid if the resource is already hidden
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless hideable?
+
+        hide!
+        broadcast(:ok, @reportable)
+      end
+
+      private
+
+      def hideable?
+        !@reportable.hidden? && @reportable.reported?
+      end
+
+      def hide!
+        @reportable.moderation.update_attributes!(hidden_at: Time.current)
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/reorder_participatory_process_steps.rb

@@ -36,6 +36,7 @@ module Decidim
 
         ParticipatoryProcessStep.transaction do
           collection.update_all(position: nil)
+          collection.reload
           collection.update(data.keys, data.values)
         end
       end

data/app/commands/decidim/admin/unreport_resource.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when a user unreports a resource.
+    class UnreportResource < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # reportable - A Decidim::Reportable
+      def initialize(reportable)
+        @reportable = reportable
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the resource.
+      # - :invalid if the resource is not reported
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @reportable.reported?
+
+        unreport!
+        broadcast(:ok, @reportable)
+      end
+
+      private
+
+      def unreport!
+        @reportable.moderation.update_attributes!(report_count: 0, hidden_at: nil)
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/update_participatory_process.rb

@@ -58,8 +58,10 @@ module Decidim
           target: form.target,
           participatory_scope: form.participatory_scope,
           participatory_structure: form.participatory_structure,
-          end_date: form.end_date
-        }.compact
+          meta_scope: form.meta_scope,
+          end_date: form.end_date,
+          participatory_process_group: form.participatory_process_group
+        }
       end
     end
   end

data/app/commands/decidim/admin/update_participatory_process_group.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when creating a new participatory
+    # process group in the system.
+    class UpdateParticipatoryProcessGroup < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # participatory_process_group - the ParticipatoryProcessGroup to update
+      # form - A form object with the params.
+      def initialize(participatory_process_group, form)
+        @participatory_process_group = participatory_process_group
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+        update_participatory_process_group
+
+        if @participatory_process_group.valid?
+          broadcast(:ok, @participatory_process_group)
+        else
+          form.errors.add(:hero_image, @participatory_process_group.errors[:hero_image]) if @participatory_process_group.errors.include? :hero_image
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      attr_reader :form
+
+      def update_participatory_process_group
+        @participatory_process_group.assign_attributes(attributes)
+        @participatory_process_group.save! if @participatory_process_group.valid?
+      end
+
+      def attributes
+        {
+          name: form.name,
+          hero_image: form.hero_image,
+          description: form.description,
+          participatory_processes: participatory_processes
+        }
+      end
+
+      def participatory_processes
+        Decidim::ParticipatoryProcess.where(id: form.participatory_process_ids)
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/update_participatory_process_step.rb

@@ -40,8 +40,7 @@ module Decidim
           title: form.title,
           start_date: form.start_date,
           end_date: form.end_date,
-          description: form.description,
-          short_description: form.short_description
+          description: form.description
         }
       end
     end

data/app/controllers/decidim/admin/application_controller.rb

@@ -7,7 +7,11 @@ module Decidim
       include NeedsAuthorization
       include FormFactory
       include LocaleSwitcher
+      include PayloadInfo
       helper Decidim::DecidimFormHelper
+      helper Decidim::ReplaceButtonsHelper
+      helper Decidim::OrganizationScopesHelper
+      helper Decidim::TranslationsHelper
 
       helper Decidim::LanguageChooserHelper
 

data/app/controllers/decidim/admin/categories_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing categories.
     #
     class CategoriesController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin

data/app/controllers/decidim/admin/feature_permissions_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing feature permissions.
     #
     class FeaturePermissionsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
@@ -48,7 +48,7 @@ module Decidim
       end
 
       def authorizations
-        Decidim.authorization_handlers.map(&:handler_name)
+        current_organization.available_authorizations.map(&:constantize).map(&:handler_name)
       end
 
       def feature