decidim-assemblies 0.27.4 → 0.28.0.rc5

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -7,7 +7,6 @@ module Decidim
       include Decidim::ResourceHelper
       include Decidim::AttachmentsHelper
       include Decidim::IconHelper
-      include Decidim::WidgetUrlsHelper
       include Decidim::SanitizeHelper
       include Decidim::ResourceReferenceHelper
       include Decidim::FiltersHelper
@@ -15,10 +14,11 @@ module Decidim
 
       # Public: Returns the characteristics of an assembly in a readable format like
       # "title: close, no public, no transparent and is restricted to the members of the assembly"
+      # deprecated
       def participatory_processes_for_assembly(assembly_participatory_processes)
         html = ""
         html += %( <div class="section"> ).html_safe
-        html += %( <h4 class="section-heading">#{t("assemblies.show.related_participatory_processes", scope: "decidim")}</h4> ).html_safe
+        html += %( <h4>#{t("assemblies.show.related_participatory_processes", scope: "decidim")}</h4> ).html_safe
         html += %( <div class="row small-up-1 medium-up-2 card-grid"> ).html_safe
         assembly_participatory_processes.each do |assembly_participatory_process|
           html += render partial: "decidim/participatory_processes/participatory_process", locals: { participatory_process: assembly_participatory_process }
@@ -38,24 +38,26 @@ module Decidim
         html.html_safe
       end
 
-      def social_handler_links(assembly)
-        html = "".html_safe
-        if Decidim::Assembly::SOCIAL_HANDLERS.any? { |h| assembly.try("#{h}_handler").present? }
-          html += "<div class='definition-data__item social_networks'>".html_safe
-          html += "<span class='definition-data__title'>#{t("assemblies.show.social_networks", scope: "decidim")}</span>".html_safe
-          Decidim::Assembly::SOCIAL_HANDLERS.each do |handler|
-            handler_name = "#{handler}_handler"
-            next if assembly.send(handler_name).blank?
+      # Items to display in the navigation of an assembly
+      def assembly_nav_items(participatory_space)
+        components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
 
-            html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}",
-                            target: "_blank",
-                            class: "",
-                            title: t("assemblies.show.social_networks_title", scope: "decidim") << " " << handler.capitalize.to_s, rel: "noopener"
-          end
-          html += "</div>".html_safe
+        [
+          *(if participatory_space.members.not_ceased.any?
+              [{
+                name: t("assembly_member_menu_item", scope: "layouts.decidim.assembly_navigation"),
+                url: decidim_assemblies.assembly_assembly_members_path(participatory_space),
+                active: is_active_link?(decidim_assemblies.assembly_assembly_members_path(participatory_space), :inclusive)
+              }]
+            end
+           )
+        ] + components.map do |component|
+          {
+            name: translated_attribute(component.name),
+            url: main_component_path(component),
+            active: is_active_link?(main_component_path(component), :inclusive)
+          }
         end
-
-        html.html_safe
       end
     end
   end

data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb

@@ -2,44 +2,29 @@
 
 module Decidim
   module Assemblies
-    # Helpers related to the Assemblies filter by type.
-    #
-    # `filter` returns a Filter object from Decidim::FilterResource
+    # Helpers related to the Assemblies filters.
     module FilterAssembliesHelper
-      def available_filters
-        return if organization_assembly_types.blank?
+      include Decidim::CheckBoxesTreeHelper
 
-        [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
+      def assembly_types
+        @assembly_types ||= AssembliesType.where(organization: current_organization).joins(:assemblies).distinct
       end
 
-      def filter_link(type_id)
-        Decidim::Assemblies::Engine
-          .routes
-          .url_helpers
-          .assemblies_path(
-            filter: {
-              with_scope: filter.with_scope,
-              with_area: filter.with_area,
-              type_id_eq: type_id
-            }
-          )
-      end
-
-      def help_text
-        t("help", scope: "decidim.assemblies.filter")
-      end
+      def filter_types_values
+        return if assembly_types.blank?
 
-      def current_filter_name
-        type = AssembliesType.find_by(id: filter_params[:type_id_eq])
-        return translated_attribute type.title if type
+        type_values = assembly_types.map { |type| [type.id.to_s, translated_attribute(type.title)] }
+        type_values.prepend(["", t("decidim.assemblies.assemblies.filters.names.all")])
 
-        t("all", scope: "decidim.assemblies.filter")
+        filter_tree_from_array(type_values)
       end
 
-      def organization_assembly_types
-        @organization_assembly_types ||= AssembliesType.where(organization: current_organization).joins(:assemblies).where(
-          decidim_assemblies: { id: search.result.unscope(where: :decidim_assemblies_type_id).parent_assemblies }
-        ).distinct&.map { |type| [translated_attribute(type.title), type.id] }
+      def filter_sections
+        [
+          { method: :with_any_scope, collection: filter_global_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope" },
+          { method: :with_any_area, collection: filter_areas_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "area" },
+          { method: :with_any_type, collection: filter_types_values, label_scope: "decidim.assemblies.assemblies.filters", id: "type" }
+        ].reject { |item| item[:collection].blank? }
       end
     end
   end

data/app/models/decidim/assembly.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # Interaction between a user and an organization can be done via an Assembly.
-  # It's a unit of action from the Organization point of view that groups
+  # It is a unit of action from the Organization point of view that groups
   # several components (proposals, debates...) that can be enabled or disabled.
   #
   # An assembly can have children. This is implemented using a PostgreSQL extension: LTREE
@@ -37,7 +37,6 @@ module Decidim
     include Decidim::HasArea
     include Decidim::FilterableResource
 
-    SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
     CREATED_BY = %w(city_council public others).freeze
 
     translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
@@ -83,6 +82,8 @@ module Decidim
     after_create :set_parents_path
     after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
 
+    scope :with_any_type, ->(*type_ids) { where(decidim_assemblies_type_id: type_ids) }
+
     searchable_fields({
                         scope_id: :decidim_scope_id,
                         participatory_space: :itself,
@@ -134,7 +135,7 @@ module Decidim
     end
 
     def ancestors
-      self_and_ancestors.where.not(id: id)
+      self_and_ancestors.where.not(id:)
     end
 
     def translated_title
@@ -159,7 +160,7 @@ module Decidim
     end
 
     def self.ransackable_scopes(_auth_object = nil)
-      [:with_area, :with_scope]
+      [:with_any_area, :with_any_scope, :with_any_type]
     end
 
     private
@@ -206,7 +207,7 @@ module Decidim
     # rubocop:disable Rails/SkipsModelValidations
     def update_children_paths
       self.class.where(
-        ["#{self.class.table_name}.parents_path <@ :old_path AND #{self.class.table_name}.id != :id", { old_path: parents_path_before_last_save, id: id }]
+        ["#{self.class.table_name}.parents_path <@ :old_path AND #{self.class.table_name}.id != :id", { old_path: parents_path_before_last_save, id: }]
       ).update_all(
         ["parents_path = :new_path || subpath(parents_path, nlevel(:old_path))", { new_path: parents_path, old_path: parents_path_before_last_save }]
       )

data/app/models/decidim/assembly_user_role.rb

@@ -6,46 +6,18 @@ module Decidim
   class AssemblyUserRole < ApplicationRecord
     include Traceable
     include Loggable
+    include ParticipatorySpaceUser
 
-    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
     belongs_to :assembly, foreign_key: "decidim_assembly_id", class_name: "Decidim::Assembly", optional: true
     alias participatory_space assembly
 
-    ROLES = %w(admin collaborator moderator valuator).freeze
-    validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :assembly] }
-    validate :user_and_assembly_same_organization
+    scope :for_space, ->(participatory_space) { where(assembly: participatory_space) }
+
+    validates :role, inclusion: { in: ParticipatorySpaceUser::ROLES }, uniqueness: { scope: [:user, :assembly] }
+    def target_space_association = :assembly
 
     def self.log_presenter_class_for(_log)
       Decidim::Assemblies::AdminLog::AssemblyUserRolePresenter
     end
-
-    ransacker :name do
-      Arel.sql(%{("decidim_users"."name")::text})
-    end
-
-    ransacker :nickname do
-      Arel.sql(%{("decidim_users"."nickname")::text})
-    end
-
-    ransacker :email do
-      Arel.sql(%{("decidim_users"."email")::text})
-    end
-
-    ransacker :invitation_accepted_at do
-      Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
-    end
-
-    ransacker :last_sign_in_at do
-      Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
-    end
-
-    private
-
-    # Private: check if the process and the user have the same organization
-    def user_and_assembly_same_organization
-      return if !assembly || !user
-
-      errors.add(:assembly, :invalid) unless user.organization == assembly.organization
-    end
   end
 end

data/app/packs/entrypoints/decidim_assemblies.js

@@ -1,5 +1,4 @@
 import "src/decidim/assemblies/assemblies"
-import "src/decidim/assemblies/orgchart"
 
 // Images
 require.context("../images", true)

data/app/packs/src/decidim/assemblies/admin/assemblies.js

@@ -5,9 +5,9 @@ $(() => {
   if ($(".edit_assembly, .new_assembly").length > 0) {
     $assemblyScopeEnabled.on("change", (event) => {
       const checked = event.target.checked;
-      window.theDataPicker.enabled($assemblyScopeId, checked);
+      $assemblyScopeId.attr("disabled", !checked);
     })
-    window.theDataPicker.enabled($assemblyScopeId, $assemblyScopeEnabled.prop("checked"));
+    $assemblyScopeId.attr("disabled", !$assemblyScopeEnabled.prop("checked"));
   }
 
   const $form = $(".assembly_form_admin");