decidim-initiatives 0.29.4 → 0.30.0.rc1

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

@@ -2,33 +2,14 @@
 
 module Decidim
   module Initiatives
-    class InitiativeSerializer < Decidim::Exporters::Serializer
+    class InitiativeSerializer < Decidim::Initiatives::OpenDataInitiativeSerializer
       # Serializes an initiative
       def serialize
-        {
-          id: resource.id,
-          title: resource.title,
-          description: resource.description,
-          state: resource.state,
-          created_at: resource.created_at,
-          published_at: resource.published_at,
-          signature_end_date: resource.signature_end_date,
-          signature_type: resource.signature_type,
-          signatures: resource.supports_count,
-          scope: {
-            name: resource.scope&.name
-          },
-          type: {
-            title: resource.type&.title
-          },
-          authors: {
-            id: resource.author_users.map(&:id),
-            name: resource.author_users.map(&:name)
-          },
-          area: {
-            name: resource.area&.name
+        super.merge(
+          {
+            components: serialize_components
           }
-        }
+        )
       end
     end
   end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class OpenDataInitiativeSerializer < Decidim::Exporters::ParticipatorySpaceSerializer
+      # Public: Exports a hash with the serialized data for this initiative.
+      #
+      # Note that we do not merge the original serialize method here, as the Initiative
+      # model does not have the same attributes as the other Spaces models.
+      def serialize
+        {
+          reference: resource.reference,
+          title: resource.title,
+          url: EngineRouter.main_proxy(resource).initiative_url(resource),
+          description: resource.description,
+          state: resource.state,
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
+          published_at: resource.published_at,
+          signature_start_date: resource.signature_start_date,
+          signature_end_date: resource.signature_end_date,
+          signature_type: resource.signature_type,
+          signatures: resource.supports_count,
+          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,
+          offline_votes: resource.offline_votes,
+          comments_count: resource.comments_count,
+          follows_count: resource.follows_count,
+          scope: {
+            id: resource.scope.try(:id),
+            name: resource.scope.try(:name) || empty_translatable
+          },
+          type: {
+            id: resource.type&.id,
+            title: resource.type&.title
+          },
+          authors: {
+            id: resource.author_users.map(&:id),
+            name: resource.author_users.map(&:name)
+          },
+          area: {
+            id: resource.area.try(:id),
+            name: resource.area.try(:name) || empty_translatable
+          }
+        }
+      end
+    end
+  end
+end

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

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

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

@@ -50,8 +50,6 @@ module Decidim
       private
 
       def signature_widget(doc)
-        doc.pages.add.document
-
         form = doc.acro_form(create: true)
         form.signature_flag(:append_only)
 

data/app/views/decidim/initiatives/admin/initiatives/edit.html.erb

@@ -73,8 +73,7 @@
             <% if allowed_to? :export_pdf_signatures, :initiative, initiative: current_initiative %>
               <%= link_to t(".export_pdf_signatures"),
                           export_pdf_signatures_initiative_path(current_initiative, format: :pdf),
-                          class: "button button__sm button__secondary",
-                          data: { confirm: t(".confirm") } %>
+                          class: "button button__sm button__secondary" %>
             <% end %>
        </div>
      </div>

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

@@ -45,6 +45,13 @@
             <td class="table-list__date"><%= l initiative.created_at, format: :short %></td>
             <td class="table-list__date"><%= initiative.published_at? ? l(initiative.published_at, format: :short) : "" %></td>
             <td class="table-list__actions">
+
+              <% if allowed_to? :read, :share_tokens, current_participatory_space: initiative %>
+                <%= icon_link_to "share-line", decidim_admin_initiatives.initiative_share_tokens_path(initiative), t("actions.share_tokens", scope: "decidim.admin"), class: "action-icon--new" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
+
               <% if allowed_to? :edit, :initiative, initiative: initiative %>
                 <%= icon_link_to "pencil-line",
                                  decidim_admin_initiatives.edit_initiative_path(initiative.to_param),

data/app/views/decidim/initiatives/committee_requests/new.html.erb

@@ -1,11 +1,10 @@
 <% add_decidim_meta_tags({
-                           image_url: current_initiative.type.attached_uploader(:banner_image).url,
+                           image_url: resolve_meta_image_url(current_initiative),
                            description: translated_attribute(current_initiative.description),
                            title: translated_attribute(current_initiative.title),
                            url: initiative_url(current_initiative.id)
                          }) %>
 
-<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
 <% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).url %>
 
 <%= render layout: "layouts/decidim/shared/layout_center" do %>

data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb

@@ -47,10 +47,10 @@
     <% if initiative_type.attachments_enabled? %>
       <%= f.attachment :documents,
                        multiple: true,
-                       label: t("decidim.initiatives.form.add_documents"),
-                       button_label: t("decidim.initiatives.form.add_documents"),
+                       label: t("decidim.initiatives.form.add_attachments"),
+                       button_label: t("decidim.initiatives.form.add_attachments"),
                        button_class: "button button__lg button__transparent-secondary w-full",
-                       button_edit_label: t("decidim.initiatives.form.edit_documents"),
+                       button_edit_label: t("decidim.initiatives.form.edit_attachments"),
                        help_text: t("attachment_legend", scope: "decidim.initiatives.form") %>
       <%= f.attachment :photos,
                        multiple: true,

data/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb

@@ -27,8 +27,16 @@
         <div class="initiatives__selection__text">
           <h2 class="h5 text-secondary"><%= translated_attribute(type.title) %></h2>
           <span><%= decidim_sanitize_admin(translated_attribute(type.description)) %></span>
-          <%= authorized_create_modal_button(type, remote: true, class: "button button__sm button__secondary") do %>
-            <%= t("verification_required", scope: "decidim.initiatives.create_initiative.select_initiative_type") %>
+          <%= action_authorized_link_to(
+                :create,
+                fill_data_create_initiative_index_path(initiative: { type_id: type.id }),
+                authorizations_modal_path: authorization_create_modal_initiative_path(type),
+                permissions_holder: type,
+                class: "button button__sm button__secondary",
+                "data-dialog-open": "not-authorized-modal",
+                onclick: "event.preventDefault();"
+              ) do %>
+              <%= t("verification_required", scope: "decidim.initiatives.create_initiative.select_initiative_type") %>
           <% end %>
         </div>
       </div>

data/app/views/decidim/initiatives/initiatives/_form.html.erb

@@ -51,10 +51,10 @@
 <% if current_initiative.type.attachments_enabled? %>
   <%= form.attachment :documents,
                       multiple: true,
-                      label: t("decidim.initiatives.form.add_documents"),
-                      button_label: t("decidim.initiatives.form.add_documents"),
+                      label: t("decidim.initiatives.form.add_attachments"),
+                      button_label: t("decidim.initiatives.form.add_attachments"),
                       button_class: "button button__lg button__transparent-secondary w-full",
-                      button_edit_label: t("decidim.initiatives.form.edit_documents"),
+                      button_edit_label: t("decidim.initiatives.form.edit_attachments"),
                       help_text: t("decidim.initiatives.form.attachment_legend") %>
 
   <%= form.attachment :photos,

data/app/views/decidim/initiatives/initiatives/_new_initiative_button.html.erb

@@ -1,27 +1,30 @@
 <% if Decidim::Initiatives.creation_enabled %>
-  <% if current_user && available_initiative_types.size > 1 %>
-    <%= link_to create_initiative_path(:select_initiative_type), class: "!px-4 title-action__action button button__xl button__secondary w-full" do %>
-      <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
-      <%= icon "add-fill" %>
-    <% end %>
-  <% elsif current_user %>
-    <% if allowed_to?(:create, :initiative, { initiative_type: available_initiative_types.first }) %>
+  <% if available_initiative_types.size > 1 %>
+    <% if current_user %>
       <%= link_to create_initiative_path(:select_initiative_type), class: "!px-4 title-action__action button button__xl button__secondary w-full" do %>
         <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
         <%= icon "add-fill" %>
       <% end %>
     <% else %>
-      <%= authorized_create_modal_button(available_initiative_types.first, remote: true, class: "!px-4 title-action__action button button__xl button__secondary w-full") do %>
+      <% content_for(:redirect_after_login) { create_initiative_url(:select_initiative_type) } %>
+      <button type="button" class="button button__xl button__secondary w-full" data-dialog-open="loginModal" aria-controls="loginModal" aria-haspopup="dialog" tabindex="0">
         <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
         <%= icon "add-fill" %>
-      <% end %>
+      </button>
     <% end %>
-  <% else %>
-    <% content_for(:redirect_after_login) { create_initiative_url(:select_initiative_type) } %>
-    <button type="button" class="button button__xl button__secondary w-full" data-dialog-open="loginModal" aria-controls="loginModal" aria-haspopup="dialog" tabindex="0">
+  <% elsif (initiative_type = available_initiative_types.first).present? %>
+    <% content_for(:redirect_after_login) { fill_data_create_initiative_index_path(initiative: { type_id: initiative_type.id }) } unless current_user %>
+    <%= action_authorized_link_to(
+          :create,
+          fill_data_create_initiative_index_path(initiative: { type_id: initiative_type.id }),
+          authorizations_modal_path: authorization_create_modal_initiative_path(initiative_type),
+          permissions_holder: initiative_type,
+          "data-dialog-open": allowed_to?(:create, :initiative, { initiative_type: }) ? "" : "not-authorized-modal",
+          class: "!px-4 title-action__action button button__xl button__secondary w-full"
+        ) do %>
       <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
       <%= icon "add-fill" %>
-    </button>
+    <% end %>
   <% end %>
 <% end %>
 

data/app/views/decidim/initiatives/initiatives/_vote_button.html.erb

@@ -34,8 +34,14 @@
       </button>
     <% end %>
   <% else %>
-    <%= authorized_vote_modal_button(initiative, remote: true, class: "button button__xl w-full button__secondary") do %>
-      <%= verification_label %>
-    <% end %>
+    <%= action_authorized_link_to(
+      :vote,
+      t("vote", scope: "decidim.initiatives.initiatives.vote_cabin"),
+      steps ? initiative_signatures_path(initiative_slug: current_initiative.slug) : initiative_path(current_initiative),
+      resource: current_initiative,
+      permissions_holder: current_initiative.type,
+      authorizations_modal_path: authorization_sign_modal_initiative_path(current_initiative),
+      class: "button button__xl w-full button__secondary"
+    ) %>
   <% end %>
 <% end %>

data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb

@@ -4,7 +4,6 @@
                  initiative:,
                  vote_label: t("vote", scope: "decidim.initiatives.initiatives.vote_cabin"),
                  unvote_label: t("already_voted", scope: "decidim.initiatives.initiatives.vote_cabin"),
-                 verification_label: t("verification_required", scope: "decidim.initiatives.initiatives.vote_cabin"),
                  steps: signature_has_steps?
                } %>
 <% else %>

data/app/views/decidim/initiatives/initiatives/show.html.erb

@@ -1,9 +1,8 @@
-<% add_decidim_meta_tags({
-                           image_url: current_initiative.type.attached_uploader(:banner_image).url,
-                           description: translated_attribute(current_initiative.description),
-                           title: translated_attribute(current_initiative.title),
-                           url: initiative_url(current_initiative.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_initiative.description),
+  title: translated_attribute(current_initiative.title),
+  url: initiative_url(current_initiative.id),
+  resource: current_initiative) %>
 
 <%
 edit_link(
@@ -210,8 +209,8 @@ edit_link(
   <% if current_initiative.commentable? && current_initiative.published? %>
     <%= cell "decidim/comments_button", nil, display: current_initiative.commentable? && current_initiative.published? %>
   <% end %>
-  <div class="ml-auto">
-    <%= cell "decidim/share_button", nil %>
+  <div class="ml-auto lg:ml-0">
+    <%= cell "decidim/share_widget", current_initiative %>
   </div>
 </section>
 

data/app/views/layouts/decidim/admin/_manage_initiatives.html.erb

@@ -0,0 +1,11 @@
+<div class="inline-block relative">
+  <%= button_tag data: { component: "dropdown", target: "initiatives-dropdown-menu-settings" }, class: "dropdown__trigger button button__transparent" do %>
+    <span>
+      <%= t("menu.manage", scope: "decidim.admin") %>
+    </span>
+    <%= icon "arrow-down-s-line" %>
+  <% end %>
+  <div id="initiatives-dropdown-menu-settings" class="process-title-content-dropdown" aria-hidden="true">
+    <%= dropdown_menu(:admin_initiatives_menu).render %>
+  </div>
+</div>

data/app/views/layouts/decidim/admin/initiatives.html.erb

@@ -1,13 +1,5 @@
 <% content_for :breadcrumb_context_menu do %>
-  <div class="inline-block relative">
-    <%= button_tag data: { component: "dropdown", target: "initiatives-dropdown-menu-settings" }, class: "dropdown__trigger button button__transparent" do %>
-      <%= t("actions.manage", scope: "decidim.admin") %>
-      <%= icon "arrow-down-s-line" %>
-    <% end %>
-    <div id="initiatives-dropdown-menu-settings" class="process-title-content-dropdown" aria-hidden="true">
-      <%= dropdown_menu(:admin_initiatives_menu).render %>
-    </div>
-  </div>
+  <%= render partial: "layouts/decidim/admin/manage_initiatives" %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/config/assets.rb

@@ -5,7 +5,5 @@ base_path = File.expand_path("..", __dir__)
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
   decidim_initiatives: "#{base_path}/app/packs/entrypoints/decidim_initiatives.js",
-  decidim_initiatives_admin: "#{base_path}/app/packs/entrypoints/decidim_initiatives_admin.js",
-  decidim_initiatives_print: "#{base_path}/app/packs/entrypoints/decidim_initiatives_print.js",
-  decidim_initiatives_initiatives_votes: "#{base_path}/app/packs/entrypoints/decidim_initiatives_initiatives_votes.js"
+  decidim_initiatives_admin: "#{base_path}/app/packs/entrypoints/decidim_initiatives_admin.js"
 )

data/config/locales/ar.yml

@@ -96,9 +96,8 @@ ar:
             initiative_start_date: تاريخ البدء
             initiative_title: عنوان المبادرة
             name_and_surname: اسم ولقب
+            nickname: الاسم المستعار
             postal_code: الكود البريدى
-            scope: نطاق
-            time_and_date: الوقت و التاريخ
             timestamp: الطابع الزمني
       titles:
         initiatives: المبادرات
@@ -125,8 +124,8 @@ ar:
       badges:
         initiatives:
           conditions:
-            - انتقل إلى مساحة مشاركة المبادرات
-            - اتبع الخطوات لإنشاء مبادرة جديدة
+          - انتقل إلى مساحة مشاركة المبادرات
+          - اتبع الخطوات لإنشاء مبادرة جديدة
           description: تُمنح هذه الشارة عند إطلاق مبادرات جديدة ، وإقامة شراكة مع الآخرين لتنفيذها.
           description_another: حصل هذا المشارك على %{score} مبادرة تم نشرها.
           name: المبادرات المنشورة
@@ -202,7 +201,6 @@ ar:
       admin_states:
         created: تمّ إنشاؤه
         discarded: التخلص منها
-        published: نشرت
         validating: المصادقة الفنية
       application_helper:
         filter_state_values:
@@ -253,6 +251,10 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
           email_subject: المبادرة التي أقرتها %{author_nickname}
           notification_title: تمت الموافقة على مبادرة <a href="%{resource_path}">%{resource_title}</a> من قبل <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+      form:
+        add_attachments: إضافة مرفقات
+        attachment_legend: إضافة مستند أو صورة
+        edit_attachments: تعديل المرفقات
       initiative_signatures:
         fill_personal_data:
           continue: استمر
@@ -315,7 +317,6 @@ ar:
           full_name: الاسم الكامل
           initiative:
             description: 'الوصف:'
-          print: طباعة
         result:
           initiative_rejected_reason: تم رفض هذه المبادرة بسبب افتقارها للتوقيعات.
         signatures_count:
@@ -327,7 +328,6 @@ ar:
           other: " التوقيعات"
         vote_cabin:
           already_voted: وقعت بالفعل
-          verification_required: تحقق من حسابك لتوقيع المبادرة
           vote: إشارة
           votes_blocked: توقيع المعوقين
         votes_count:
@@ -365,7 +365,6 @@ ar:
           comment: تعليق
       initiatives_type:
         actions:
-          create: إنشاء
           title: أفعال
           vote: إشارة
   layouts:

data/config/locales/bg.yml

@@ -92,7 +92,6 @@ bg:
               accepted: Достатъчно подписи
               created: Създаден
               discarded: Отхвърлено
-              published: Публикувано
               rejected: Няма достатъчно подписи
               validating: Техническа проверка
           type_id_eq:
@@ -101,7 +100,6 @@ bg:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Търсете в %{collection} по заглавие, описание, идент. № или име на автора.
       initiatives_settings:
         update:
-          error: Възникна грешка.
           success: Настройките на инициативите са актуализирани успешно.
       menu:
         attachments: Прикачени файлове
@@ -147,8 +145,6 @@ bg:
             initiative_title: Заглавие на инициативата
             name_and_surname: Име и фамилия
             postal_code: Пощенски код
-            scope: Обхват
-            time_and_date: Време и дата
             timestamp: Времево клеймо
       titles:
         initiatives: Инициативи
@@ -191,8 +187,8 @@ bg:
       badges:
         initiatives:
           conditions:
-            - Отидете в пространството за участие на Инициативи
-            - Следвайте стъпките, за да създадете нова инициатива
+          - Отидете в пространството за участие на Инициативи
+          - Следвайте стъпките, за да създадете нова инициатива
           description: Тази значка се предоставя, когато стартирате нови инициативи, като си партнирате с други, за да ги изпълните.
           description_another: Този участник е публикувал %{score} инициативи.
           description_own: Имате %{score} публикувани инициативи.
@@ -262,7 +258,6 @@ bg:
             new: Ново
             photos: Снимки
           update:
-            error: Възникна грешка.
             success: Инициативата беше актуализирана успешно.
         initiatives_settings:
           edit:
@@ -276,7 +271,6 @@ bg:
             title: Настройки за инициативи
         initiatives_type_scopes:
           create:
-            error: Възникна грешка.
             success: Създаден е нов обхват за дадения тип инициатива.
           destroy:
             success: Обхватът беше премахнат успешно.
@@ -287,11 +281,8 @@ bg:
             create: Създаване
             title: Създаване на обхват на типа инициатива
           update:
-            error: Възникна грешка.
             success: Обхватът беше актуализиран успешно.
         initiatives_types:
-          create:
-            error: Възникна грешка.
           destroy:
             success: Типът инициатива беше премахнат успешно.
           edit:
@@ -307,7 +298,6 @@ bg:
             create: Създаване
             title: Нов тип инициатива
           update:
-            error: Възникна грешка.
             success: Типът инициатива беше актуализиран успешно.
       admin_log:
         initiative:
@@ -325,7 +315,6 @@ bg:
         accepted: Достатъчно подписи
         created: Създаден
         discarded: Отхвърлено
-        published: Публикувано
         rejected: Няма достатъчно подписи
         validating: Техническа проверка
       application_helper:
@@ -362,6 +351,7 @@ bg:
         finish:
           back: Назад
           back_to_initiatives: Назад към инициативите
+          callout_text: Поздравления! Гражданската Ви инициатива беше създадена успешно.
           confirm: Ще изпратите инициативата на администратор да я прегледа и публикува. След публикуване няма да можете да го редактирате. Сигурен ли си?
           edit_my_initiative: Редактиране на моята инициатива
           go_to_my_initiatives: Към моите инициативи
@@ -422,10 +412,7 @@ bg:
           email_subject: "%{applicant_nickname} иска да се присъедини към вашата инициатива"
           notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> кандидатства за промоторския комитет на вашата инициатива <a href="%{resource_url}">%{resource_title}</a>. За да приемете или отхвърлите, щракнете <a href="%{resource_url}/edit">тук</a>.
       form:
-        add_documents: Добавяне на документи
         add_image: Добавяне на изображение
-        attachment_legend: "(Незадължително) Добавяне на прикачен файл"
-        edit_documents: Редактиране на документ
         edit_image: Редактиране на изображение
         image_legend: "(По избор) Добавяне на изображение"
       index:
@@ -514,9 +501,7 @@ bg:
           phone_number: Телефонен номер
           place_date: Място, дата
           postal_code: Пощенски код (ПК)
-          print: Принтиране
           province: Район/Област
-          section: 'При поискване от организацията, моля, отпечатайте и попълнете този формуляр, за да го изпратите, където е посочено:'
           signature: Подпис
         result:
           answer_title: На тази инициатива е отговорено.
@@ -538,7 +523,6 @@ bg:
           other: " подписи"
         vote_cabin:
           already_voted: Вече подписани
-          verification_required: Потвърдете профила си, за да подпишете инициативата
           vote: Подписване
           votes_blocked: Подписването е деактивирано
         votes_count:
@@ -573,7 +557,6 @@ bg:
           accepted: Достатъчно подписи
           created: Създаден
           discarded: Отхвърлено
-          published: Публикувано
           rejected: Няма достатъчно подписи
           validating: Техническа проверка
       states:
@@ -581,7 +564,6 @@ bg:
         expired: Изтекло
       unavailable_scope: Недостъпен обхват
       update:
-        error: Възникна грешка.
         success: Инициативата беше актуализирана успешно.
     menu:
       initiatives: Инициативи
@@ -591,7 +573,6 @@ bg:
           comment: Коментар
       initiatives_type:
         actions:
-          create: Създаване
           title: Активности
           vote: Подписване
   layouts: