decidim-proposals 0.10.1 → 0.11.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134c47ba1de8ba2cdf3a628a14c2dc48698f211e82c681780c84dc8b2430c9dc
-  data.tar.gz: 32a3c2095ce8d9911fedfb4b2de32700e8486f77295b0803286dc13177edec30
+  metadata.gz: 61f120f1a36e87a9527996ea017a92f0b86b86568238b2f3da8d3a1e71f6f2b8
+  data.tar.gz: 9f16f208205af60021e22ebe63b5de3777257b307bb20df62fe3b21854af8743
 SHA512:
-  metadata.gz: ef07e3be67591e0b8762c564f249f264a9dc21c85a3cf369cef4a705a08487c3936a399d797027aa79fba678eb189c3f40b9c782a96de8db01faae4a38844f80
-  data.tar.gz: a62d55e516832b9e7406caeb89313fdc36316918457fe0006b006b0296824b7c39311f89c96c536b936f4a1178ec42e73a0593faf871802275a46ab6be55b4fc
+  metadata.gz: 422a99e81a8365aedcaf35b849878c314fad0175bb2de621b15e64d9764583488c5639a8879b6ffda09b57e21f36474ed29078debdbcfdd0d4d5b500fa942b8b
+  data.tar.gz: dc7f9546a449a83fd9625ae16c8dadb319784e57bdb3ccd7e455a341c9bf9b8442d060c902a2d04ed9de2cb82d4b7888516a1b2ab94f65dc4144bb9de30aa1fa

data/README.md

@@ -1,10 +1,10 @@
 # Decidim::Proposals
 
-The Proposals module adds one of the main features of Decidim: allows users to contribute to a participatory process by creating proposals.
+The Proposals module adds one of the main components of Decidim: allows users to contribute to a participatory process by creating proposals.
 
 ## Usage
 
-Proposals will be available as a Feature for a Participatory Process.
+Proposals will be available as a Component for a Participatory Process.
 
 ## Installation
 

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

@@ -2,8 +2,8 @@ $(() => {
   window.DecidimProposals = window.DecidimProposals || {};
 
   window.DecidimProposals.bindProposalAddress = () => {
-    const $checkbox = $('#proposal_has_address');
-    const $addressInput = $('#address_input');
+    const $checkbox = $("#proposal_has_address");
+    const $addressInput = $("#address_input");
 
     if ($checkbox.length > 0) {
       const toggleInput = () => {
@@ -14,7 +14,7 @@ $(() => {
         }
       }
       toggleInput();
-      $checkbox.on('change', toggleInput);
+      $checkbox.on("change", toggleInput);
     }
   };
 

data/app/assets/javascripts/decidim/proposals/admin/proposals.es6

@@ -4,7 +4,7 @@ $(document).ready(function () {
     return $('.table-list .js-check-all-proposal:checked').length
   }
 
-  let selectedProposalsCountUpdate = function() {
+  window.selectedProposalsCountUpdate = function() {
     if(selectedProposalsCount() == 0){
       $("#js-recategorize-proposals-count").text("")
     } else {
@@ -25,7 +25,7 @@ $(document).ready(function () {
     }
   }
 
-  let showOtherActionsButtons = function() {
+  window.showOtherActionsButtons = function() {
     $("#js-other-actions-wrapper").removeClass('hide');
   }
 
@@ -37,13 +37,12 @@ $(document).ready(function () {
     $("#js-recategorize-proposals-actions").removeClass('hide');
   }
 
-  let hideRecategorizeProposalActions = function() {
-    $("#js-recategorize-proposals-actions").addClass('hide');
+  window.hideRecategorizeProposalActions = function() {
+    return $("#js-recategorize-proposals-actions").addClass('hide');
   }
 
-
   if ($('#js-form-recategorize-proposals').length) {
-    hideRecategorizeProposalActions();
+    window.hideRecategorizeProposalActions();
     $("#js-bulk-actions-button").addClass('hide');
 
     $("#js-bulk-actions-recategorize").click(function(e){
@@ -105,7 +104,7 @@ $(document).ready(function () {
     });
 
     $('#js-cancel-edit-category').on('click', function (e) {
-      hideRecategorizeProposalActions();
+      window.hideRecategorizeProposalActions()
       showBulkActionsButton();
       showOtherActionsButtons();
     });

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

@@ -5,17 +5,17 @@
  */
 $(document).ready(function () {
 
-  let button = $('#select-identity-button'),
+  let button = $("#select-identity-button"),
       refreshUrl = null,
-      userIdentitiesDialog = $('#user-identities');
+      userIdentitiesDialog = $("#user-identities");
 
   if (userIdentitiesDialog.length) {
-    refreshUrl = userIdentitiesDialog.data('refresh-url');
+    refreshUrl = userIdentitiesDialog.data("refresh-url");
 
     button.click(function () {
       $.ajax(refreshUrl).done(function(response) {
-        userIdentitiesDialog.html(response).foundation('open');
-        button.trigger('ajax:success')
+        userIdentitiesDialog.html(response).foundation("open");
+        button.trigger("ajax:success")
       });
     });
   }
@@ -27,26 +27,26 @@ $(document).ready(function () {
  *
  */
 $(document).ready(function () {
-  $("#select-identity-button").on('ajax:success', function() {
+  $("#select-identity-button").on("ajax:success", function() {
     // once reveal popup has been rendered register event callbacks
     $("#user-identities ul.reveal__list li").each(function(index, elem) {
       let liTag = $(elem)
-      liTag.on('click', function() {
-        let method = liTag.data('method')
-        let url = liTag.data('url')
+      liTag.on("click", function() {
+        let method = liTag.data("method")
+        let url = liTag.data("url")
         $.ajax({
           url: url,
           method: method,
-          dataType: 'script',
+          dataType: "script",
           success: function() {
-            if (liTag.hasClass('selected')) {
-              liTag.removeClass('selected')
-              liTag.find('.icon--circle-check').addClass('invisible')
-              liTag.data('method', 'post')
+            if (liTag.hasClass("selected")) {
+              liTag.removeClass("selected")
+              liTag.find(".icon--circle-check").addClass("invisible")
+              liTag.data("method", "post")
             } else {
-              liTag.addClass('selected')
-              liTag.find('.icon--circle-check').removeClass('invisible')
-              liTag.data('method', 'delete')
+              liTag.addClass("selected")
+              liTag.find(".icon--circle-check").removeClass("invisible")
+              liTag.data("method", "delete")
             }
           }
         })

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

@@ -2,10 +2,10 @@
 
 (() => {
   $("#vote_button").mouseover(function () {
-    $(this).text($(this).data('replace'));
+    $(this).text($(this).data("replace"));
   });
 
   $("#vote_button").mouseout(function () {
-    $(this).text($(this).data('original'));
+    $(this).text($(this).data("original"));
   });
 })(this);

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -53,7 +53,7 @@ module Decidim
             body: form.body,
             category: form.category,
             scope: form.scope,
-            feature: form.feature,
+            component: form.component,
             address: form.address,
             latitude: form.latitude,
             longitude: form.longitude,
@@ -86,7 +86,7 @@ module Decidim
         end
 
         def attachments_allowed?
-          form.current_feature.settings.attachments_allowed?
+          form.current_component.settings.attachments_allowed?
         end
 
         def process_attachments?

data/app/commands/decidim/proposals/admin/import_proposals.rb

@@ -31,6 +31,8 @@ module Decidim
 
         def import_proposals
           proposals.map do |original_proposal|
+            next if proposal_already_copied?(original_proposal, target_component)
+
             origin_attributes = original_proposal.attributes.except(
               "id",
               "created_at",
@@ -38,7 +40,7 @@ module Decidim
               "state",
               "answer",
               "answered_at",
-              "decidim_feature_id",
+              "decidim_component_id",
               "reference",
               "proposal_votes_count",
               "proposal_notes_count"
@@ -46,16 +48,16 @@ module Decidim
 
             proposal = Decidim::Proposals::Proposal.new(origin_attributes)
             proposal.category = original_proposal.category
-            proposal.feature = target_feature
+            proposal.component = target_component
             proposal.save!
 
             proposal.link_resources([original_proposal], "copied_from_component")
-          end
+          end.compact
         end
 
         def proposals
           Decidim::Proposals::Proposal
-            .where(feature: origin_feature)
+            .where(component: origin_component)
             .where(state: proposal_states)
         end
 
@@ -70,12 +72,18 @@ module Decidim
           @proposal_states
         end
 
-        def origin_feature
-          @form.origin_feature
+        def origin_component
+          @form.origin_component
         end
 
-        def target_feature
-          @form.current_feature
+        def target_component
+          @form.current_component
+        end
+
+        def proposal_already_copied?(original_proposal, target_component)
+          original_proposal.linked_resources(:proposals, "copied_from_component").any? do |proposal|
+            proposal.component == target_component
+          end
         end
       end
     end

data/app/commands/decidim/proposals/create_proposal.rb

@@ -52,7 +52,7 @@ module Decidim
           scope: form.scope,
           author: @current_user,
           decidim_user_group_id: form.user_group_id,
-          feature: form.feature,
+          component: form.component,
           address: form.address,
           latitude: form.latitude,
           longitude: form.longitude
@@ -84,7 +84,7 @@ module Decidim
       end
 
       def attachments_allowed?
-        form.current_feature.settings.attachments_allowed?
+        form.current_component.settings.attachments_allowed?
       end
 
       def process_attachments?
@@ -92,7 +92,7 @@ module Decidim
       end
 
       def proposal_limit_reached?
-        proposal_limit = form.current_feature.settings.proposal_limit
+        proposal_limit = form.current_component.settings.proposal_limit
 
         return false if proposal_limit.zero?
 
@@ -104,7 +104,7 @@ module Decidim
       end
 
       def user_group
-        @user_group ||= Decidim::UserGroup.where(organization: organization, id: form.user_group_id).first
+        @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
       end
 
       def organization
@@ -112,11 +112,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.where(author: @current_user, feature: form.current_feature)
+        Proposal.where(author: @current_user, component: form.current_component).except_withdrawn
       end
 
       def user_group_proposals
-        Proposal.where(user_group: @user_group, feature: form.current_feature)
+        Proposal.where(user_group: @user_group, component: form.current_component).except_withdrawn
       end
     end
   end

data/app/commands/decidim/proposals/destroy_proposal.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user destroys a draft proposal.
+    class DestroyProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - The proposal to destroy.
+      # current_user - The current user.
+      def initialize(proposal, current_user)
+        @proposal = proposal
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid and the proposal is deleted.
+      # - :invalid if the proposal is not a draft.
+      # - :invalid if the proposal's author is not the current user.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @proposal.draft?
+        return broadcast(:invalid) if @proposal.author != @current_user
+
+        @proposal.destroy!
+
+        broadcast(:ok, @proposal)
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/update_proposal.rb

@@ -52,7 +52,7 @@ module Decidim
       end
 
       def proposal_limit_reached?
-        proposal_limit = form.current_feature.settings.proposal_limit
+        proposal_limit = form.current_component.settings.proposal_limit
 
         return false if proposal_limit.zero?
 
@@ -64,7 +64,7 @@ module Decidim
       end
 
       def user_group
-        @user_group ||= Decidim::UserGroup.where(organization: organization, id: form.user_group_id).first
+        @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
       end
 
       def organization
@@ -72,11 +72,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.where(author: current_user, feature: form.current_feature).published.where.not(id: proposal.id)
+        Proposal.where(author: current_user, component: form.current_component).published.where.not(id: proposal.id)
       end
 
       def user_group_proposals
-        Proposal.where(user_group: user_group, feature: form.current_feature).published.where.not(id: proposal.id)
+        Proposal.where(user_group: user_group, component: form.current_component).published.where.not(id: proposal.id)
       end
     end
   end

data/app/controllers/decidim/proposals/admin/application_controller.rb

@@ -6,9 +6,9 @@ module Decidim
       # This controller is the abstract class from which all other controllers of
       # this engine inherit.
       #
-      # Note that it inherits from `Decidim::Admin::Features::BaseController`, which
+      # Note that it inherits from `Decidim::Admin::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
-      class ApplicationController < Decidim::Admin::Features::BaseController
+      class ApplicationController < Decidim::Admin::Components::BaseController
       end
     end
   end

data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -32,7 +32,7 @@ module Decidim
         private
 
         def proposal
-          @proposal ||= Proposal.where(feature: current_feature).find(params[:id])
+          @proposal ||= Proposal.where(component: current_component).find(params[:id])
         end
       end
     end

data/app/controllers/decidim/proposals/admin/proposal_notes_controller.rb

@@ -32,7 +32,7 @@ module Decidim
         private
 
         def proposal
-          @proposal ||= Proposal.where(feature: current_feature).find(params[:proposal_id])
+          @proposal ||= Proposal.where(component: current_component).find(params[:proposal_id])
         end
       end
     end

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -64,7 +64,7 @@ module Decidim
         private
 
         def query
-          @query ||= Proposal.where(feature: current_feature).published.ransack(params[:q])
+          @query ||= Proposal.where(component: current_component).published.ransack(params[:q])
         end
 
         def proposals
@@ -72,7 +72,7 @@ module Decidim
         end
 
         def proposal
-          @proposal ||= Proposal.where(feature: current_feature).find(params[:id])
+          @proposal ||= Proposal.where(component: current_component).find(params[:id])
         end
 
         def update_proposals_category_response_successful(response)

data/app/controllers/decidim/proposals/admin/proposals_imports_controller.rb

@@ -5,22 +5,22 @@ module Decidim
     module Admin
       class ProposalsImportsController < Admin::ApplicationController
         def new
-          authorize! :manage, current_feature
+          authorize! :manage, current_component
 
           @form = form(Admin::ProposalsImportForm).instance
         end
 
         def create
-          authorize! :manage, current_feature
+          authorize! :manage, current_component
 
           @form = form(Admin::ProposalsImportForm).from_params(params)
 
-          authorize! :manage, @form.origin_feature
+          authorize! :manage, @form.origin_component
 
           Admin::ImportProposals.call(@form) do
             on(:ok) do |proposals|
               flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.proposals.admin", number: proposals.length)
-              redirect_to EngineRouter.admin_proxy(current_feature).root_path
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
             end
 
             on(:invalid) do

data/app/controllers/decidim/proposals/application_controller.rb

@@ -5,9 +5,9 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Features::BaseController`, which
+    # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
-    class ApplicationController < Decidim::Features::BaseController
+    class ApplicationController < Decidim::Components::BaseController
       helper Decidim::Messaging::ConversationHelper
 
       helper_method :proposal_limit_reached?
@@ -15,8 +15,8 @@ module Decidim
       private
 
       def proposal_limit
-        return nil if feature_settings.proposal_limit.zero?
-        feature_settings.proposal_limit
+        return nil if component_settings.proposal_limit.zero?
+        component_settings.proposal_limit
       end
 
       def proposal_limit_reached?
@@ -26,7 +26,7 @@ module Decidim
       end
 
       def proposals
-        Proposal.where(feature: current_feature)
+        Proposal.where(component: current_component)
       end
     end
   end