decidim-assemblies 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8105c47504e59581cdaeb4d81d7c4059ffb2a735148a16ba354e090dc44faf79
-  data.tar.gz: cda2b42ce4e419c7f395cffa2d8cab75000b04f5b32914c6fe1458cb716e31a8
+  metadata.gz: 93623b3d750202db5ba682221675d92c5abe68884ad81f3838bb695ae6b1bcf1
+  data.tar.gz: 22bd1c3b11d93e20a77aded79e1b5258e07af3f301d37d7f2038a8c685318eab
 SHA512:
-  metadata.gz: d6d5a0b2a085b40ab2b84842a09e2d6ad0dc25bbd914fd3ccc76524f5cbedbfb10e5834f3201401e7599abd46046eddfcb34e38faf87865d2c6238302f305faf
-  data.tar.gz: 896fd982d665e9aac54c88e50ed4d23499c807c9eaefafe911d54d3c6ec3fc5fa59dc471509781edae38caebb2f2787a8d59499b8d0be16730308e45983f3686
+  metadata.gz: da27795b25811e8c8d0e45e69f28071ca169761a08953814908f670bcd41e297b2bc8af431904f9f6a6b504441468589103a2b0b83d7ba6371b969b6a0a4a5f7
+  data.tar.gz: 64d33448389d1dcc36026959a49b6056b2c19e3581d3dd0316f578eba89d691820afdcfb76b64e13a5eb1c02a738a00fee417e2a3a4fef12d41e4260c40f6b0b

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -9,7 +9,7 @@ module Decidim
         helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space
         layout "decidim/admin/assemblies"
 
-        before_action :set_all_assemblies, except: [:index, :destroy]
+        before_action :set_all_assemblies, except: [:index]
 
         def index
           enforce_permission_to :read, :assembly_list
@@ -65,15 +65,6 @@ module Decidim
           end
         end
 
-        def destroy
-          enforce_permission_to :destroy, :assembly, assembly: current_assembly
-          current_assembly.destroy!
-
-          flash[:notice] = I18n.t("assemblies.destroy.success", scope: "decidim.admin")
-
-          redirect_to assemblies_path
-        end
-
         def copy
           enforce_permission_to :create, :assembly
         end

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -26,6 +26,12 @@ module Decidim
             render "index"
           end
 
+          format.js do
+            raise ActionController::RoutingError, "Not Found" if published_assemblies.none?
+
+            render "index"
+          end
+
           format.json do
             render json: published_assemblies.query.includes(:children).where(parent: nil).collect { |assembly|
               {
@@ -43,7 +49,7 @@ module Decidim
       end
 
       def show
-        check_current_user_can_visit_space
+        enforce_permission_to :read, :assembly, assembly: current_participatory_space
       end
 
       private
@@ -65,7 +71,7 @@ module Decidim
       end
 
       def parent_assemblies
-        @parent_assemblies ||= assemblies | ParentAssemblies.new
+        @parent_assemblies ||= assemblies | ParentAssemblies.new | FilteredAssemblies.new(params[:filter])
       end
 
       alias collection parent_assemblies

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

@@ -5,6 +5,8 @@ module Decidim
     # Helpers related to the Assemblies layout.
     module AssembliesHelper
       include Decidim::ResourceHelper
+      include FilterAssembliesHelper
+
       # 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"
       def participatory_processes_for_assembly(assembly_participatory_processes)

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # Helpers related to the Assemblies filter by type.
+    module FilterAssembliesHelper
+      def available_filters
+        %w(all government executive consultative_advisory participatory working_group commission others)
+      end
+
+      def filter_link(filter)
+        link_to t(filter, scope: "decidim.assemblies.filter"), url_for(params.to_unsafe_h.merge(page: nil, filter: filter)), data: { filter: filter }, remote: true
+      end
+
+      def label_text
+        t("label", scope: "decidim.assemblies.filter")
+      end
+
+      def placeholder_text
+        t("placeholder", scope: "decidim.assemblies.filter")
+      end
+    end
+  end
+end

data/app/models/decidim/assembly.rb

@@ -59,11 +59,14 @@ module Decidim
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
     belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
 
+    mount_uploader :hero_image, Decidim::HeroImageUploader
+    mount_uploader :banner_image, Decidim::BannerImageUploader
+
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
-    mount_uploader :hero_image, Decidim::HeroImageUploader
-    mount_uploader :banner_image, Decidim::BannerImageUploader
+    after_create :set_parents_path
+    after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
 
     scope :visible_for, lambda { |user|
                           joins("LEFT JOIN decidim_participatory_space_private_users ON
@@ -72,8 +75,6 @@ module Decidim
                             or private_space = ? or (private_space = ? and is_transparent = ?)", true, user, false, true, true).distinct
                         }
 
-    after_create :set_parents_path
-    after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
     # Scope to return only the promoted assemblies.
     #
     # Returns an ActiveRecord::Relation.
@@ -81,6 +82,14 @@ module Decidim
       where(promoted: true)
     end
 
+    def self.private_assemblies
+      where(private_space: true)
+    end
+
+    def self.public_spaces
+      super.where(private_space: false).or(Decidim::Assembly.where(private_space: true).where(is_transparent: true))
+    end
+
     def self.log_presenter_class_for(_log)
       Decidim::Assemblies::AdminLog::AssemblyPresenter
     end
@@ -101,14 +110,6 @@ module Decidim
       self_and_ancestors.where.not(id: id)
     end
 
-    def self.private_assemblies
-      where(private_space: true)
-    end
-
-    def self.public_spaces
-      super.where(private_space: false).or(Decidim::Assembly.where(private_space: true).where(is_transparent: true))
-    end
-
     def can_participate?(user)
       return true unless private_space?
       return true if private_space? && users.include?(user)

data/app/permissions/decidim/assemblies/permissions.rb

@@ -31,7 +31,6 @@ module Decidim
         user_can_read_assembly_list?
         user_can_read_current_assembly?
         user_can_create_assembly?
-        user_can_destroy_assembly?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -83,11 +82,17 @@ module Decidim
                       [:assembly, :participatory_space].include?(permission_action.subject) &&
                       assembly
 
+        return disallow! if cannot_view_private_space
         return allow! if user&.admin?
         return allow! if assembly.published?
         toggle_allow(can_manage_assembly?)
       end
 
+      def cannot_view_private_space
+        return unless assembly.private_space && !assembly.is_transparent
+        !user || !user.admin && !assembly.users.include?(user)
+      end
+
       def public_list_members_action?
         return unless permission_action.action == :list &&
                       permission_action.subject == :members
@@ -137,14 +142,6 @@ module Decidim
         toggle_allow(user.admin?)
       end
 
-      # Only organization admins can destroy a assembly
-      def user_can_destroy_assembly?
-        return unless permission_action.action == :destroy &&
-                      permission_action.subject == :assembly
-
-        toggle_allow(user.admin?)
-      end
-
       # Everyone can read the assembly list
       def user_can_read_assembly_list?
         return unless read_assembly_list_permission_action?
@@ -174,14 +171,12 @@ module Decidim
 
       # Process admins can eprform everything *inside* that assembly. They cannot
       # create a assembly or perform actions on assembly groups or other
-      # assemblies. They cannot destroy their assembly either.
+      # assemblies.
       def assembly_admin_action?
         return unless can_manage_assembly?(role: :admin)
         return if user.admin?
         return disallow! if permission_action.action == :create &&
                             permission_action.subject == :assembly
-        return disallow! if permission_action.action == :destroy &&
-                            permission_action.subject == :assembly
 
         is_allowed = [
           :attachment,

data/app/queries/decidim/assemblies/filtered_assemblies.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This query filters assemblies by type.
+    class FilteredAssemblies < Rectify::Query
+      def initialize(filter)
+        @filter = filter
+      end
+
+      def filter
+        return "all" if @filter.nil?
+
+        @filter
+      end
+
+      def assemblies
+        Decidim::Assembly
+      end
+
+      def query
+        return assemblies.all if filter == "all"
+
+        assemblies.where(assembly_type: filter)
+      end
+    end
+  end
+end

data/app/queries/decidim/assemblies/visible_assemblies.rb

@@ -9,10 +9,13 @@ module Decidim
       end
 
       def query
+        assemblies = Decidim::Assembly.all
+
         if @user
-          Decidim::Assembly.visible_for(@user.id)
+          return assemblies if @user.admin
+          assemblies.visible_for(@user.id)
         else
-          Decidim::Assembly.public_spaces
+          assemblies.public_spaces
         end
       end
     end

data/app/views/decidim/assemblies/_filter_by_type.html.erb

@@ -0,0 +1,13 @@
+<div class="inline-filters">
+<label>
+  <span><%= label_text %></span>
+  <button data-toggle="inline-filter-sort"><%= placeholder_text %></button>
+  <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
+    <ul class="list-reset">
+      <% available_filters.each do |filter| %>
+        <li><%= filter_link(filter) %></li>
+      <% end %>
+    </ul>
+  </div>
+</label>
+</div>

data/app/views/decidim/assemblies/admin/assemblies/edit.html.erb

@@ -10,9 +10,5 @@
         <%= link_to t("actions.publish", scope: "decidim.admin"), assembly_publish_path(current_assembly), method: :post, class: "button hollow" %>
       <% end %>
     <% end %>
-
-    <% if allowed_to? :destroy, :assembly, assembly: current_assembly %>
-      <%= link_to t("decidim.admin.actions.destroy"), current_assembly, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
-    <% end %>
   </div>
 <% end %>

data/app/views/decidim/assemblies/assemblies/_count.html.erb

@@ -0,0 +1 @@
+<%= t("assemblies.order_by_assemblies.assemblies", scope: "layouts.decidim", count: collection.count) %>

data/app/views/decidim/assemblies/assemblies/_statistics.html.erb

@@ -1,6 +1,6 @@
 <section class="extended" id="assembly-statistics" class="statistics">
   <div class="row column">
-    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.assemblies") %></h3>
+    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.assemblies") %></h4>
   </div>
   <div class="row">
     <div class="columns small-centered mediumlarge-12 large-12 process_stats">

data/app/views/decidim/assemblies/assemblies/index.html.erb

@@ -8,7 +8,7 @@ edit_link(
 )
 %>
 
-<main class="wrapper">
+<%= participatory_space_wrapper do %>
   <% if promoted_assemblies.any? %>
     <section id="highlighted-assemblies" class="row section">
       <h1 class="section-heading"><%= t("assemblies.index.promoted_assemblies", scope: "layouts.decidim") %></h1>
@@ -17,7 +17,15 @@ edit_link(
   <% end %>
 
   <section id="assemblies-grid" class="section row collapse">
-    <%= render partial: "decidim/assemblies/order_by_assemblies" %>
+    <div class="row column">
+      <div class="flex--sbe">
+        <h2 id="assemblies-count" class="section-heading collapse">
+          <%= render partial: "count" %>
+        </h2>
+        <%= render partial: "decidim/assemblies/filter_by_type" %>
+      </div>
+      <hr class="reset mt-s mb-s" />
+    </div>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
       <%= render(collection) %>
     </div>
@@ -31,4 +39,4 @@ edit_link(
       </article>
     </div>
   </section>
-</main>
+<% end %>

data/app/views/decidim/assemblies/assemblies/index.js.erb

@@ -0,0 +1,5 @@
+var $grid = $('#assemblies-grid');
+var $assembliesCount = $('#assemblies-count');
+
+$grid.find('.card-grid').html('<%= j(render(collection)).strip.html_safe %>');
+$assembliesCount.html('<%= j(render partial: "count").strip.html_safe %>');

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -14,6 +14,8 @@ edit_link(
 )
 %>
 
+<%= participatory_space_floating_help %>
+
 <% if current_participatory_space.private_space? %>
   <%= render partial: "decidim/shared/private_participatory_space", locals: { text: t("assemblies.show.private_space", scope: "decidim") } %>
 <% end %>
@@ -93,7 +95,7 @@ edit_link(
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra">
         <div class="card__content">
-          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_participatory_space } %>
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_participatory_space, large: false  } %>
         </div>
       </div>
       <div class="card extra definition-data">

data/app/views/layouts/decidim/_assembly_header.html.erb

@@ -1,8 +1,10 @@
-<div class="process-header row column">
-  <div class="row column process-header__main"
-       style="background-image:url(<%= current_participatory_space.banner_image.url %>);">
-    <div class="process-header__container row">
-      <div class="columns mediumlarge-9 process-header__info">
+<div class="process-header">
+  <div class="process-header__inner">
+    <div class="row column process-header__main"
+        style="background-image:url(<%= current_participatory_space.banner_image.url %>);">
+    </div>
+    <div class="process-header__container row collapse column">
+      <div class="columns mediumlarge-8 process-header__info">
         <div>
           <h1 class="text-highlight heading2">
             <%= translated_attribute(current_participatory_space.title) %>
@@ -21,53 +23,5 @@
       </div>
     </div>
   </div>
-  <% if current_participatory_space.components.any? || current_participatory_space.members.not_ceased.any? %>
-    <div class="row column">
-      <div class="process-nav">
-        <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
-          <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
-            <div class="process-nav__link">
-            <% if self.try(:current_component) %>
-                <%= component_icon(current_component) %>
-                <%= translated_attribute(current_component.name) %>
-            <% else %>
-                <%= icon "assembly" %>
-                <%= t ".assembly_menu_item" %>
-            <% end %>
-            </div>
-        </button>
-        <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
-          <ul>
-            <li class="<%= "is-active" if is_active_link?(decidim_assemblies.assembly_path(current_participatory_space), :exclusive) %>">
-              <%= active_link_to decidim_assemblies.assembly_path(current_participatory_space), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
-                <%= external_icon "decidim/assemblies/assembly.svg" %>
-                <%= t ".assembly_menu_item" %>
-              <% end %>
-            </li>
-
-            <% if current_participatory_space.members.not_ceased.any? %>
-              <li class="<%= "is-active" if is_active_link?(decidim_assemblies.assembly_assembly_members_path(current_participatory_space), :inclusive) %>">
-                <%= active_link_to decidim_assemblies.assembly_assembly_members_path(current_participatory_space), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
-                  <%= icon("members") %>
-                  <%= t ".assembly_member_menu_item" %>
-                <% end %>
-              </li>
-            <% end %>
-
-            <% current_participatory_space.components.each do |component| %>
-              <% if component.published? || component == self.try(:current_component) %>
-                <li class="<%= "is-active" if is_active_link?(main_component_path(component), :inclusive) %>">
-                  <%= active_link_to main_component_path(component), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
-                    <%= component_icon(component) %>
-
-                    <%= translated_attribute(component.name) %>
-                  <% end %>
-                </li>
-              <% end %>
-            <% end %>
-          </ul>
-        </div>
-      </div>
-    </div>
-  <% end %>
+  <%= render partial: "layouts/decidim/assembly_navigation", locals: { participatory_space: current_participatory_space } %>
 </div>

data/app/views/layouts/decidim/_assembly_navigation.html.erb

@@ -0,0 +1,24 @@
+<%
+  components = participatory_space.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
+%>
+
+<%=
+  extended_navigation_bar(([
+    {
+      name: t(".assembly_menu_item"),
+      url: decidim_assemblies.assembly_path(current_participatory_space),
+      active: is_active_link?(decidim_assemblies.assembly_path(current_participatory_space), :exclusive)
+    },
+    participatory_space.members.not_ceased.any? ? {
+      name: t(".assembly_member_menu_item"),
+      url: decidim_assemblies.assembly_assembly_members_path(current_participatory_space),
+      active: is_active_link?(decidim_assemblies.assembly_assembly_members_path(current_participatory_space), :inclusive)
+    } : nil
+  ] + components.map do |component|
+    {
+      name: translated_attribute(component.name),
+      url: main_component_path(component),
+      active: is_active_link?(main_component_path(component), :inclusive)
+    }
+  end).compact)
+%>