decidim-admin 0.13.1 → 0.14.1

data/app/assets/javascripts/decidim/admin/draggable-list.js.es6

@@ -0,0 +1,30 @@
+((exports) => {
+  const { createSortList } = exports.DecidimAdmin;
+
+  const createSortableList = (lists) => {
+    createSortList(lists, {
+      handle: "li",
+      forcePlaceholderSize: true,
+      connectWith: ".js-connect"
+    })
+  };
+
+  // Once in DOM
+  $(() => {
+    const $draggables = $(".draggable-list")
+    let draggablesClassNames = []
+    $draggables.each((index, elem) => {
+      draggablesClassNames = [...draggablesClassNames, `.${elem.className.split(" ").filter((name) => (/js-list.*/).test(name))[0]}`]
+    })
+
+    document.addEventListener("drag", function (event) {
+      $draggables.not(event.target.parentElement).addClass("dragging")
+    })
+
+    document.addEventListener("dragend", function() {
+      $draggables.removeClass("dragging")
+    })
+
+    createSortableList(draggablesClassNames.join(", "))
+  })
+})(window)

data/app/assets/stylesheets/decidim/admin/components/_autocomplete_select.component.scss

@@ -11,3 +11,9 @@
     }
   }
 }
+
+.autocomplete-field--results-inline{
+  .Select-menu-outer{
+    position: relative;
+  }
+}

data/app/assets/stylesheets/decidim/admin/extra/_action-icon.scss

@@ -4,5 +4,10 @@
       color: rgba($muted, .3);
       vertical-align: bottom;
     }
+
+    &.action-icon--highlighted{
+      color: $warning-color;
+      vertical-align: bottom;
+    }
   }
 }

data/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss

@@ -18,6 +18,10 @@
     position: initial;
   }
 
+  .is-dropdown-submenu{
+    z-index: 2;
+  }
+
   .user-login{
     vertical-align: middle;
     position: initial;

data/app/assets/stylesheets/decidim/admin/modules/_card-grid.scss

@@ -0,0 +1,25 @@
+$card-grid-margin-bottom: map-get($grid-column-gutter, medium);
+
+.card-grid{
+  display: flex;
+  flex-wrap: wrap;
+
+  &::before{
+    width: 0; //fixes a flexbox bug in Safari with the clearfix element
+  }
+
+  .column{
+    margin-bottom: $card-grid-margin-bottom;
+  }
+
+  .card{
+    margin-bottom: 0;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
+  .card__content{
+    flex-grow: 1;
+  }
+}

data/app/assets/stylesheets/decidim/admin/modules/_draggable-list.scss

@@ -0,0 +1,27 @@
+.draggable-list{
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+  min-height: ($global-padding * 2) + $global-lineheight;
+
+  &.dragging{
+    border-top: 2px dashed $medium-gray;
+    border-bottom: 2px dashed $medium-gray;
+    background-color: $body-background;
+  }
+
+  li{
+    cursor: move;
+    padding: $global-padding / 2 0;
+  }
+
+  .draggable-content{
+    @include flex;
+    @include flex-align(justify, middle);
+
+    font-weight: $global-weight-bold;
+    border: $border;
+    background-color: $light-gray;
+    padding: $global-padding / 2 $global-padding;
+  }
+}

data/app/assets/stylesheets/decidim/admin/modules/_forms.scss

@@ -63,13 +63,20 @@ textarea{
   justify-content: center;
 }
 
-.check-radio{
+.check-radio,
+.check-radio-collection{
   label{
     font-weight: normal;
     display: inline-flex;
     align-items: center;
   }
 
+  legend{
+    font-weight: 600;
+  }
+}
+
+.check-radio{
   input{
     margin-bottom: 0;
   }

data/app/assets/stylesheets/decidim/admin/modules/_modules.scss

@@ -18,6 +18,7 @@
 //Contents
 @import "callouts";
 @import "cards";
+@import "card-grid";
 @import "table-list";
 @import "action-icon";
 @import "char-counter";
@@ -26,3 +27,10 @@
 @import "filters";
 @import "dropdown";
 @import "agenda";
+@import "draggable-list";
+
+// mentions__container
+@import "decidim/modules/tags";
+@import "decidim/modules/input-tags";
+@import "decidim/modules/input-mentions";
+@import "decidim/modules/input-hashtags";

data/app/assets/stylesheets/decidim/admin/utils/_mixins.scss

@@ -36,6 +36,7 @@ $palette: $foundation-palette;
 }
 
 // helpers
+$margin-xs: .5rem;
 $margin-s: 1rem;
 $margin-sm: 2rem;
 $margin-m: 3rem;
@@ -43,6 +44,7 @@ $margin-l: 5rem;
 
 $size:(
   none: 0,
+  xs: $margin-xs,
   s: $margin-s,
   sm: $margin-sm,
   m: $margin-m,

data/app/cells/decidim/admin/content_block/show.erb

@@ -0,0 +1,13 @@
+<li draggable="true" data-content-block-manifest-name="<%= manifest_name %>">
+  <div class="draggable-content">
+    <%= t(public_name_key) %>
+    <div>
+      <% if has_settings? %>
+        <%= link_to decidim_admin.edit_organization_homepage_content_block_path(manifest_name), class: "mr-s text-muted" do %>
+          <%= icon "pencil" %>
+        <% end %>
+      <% end %>
+      <%= icon "menu" %>
+    </div>
+  </div>
+</li>

data/app/cells/decidim/admin/content_block_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ContentBlockCell < Decidim::ViewModel
+      include Decidim::IconHelper
+
+      delegate :public_name_key, :has_settings?, to: :model
+
+      def manifest_name
+        model.try(:manifest_name) || model.name
+      end
+
+      def decidim_admin
+        Decidim::Admin::Engine.routes.url_helpers
+      end
+    end
+  end
+end

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

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command that reorders a collection of content blocks. It also creates
+    # the ones that might be missing.
+    class ReorderContentBlocks < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # organization - the Organization where the content blocks reside
+      # scope - the scope applied to the content blocks
+      # order - an Array holding the order of IDs of published content blocks.
+      def initialize(organization, scope, order)
+        @organization = organization
+        @scope = scope
+        @order = order
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the data wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if order.blank?
+
+        reorder_steps
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :organization, :scope
+
+      def reorder_steps
+        transaction do
+          reset_weights
+          collection.reload
+          set_new_weights
+          unpublish_removed_content_blocks
+          publish_appearing_content_blocks
+        end
+      end
+
+      def reset_weights
+        # rubocop:disable Rails/SkipsModelValidations
+        collection.where.not(weight: nil).update_all(weight: nil)
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+
+      def set_new_weights
+        data = order.each_with_index.inject({}) do |hash, (manifest_name, index)|
+          hash.update(manifest_name => index + 1)
+        end
+
+        data.each do |manifest_name, weight|
+          content_block = collection.find { |block| block.manifest_name == manifest_name }
+          if content_block.present?
+            content_block.update!(weight: weight)
+          else
+            create_content_block(manifest_name, weight)
+          end
+        end
+      end
+
+      # rubocop:disable Rails/SkipsModelValidations
+      def unpublish_removed_content_blocks
+        collection.where(weight: nil).update_all(published_at: nil)
+      end
+
+      def publish_appearing_content_blocks
+        collection.where(published_at: nil).where.not(weight: nil).update_all(published_at: Time.current)
+      end
+      # rubocop:enable Rails/SkipsModelValidations
+
+      def create_content_block(manifest_name, weight)
+        Decidim::ContentBlock.create!(
+          organization: organization,
+          scope: scope,
+          weight: weight,
+          manifest_name: manifest_name
+        )
+      end
+
+      def order
+        return nil unless @order.is_a?(Array) && @order.present?
+
+        @order
+      end
+
+      def collection
+        @collection ||= Decidim::ContentBlock.for_scope(scope, organization: organization)
+      end
+    end
+  end
+end

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

@@ -5,22 +5,22 @@ module Decidim
     # This command gets called when permissions for a component are updated
     # in the admin panel.
     class UpdateComponentPermissions < Rectify::Command
-      attr_reader :form, :component
-
       # Public: Initializes the command.
       #
       # form    - The form from which the data in this component comes from.
       # component - The component to update.
-      def initialize(form, component)
+      # resource - The resource to update.
+      def initialize(form, component, resource)
         @form = form
         @component = component
+        @resource = resource
       end
 
       # Public: Sets the permissions for a component.
       #
       # Broadcasts :ok if created, :invalid otherwise.
       def call
-        return broadcast(:invalid) unless @form.valid?
+        return broadcast(:invalid) unless form.valid?
 
         transaction do
           update_permissions
@@ -32,9 +32,11 @@ module Decidim
 
       private
 
+      attr_reader :form, :component, :resource
+
       def configured_permissions
-        @form.permissions.select do |_action, permission|
-          permission.authorization_handler_name.present?
+        form.permissions.select do |action, permission|
+          permission.authorization_handler_name.present? || overriding_component_permissions?(action)
         end
       end
 
@@ -45,16 +47,34 @@ module Decidim
             "options" => value.options
           }
 
-          result.update(key => serialized)
+          result.update(key => value.authorization_handler_name.present? ? serialized : {})
         end
 
-        @component.update!(
-          permissions: permissions
-        )
+        if resource
+          resource_permissions.update!(permissions: different_from_component_permissions(permissions))
+        else
+          component.update!(permissions: permissions)
+        end
       end
 
       def run_hooks
-        @component.manifest.run_hooks(:permission_update, @component)
+        component.manifest.run_hooks(:permission_update, component: component, resource: resource)
+      end
+
+      def resource_permissions
+        @resource_permissions ||= resource.resource_permission || resource.build_resource_permission
+      end
+
+      def different_from_component_permissions(permissions)
+        return permissions unless component.permissions
+
+        permissions.deep_stringify_keys.reject do |action, config|
+          HashDiff.diff(config, component.permissions[action]).empty?
+        end
+      end
+
+      def overriding_component_permissions?(action)
+        resource && component&.permissions&.fetch(action, nil)
       end
     end
   end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This command gets called when a content block is updated from the admin
+    # panel.
+    class UpdateContentBlock < Rectify::Command
+      attr_reader :form, :content_block, :scope
+
+      # Public: Initializes the command.
+      #
+      # form    - The form from which the data in this component comes from.
+      # component - The component to update.
+      # scope - the scope where the content block belongs to.
+      def initialize(form, content_block, scope)
+        @form = form
+        @content_block = content_block
+        @scope = scope
+      end
+
+      # Public: Updates the content block settings and its attachments.
+      #
+      # Broadcasts :ok if created, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          update_content_block_settings
+          update_content_block_images
+          content_block.save!
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      def update_content_block_settings
+        content_block.settings = form.settings
+      end
+
+      def update_content_block_images
+        content_block.manifest.images.each do |image_config|
+          image_name = image_config[:name]
+
+          if form.images["remove_#{image_name}".to_sym]
+            content_block.images_container.send("remove_#{image_name}=", true)
+          elsif form.images[image_name]
+            content_block.images_container.send("#{image_name}=", form.images[image_name])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -59,9 +59,6 @@ module Decidim
           cta_button_path: form.cta_button_path,
           cta_button_text: form.cta_button_text,
           description: form.description,
-          welcome_text: form.welcome_text,
-          homepage_image: form.homepage_image,
-          remove_homepage_image: form.remove_homepage_image,
           logo: form.logo,
           remove_logo: form.remove_logo,
           favicon: form.favicon,

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

@@ -5,7 +5,11 @@ module Decidim
     # Controller that allows managing component permissions.
     #
     class ComponentPermissionsController < Decidim::Admin::ApplicationController
-      helper_method :authorizations, :other_authorizations_for, :component
+      include Decidim::ComponentPathHelper
+
+      helper Decidim::ResourceHelper
+
+      helper_method :authorizations, :other_authorizations_for, :component, :resource_params, :resource
 
       def edit
         enforce_permission_to :update, :component, component: component
@@ -18,10 +22,10 @@ module Decidim
         enforce_permission_to :update, :component, component: component
         @permissions_form = PermissionsForm.from_params(params)
 
-        UpdateComponentPermissions.call(@permissions_form, component) do
+        UpdateComponentPermissions.call(@permissions_form, component, resource) do
           on(:ok) do
             flash[:notice] = t("component_permissions.update.success", scope: "decidim.admin")
-            redirect_to components_path(current_participatory_space)
+            redirect_to return_path
           end
 
           on(:invalid) do
@@ -32,8 +36,20 @@ module Decidim
 
       private
 
+      def return_path
+        if resource
+          manage_component_path(component)
+        else
+          components_path(current_participatory_space)
+        end
+      end
+
+      def resource_params
+        params.permit(:resource_id, :resource_name).to_h.symbolize_keys
+      end
+
       def permission_forms
-        component.manifest.actions.inject({}) do |result, action|
+        actions.inject({}) do |result, action|
           form = PermissionForm.new(
             authorization_handler_name: authorization_for(action),
             options: permissions.dig(action, "options")
@@ -43,6 +59,10 @@ module Decidim
         end
       end
 
+      def actions
+        @actions ||= (resource&.resource_manifest || component.manifest).actions
+      end
+
       def authorizations
         Verifications::Adapter.from_collection(
           current_organization.available_authorizations
@@ -55,12 +75,19 @@ module Decidim
         )
       end
 
+      def resource
+        @resource ||= if params[:resource_id] && params[:resource_name]
+                        res = Decidim.find_resource_manifest(params[:resource_name])&.resource_scope(component)&.find_by(id: params[:resource_id])
+                        res if res&.allow_resource_permissions?
+                      end
+      end
+
       def component
         @component ||= current_participatory_space.components.find(params[:component_id])
       end
 
       def permissions
-        @permissions ||= component.permissions || {}
+        @permissions ||= (component.permissions || {}).merge(resource&.permissions || {})
       end
 
       def authorization_for(action)

data/app/controllers/decidim/admin/components/base_controller.rb

@@ -15,6 +15,7 @@ module Decidim
         helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
         helper Decidim::Admin::BulkActionsHelper
+        helper Decidim::Admin::ResourcePermissionsHelper
 
         helper_method :current_component,
                       :current_participatory_space,
@@ -53,7 +54,7 @@ module Decidim
         end
 
         def parent_path
-          @parent_path ||= EngineRouter.admin_proxy(current_participatory_space).components_path
+          @parent_path ||= ::Decidim::EngineRouter.admin_proxy(current_participatory_space).components_path
         end
       end
     end

data/app/controllers/decidim/admin/concerns/has_attachment_collections.rb

@@ -100,14 +100,6 @@ module Decidim
             raise NotImplementedError
           end
 
-          # Public: The Class or Object to be used with the authorization layer to
-          # verify the user can manage the attachment collection
-          #
-          # By default is the same as the collection_for.
-          def authorization_object
-            collection_for
-          end
-
           def collection
             @collection ||= collection_for.attachment_collections
           end

data/app/controllers/decidim/admin/concerns/has_private_users.rb

@@ -13,7 +13,8 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          helper_method :privatable_to, :authorization_object, :collection
+          helper PaginateHelper
+          helper_method :privatable_to, :collection
 
           def index
             enforce_permission_to :read, :space_private_user
@@ -84,16 +85,11 @@ module Decidim
             raise NotImplementedError
           end
 
-          # Public: The Class or Object to be used with the authorization layer to
-          # verify the user can manage the private users
-          #
-          # By default is the same as the privatable_to.
-          def authorization_object
-            privatable_to
-          end
-
           def collection
-            @collection ||= privatable_to.participatory_space_private_users
+            @collection ||= privatable_to
+                            .participatory_space_private_users
+                            .page(params[:page])
+                            .per(20)
           end
         end
       end

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

@@ -80,6 +80,7 @@ module Decidim
           managed: true,
           name: params.dig(:impersonate_user, :name)
         ) do |u|
+          u.nickname = User.nicknamize(u.name, organization: current_organization)
           u.admin = false
           u.tos_agreement = true
         end

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

@@ -8,6 +8,7 @@ module Decidim
       layout "decidim/admin/users"
 
       helper_method :user
+      helper Decidim::Messaging::ConversationHelper
 
       def index
         enforce_permission_to :read, :officialization

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing the organization homepage content blocks
+    class OrganizationHomepageContentBlocksController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/settings"
+
+      helper_method :content_block
+
+      def edit
+        enforce_permission_to :update, :organization, organization: current_organization
+        @form = form(ContentBlockForm).from_model(content_block)
+      end
+
+      def update
+        enforce_permission_to :update, :organization, organization: current_organization
+        @form = form(ContentBlockForm).from_params(params)
+
+        UpdateContentBlock.call(@form, content_block, :homepage) do
+          on(:ok) do
+            redirect_to edit_organization_homepage_path
+          end
+          on(:invalid) do
+            render :edit
+          end
+        end
+      end
+
+      private
+
+      def content_block
+        @content_block ||= content_blocks.find_by(manifest_name: params[:id]) ||
+                           content_block_from_manifest
+      end
+
+      def content_block_manifest
+        @content_block_manifest = unused_content_block_manifests.find { |manifest| manifest.name.to_s == params[:id] }
+      end
+
+      def content_blocks
+        @content_blocks ||= Decidim::ContentBlock.for_scope(:homepage, organization: current_organization)
+      end
+
+      def used_content_block_manifests
+        @used_content_block_manifests ||= content_blocks.map(&:manifest_name)
+      end
+
+      def unused_content_block_manifests
+        @unused_content_block_manifests ||= Decidim.content_blocks.for(:homepage).reject do |manifest|
+          used_content_block_manifests.include?(manifest.name.to_s)
+        end
+      end
+
+      def content_block_from_manifest
+        Decidim::ContentBlock.create!(
+          organization: current_organization,
+          scope: :homepage,
+          manifest_name: params[:id]
+        )
+      end
+    end
+  end
+end