decidim-assemblies 0.29.2 → 0.30.0.rc2

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

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # Controller used to manage the available assemblies types for the current
-      # organization.
-      # As this substitutes former i18n simple hash we need to keep these i18n keys for migrations
-      # and rollbacks. So let i18n-tasks know about:
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.government')
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.commission')
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.consultative_advisory')
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.executive')
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.others')
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.participatory')
-      # i18n-tasks-use t('decidim.assemblies.assembly_types.working_group')
-      # This comment (and the i18n keys) may be removed in future versions
-      class AssembliesTypesController < Decidim::Assemblies::Admin::ApplicationController
-        helper_method :available_assemblies_types, :current_assembly_type
-        layout "decidim/admin/assemblies_types"
-
-        # GET /admin/assemblies_types
-        def index
-          enforce_permission_to :index, :assembly_type
-        end
-
-        # GET /admin/assemblies_types/new
-        def new
-          enforce_permission_to :create, :assembly_type
-          @form = assembly_type_form.instance
-        end
-
-        # POST /admin/assemblies_types
-        def create
-          enforce_permission_to :create, :assembly_type
-          @form = assembly_type_form.from_params(params)
-
-          CreateAssembliesType.call(@form) do
-            on(:ok) do |_assembly_type|
-              flash[:notice] = I18n.t("assemblies_types.create.success", scope: "decidim.admin")
-              redirect_to assemblies_types_path
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("assemblies_types.create.error", scope: "decidim.admin")
-              render :new
-            end
-          end
-        end
-
-        # GET /admin/assemblies_types/:id/edit
-        def edit
-          enforce_permission_to :edit, :assembly_type, assembly_type: current_assembly_type
-          @form = assembly_type_form
-                  .from_model(current_assembly_type,
-                              assembly_type: current_assembly_type)
-        end
-
-        # PUT /admin/assemblies_types/:id
-        def update
-          enforce_permission_to :update, :assembly_type, assembly_type: current_assembly_type
-
-          @form = assembly_type_form
-                  .from_params(params, assembly_type: current_assembly_type)
-
-          UpdateAssembliesType.call(@form, current_assembly_type) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assemblies_types.update.success", scope: "decidim.admin")
-              redirect_to assemblies_types_path
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("assemblies_types.update.error", scope: "decidim.admin")
-              render :edit
-            end
-          end
-        end
-
-        # DELETE /admin/assemblies_types/:id
-        def destroy
-          enforce_permission_to :destroy, :assembly_type, assembly_type: current_assembly_type
-
-          Decidim::Commands::DestroyResource.call(current_assembly_type, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assemblies_types.destroy.success", scope: "decidim.admin")
-              redirect_to assemblies_types_path
-            end
-          end
-        end
-
-        private
-
-        def available_assemblies_types
-          @available_assemblies_types ||= AssembliesType.where(organization: current_organization)
-        end
-
-        def current_assembly_type
-          @current_assembly_type ||= available_assemblies_types.find(params[:id])
-        end
-
-        def assembly_type_form
-          form(Decidim::Assemblies::Admin::AssembliesTypeForm)
-        end
-      end
-    end
-  end
-end

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

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # Controller that allows managing assembly members.
-      #
-      class AssemblyMembersController < Decidim::Assemblies::Admin::ApplicationController
-        include Concerns::AssemblyAdmin
-        include Decidim::Assemblies::Admin::AssemblyMembers::Filterable
-
-        def index
-          enforce_permission_to :index, :assembly_member
-          @assembly_members = filtered_collection
-        end
-
-        def new
-          enforce_permission_to :create, :assembly_member
-          @form = form(AssemblyMemberForm).instance
-        end
-
-        def create
-          enforce_permission_to :create, :assembly_member
-          @form = form(AssemblyMemberForm).from_params(params)
-
-          CreateAssemblyMember.call(@form) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_members.create.success", scope: "decidim.admin")
-              redirect_to assembly_members_path(current_assembly)
-            end
-
-            on(:invalid) do
-              flash[:alert] = I18n.t("assembly_members.create.error", scope: "decidim.admin")
-              render :new
-            end
-          end
-        end
-
-        def edit
-          @assembly_member = collection.find(params[:id])
-          enforce_permission_to :update, :assembly_member, member: @assembly_member
-          @form = form(AssemblyMemberForm).from_model(@assembly_member)
-        end
-
-        def update
-          @assembly_member = collection.find(params[:id])
-          enforce_permission_to :update, :assembly_member, member: @assembly_member
-          @form = form(AssemblyMemberForm).from_params(params)
-
-          UpdateAssemblyMember.call(@form, @assembly_member) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_members.update.success", scope: "decidim.admin")
-              redirect_to assembly_members_path(current_assembly)
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("assembly_members.update.error", scope: "decidim.admin")
-              render :edit
-            end
-          end
-        end
-
-        def destroy
-          @assembly_member = collection.find(params[:id])
-          enforce_permission_to :destroy, :assembly_member, member: @assembly_member
-
-          DestroyAssemblyMember.call(@assembly_member, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("assembly_members.destroy.success", scope: "decidim.admin")
-              redirect_to assembly_members_path(current_assembly)
-            end
-          end
-        end
-
-        private
-
-        def collection
-          @collection ||= current_assembly.members
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # Controller that allows managing categories for assemblies.
-      #
-      class CategoriesController < Decidim::Admin::CategoriesController
-        include Concerns::AssemblyAdmin
-      end
-    end
-  end
-end

data/app/events/decidim/assemblies/create_assembly_member_event.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    class CreateAssemblyMemberEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :resource_name
-
-      def resource_name
-        @resource_name ||= decidim_sanitize_translated(assembly.title)
-      end
-
-      def assembly
-        @assembly ||= resource
-      end
-    end
-  end
-end

data/app/forms/decidim/assemblies/admin/assembly_member_form.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # A form object used to create assembly members from the admin dashboard.
-      #
-      class AssemblyMemberForm < Form
-        mimic :assembly_member
-
-        attribute :weight, Integer, default: 0
-        attribute :full_name, String
-        attribute :non_user_avatar
-        attribute :remove_non_user_avatar, Boolean, default: false
-        attribute :gender, String
-        attribute :birthday, Decidim::Attributes::LocalizedDate
-        attribute :birthplace, String
-        attribute :ceased_date, Decidim::Attributes::LocalizedDate
-        attribute :designation_date, Decidim::Attributes::LocalizedDate
-        attribute :position, String
-        attribute :position_other, String
-        attribute :user_id, Integer
-        attribute :existing_user, Boolean, default: false
-
-        validates :designation_date, presence: true
-        validates :full_name, presence: true, unless: proc { |object| object.existing_user }
-        validates :non_user_avatar, passthru: {
-          to: Decidim::AssemblyMember,
-          with: {
-            # The member gets its organization context through the assembly
-            # object which is why we need to create a dummy assembly in order
-            # to pass the correct organization context to the file upload
-            # validators.
-            assembly: lambda do |form|
-              Decidim::Assembly.new(organization: form.current_organization)
-            end
-          }
-        }
-        validates :position, presence: true, inclusion: { in: Decidim::AssemblyMember::POSITIONS }
-        validates :position_other, presence: true, if: ->(form) { form.position == "other" }
-        validates :ceased_date, date: { after: :designation_date, allow_blank: true }
-        validates :user, presence: true, if: proc { |object| object.existing_user }
-
-        def map_model(model)
-          self.user_id = model.decidim_user_id
-          self.existing_user = user_id.present?
-        end
-
-        def user
-          @user ||= current_organization.user_entities.find_by(id: user_id)
-        end
-
-        def positions_for_select
-          Decidim::AssemblyMember::POSITIONS.map do |position|
-            [
-              I18n.t(position, scope: "decidim.admin.models.assembly_member.positions"),
-              position
-            ]
-          end
-        end
-      end
-    end
-  end
-end

data/app/helpers/decidim/assemblies/admin/assembly_members_helper.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      module AssemblyMembersHelper
-        include Decidim::PaginateHelper
-      end
-    end
-  end
-end

data/app/models/decidim/assembly_member.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # It represents a member of the assembly (president, secretary, ...)
-  # Can be linked to an existent user in the platform
-  class AssemblyMember < ApplicationRecord
-    include Decidim::Traceable
-    include Decidim::Loggable
-    include Decidim::HasUploadValidations
-
-    POSITIONS = %w(president vice_president secretary other).freeze
-
-    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::UserBaseEntity", optional: true
-    belongs_to :assembly, foreign_key: "decidim_assembly_id", class_name: "Decidim::Assembly"
-    alias participatory_space assembly
-
-    has_one_attached :non_user_avatar
-    validates_avatar :non_user_avatar, uploader: Decidim::AvatarUploader
-
-    delegate :organization, to: :assembly
-
-    default_scope { order(weight: :asc, created_at: :asc) }
-
-    scope :not_ceased, -> { where("ceased_date >= ? OR ceased_date IS NULL", Time.zone.today) }
-
-    def self.log_presenter_class_for(_log)
-      Decidim::Assemblies::AdminLog::AssemblyMemberPresenter
-    end
-
-    def remove_non_user_avatar
-      false
-    end
-  end
-end

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

@@ -1,47 +0,0 @@
-import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
-
-$(() => {
-  const $assemblyMemberType = $("#assembly_member_existing_user");
-
-  createFieldDependentInputs({
-    controllerField: $assemblyMemberType,
-    wrapperSelector: ".user-fields",
-    dependentFieldsSelector: ".user-fields--full-name",
-    dependentInputSelector: "input",
-    enablingCondition: ($field) => {
-      return $field.val() === "false"
-    }
-  });
-
-  createFieldDependentInputs({
-    controllerField: $assemblyMemberType,
-    wrapperSelector: ".user-fields",
-    dependentFieldsSelector: ".user-fields--non-user-avatar",
-    dependentInputSelector: "input",
-    enablingCondition: ($field) => {
-      return $field.val() === "false"
-    }
-  });
-
-  createFieldDependentInputs({
-    controllerField: $assemblyMemberType,
-    wrapperSelector: ".user-fields",
-    dependentFieldsSelector: ".user-fields--user-picker",
-    dependentInputSelector: "input",
-    enablingCondition: ($field) => {
-      return $field.val() === "true"
-    }
-  });
-
-  const $assemblyMemberPosition = $("#assembly_member_position");
-
-  createFieldDependentInputs({
-    controllerField: $assemblyMemberPosition,
-    wrapperSelector: ".position-fields",
-    dependentFieldsSelector: ".position-fields--position-other",
-    dependentInputSelector: "input",
-    enablingCondition: ($field) => {
-      return $field.val() === "other"
-    }
-  });
-})

data/app/presenters/decidim/admin/assembly_member_presenter.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    #
-    # Decorator for assembly members
-    #
-    class AssemblyMemberPresenter < SimpleDelegator
-      def name
-        if user
-          "#{user.name} (#{Decidim::UserPresenter.new(user).nickname})"
-        else
-          full_name
-        end
-      end
-
-      def position
-        return position_other if __getobj__.position == "other"
-
-        I18n.t(__getobj__.position, scope: "decidim.admin.models.assembly_member.positions", default: "")
-      end
-    end
-  end
-end

data/app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module AdminLog
-      # This class holds the logic to present a `Decidim::AssemblyMember`
-      # for the `AdminLog` log.
-      #
-      # Usage should be automatic and you should not need to call this class
-      # directly, but here is an example:
-      #
-      #    action_log = Decidim::ActionLog.last
-      #    view_helpers # => this comes from the views
-      #    AssemblyMemberPresenter.new(action_log, view_helpers).present
-      class AssemblyMemberPresenter < Decidim::Log::BasePresenter
-        private
-
-        def diff_fields_mapping
-          {
-            full_name: :string,
-            gender: :string,
-            birthday: :date,
-            birthplace: :string,
-            designation_date: :date,
-            position: "Decidim::Assemblies::AdminLog::ValueTypes::MemberPositionPresenter",
-            position_other: :string,
-            weight: :integer,
-            ceased_date: :date
-          }
-        end
-
-        def i18n_labels_scope
-          "activemodel.attributes.assembly_member"
-        end
-
-        def action_string
-          case action
-          when "create", "delete", "update"
-            "decidim.admin_log.assembly_member.#{action}"
-          else
-            super
-          end
-        end
-
-        def diff_actions
-          super + %w(delete)
-        end
-      end
-    end
-  end
-end

data/app/presenters/decidim/assemblies/admin_log/value_types/member_position_presenter.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module AdminLog
-      module ValueTypes
-        # This class presents the given value as an assembly member position.
-        # Check the `DefaultPresenter` for more info on how value presenters work.
-        class MemberPositionPresenter < Decidim::Log::ValueTypes::DefaultPresenter
-          # Public: Presents the value as an assembly member position.
-          #
-          # Returns an HTML-safe String.
-          def present
-            return if value.blank?
-
-            h.t(value, scope: "decidim.admin.models.assembly_member.positions", default: value)
-          end
-        end
-      end
-    end
-  end
-end

data/app/presenters/decidim/assembly_member_presenter.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  #
-  # Decorator for assembly members
-  #
-  class AssemblyMemberPresenter < SimpleDelegator
-    def age
-      (Time.current.strftime("%Y%m%d").to_i - birthday.strftime("%Y%m%d").to_i) / 10_000 if birthday
-    end
-
-    delegate :profile_url, to: :user, allow_nil: true
-
-    def name
-      user ? user.name : full_name
-    end
-
-    def nickname
-      user.nickname if user
-    end
-
-    def personal_information
-      [
-        gender.presence,
-        age,
-        birthplace.presence
-      ].compact.join(" / ")
-    end
-
-    def position
-      return position_other if __getobj__.position == "other"
-
-      I18n.t(__getobj__.position, scope: "decidim.admin.models.assembly_member.positions", default: "")
-    end
-
-    def avatar_url(variant = nil)
-      return user.avatar_url(variant) if user.present?
-
-      non_user_avatar_path(variant)
-    end
-
-    def non_user_avatar_path(variant = nil)
-      return non_user_avatar.default_url(variant) unless non_user_avatar.attached?
-
-      non_user_avatar.path(variant:)
-    end
-
-    def non_user_avatar
-      attached_uploader(:non_user_avatar)
-    end
-
-    def has_tooltip?
-      false
-    end
-
-    def deleted?
-      false
-    end
-
-    private
-
-    def user
-      @user ||= if (user = __getobj__.user.presence)
-                  Decidim::UserPresenter.new(user)
-                end
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-<div class="form__wrapper">
-  <div class="card pt-4">
-    <div class="card-section">
-      <div class="row column">
-        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
-      </div>
-    </div>
-  </div>
-</div>

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

@@ -1,13 +0,0 @@
-<% add_decidim_page_title(t("decidim.assemblies.admin.assemblies_types.form.title")) %>
-<div class="item__edit item__edit-1col">
-  <div class="item__edit-form">
-    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_assembly_type" }) do |f| %>
-      <%= render partial: "form", object: f %>
-      <div class="item__edit-sticky">
-        <div class="item__edit-sticky-container">
-          <%= f.submit t("assemblies.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>

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

@@ -1,44 +0,0 @@
-<% add_decidim_page_title(t("decidim.admin.titles.assemblies_types")) %>
-
-<div class="card" id="assembly-types">
-  <div class="item_show__header">
-    <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.assemblies_types" %>
-      <%= link_to t("actions.new_assembly_type", scope: "decidim.admin"),
-                  [:new, :assemblies_type],
-                  class: "button button__sm button__secondary" if allowed_to? :create, :assembly_type %>
-    </h1>
-  </div>
-  <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-line", 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 "delete-bin-line", 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>
-        </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-</div>

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

@@ -1,18 +0,0 @@
-<% add_decidim_page_title(t("assemblies_types.new.title", scope: "decidim.admin")) %>
-<div class="item_show__header">
-  <h1 class="item_show__header-title">
-    <%= t("assemblies_types.new.title", scope: "decidim.admin") %>
-  </h1>
-</div>
-<div class="item__edit item__edit-1col">
-  <div class="item__edit-form">
-    <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly_type" }) do |f| %>
-      <%= render partial: "form", object: f %>
-      <div class="item__edit-sticky">
-        <div class="item__edit-sticky-container">
-          <%= f.submit t("assemblies_types.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>