decidim-core 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0dd8d6b3f087054a2af0d5d971d81c6a52adae
-  data.tar.gz: 5395196374ab3e8f0f7a65abba480e914505938d
+  metadata.gz: d96ba296398fd826bdcf4c32066893664f91f190
+  data.tar.gz: e378de5bd40d0cbd7f95e811e921cbbce3fd3f15
 SHA512:
-  metadata.gz: fae7b86d0ca687eb0f3519d3cd7886c626224e023d95a6db84a7cdeef3d979193475117596993846231df7a4510bcab8f22b5f912283e1ea075b1d68b4018e77
-  data.tar.gz: 6e0d57a494c3a2d7bcbc1ecac618c47447defd88422c1761006b65e7f9e3a1ecb1889db554d150451728e8fd5c11591d1a18cadbbec176630ffb2c34ea392ee3
+  metadata.gz: c5ad0b5762d5c1c9d2ec61392c7a22587ecc4d769f35dbe938be51513f0446df6104c75fb36e34cf5260ba104a71ab5bb591527a3706e5f1e8e1a22155515ba2
+  data.tar.gz: 5d32c6d26f18146787b85c53c019bb549d0a3569b90dcae89588a4a7249f6f472e2addad8b08b911276472b487809462b45639277f58fe346aaa95aaa2417c73

data/app/assets/javascripts/decidim.js.es6

@@ -1,3 +1,4 @@
+// = require jquery
 // = require decidim/foundation
 // = require modernizr
 // = require svg4everybody.min
@@ -8,6 +9,7 @@
 // = require decidim/history
 // = require decidim/append_elements
 // = require decidim/user_registrations
+// = require decidim/account_form
 
 /* globals svg4everybody */
 

data/app/assets/javascripts/decidim/account_form.js.es6

@@ -0,0 +1,27 @@
+/**
+ * Since the delete account has a modal to confirm it we need to copy the content of the
+ * reason field to the hidden field in the form inside the modal.
+ */
+$(() => {
+  const $deleteAccountForm = $('.delete-account');
+  const $deleteAccountModalForm = $('.delete-account-modal');
+
+  if ($deleteAccountForm.length > 0) {
+    const $openModalButton = $('.open-modal-button');
+    const $modal = $('#deleteConfirm');
+
+    $openModalButton.on('click', (event) => {
+      try {
+        const reasonValue = $deleteAccountForm.find('textarea#delete_account_delete_reason').val();
+        $deleteAccountModalForm.find('input#delete_account_delete_reason').val(reasonValue);
+        $modal.foundation('open');
+      } catch (error) {
+        console.error(error); // eslint-disable-line no-console
+      }
+
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    });
+  }
+});

data/app/assets/javascripts/decidim/editor.js.es6

@@ -5,7 +5,7 @@ $(() => {
   const $container = $('.editor-container');
   const quillFormats = ['bold', 'italic', 'link', 'underline', 'header', 'list', 'video'];
 
-  $container.each((idx, container) => {
+  const createQuillEditor = (container) => {
     const toolbar = $(container).data('toolbar');
 
     let quillToolbar = [
@@ -39,6 +39,13 @@ $(() => {
       }
     });
 
-    quill.root.innerHTML = $input.val();
+    quill.root.innerHTML = $input.val() || '';
+  };
+
+  $container.each((idx, container) => {
+    createQuillEditor(container);
   });
+
+  window.Decidim = window.Decidim || {};
+  window.Decidim.createQuillEditor = createQuillEditor;
 });

data/app/assets/javascripts/decidim/form_filter.component.js.es6

@@ -54,7 +54,7 @@
     }
 
     /**
-     * Finds the values of the location prams that match the given regexp.
+     * Finds the values of the location params that match the given regexp.
      * @private
      * @param {Regexp} regex - a Regexp to match the params.
      * @returns {String[]} - An array of values of the params that match the regexp.

data/app/assets/javascripts/decidim/form_filter.component.test.js

@@ -70,14 +70,14 @@ describe('FormFilterComponent', () => {
       it('clears the form data', () => {
         spyOn(subject, '_clearForm');
 
-        window.onpopstate();
+        window.onpopstate({ isTrusted: true });
 
         expect(subject._clearForm).toHaveBeenCalled();
       });
 
       it('sets the correct form fields based on the current location', () => {
         spyOn(subject, '_getLocation').and.returnValue('/filters?filter[scope_id][]=1&scope_id[]=2&filter[category_id]=2');
-        window.onpopstate();
+        window.onpopstate({ isTrusted: true });
 
         expect($(selector).find('select').val()).toEqual('2');
         expect($(selector).find('input[name="filter[scope_id][]"][value="1"]')[0].checked).toBeTruthy();

data/app/assets/javascripts/decidim/history.js.es6

@@ -4,10 +4,13 @@
 ((exports) => {
   let callbacks = {};
 
-  exports.onpopstate = () => {
-    for (let callbackId in callbacks) {
-      if (callbacks.hasOwnProperty(callbackId)) {
-        callbacks[callbackId]();
+  exports.onpopstate = (event) => {
+    // Ensure the event is caused by user action
+    if (event.isTrusted) {
+      for (let callbackId in callbacks) {
+        if (callbacks.hasOwnProperty(callbackId)) {
+          callbacks[callbackId]();
+        }
       }
     }
   };

data/app/commands/decidim/create_registration.rb

@@ -48,7 +48,8 @@ module Decidim
       UserGroupMembership.create!(user: @user,
                                   user_group: UserGroup.new(name: form.user_group_name,
                                                             document_number: form.user_group_document_number,
-                                                            phone: form.user_group_phone))
+                                                            phone: form.user_group_phone,
+                                                            decidim_organization_id: form.current_organization.id))
     end
   end
 end

data/app/commands/decidim/destroy_account.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This command destroys the user's account.
+  class DestroyAccount < Rectify::Command
+    # Destroy a user's account.
+    #
+    # user - The user to be updated.
+    # form - The form with the data.
+    def initialize(user, form)
+      @user = user
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid) unless @form.valid?
+
+      Decidim::User.transaction do
+        destroy_user_account!
+        destroy_user_identities
+        destroy_user_group_memberships
+      end
+
+      broadcast(:ok)
+    end
+
+    private
+
+    def destroy_user_account!
+      @user.name = ""
+      @user.email = ""
+      @user.delete_reason = @form.delete_reason
+      @user.deleted_at = Time.current
+      @user.skip_reconfirmation!
+      @user.remove_avatar!
+      @user.save!
+    end
+
+    def destroy_user_identities
+      @user.identities.destroy_all
+    end
+
+    def destroy_user_group_memberships
+      Decidim::UserGroupMembership.where(user: @user).destroy_all
+    end
+  end
+end

data/app/constraints/decidim/current_feature.rb

@@ -28,7 +28,7 @@ module Decidim
 
       env["decidim.current_participatory_process"] ||= @participatory_process
 
-      feature = detect_current_feature(request)
+      feature = detect_current_feature(params)
 
       return false unless feature
 
@@ -38,12 +38,11 @@ module Decidim
 
     private
 
-    def detect_current_feature(request)
-      params = request.params
+    def detect_current_feature(params)
       return nil unless params["feature_id"]
 
-      @participatory_process.features.to_a.find do |feature|
-        params["feature_id"].to_s == feature.id.to_s && feature.manifest_name == @manifest.name.to_s
+      @participatory_process.features.find do |feature|
+        params["feature_id"] == feature.id.to_s && feature.manifest_name == @manifest.name.to_s
       end
     end
   end

data/app/controllers/concerns/decidim/needs_participatory_process.rb

@@ -19,7 +19,7 @@ module Decidim
       #
       # Returns the current ParticipatoryProcess.
       def current_participatory_process
-        @current_participatory_process ||= current_organization.participatory_processes.find_by(id: params[:participatory_process_id] || params[:id])
+        @current_participatory_process ||= detect_participatory_process
       end
 
       private
@@ -27,6 +27,11 @@ module Decidim
       def verify_participatory_process
         raise ActionController::RoutingError, "Participatory process not found." unless current_participatory_process
       end
+
+      def detect_participatory_process
+        request.env["current_participatory_process"] ||
+          current_organization.participatory_processes.find_by(id: params[:participatory_process_id] || params[:id])
+      end
     end
   end
 end

data/app/controllers/decidim/account_controller.rb

@@ -18,8 +18,8 @@ module Decidim
       @account = form(AccountForm).from_params(params)
 
       UpdateAccount.call(current_user, @account) do
-        on(:ok) do |_account, unconfirmed_email|
-          flash.now[:notice] = if unconfirmed_email
+        on(:ok) do |email_is_unconfirmed|
+          flash.now[:notice] = if email_is_unconfirmed
                                  t("account.update.success_with_email_confirmation", scope: "decidim")
                                else
                                  t("account.update.success", scope: "decidim")
@@ -36,6 +36,29 @@ module Decidim
       render action: :show
     end
 
+    def delete
+      authorize! :delete, current_user
+      @form = form(DeleteAccountForm).from_model(current_user)
+    end
+
+    def destroy
+      authorize! :delete, current_user
+      @form = form(DeleteAccountForm).from_params(params)
+
+      DestroyAccount.call(current_user, @form) do
+        on(:ok) do
+          sign_out(current_user)
+          flash[:notice] = t("account.destroy.success", scope: "decidim")
+        end
+
+        on(:invalid) do
+          flash[:alert] = t("account.destroy.error", scope: "decidim")
+        end
+      end
+
+      redirect_to decidim.root_path
+    end
+
     private
 
     def authorizations

data/app/controllers/decidim/authorizations_controller.rb

@@ -63,7 +63,7 @@ module Decidim
     end
 
     def handler_name
-      params[:handler] || params[:authorization_handler][:handler_name]
+      params[:handler] || params.dig(:authorization_handler, :handler_name)
     end
 
     def valid_handler
@@ -72,7 +72,7 @@ module Decidim
       logger.warn "Invalid authorization handler given: #{handler_name} doesn't"\
         "exist or you haven't added it to `Decidim.authorization_handlers`"
 
-      redirect_to(account_path) && (return false)
+      redirect_to(authorizations_path) && (return false)
     end
 
     def only_one_handler?

data/app/controllers/decidim/pages_controller.rb

@@ -25,11 +25,13 @@ module Decidim
     end
 
     def promoted_participatory_processes
-      @promoted_processes ||= OrganizationPrioritizedParticipatoryProcesses.new(current_organization) | PromotedParticipatoryProcesses.new
+      @promoted_participatory_processes ||=
+        OrganizationPrioritizedParticipatoryProcesses.new(current_organization) | PromotedParticipatoryProcesses.new
     end
 
     def highlighted_participatory_processes
-      @promoted_processes ||= OrganizationParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
+      @highlighted_participatory_processes ||=
+        OrganizationParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
     end
 
     private

data/app/forms/decidim/delete_account_form.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object that handles the data behind deleting users account.
+  class DeleteAccountForm < Form
+    attribute :delete_reason, String
+  end
+end

data/app/forms/decidim/registration_form.rb

@@ -28,6 +28,8 @@ module Decidim
     validates :user_group_phone, presence: true, if: :user_group?
 
     validate :email_unique_in_organization
+    validate :user_group_name_unique_in_organization
+    validate :user_group_document_number_unique_in_organization
 
     def user_group?
       sign_up_as == "user_group"
@@ -38,5 +40,16 @@ module Decidim
     def email_unique_in_organization
       errors.add :email, :taken if User.where(email: email, organization: current_organization).first.present?
     end
+
+    def user_group_name_unique_in_organization
+      errors.add :user_group_name, :taken if UserGroup.where(name: user_group_name, decidim_organization_id: current_organization.id).first.present?
+    end
+
+    def user_group_document_number_unique_in_organization
+      errors.add :user_group_document_number, :taken if UserGroup.where(
+        document_number: user_group_document_number,
+        decidim_organization_id: current_organization.id
+      ).first.present?
+    end
   end
 end

data/app/helpers/decidim/action_authorization_helper.rb

@@ -33,10 +33,10 @@ module Decidim
         html_options = arguments[2]
       end
 
-      unless action_authorization(action).ok?
+      unless current_user_authorized?(action)
         html_options ||= {}
         html_options["onclick"] = "event.preventDefault();"
-        html_options["data-toggle"] = "#{action.to_s.underscore}AuthorizationModal"
+        html_options["data-toggle"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
         url = ""
       end
 
@@ -66,9 +66,9 @@ module Decidim
         html_options = arguments[2] || {}
       end
 
-      unless action_authorization(action).ok?
+      unless current_user_authorized?(action)
         html_options["onclick"] = "event.preventDefault();"
-        html_options["data-toggle"] = "#{action.to_s.underscore}AuthorizationModal"
+        html_options["data-toggle"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
         url = ""
       end
 
@@ -78,5 +78,11 @@ module Decidim
         button_to(body, url, html_options)
       end
     end
+
+    private
+
+    def current_user_authorized?(action)
+      current_user && action_authorization(action).ok?
+    end
   end
 end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -15,5 +15,101 @@ module Decidim
       options[:data].update(abide: true, "live-validate" => true, "validate-on-blur" => true)
       form_for(record, options, &block)
     end
+
+    # A custom helper to include an editor field without requiring a form object
+    #
+    # name - The input name
+    # value - The input value
+    # options - The set of options to send to the field
+    #           :label   - The Boolean value to create or not the input label (optional) (default: true)
+    #           :toolbar - The String value to configure WYSIWYG toolbar. It should be 'basic' or
+    #                      or 'full' (optional) (default: 'basic')
+    #           :lines   - The Integer to indicate how many lines should editor have (optional)
+    #
+    # Returns a rich editor to be included in a html template.
+    def editor_field_tag(name, value, options = {})
+      options[:toolbar] ||= "basic"
+      options[:lines] ||= 10
+
+      content_tag(:div, class: "editor") do
+        template = ""
+        template += label_tag(name, options[:label]) if options[:label] != false
+        template += hidden_field_tag(name, value, options)
+        template += content_tag(:div, nil, class: "editor-container", data: {
+                                  toolbar: options[:toolbar]
+                                }, style: "height: #{options[:lines]}rem")
+        template.html_safe
+      end
+    end
+
+    # A custom helper to include a translated field without requiring a form object.
+    #
+    # type        - The type of the translated input field.
+    # object_name - The object name used to identify the Foundation tabs.
+    # name        - The name of the input which will be suffixed with the corresponding locales.
+    # value       - A hash containing the value for each locale.
+    # options     - An optional hash of options.
+    #             * enable_tabs: Adds the data-tabs attribute so Foundation picks up automatically.
+    #             * tabs_id: The id to identify the Foundation tabs element.
+    #             * label: The label used for the field.
+    #
+    # Returns a Foundation tabs element with the translated input field.
+    def translated_field_tag(type, object_name, name, value = {}, options = {})
+      locales = available_locales
+
+      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
+      enabled_tabs = options[:enable_tabs].nil? ? true : options[:enable_tabs]
+      tabs_panels_data = enabled_tabs ? { tabs: true } : {}
+
+      if locales.count == 1
+        return send(
+          type,
+          "#{name}_#{locales.first.to_s.gsub("-", "__")}",
+          options.merge(label: options[:label])
+        )
+      end
+
+      label_tabs = content_tag(:div, class: "label--tabs") do
+        field_label = label_tag(name, options[:label])
+
+        tabs_panels = "".html_safe
+        if options[:label] != false
+          tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: tabs_id, data: tabs_panels_data) do
+            locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
+              string + content_tag(:li, class: tab_element_class_for("title", index)) do
+                title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
+                tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+                content_tag(:a, title, href: "##{tab_content_id}")
+              end
+            end
+          end
+        end
+
+        safe_join [field_label, tabs_panels]
+      end
+
+      tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
+        locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
+          tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+          string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
+            send(type, "#{object_name}[#{name_with_locale(name, locale)}]", value[locale.to_s], options.merge(id: "#{tabs_id}_#{name}_#{locale}", label: false))
+          end
+        end
+      end
+
+      safe_join [label_tabs, tabs_content]
+    end
+
+    # Helper method used by `translated_field_tag`
+    def tab_element_class_for(type, index)
+      element_class = "tabs-#{type}"
+      element_class += " is-active" if index.zero?
+      element_class
+    end
+
+    # Helper method used by `translated_field_tag`
+    def name_with_locale(name, locale)
+      "#{name}_#{locale.to_s.gsub("-", "__")}"
+    end
   end
 end