decidim-initiatives 0.30.1 → 0.31.0.rc1

data/app/packs/src/decidim/initiatives/check_code.js

@@ -0,0 +1,114 @@
+const focusDigit = (digit) => {
+  const length = digit.value.length;
+  digit.focus();
+  setTimeout(() => digit.setSelectionRange(length, length), 0);
+};
+
+const validateCode = (path, code) => {
+  return fetch(path, {
+    method: "PUT",
+    cache: "no-cache",
+    headers: {
+      "Content-Type": "application/json",
+      "X-CSRF-Token": document.querySelector("meta[name=csrf-token]")?.content
+    },
+    body: JSON.stringify({ confirmation: { "verification_code": code } })
+  }).
+    then((response) => response.json()).
+    then((json) => { return json.sms_code === "OK" });
+};
+
+const updateSubmit = (enable, includeAnnouncement) => {
+  const correctAnnouncement = document.querySelector(".code-correct-announcement");
+  const incorrectAnnouncement = document.querySelector(".code-incorrect-announcement");
+  const submitButton = document.querySelector("[data-submit-verification-code]");
+  const resendCodeMessage = document.querySelector("[data-resend-code]");
+
+  if (enable) {
+    if (includeAnnouncement) {
+      correctAnnouncement.classList.remove("hidden");
+      resendCodeMessage.classList.add("hidden");
+    } else {
+      correctAnnouncement.classList.add("hidden");
+      resendCodeMessage.classList.remove("hidden");
+    }
+    incorrectAnnouncement.classList.add("hidden");
+    submitButton.classList.remove("hidden");
+    submitButton.disabled = false;
+  } else {
+    if (includeAnnouncement) {
+      incorrectAnnouncement.classList.remove("hidden");
+      resendCodeMessage.classList.add("hidden");
+    } else {
+      incorrectAnnouncement.classList.add("hidden");
+      resendCodeMessage.classList.remove("hidden");
+    }
+    correctAnnouncement.classList.add("hidden");
+    submitButton.classList.add("hidden");
+    submitButton.disabled = true;
+  }
+}
+
+const updateValue = (codeInput, event, digitsInputs) => {
+  const checkCodePath = codeInput.dataset.checkCodePath;
+  const index = Number(event.target.dataset.verificationCode);
+  const prevDigit = digitsInputs[index - 1];
+  const nextDigit = digitsInputs[index + 1];
+  let digits = codeInput.value.split("");
+  const newDigit = event.target.value || "-";
+  if (newDigit.length > 0) {
+    const position = event.target.dataset.verificationCode;
+    digits[position] = newDigit;
+    const newCode = digits.join("")
+    if (codeInput.value !== newCode) {
+      codeInput.value = newCode;
+      if ((/^\d{6}$/).test(newCode)) {
+        validateCode(checkCodePath, newCode).then((validCode) => updateSubmit(validCode, true));
+      } else {
+        updateSubmit(false, false);
+      }
+    }
+
+    if (prevDigit && newDigit === "-") {
+      focusDigit(prevDigit);
+    } else if (nextDigit && newDigit !== "-") {
+      focusDigit(nextDigit);
+    }
+  }
+};
+
+const updatePosition = (codeInput, event, digitsInputs) => {
+  const index = Number(event.target.dataset.verificationCode);
+  const nextDigit = (() => {
+    if (event.key === "ArrowLeft" || ["Delete", "Backspace"].includes(event.key) && event.target.value === "") {
+      return digitsInputs[index - 1];
+    } else if (event.key === "ArrowRight" || (/^\d$/).test(event.key) && event.target.value.length > 0) {
+      return digitsInputs[index + 1];
+    }
+    return false;
+  })();
+
+  if (nextDigit) {
+    focusDigit(nextDigit);
+  }
+  return true;
+};
+
+
+const initializeCodeVerificator = (codeElement) => {
+  const codeInput = codeElement.querySelector("[data-check-code-path]");
+  const digitsInputs = codeElement.querySelectorAll("[data-verification-code]");
+
+  digitsInputs.forEach((digitInput) => {
+    digitInput.addEventListener("input", (event) => updateValue(codeInput, event, digitsInputs));
+    digitInput.addEventListener("keydown", (event) => updatePosition(codeInput, event, digitsInputs));
+  });
+  codeInput.value = "------";
+};
+
+document.addEventListener("turbo:load", () => {
+  const codeElement = document.querySelector("[data-check-code]");
+  if (codeElement) {
+    initializeCodeVerificator(codeElement);
+  }
+});

data/app/packs/src/decidim/initiatives/initiative_creation_wizard.js

@@ -0,0 +1,16 @@
+document.addEventListener("turbo:load", () => {
+  const selectInitiativeType = document.getElementById("select-initiative-type");
+
+  if (selectInitiativeType) {
+    const submitButton = selectInitiativeType.querySelector('button[type="submit"]');
+    const radioButtons = selectInitiativeType.querySelectorAll('input[type="radio"][name="initiative[type_id]"]');
+
+    submitButton.disabled = true;
+
+    for (const radioButton of radioButtons) {
+      radioButton.addEventListener("click", () => {
+        submitButton.disabled = false;
+      });
+    }
+  }
+});

data/app/packs/src/decidim/initiatives/scoped_type.js

@@ -27,7 +27,7 @@ const controlSelector = function (source, prefix, currentValueKey) {
   }
 };
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   let typeSelector = $("[data-scope-selector]");
   controlSelector(typeSelector, "scope", "scope-id");
   controlSelector(typeSelector, "signature-types", "signature-type");

data/app/packs/stylesheets/initiatives.scss

@@ -3,7 +3,7 @@
 
   &__selection {
     .form-defaults {
-      @apply my-10;
+      @apply my-8;
     }
 
     .card__highlight {
@@ -90,7 +90,7 @@
   }
 
   &__form__committee {
-    @apply flex items-center px-4 py-2 border border-gray outline outline-1 outline-transparent rounded bg-background-2 focus:outline-2 focus:outline-secondary w-full;
+    @apply flex items-center px-4 py-2 border border-gray outline outline-1 outline-transparent rounded bg-background-2 focus:outline-2 focus:outline-secondary w-full mt-4;
 
     span {
       @apply text-black font-normal;
@@ -169,3 +169,17 @@
 .edit_initiative .profile__group__list {
   @apply w-full;
 }
+
+.pending-initiatives {
+  @apply bg-background rounded-lg px-4 py-8 mb-12;
+
+  .card__grid {
+    @apply bg-white;
+
+    --tw-ring-color: #ddd;
+
+    &:hover {
+      --tw-ring-color: var(--tertiary);
+    }
+  }
+}

data/app/permissions/decidim/initiatives/admin/permissions.rb

@@ -39,7 +39,7 @@ module Decidim
           initiative_export_action?
           initiatives_settings_action?
           moderator_action?
-          share_tokens_action?
+          share_token_action?
           allow! if permission_action.subject == :attachment
 
           permission_action
@@ -180,8 +180,8 @@ module Decidim
           allow!
         end
 
-        def share_tokens_action?
-          return unless permission_action.subject == :share_tokens
+        def share_token_action?
+          return unless permission_action.subject == :share_token
 
           allow!
         end
@@ -214,10 +214,7 @@ module Decidim
 
         def allowed_to_send_to_technical_validation?
           initiative.discarded? ||
-            (initiative.created? && (
-              !initiative.created_by_individual? ||
-              initiative.enough_committee_members?
-            ))
+            (initiative.created? && initiative.enough_committee_members?)
         end
       end
     end

data/app/permissions/decidim/initiatives/permissions.rb

@@ -15,12 +15,14 @@ module Decidim
         read_public_initiative?
         search_initiative_types_and_scopes?
         request_membership?
+        ephemeral_vote_initiative?
 
         return permission_action unless user
 
         create_initiative?
         edit_public_initiative?
         update_public_initiative?
+        discard_initiative?
         print_initiative?
 
         vote_initiative?
@@ -89,11 +91,17 @@ module Decidim
         toggle_allow(initiative&.created? && authorship_or_admin?)
       end
 
+      def discard_initiative?
+        return unless permission_action.subject == :initiative &&
+                      permission_action.action == :discard
+
+        toggle_allow(initiative&.created? && authorship_or_admin?)
+      end
+
       def creation_enabled?
         Decidim::Initiatives.creation_enabled && (
         Decidim::Initiatives.do_not_require_authorization ||
-          UserAuthorizations.for(user).any? ||
-          Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?) &&
+          UserAuthorizations.for(user).any?) &&
           authorized?(:create, permissions_holder: initiative_type)
       end
 
@@ -120,8 +128,7 @@ module Decidim
           !initiative.has_authorship?(user) &&
           (
           Decidim::Initiatives.do_not_require_authorization ||
-              UserAuthorizations.for(user).any? ||
-              Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
+              UserAuthorizations.for(user).any?
         )
       end
 
@@ -143,6 +150,14 @@ module Decidim
         toggle_allow(can_vote?)
       end
 
+      def ephemeral_vote_initiative?
+        return unless permission_action.action == :vote &&
+                      permission_action.subject == :initiative &&
+                      user.blank?
+
+        toggle_allow(ephemeral_signature_workflow?)
+      end
+
       def authorized?(permission_action, resource: nil, permissions_holder: nil)
         return unless resource || permissions_holder
 
@@ -155,8 +170,7 @@ module Decidim
 
         can_unvote = initiative.accepts_online_unvotes? &&
                      initiative.organization&.id == user.organization&.id &&
-                     initiative.votes.where(author: user).any? &&
-                     authorized?(:vote, resource: initiative, permissions_holder: initiative.type)
+                     initiative.votes.where(author: user).any?
 
         toggle_allow(can_unvote)
       end
@@ -178,15 +192,10 @@ module Decidim
         toggle_allow(can_sign)
       end
 
-      def decidim_user_group_id
-        context.fetch(:group_id, nil)
-      end
-
       def can_vote?
         initiative.votes_enabled? &&
           initiative.organization&.id == user.organization&.id &&
-          initiative.votes.where(author: user).empty? &&
-          authorized?(:vote, resource: initiative, permissions_holder: initiative.type)
+          initiative.votes.where(author: user).empty?
       end
 
       def can_user_support?(initiative)
@@ -226,15 +235,16 @@ module Decidim
       end
 
       def allowed_to_send_to_technical_validation?
-        initiative.created? && (
-        !initiative.created_by_individual? ||
-            initiative.enough_committee_members?
-      )
+        initiative.created? && initiative.enough_committee_members?
       end
 
       def authorship_or_admin?
         initiative&.has_authorship?(user) || user.admin?
       end
+
+      def ephemeral_signature_workflow?
+        initiative.type.signature_workflow_manifest&.ephemeral?
+      end
     end
   end
 end

data/app/presenters/decidim/initiative_presenter.rb

@@ -4,13 +4,19 @@ module Decidim
   #
   # Decorator for initiatives
   #
-  class InitiativePresenter < SimpleDelegator
+  class InitiativePresenter < Decidim::ResourcePresenter
     def author
-      @author ||= if user_group
-                    Decidim::UserGroupPresenter.new(user_group)
-                  else
-                    Decidim::UserPresenter.new(super)
-                  end
+      @author ||= super.presenter
+    end
+
+    def initiative
+      __getobj__
+    end
+
+    def title(html_escape: false, all_locales: false)
+      return unless initiative
+
+      super(initiative.title, html_escape, all_locales)
     end
   end
 end

data/app/presenters/decidim/initiatives/admin_log/initiative_presenter.rb

@@ -31,8 +31,7 @@ module Decidim
             signature_start_date: :date,
             signature_end_date: :date,
             description: :i18n,
-            title: :i18n,
-            hashtag: :string
+            title: :i18n
           }
         end
 

data/app/queries/decidim/initiatives/initiatives_stats_followers_count.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This class counts all Followers of a initiative
+    class InitiativesStatsFollowersCount < Decidim::StatsFollowersCount
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a?(Decidim::Initiatives)
+
+        new(participatory_space).query
+      end
+    end
+  end
+end

data/app/queries/decidim/initiatives/initiatives_stats_participants_count.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This class counts unique Participants on a initiative
+    class InitiativesStatsParticipantsCount < Decidim::StatsParticipantsCount
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a?(Decidim::Initiatives)
+
+        new(participatory_space).query
+      end
+    end
+  end
+end

data/app/serializers/decidim/initiatives/open_data_initiative_serializer.rb

@@ -24,7 +24,6 @@ module Decidim
           answer: resource.answer,
           answered_at: resource.answered_at,
           answer_url: resource.answer_url,
-          hashtag: resource.hashtag,
           first_progress_notification_at: resource.first_progress_notification_at,
           second_progress_notification_at: resource.second_progress_notification_at,
           online_votes: resource.online_votes,

data/app/services/decidim/initiatives/data_encryptor.rb

@@ -8,7 +8,7 @@ module Decidim
 
       def initialize(args = {})
         @secret = args.fetch(:secret) || "default"
-        @key = ActiveSupport::KeyGenerator.new(secret).generate_key(
+        @key = ActiveSupport::KeyGenerator.new(secret, hash_digest_class: OpenSSL::Digest::SHA1).generate_key(
           Rails.application.secret_key_base, ActiveSupport::MessageEncryptor.key_len
         )
         @encryptor = ActiveSupport::MessageEncryptor.new(@key)

data/app/services/decidim/initiatives/legacy_signature_handler.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # Signature handler which reproduces the old feature of
+    # `collect_personal_data` of initiative types. The handler will collect the
+    # name and surname, the document number and the date of birth
+    class LegacySignatureHandler < SignatureHandler
+      attribute :name_and_surname, String
+      attribute :document_number, String
+      attribute :date_of_birth, Date
+      attribute :postal_code, String
+
+      validates :name_and_surname, :document_number, :date_of_birth, :postal_code, presence: true
+
+      def unique_id
+        document_number
+      end
+
+      def metadata
+        super.merge(name_and_surname:, document_number:, date_of_birth:, postal_code:)
+      end
+    end
+  end
+end

data/app/services/decidim/initiatives/progress_notifier.rb

@@ -12,15 +12,9 @@ module Decidim
 
       # PUBLIC: Notifies the support progress of the initiative.
       #
-      # Notifies to Initiative's authors and followers about the
+      # Notifies to Initiative's authors about the
       # number of supports received by the initiative.
       def notify
-        initiative.followers.each do |follower|
-          Decidim::Initiatives::InitiativesMailer
-            .notify_progress(initiative, follower)
-            .deliver_later
-        end
-
         initiative.committee_members.approved.each do |committee_member|
           Decidim::Initiatives::InitiativesMailer
             .notify_progress(initiative, committee_member.user)