decidim-decidim_awesome 0.10.1 → 0.10.3

data/config/locales/pt-BR.yml

@@ -39,8 +39,6 @@ pt-BR:
         target: Aberto em
         url: URL
         visibility: Visibilidade
-      proposal:
-        proposal_custom_fields: Campos personalizados
   decidim:
     admin:
       menu:
@@ -103,7 +101,6 @@ pt-BR:
             start_image_migrations: "\U0001F449 Inicie o processo de migração agora"
             title: Checar compatibilidade do sistema
         config:
-          caution: 'NOTA: Este recurso modifica fortemente alguns comportamentos padrão que podem levar a resultados inesperados. Use-o com cuidado!'
           constraints:
             add_condition: Adicionar Caso
             always: Sempre
@@ -152,14 +149,19 @@ pt-BR:
               scoped_styles_variables: 'Você pode usar as seguintes variáveis CSS para cores personalizadas da organização:'
               use_markdown_editor: Isto irá substituir o editor do Quill WYSIWYG, para usar um editor de Markdown. O texto será convertido e salvo como HTML no banco de dados.
           form_proposal_custom_fields:
+            delete: Deletar
             new: Adicionar uma nova caixa "campos personalizados"
             remove: Remover esta caixa "campos personalizados"
             sure_to_remove: Deseja mesmo destruir essa caixa de campos?
+          form_proposal_private_custom_fields:
+            delete: Deletar
           form_scoped_admins:
+            delete: Deletar
             new: Adicionar um novo grupo "Administradores com Escopos"
             remove: Remover este grupo "Administradores com Escopos"
             sure_to_remove: Deseja mesmo destruir esse grupo de "Administradores com Escopos"?
           form_scoped_styles:
+            delete: Deletar
             new: Adicionar uma nova caixa CSS
             remove: Remover esta caixa CSS
             sure_to_remove: Deseja mesmo destruir essa caixa de CSS?
@@ -170,6 +172,13 @@ pt-BR:
             title: Ajustes para %{setting}
             update: Configuração atualizada
           system: Qualquer lugar exceto salas participativas
+          title:
+            admins: Administradores com escopo
+            editors: Hacks do editor
+            livechat: Chat Ao Vivo
+            proposals: Pacotes de Propostas
+            styles: Estilos Personalizados
+            surveys: Pesquisas e Formulários
           update:
             error: Erro ao atualizar configuração!%{error}
             success: Configuração atualizada com sucesso
@@ -231,10 +240,11 @@ pt-BR:
             success: Redirecionamento atualizado com sucesso
         menu:
           admins: Administradores com escopo
-          checks: Compatibilidade de sistema
           custom_redirects: Redirecionamentos personalizados
           editors: Hacks do editor
           livechat: Chat Ao Vivo
+          maintenance:
+            checks: Compatibilidade de sistema
           menu_hacks: Ajustes do menu
           proposal_custom_fields: Campos Personalizados de Propostas
           proposals: Pacotes de Propostas
@@ -263,6 +273,8 @@ pt-BR:
           index:
             confirm_destroy: Tem certeza que deseja remover esta customização?
             edit: Editar
+            menu:
+              title: Menu Principal
             new: Novo item
             remove: Remover adição
             remove_hack: Remover personalização
@@ -333,9 +345,6 @@ pt-BR:
             cancel: Cancelar
   layouts:
     decidim:
-      admin:
-        decidim_awesome:
-          title: Ajustes Decidim
       decidim_awesome:
         awesome_config:
           amendments: Emendas

data/config/locales/ro-RO.yml

@@ -25,8 +25,6 @@ ro:
         target: Deschidere in
         url: URL
         visibility: Vizibilitate
-      proposal:
-        proposal_custom_fields: Câmpuri particularizate
   decidim:
     admin:
       filters:
@@ -97,7 +95,18 @@ ro:
             error: Eroare la crearea unui nou "câmp personalizat"! %{error}
           form:
             edit_label: Redenumește eticheta
+          form_proposal_custom_fields:
+            delete: Șterge
+          form_proposal_private_custom_fields:
+            delete: Șterge
+          form_scoped_admins:
+            delete: Șterge
+          form_scoped_styles:
+            delete: Șterge
           process_groups: Grupuri de procese
+          title:
+            styles: Stiluri personalizate
+            surveys: Chestionare și formulare
         constraints:
           errors:
             not_unique: Această condiție există deja

data/config/locales/sv.yml

@@ -28,8 +28,6 @@ sv:
         target: Öppna i
         url: Webbadress
         visibility: Synlighet
-      proposal:
-        proposal_custom_fields: Tilläggsfält
   decidim:
     admin:
       menu:
@@ -75,12 +73,25 @@ sv:
             edit_label: Byt namn på etikett
             help:
               use_markdown_editor: This will substitute the Quill WYSIWYG editor, use a Markdown editor instead. Text will be rendered as HTML in the public pages (text in database will be saved as markdown text)
+          form_proposal_custom_fields:
+            delete: Radera
+          form_proposal_private_custom_fields:
+            delete: Radera
+          form_scoped_admins:
+            delete: Radera
           form_scoped_styles:
+            delete: Radera
             remove: Ta bort CSS-rutan
           process_groups: Dialoggrupper
           show:
             title: Tweaks för %{setting}
             update: Uppdatera konfiguration
+          title:
+            admins: Begränsade administratörer
+            editors: Editor hacks
+            proposals: Proposals hacks
+            styles: Custom styles
+            surveys: Surveys & forms
         constraints:
           new:
             cancel: Avbryt
@@ -105,10 +116,11 @@ sv:
             title: Ny omdirigering
         menu:
           admins: Begränsade administratörer
-          checks: System compatibility
           custom_redirects: Anpassade omdirigeringar
           editors: Editor hacks
           livechat: Live Chat
+          maintenance:
+            checks: System compatibility
           menu_hacks: Menu tweaks
           proposals: Proposals hacks
           styles: Custom styles
@@ -127,6 +139,8 @@ sv:
               logged: Endast synlig för inloggade användare
           index:
             edit: Redigera
+            menu:
+              title: Huvudmeny
             new: Ny menyknapp
             remove: Ta bort menyknapp
             remove_hack: Ta bort menyknapp
@@ -160,9 +174,6 @@ sv:
             cancel: Avbryt
   layouts:
     decidim:
-      admin:
-        decidim_awesome:
-          title: Decidim Tweaks
       decidim_awesome:
         awesome_config:
           amendments: Ändringsförslag

data/db/migrate/20240531224204_add_decidim_awesome_proposal_private_fields.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class AddDecidimAwesomeProposalPrivateFields < ActiveRecord::Migration[6.0]
+  class ProposalExtraField < ApplicationRecord
+    self.table_name = :decidim_awesome_proposal_extra_fields
+  end
+
+  def change
+    add_column :decidim_awesome_proposal_extra_fields, :private_body, :string
+    add_column :decidim_awesome_proposal_extra_fields, :decidim_proposal_type, :string
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_awesome_proposal_extra_fields
+          SET decidim_proposal_type = 'Decidim::Proposals::Proposal'
+        SQL
+      end
+    end
+
+    remove_index :decidim_awesome_proposal_extra_fields, name: "decidim_awesome_extra_fields_on_proposal"
+    add_index :decidim_awesome_proposal_extra_fields,
+              [:decidim_proposal_id, :decidim_proposal_type],
+              name: "index_decidim_awesome_proposal_extra_fields_on_decidim_proposal"
+
+    change_column_null :decidim_awesome_proposal_extra_fields, :decidim_proposal_id, false
+    change_column_null :decidim_awesome_proposal_extra_fields, :decidim_proposal_type, false
+    ProposalExtraField.reset_column_information
+  end
+end

data/db/migrate/20240729164227_add_decidim_awesome_proposal_private_fields_date.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddDecidimAwesomeProposalPrivateFieldsDate < ActiveRecord::Migration[6.0]
+  class ProposalExtraField < ApplicationRecord
+    self.table_name = :decidim_awesome_proposal_extra_fields
+  end
+
+  def change
+    add_column :decidim_awesome_proposal_extra_fields, :private_body_updated_at, :datetime
+
+    reversible do |direction|
+      direction.up do
+        execute <<~SQL.squish
+          UPDATE decidim_awesome_proposal_extra_fields
+          SET private_body_updated_at = updated_at
+        SQL
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/admin_engine.rb

@@ -26,7 +26,10 @@ module Decidim
         post :export_admin_accountability, to: "admin_accountability#export", as: "export_admin_accountability"
         get :users, to: "config#users"
         post :rename_scope_label, to: "config#rename_scope_label"
-        get :checks, to: "checks#index"
+        resources :maintenance, only: [:show] do
+          delete :destroy_private_data, on: :member
+          get :checks, on: :collection, to: "checks#index"
+        end
         post :migrate_images, to: "checks#migrate_images"
         root to: "config#show"
       end
@@ -37,19 +40,32 @@ module Decidim
         end
       end
 
-      initializer "decidim_awesome.admin_menu" do
+      initializer "decidim_awesome.admin_menus" do
+        first_available = Decidim::DecidimAwesome::Menu.menus.detect { |_key, val| val.present? }&.first
+
         Decidim.menu :admin_menu do |menu|
           menu.add_item :awesome_menu,
                         I18n.t("menu.decidim_awesome", scope: "decidim.admin"),
-                        decidim_admin_decidim_awesome.config_path(:editors),
+                        if first_available
+                          decidim_admin_decidim_awesome.config_path(first_available)
+                        else
+                          decidim_admin_decidim_awesome.checks_maintenance_index_path
+                        end,
                         icon_name: "fire",
                         position: 7.5,
-                        active: is_active_link?(decidim_admin_decidim_awesome.config_path(:editors), :inclusive),
+                        active: if first_available
+                                  is_active_link?(decidim_admin_decidim_awesome.config_path(first_available), :inclusive)
+                                else
+                                  is_active_link?(decidim_admin_decidim_awesome.checks_maintenance_index_path)
+                                end,
                         if: defined?(current_user) && current_user&.read_attribute("admin")
         end
-      end
+        # submenus
+        Decidim::DecidimAwesome::Menu.register_custom_fields_submenu!
+        Decidim::DecidimAwesome::Menu.register_maintenance_admin_menu!
+        Decidim::DecidimAwesome::Menu.register_awesome_admin_menu!
 
-      initializer "decidim_awesome.admin_menu" do
+        # user menu
         Decidim.menu :admin_user_menu do |menu|
           if DecidimAwesome.enabled? :admin_accountability
             menu.add_item :admin_accountability,

data/lib/decidim/decidim_awesome/api/types/localized_custom_fields_type.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    # This type represents a localized string in a single language.
+    class LocalizedCustomFieldsType < Decidim::Api::Types::BaseObject
+      description "Represents a particular translation of a LocalizedCustomFieldsType"
+
+      field :locale, GraphQL::Types::String, "The standard locale of this translation.", null: false
+      field :fields, GraphQL::Types::JSON, "The fields of this translation.", null: true
+      field :machine_translated, GraphQL::Types::Boolean, "Whether this string is machine translated or not.", null: false
+
+      def machine_translated
+        if object.respond_to?(:machine_translated)
+          object.machine_translated.present?
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/api/types/translated_custom_fields_type.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Decidim::DecidimAwesome
+    # This type represents a translated field in multiple languages.
+    class TranslatedCustomFieldsType < Decidim::Api::Types::BaseObject
+      description "A translated field"
+
+      field :locales, [GraphQL::Types::String, { null: true }], description: "Lists all the locales in which this translation is available", null: true
+
+      field :translations, [LocalizedCustomFieldsType, { null: true }], description: "All the localized custom fields for this translation.", null: false do
+        argument :locales, [GraphQL::Types::String], description: "A list of locales to scope the translations to.", required: false
+      end
+
+      field :translation, GraphQL::Types::JSON, description: "Returns a single translation given a locale.", null: true do
+        argument :locale, GraphQL::Types::String, "A locale to search for", required: true
+      end
+
+      def locales
+        (defined_translations.keys + machine_translations.keys).uniq
+      end
+
+      def translation(locale: "")
+        display_translations[locale]
+      end
+
+      def translations(locales: [])
+        translations = display_translations
+        translations = translations.slice(*locales) unless locales.empty?
+        # rubocop:disable Style/OpenStructUse
+        translations.map { |locale, fields| OpenStruct.new(locale: locale, fields: fields, machine_translated: defined_translations[locale].blank?) }
+        # rubocop:enable Style/OpenStructUse
+      end
+
+      private
+
+      def display_translations
+        @display_translations ||= locales.index_with do |locale|
+          defined_translations[locale].presence || machine_translations[locale]
+        end
+      end
+
+      def defined_translations
+        object.stringify_keys.except("machine_translations")
+      end
+
+      def machine_translations
+        object.stringify_keys["machine_translations"]&.stringify_keys || {}
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/awesome.rb

@@ -10,6 +10,9 @@ module Decidim
     autoload :MenuHacker, "decidim/decidim_awesome/menu_hacker"
     autoload :CustomFields, "decidim/decidim_awesome/custom_fields"
     autoload :VotingManifest, "decidim/decidim_awesome/voting_manifest"
+    autoload :Lock, "decidim/decidim_awesome/lock"
+    autoload :TranslatedCustomFieldsType, "decidim/decidim_awesome/api/types/translated_custom_fields_type"
+    autoload :LocalizedCustomFieldsType, "decidim/decidim_awesome/api/types/localized_custom_fields_type"
 
     # Awesome coms with some components for participatory spaces
     # Currently :awesome_map and :awesome_iframe, list them here
@@ -121,6 +124,16 @@ module Decidim
       ]
     end
 
+    # Allows admins to limit the amount of pending amendments to (currently) one per proposal before it's accepted.
+    # Once a pending amendment is accepted, a new on can be created.
+    # Note that this does not limit the number of amendment per se, the admin has to set the limit in the proposal's component configuration.
+    # set to :disable to will prevent admins to set an amendment's limit in the proposal's component configuration.
+    # if set to "true" the checkbox will be checked by default
+    # if set to "false" the checkbox will be unchecked by default
+    config_accessor :allow_limiting_amendments do
+      false
+    end
+
     # allows admins to created specific CSS snippets affecting only some specific parts
     # Valid values differ a little from the previous convention:
     #   :disabled => false and non available, hidden from admins
@@ -146,6 +159,21 @@ module Decidim
       {}
     end
 
+    # Same as proposal_custom_fields but for generating private fields than can be read only by admins
+    config_accessor :proposal_private_custom_fields do
+      {}
+    end
+
+    # How old must be the private data to be considered expired and therefore presented to the admins for deletion
+    config_accessor :private_data_expiration_time do
+      3.months
+    end
+
+    # How long must be the private data prevented from being deleted again after being scheduled for deletion
+    config_accessor :lock_time do
+      1.minute
+    end
+
     # allows to keep modifications for the main menu
     # can return :disabled to completly remove this feature
     # otherwise it should be an array (some overrides can be specified by default):
@@ -273,7 +301,9 @@ module Decidim
     # pass a single config var or an array of them
     # any non disabled match will return as true
     def self.possible_additional_proposal_sortings
-      @possible_additional_proposal_sortings ||= additional_proposal_sortings.to_a.filter_map do |sort|
+      return [] unless additional_proposal_sortings.is_a?(Array)
+
+      @possible_additional_proposal_sortings ||= additional_proposal_sortings.filter_map do |sort|
         next unless sort.to_sym.in?([:az, :za, :supported_first, :supported_last])
 
         sort.to_s
@@ -282,16 +312,14 @@ module Decidim
 
     def self.collation_for(locale)
       @collation_for ||= {}
-      @collation_for[locale] ||= begin
-        res = ActiveRecord::Base.connection.execute(Arel.sql("SELECT collname FROM pg_collation WHERE collname LIKE '#{locale}-x-icu' LIMIT 1")).first
-        res ||= ActiveRecord::Base.connection.execute(Arel.sql("SELECT collname FROM pg_collation WHERE collname LIKE '#{locale[0..1]}%' LIMIT 1")).first
+      @collation_for[locale] ||= ["#{locale}-x-icu", "#{locale[0..1]}%"].filter_map do |loc|
+        sql = ApplicationRecord.sanitize_sql(["SELECT collname FROM pg_collation WHERE collname LIKE ? LIMIT 1", loc])
+        res = ActiveRecord::Base.connection.execute(sql).first
         res["collname"] if res
-      end
+      end.first
     end
 
-    def self.enabled?(config_vars)
-      config_vars = [config_vars] unless config_vars.respond_to?(:any?)
-
+    def self.enabled?(*config_vars)
       config_vars.any? do |item|
         next unless config.has_key?(item.to_sym)
 
@@ -309,6 +337,15 @@ module Decidim
       registered_components << [manifest, block]
     end
 
+    # appends to a hash a new value in a specified position so that the hash becomes:
+    # { a: 1, b: 2, c: 3 } => append_hash(hash, :b, :d, 4) => { a: 1, b: 2, d: 4, c: 3 }
+    # if key is not found then it will be inserted at the end
+    def self.hash_append!(hash, after_key, key, value)
+      insert_at = hash.to_a.index(hash.assoc(after_key))
+      insert_at = insert_at.nil? ? hash.size : insert_at + 1
+      hash.replace(hash.to_a.insert(insert_at, [key, value]).to_h)
+    end
+
     def self.legacy_version?
       Decidim.version[0..3] == "0.26"
     end

data/lib/decidim/decidim_awesome/awesome_helpers.rb

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def javascript_config_vars
-        awesome_config.except(:scoped_styles, :proposal_custom_fields, :scoped_admins).to_json.html_safe
+        awesome_config.except(:scoped_styles, :proposal_custom_fields, :proposal_private_custom_fields, :scoped_admins).to_json.html_safe
       end
 
       def show_public_intergram?
@@ -61,6 +61,10 @@ module Decidim
         @awesome_proposal_custom_fields ||= awesome_config_instance.collect_sub_configs_values("proposal_custom_field")
       end
 
+      def awesome_proposal_private_custom_fields
+        @awesome_proposal_private_custom_fields ||= awesome_config_instance.collect_sub_configs_values("proposal_private_custom_field")
+      end
+
       # this will check if the current component has been configured to use a custom voting manifest
       def awesome_voting_manifest_for(component)
         return nil unless component.settings.respond_to? :awesome_voting_manifest

data/lib/decidim/decidim_awesome/checksums.yml

@@ -1,6 +1,7 @@
 decidim-admin:
   /app/views/layouts/decidim/admin/_header.html.erb:
     decidim-0.25: 1aff077428830b12306d6c42e6b37216
+    decidim-0.27.5: ee303c717d9fc8ea77f644b29981b3f4
 decidim-core:
   /app/validators/etiquette_validator.rb:
     decidim-0.25: f7a4a652005385a994208f1ab41c4f08
@@ -25,6 +26,7 @@ decidim-core:
 decidim-proposals:
   /lib/decidim/proposals/proposal_serializer.rb:
     decidim-0.26: 2d817775f79a19cfcf9cfae8e5b68c5a
+    decidim-0.27.6: 3c2bc99fb00985714c8b55594fa0082e
   /lib/decidim/api/proposal_type.rb:
     decidim-0.26: e38e4875e408ec4f658e28725c5a94d4
   /app/forms/decidim/proposals/proposal_wizard_create_step_form.rb:
@@ -51,6 +53,7 @@ decidim-proposals:
   /app/views/decidim/proposals/admin/proposals/_form.html.erb:
     decidim-0.25: 90a04984d4269398b7cd21aa33763a1f
     decidim-0.27: f60168e432e1d419e5aec5d3d1e53f0e
+    decidim-0.27.6: 05d4ceb99f81a7ad71f2936614d89d23
   /app/views/decidim/proposals/proposals/_vote_button.html.erb:
     decidim-0.27: f7202c37fe042cd816a6f9fd0f9e6807
   /app/views/decidim/proposals/proposals/_votes_count.html.erb:
@@ -61,3 +64,23 @@ decidim-proposals:
     decidim-0.27.4: ce3b30cdddfee547b8fb089c0fddd8a4
   /app/cells/decidim/proposals/proposal_m/footer.erb:
     decidim-0.26: 7ade5bbd8412f44f1c4ed913ae1834c6
+  /app/commands/decidim/proposals/create_proposal.rb:
+    decidim-0.26: 8808a4239d750a86edd6e9c309533788
+    decidim-0.27: 7a6b8a1ea733e1e331b5251accfc9126
+  /app/commands/decidim/proposals/create_collaborative_draft.rb:
+    decidim-0.26: 4ad30f5a912fa5f76e94f686b7f475c1
+    decidim-0.27: 2d9a8cef43690e54419f1bd0478fa580
+  /app/commands/decidim/proposals/admin/create_proposal.rb:
+    decidim-0.26: e057ebfc83bb8fa4dbfeea4058776f43
+    decidim-0.27: 40db71d026e1f8e8086aa149bdd97106
+  /app/commands/decidim/proposals/update_proposal.rb:
+    decidim-0.26: 28ebdc4efcb2c9eab307d3bf9f4a7ef7
+    decidim-0.27: 5e2f8ef1bfa4edd8fb5479c15c5f06de
+  /app/commands/decidim/proposals/update_collaborative_draft.rb:
+    decidim-0.26: df8d09786857b31942c1e1bcb0290551
+    decidim-0.27: 2ddf7f98cb085cb4565ec6ac257ca8c9
+  /app/commands/decidim/proposals/admin/update_proposal.rb:
+    decidim-0.26: 82478685f772c818d7300551891dc717
+    decidim-0.27: aacc7c104abe2bbd2f09c0dfe4f74e0c
+  /app/presenters/decidim/proposals/proposal_presenter.rb:
+    decidim-0.27: 105b7266bcdd8b947ababbb7ebb78789

data/lib/decidim/decidim_awesome/custom_fields.rb

@@ -13,6 +13,14 @@ module Decidim
 
       attr_reader :fields, :xml, :errors, :data
 
+      def empty?
+        @fields.empty?
+      end
+
+      def present?
+        !@fields.empty?
+      end
+
       def apply_xml(xml)
         parse_xml(xml)
         map_fields!