decidim-assemblies 0.27.10 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cad25109895a4ad7e70995e89bacb52ef3bbb2c70ec63eff1ff20e054c826cd2
-  data.tar.gz: 1a6bb807c17bf4cbbf829c9920ea78c3e2a47b2fe24ad4ed8250415390bbd12d
+  metadata.gz: e8a9b53150a9eaf9e2666b2605108873e16f6d3a34c85dc9d1c4dd983179e6a7
+  data.tar.gz: 8675b6cb5150806349a85e7a6d59bca1a56701f1cdce4c520a4d862034aec818
 SHA512:
-  metadata.gz: 1722d16ff05779926e9e03a17536ce3773a11c5a7c0eb0faceb1f6db43cfc953131cab7487caa87de29151e08cae6624c8572380f0902a17d62bf27d455fada7
-  data.tar.gz: f3622f8efc5a6bb5b15a88ceab54c0de1ce1d74e20ff770cdd11ac0dc053d74ff541b6d41234efa6c4a209f5e2404257d7c655fd1de76f2776be9e6fe72653e6
+  metadata.gz: 127bee807517c724cc25aac51deacc318225a8238c9788ec63aacee429f94722019a8ab02efbd8f53f428fa4d75749594fac9a52a29d697f653df8e9afb531a9
+  data.tar.gz: 8bc3f4df2e9119a094fa9c665e491887e787c57424abc8ce61d472a814024ecf72e22b5337a77331b4b24d951cd1b8c0e34bfef3b1fb3bba76425b819f16eb73

data/app/cells/decidim/assemblies/assemblies/show.erb

@@ -0,0 +1,16 @@
+<div class="content-block__title">
+  <h2 class="h2 decorator"><%= title %></h2>
+  <div class="label text-lg"><%= total_count %></div>
+  <% if show_all_path.present? %>
+    <%= link_to show_all_path, class: "button button__sm button__text-secondary" do %>
+      <span><%= t("decidim.assemblies.pages.home.highlighted_assemblies.see_all_spaces") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  <% end %>
+</div>
+
+<div class="participatory-space__block-grid">
+  <% assemblies.each do |assembly| %>
+    <%= card_for(assembly) %>
+  <% end %>
+</div>

data/app/cells/decidim/assemblies/assemblies_cell.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders a list of assemblies in content blocks
+    class AssembliesCell < Decidim::ViewModel
+      include Decidim::CardHelper
+
+      alias assemblies model
+
+      def total_count
+        @total_count ||= options[:total_count] || assemblies.size
+      end
+
+      def show_all_path
+        @show_all_path ||= options[:show_all_path].presence
+      end
+
+      def title
+        @title ||= options[:title] || t("name", scope: "decidim.assemblies.content_blocks.related_assemblies")
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/assembly_cell.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # This cell renders the assembly card for an instance of an Assembly
-    # the default size is the Medium Card (:m)
+    # the default size is the Grid Card (:g)
     class AssemblyCell < Decidim::ViewModel
       def show
         cell card_size, model, options
@@ -12,7 +12,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/assemblies/assembly_m"
+        case @options[:size]
+        when :s
+          "decidim/assemblies/assembly_s"
+        else
+          "decidim/assemblies/assembly_g"
+        end
       end
     end
   end

data/app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    class AssemblyDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
+      include AssembliesHelper
+      include Decidim::ComponentPathHelper
+      include ActiveLinkTo
+
+      def decidim_assemblies
+        Decidim::Assemblies::Engine.routes.url_helpers
+      end
+
+      private
+
+      def nav_items_method = :assembly_nav_items
+    end
+  end
+end

data/app/cells/decidim/assemblies/assembly_g_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders the Grid (:g) assembly card
+    # for a given instance of an Assembly
+    class AssemblyGCell < Decidim::CardGCell
+      private
+
+      def resource_path
+        Decidim::Assemblies::Engine.routes.url_helpers.assembly_path(model)
+      end
+
+      def resource_image_path
+        model.attached_uploader(:hero_image).path
+      end
+
+      def metadata_cell
+        "decidim/assemblies/assembly_metadata_g"
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/assembly_member/data.erb

@@ -0,0 +1,19 @@
+<div class="profile__user-avatar-container">
+  <div class="<%= has_profile? ? "profile__user-avatar" : "profile__user-avatar !border-0" %>">
+    <%= image_tag(has_profile? ? model.avatar_url(:big) : model.non_user_avatar_path, alt: "member-avatar") %>
+  </div>
+</div>
+<div>
+  <%= render :name_and_position %>
+  <div class="mt-2">
+    <span class="text-gray-2">
+      <%= t("decidim.assembly_members.assembly_member.designated_on") %>
+    </span>
+    <strong>
+      <%= l designation_date, format: :decidim_short %>
+    </strong>
+  </div>
+  <span class="profile__user-nick">
+    <%= personal_information %>
+  </span>
+</div>

data/app/cells/decidim/assemblies/assembly_member/name_and_position.erb

@@ -0,0 +1,11 @@
+<div class="<%= has_profile? ? "profile__user-name" : "profile__user-name !no-underline" %>">
+  <%= name %>
+  <span class="capitalize label alert">
+    <%= position %>
+  </span>
+</div>
+<% if nickname.present? %>
+  <span class="profile__user-nick block">
+    <%= nickname %>
+  </span>
+<% end %>

data/app/cells/decidim/assemblies/assembly_member/show.erb

@@ -1,53 +1,9 @@
-<div class="column">
-  <div class="card card--member">
-    <div class="card__content">
-      <div class="card__header collapse">
-        <div class="author-data author-data--big">
-          <div class="author-data__main">
-            <div class="author author--flex">
-              <% if has_profile? %>
-                <%= link_to profile_url, class: "author__avatar" do %>
-                  <%= image_tag model.avatar_url(:big), alt: "member-avatar" %>
-                <% end %>
-                <div>
-                  <div class="author__name--container">
-                    <%= link_to profile_url, class: "author__name" do %>
-                      <%= name %>
-                    <% end %>
-                  </div>
-                  <% if nickname.present? %>
-                    <%= link_to profile_url, class: "author__nickname" do %>
-                      <%= nickname %>
-                    <% end %>
-                  <% else %>
-                    <div class="author__nickname">&nbsp;</div>
-                  <% end %>
-                </div>
-              <% else %>
-                <div class="author__avatar"><%= image_tag model.non_user_avatar_path, alt: "member-avatar" %></div>
-                <div>
-                  <div class="author__name--container">
-                    <div class="author__name">
-                      <%= name %>
-                    </div>
-                  </div>
-                  <div class="author__nickname"><%= nickname.presence || "&nbsp;" %></div>
-                </div>
-              <% end %>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="card__text card--picture-offset">
-        <div>
-          <small><strong><%= position %></strong></small>
-        </div>
-        <div class="text-small">
-          <%= t("decidim.assembly_members.assembly_member.designated_on") %>
-          <strong> <%= l designation_date, format: :decidim_short %></strong>
-        </div>
-        <div class="text-small mt-s"><%= personal_information %></div>
-      </div>
-    </div>
+<% if has_profile? %>
+  <%= link_to profile_url, class: "profile__user" do %>
+    <%= render :data %>
+  <% end %>
+<% else %>
+  <div class="profile__user">
+    <%= render :data %>
   </div>
-</div>
+<% end %>

data/app/cells/decidim/assemblies/assembly_metadata_g_cell.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders the assembly metadata for g card
+    class AssemblyMetadataGCell < Decidim::CardMetadataCell
+      alias current_participatory_space model
+
+      private
+
+      def items
+        [children_item, assembly_type].compact
+      end
+
+      def assembly_type
+        return unless has_assembly_type?
+
+        {
+          text: translated_attribute(model.assembly_type.title),
+          icon: "group-2-line"
+        }
+      end
+
+      def children_item
+        return if children_assemblies_count_for_user.zero?
+
+        {
+          text: t("children_item", count: children_assemblies_count_for_user, scope: "layouts.decidim.assemblies.metadata"),
+          icon: "government-line"
+        }
+      end
+
+      def children_assemblies_count_for_user
+        @children_assemblies_count_for_user ||= published_children_assemblies.visible_for(current_user).count
+      end
+
+      def published_children_assemblies
+        @published_children_assemblies ||= model.children.published
+      end
+
+      def has_assembly_type?
+        model.assembly_type.present?
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/assembly_s_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders the Search (:s) process card
+    # for a given instance of an Assembly
+    class AssemblySCell < Decidim::CardSCell
+      private
+
+      def metadata_cell
+        "decidim/assemblies/assembly_metadata_g"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    class ContentBlockCell < Decidim::Admin::ContentBlockCell
+      delegate :scoped_resource, to: :controller
+
+      def edit_content_block_path
+        decidim_assemblies.edit_assembly_landing_page_content_block_path(scoped_resource, model)
+      end
+
+      def content_block_path
+        decidim_assemblies.assembly_landing_page_content_block_path(scoped_resource, model)
+      end
+
+      def decidim_assemblies
+        Decidim::Assemblies::AdminEngine.routes.url_helpers
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/children_assemblies_cell.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class ChildrenAssembliesCell < RelatedAssembliesCell
+        def related_assemblies
+          @related_assemblies ||= resource.children.visible_for(current_user).published.order(weight: :asc)
+        end
+
+        def total_count
+          related_assemblies.size
+        end
+
+        private
+
+        def title
+          t("name", scope: "decidim.assemblies.content_blocks.children_assemblies")
+        end
+
+        def limit
+          model.settings.try(:max_results)
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/dates_metadata_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class DatesMetadataCell < Decidim::ContentBlocks::ParticipatorySpaceMetadataCell
+        private
+
+        def metadata_items
+          %w(creation_date created_by included_at closing_date)
+        end
+
+        def space_presenter
+          AssemblyPresenter
+        end
+
+        def translations_scope
+          "decidim.assemblies.assemblies.description"
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/extra_data_cell.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class ExtraDataCell < Decidim::ContentBlocks::ParticipatorySpaceExtraDataCell
+        delegate :assembly_type, :duration, to: :presented_resource
+
+        private
+
+        def extra_data_items
+          [type_item, duration_item].compact
+        end
+
+        def presented_resource
+          AssemblyPresenter.new(resource)
+        end
+
+        def type_item
+          return if assembly_type.blank?
+
+          {
+            title: t("assembly_type", scope: "decidim.assemblies.show"),
+            icon: "group-2-line",
+            text: assembly_type
+          }
+        end
+
+        def duration_item
+          {
+            title: t("duration", scope: "decidim.assemblies.show"),
+            icon: "calendar-line",
+            text: duration
+          }
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -3,41 +3,33 @@
 module Decidim
   module Assemblies
     module ContentBlocks
-      class HighlightedAssembliesCell < Decidim::ViewModel
+      class HighlightedAssembliesCell < Decidim::ContentBlocks::HighlightedParticipatorySpacesCell
         delegate :current_user, to: :controller
 
-        def show
-          render if highlighted_assemblies.any?
-        end
-
-        def max_results
-          model.settings.max_results
-        end
-
-        def highlighted_assemblies
-          @highlighted_assemblies ||= OrganizationPrioritizedAssemblies
-                                      .new(current_organization, current_user)
-                                      .query
-                                      .with_attached_hero_image
-                                      .includes([:organization])
-                                      .limit(max_results)
+        def highlighted_spaces
+          @highlighted_spaces ||= OrganizationPrioritizedAssemblies
+                                  .new(current_organization, current_user)
+                                  .query
+                                  .with_attached_hero_image
+                                  .includes([:organization])
         end
 
         def i18n_scope
           "decidim.assemblies.pages.home.highlighted_assemblies"
         end
 
-        def decidim_assemblies
-          Decidim::Assemblies::Engine.routes.url_helpers
+        def all_path
+          Decidim::Assemblies::Engine.routes.url_helpers.assemblies_path
+        end
+
+        def max_results
+          model.settings.max_results
         end
 
         private
 
-        def cache_hash
-          hash = []
-          hash.push(I18n.locale)
-          hash.push(highlighted_assemblies.map(&:cache_key_with_version))
-          hash.join(Decidim.cache_key_separator)
+        def block_id
+          "highlighted-assemblies"
         end
       end
     end

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: label %>
+  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
 <% end %>

data/app/cells/decidim/assemblies/content_blocks/main_data_cell.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class MainDataCell < Decidim::ContentBlocks::ParticipatorySpaceMainDataCell
+        include AssembliesHelper
+        include Decidim::ComponentPathHelper
+        include ActiveLinkTo
+
+        EXTRA_ATTRIBUTES = %w(purpose_of_action internal_organisation composition).freeze
+
+        delegate :short_description, :description, to: :resource
+        delegate(*EXTRA_ATTRIBUTES, to: :resource)
+
+        private
+
+        def decidim_assemblies
+          Decidim::Assemblies::Engine.routes.url_helpers
+        end
+
+        def title_text
+          t("title", scope: "decidim.assemblies.assemblies.show")
+        end
+
+        def short_description_text
+          decidim_sanitize_editor_admin translated_attribute(short_description)
+        end
+
+        def description_text
+          [decidim_sanitize_editor_admin(translated_attribute(description)), extra_attributes].compact_blank.join("\n")
+        end
+
+        def extra_attributes
+          EXTRA_ATTRIBUTES.filter_map do |attribute|
+            text = translated_attribute(send(attribute))
+            next if text.blank? || text == "<p></p>"
+
+            [
+              content_tag(:h3, class: "h4") { t(attribute, scope: "activemodel.attributes.assembly") },
+              decidim_sanitize_editor_admin(text)
+            ].join("\n")
+          end
+        end
+
+        def nav_items
+          assembly_nav_items(resource)
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/metadata_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class MetadataCell < Decidim::ContentBlocks::ParticipatorySpaceMetadataCell
+        private
+
+        def metadata_items
+          %w(meta_scope developer_group local_area target participatory_scope participatory_structure area_name)
+        end
+
+        def space_presenter
+          AssemblyPresenter
+        end
+
+        def translations_scope
+          "decidim.assemblies.assemblies.description"
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/related_assemblies/content.erb

@@ -0,0 +1 @@
+<%= cell "decidim/assemblies/assemblies", related_assemblies.limit(limit), total_count:, title: %>

data/app/cells/decidim/assemblies/content_blocks/related_assemblies_cell.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class RelatedAssembliesCell < Decidim::ContentBlocks::BaseCell
+        def show
+          render if total_count.positive?
+        end
+
+        def related_assemblies
+          @related_assemblies ||=
+            resource
+            .linked_participatory_space_resources(:assembly, "included_participatory_processes")
+            .public_spaces
+        end
+
+        def total_count
+          related_assemblies.size
+        end
+
+        private
+
+        def title
+          t("name", scope: "decidim.assemblies.content_blocks.related_assemblies")
+        end
+
+        def limit
+          model.settings.try(:max_results)
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/content_blocks/stats_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class StatsCell < Decidim::ContentBlocks::ParticipatorySpaceStatsCell
+        private
+
+        def stats
+          @stats ||= resource.show_statistics && AssemblyStatsPresenter.new(assembly: resource).collection
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/assemblies/admin/copy_assembly.rb

@@ -19,7 +19,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -93,7 +93,7 @@ module Decidim
               step_settings: component.step_settings,
               weight: component.weight
             )
-            component.manifest.run_hooks(:copy, new_component: new_component, old_component: component)
+            component.manifest.run_hooks(:copy, new_component:, old_component: component)
           end
         end
       end

data/app/commands/decidim/assemblies/admin/create_assemblies_type.rb

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/assemblies/admin/create_assembly.rb

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -25,6 +25,7 @@ module Decidim
           if assembly.persisted?
             add_admins_as_followers(assembly)
             link_participatory_processes(assembly)
+            Decidim::ContentBlocksCreator.new(assembly).create_default!
 
             broadcast(:ok, assembly)
           else

data/app/commands/decidim/assemblies/admin/create_assembly_member.rb

@@ -21,7 +21,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -63,7 +63,7 @@ module Decidim
             "position_other",
             "weight"
           ).symbolize_keys.merge(
-            assembly: assembly,
+            assembly:,
             user: form.user
           ).merge(
             attachment_attributes(:non_user_avatar)
@@ -97,7 +97,7 @@ module Decidim
             event: "decidim.events.assemblies.create_assembly_member",
             event_class: Decidim::Assemblies::CreateAssemblyMemberEvent,
             resource: assembly,
-            followers: followers
+            followers:
           }
           Decidim::EventsManager.publish(**data)
         end