decidim-assemblies 0.19.0 → 0.22.0

data/app/services/decidim/assemblies/assembly_search.rb

@@ -8,10 +8,10 @@ module Decidim
         super(Assembly.all, options)
       end
 
-      def search_assembly_type
-        return query if assembly_type == "all"
+      def search_type_id
+        return query if type_id.blank?
 
-        query.where(assembly_type: assembly_type)
+        query.where(decidim_assemblies_type_id: type_id)
       end
     end
   end

data/app/types/decidim/assemblies/assemblies_type_type.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents an AssembliesType.
+    AssembliesTypeType = GraphQL::ObjectType.define do
+      name "AssembliesType"
+      description "An assemblies type"
+
+      field :id, !types.ID, "The assemblies type's unique ID"
+      field :title, !Decidim::Core::TranslatedFieldType, "The title of this assemblies type."
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this assemblies type was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this assemblies type was updated", property: :updated_at
+      field :assemblies, !types[Decidim::Assemblies::AssemblyType], "Assemblies with this assemblies type"
+    end
+  end
+end

data/app/types/decidim/assemblies/assembly_member_type.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    AssemblyMemberType = GraphQL::ObjectType.define do
+      name "AssemblyMember"
+      description "An assembly member"
+
+      field :id, !types.ID, "Internal ID of the member"
+      field :fullName, types.String, "Full name of the member", property: :full_name
+      field :position, types.String, "Position of the member in the assembly"
+
+      field :user, Decidim::Core::UserType, "The corresponding decidim user", property: :user
+
+      field :createdAt, Decidim::Core::DateTimeType, "The time this member was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this member was updated", property: :updated_at
+
+      field :weight, types.Int, "Order of appearance in which it should be represented"
+      field :gender, types.String, "Gender of the member"
+      # field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
+      field :birthplace, types.String, "Birthplace of the member"
+      field :designationDate, Decidim::Core::DateType, "Date of designation of the member", property: :designation_date
+      # field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
+      field :positionOther, types.String, "Custom position name", property: :position_other
+      field :ceasedDate, Decidim::Core::DateType, "Date of cease for the member", property: :ceased_date
+    end
+  end
+end

data/app/types/decidim/assemblies/assembly_type.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    AssemblyType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::ParticipatorySpaceResourceableInterface }
+      ]
+
+      name "Assembly"
+      description "An assembly"
+
+      field :id, !types.ID, "The internal ID for this assembly"
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly"
+      field :shortDescription, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", property: :short_description
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly"
+      field :slug, !types.String, "The slug of this assembly"
+      field :hashtag, types.String, "The hashtag for this assembly"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this assembly was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this assembly was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this assembly was published", property: :published_at
+      field :reference, !types.String, "Reference for this assembly"
+      field :categories, !types[Decidim::Core::CategoryType], "Categories for this assembly"
+
+      field :heroImage, types.String, "The hero image for this assembly", property: :hero_image
+      field :bannerImage, types.String, "The banner image for this assembly", property: :banner_image
+      field :promoted, types.Boolean, "If this assembly is promoted (therefore in the homepage)"
+      field :developerGroup, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", property: :developer_group
+      field :metaScope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", property: :meta_scope
+      field :localArea, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", property: :local_area
+      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly"
+      field :participatoryScope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", property: :participatory_scope
+      field :participatoryStructure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", property: :participatory_structure
+      field :showStatistics, types.Boolean, "If this assembly should show statistics", property: :show_statistics
+      field :scopesEnabled, types.Boolean, "If this assembly has scopes enabled", property: :scopes_enabled
+      field :privateSpace, types.Boolean, "If this assembly is a private space", property: :private_space
+      field :area, Decidim::Core::AreaApiType, "Area of this assembly"
+      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly"
+      field :parentsPath, types.String, "Assembly hierarchy representation", property: :parents_path
+      field :childrenCount, types.Int, "Number of children assemblies", property: :children_count
+      field :purposeOfAction, Decidim::Core::TranslatedFieldType, "Purpose of action", property: :purpose_of_action
+      field :composition, Decidim::Core::TranslatedFieldType, "Composition of this assembly"
+      field :assemblyType, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", property: :assembly_type
+      field :creationDate, Decidim::Core::DateType, "Creation date of this assembly", property: :creation_date
+      field :createdBy, types.String, "The creator of this assembly", property: :created_by
+      field :createdByOther, Decidim::Core::TranslatedFieldType, "Custom creator", property: :created_by_other
+      field :duration, Decidim::Core::DateType, "Duration of this assembly"
+      field :includedAt, Decidim::Core::DateType, "Included at", property: :included_at
+      field :closingDate, Decidim::Core::DateType, "Closing date of the assembly", property: :closing_date
+      field :closingDateReason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", property: :closing_date_reason
+      field :internalOrganisation, Decidim::Core::TranslatedFieldType, "Internal organisation of this assembly", property: :internal_organisation
+      field :isTransparent, types.Boolean, "If this assembly is transparent", property: :is_transparent
+      field :specialFeatures, Decidim::Core::TranslatedFieldType, "Special features of this assembly", property: :special_features
+      field :twitterHandler, types.String, "Twitter handler", property: :twitter_handler
+      field :instagramHandler, types.String, "Instagram handler", property: :instagram_handler
+      field :facebookHandler, types.String, "Facebook handler", property: :facebook_handler
+      field :youtubeHandler, types.String, "Youtube handler", property: :youtube_handler
+      field :githubHandler, types.String, "Github handler", property: :github_handler
+
+      field :members, !types[Decidim::Assemblies::AssemblyMemberType], "Members of this assembly"
+      field :children, !types[Decidim::Assemblies::AssemblyType], "Childrens of this assembly"
+    end
+  end
+end

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

@@ -1,15 +1,19 @@
 <div id="assemblies-filter" class="inline-filters">
-  <label>
-    <span><%= help_text %></span>
-    <button id="button-text" data-toggle="inline-filter-sort"><%= current_filter_name %></button>
+  <% if available_filters.any? %>
     <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| %>
-          <%= link_to filter_link(filter), remote: true do %>
-            <li><%= filter_name(filter) %></li>
+        <% available_filters.each do |title, id| %>
+          <li>
+          <%= link_to filter_link(id), remote: true do %>
+            <%= title %>
           <% end %>
+          </li>
         <% end %>
       </ul>
     </div>
-  </label>
+    <label>
+      <span><%= help_text %></span>
+      <button id="button-text" data-toggle="inline-filter-sort"><%= current_filter_name %></button>
+    </label>
+  <% end %>
 </div>

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

@@ -157,7 +157,7 @@
       <div class="row column">
         <%= form.select :parent_id,
                         options_from_collection_for_select(
-                          @all_assemblies,
+                          parent_assemblies_for_select,
                           :id,
                           :translated_title,
                           selected: current_assembly.try(:parent_id)
@@ -196,16 +196,12 @@
     </div>
 
     <div class="row column">
-      <%= form.select :assembly_type,
+      <%= form.select :decidim_assemblies_type_id,
                       @form.assembly_types_for_select,
                       { include_blank: t(".select_an_assembly_type") },
                       { multiple: false } %>
     </div>
 
-    <div class="row column" id="assembly_type_other">
-      <%= form.translated :text_field, :assembly_type_other %>
-    </div>
-
     <div class="row column">
       <% if @form.processes_for_select %>
         <%= form.select :participatory_processes_ids,

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

@@ -1,4 +1,4 @@
-<div class="card" id="assemblies">
+<div class="card with-overflow" id="assemblies">
   <div class="card-divider">
     <h2 class="card-title">
       <% parent_assembly.self_and_ancestors.each do |assembly| %>
@@ -15,6 +15,7 @@
       <% end %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -37,15 +38,18 @@
         </thead>
         <tbody>
           <% @assemblies.each do |assembly| %>
+            <% next unless allowed_to? :list, :assembly, assembly: assembly %>
             <tr>
               <td>
                 <% if assembly.promoted? %>
                   <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.assembly.fields.promoted", scope: "decidim.admin") %>">
-                    <%= icon "star" %>
+                    <%= icon "star", role: "img", "aria-hidden": true %>
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :assembly, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %><br>
+                <% elsif allowed_to? :read, :component, assembly: assembly %>
+                  <%= link_to translated_attribute(assembly.title), components_path(assembly) %><br>
                 <% elsif allowed_to? :preview, :assembly, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %><br>
                 <% elsif allowed_to? :read, :moderation, assembly: assembly %>
@@ -55,7 +59,7 @@
                 <% end %>
               </td>
               <td>
-                <%= l(assembly.created_at, format: :short) %>
+                <%= l(assembly.creation_date, format: :decidim_short) if assembly.creation_date %>
               </td>
               <td class="table-list__state">
                 <% if assembly.private_space? %>
@@ -82,7 +86,7 @@
 
                 <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
                   <%= icon_link_to "dial",
-                      decidim_admin_assemblies.assemblies_path(parent_id: assembly.id),
+                      url_for(query_params_with(parent_id_eq: assembly.id)),
                       t("decidim.admin.titles.assemblies"),
                       class: "action-icon--dial #{'highlighted' if assembly.children.count.positive?}" %>
                 <% end %>

data/app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb

@@ -0,0 +1,10 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.check_box :enable_organization_chart %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_assemblies_settings" }, url: assemblies_settings_path, method: :put) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

data/app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb

@@ -0,0 +1,11 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_assembly_type" }) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assemblies.edit.update", scope: "decidim.admin"), class: "button" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,43 @@
+<div class="card" id="assembly-types">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.assemblies_types" %>
+      <%= link_to t("actions.new_assembly_type", scope: "decidim.admin"),
+                  ["new", "assemblies_type"],
+                  class: "button tiny button--title" if allowed_to? :create, :assembly_type %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.assemblies_types.fields.title", scope: "decidim.admin") %></th>
+            <th><%= t("models.assemblies_types.fields.created_at", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% available_assemblies_types.each do |assembly_type| %>
+          <tr>
+            <td>
+              <% if allowed_to? :update, :assembly_type, assembly_type: assembly_type %>
+                <%= link_to translated_attribute(assembly_type.title), edit_assemblies_type_path(assembly_type) %>
+              <% else %>
+                <%= translated_attribute assembly_type.title %></td>
+              <% end %>
+            <td><%= l assembly_type.created_at, format: :short %></td>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :assembly_type, assembly_type: assembly_type %>
+                <%= icon_link_to "pencil", edit_assemblies_type_path(assembly_type), t("actions.edit", scope: "decidim.admin"), class: "action-icon--new" %>
+              <% end %>
+              <% if allowed_to? :destroy, :assembly_type, assembly_type: assembly_type %>
+                <%= icon_link_to "circle-x", assemblies_type_path(assembly_type), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% end %>
+            </td>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form new_assembly_type" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("assemblies_types.new.title", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assemblies_types.new.create", scope: "decidim.admin") %>
+  </div>
+<% end %>

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

@@ -1,7 +1,16 @@
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
+<div class='card' id="assembly_members">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("assembly_members.index.assembly_members_title", scope: "decidim.admin") %>
+      <% if allowed_to? :create, :assembly_member %>
+         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_member.name", scope: "decidim.admin")), new_assembly_member_path(current_assembly), class: "button tiny button--title new" %>
+      <% end %>
+    </h2>
+  </div>
+  <div class="filters__section">
+    <div class="fcell filter">
+      <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
+      <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
       <li class="is-dropdown-submenu-parent">
         <a href="#">
           <% if @status.present? %>
@@ -16,35 +25,26 @@
           <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
         </ul>
       </li>
-    </ul>
-  </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-      <div class="filters__search">
-        <div class="input-group">
-          <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-          <%= hidden_field_tag :status, @status %>
-          <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
-            </button>
+      </ul>
+    </div>
+    <div class="fcell search">
+      <div class="column medium-4">
+        <%= form_tag "", method: :get do %>
+          <div class="filters__search">
+            <div class="input-group">
+              <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
+              <%= hidden_field_tag :status, @status %>
+              <div class="input-group-button">
+                <button type="submit" class="button">
+                  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
+                </button>
+              </div>
+            </div>
           </div>
-        </div>
+        <% end %>
       </div>
-    <% end %>
-  </div>
-</div>
-
-<div class='card' id="assembly_members">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t("assembly_members.index.assembly_members_title", scope: "decidim.admin") %>
-      <% if allowed_to? :create, :assembly_member %>
-         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_member.name", scope: "decidim.admin")), new_assembly_member_path(current_assembly), class: "button tiny button--title new" %>
-      <% end %>
-    </h2>
+    </div>
   </div>
-
   <div class="card-section">
     <div class="table-scroll">
       <table class="stack">

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

@@ -1,9 +1,9 @@
 <section id="parent-assemblies" class="section row collapse">
   <div class="row column">
     <div class="flex--sbe">
-      <h2 id="assemblies-count" class="section-heading collapse">
+      <h3 id="assemblies-count" class="section-heading collapse">
         <%= render partial: "count" %>
-      </h2>
+      </h3>
       <%= render partial: "decidim/assemblies/filter_by_type" %>
     </div>
     <hr class="reset mt-s mb-s">

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

@@ -1,4 +1,4 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
@@ -6,7 +6,7 @@
           <h2 class="card__title"><%= translated_attribute promoted_assembly.title %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: "...") %>
-        <%= link_to assembly_path(promoted_assembly), class: "button secondary small hollow card__button" do %>
+        <%= link_to assembly_path(promoted_assembly), class: "button small hollow card__button" do %>
           <%= t("assemblies.promoted_assembly.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -24,4 +24,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

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

@@ -18,13 +18,16 @@ edit_link(
 
   <%= render partial: "parent_assemblies" %>
 
-  <section id="assemblies-chart" class="row column section">
-    <div class="row column">
-      <h2 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h2>
-      <article id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
-        <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
-      </article>
-    </div>
-  </section>
+  <% if current_assemblies_settings.enable_organization_chart %>
+    <section id="assemblies-chart" class="row column section">
+      <div class="row column">
+        <h3 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h3>
+        <div id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
+          <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
+        </div>
+      </div>
+    </section>
+  <% end %>
 <% end %>
 <%= javascript_include_tag "decidim/filters" %>
+<%= javascript_include_tag "decidim/assemblies/orgchart" %>