decidim-term_customizer 0.17.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16eec8f526df47ea82ef79a644e4afd290f64e7e1f7aa2fea64723ad7a30d6b9
-  data.tar.gz: 93c4464c8c3e2b3437df94b25e0f457e60ad1f18240c1fbc6609421600888805
+  metadata.gz: 9e7c2537197c329aba4d64541635965b8a2b91e12fe8c0d8e3dac11df2f5b215
+  data.tar.gz: 80a01c0978ada36f8561d1f475fcd1ac07e99b0c5664c13484530672f808958e
 SHA512:
-  metadata.gz: 4efdea5c3cca3ec8cd9f1e4d068b63f587b84f1ec9c175f9be2d1ff5832b688c467655596fcc85be7d2c2d6f22acffcf3c07913910c6a74151a4b5e4bb35aff6
-  data.tar.gz: 8864a676c3562377cc114556c058cbe50983d4b4691f9007130de45d3addbc8bb0ab4dd670c11e2a1412e53b748f06a06b78d23f652b379808ee499be24ce99c
+  metadata.gz: 45293721c61381231be57197d1e616d6fa3edd2bafd5e39fe31aeea015b8b8a823b1a939a2f3118d8b9ca411c3542affcbd7323f9e75297abb52d103a115674d
+  data.tar.gz: 742f453412332567ae90056f19a40066fae076cb57275342451ffa4a879de9f56470435e583b00ebdcd330ff8fced30afb9fd006d8ec4ee29510ffa29355ecba

data/Rakefile

@@ -38,11 +38,3 @@ task :development_app do
   install_module("development_app")
   seed_db("development_app")
 end
-
-# Run all tests, include all
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.verbose = false
-end
-
-# Run both by default
-task default: [:spec]

data/app/assets/config/translation_sets_admin_manifest.js

@@ -1,2 +1,3 @@
 //= link decidim/term_customizer/admin/translation_sets_admin.js
 //= link decidim/term_customizer/admin/translations_admin.js
+//= link decidim/term_customizer/admin/translations_admin_bulk.js

data/app/assets/javascripts/decidim/term_customizer/admin/translation_sets_admin.js.es6

@@ -15,5 +15,7 @@ $(() => {
     }
   );
 
-  $(".constraints-list", $fields).constraintSection();
+  $(".constraints-list .constraint-section", $fields).each((_i, el) => {
+    $(el).constraintSection();
+  });
 });

data/app/assets/javascripts/decidim/term_customizer/admin/translations_admin.js.es6

@@ -32,8 +32,13 @@ $(() => {
       const re = new RegExp(`(${sanitizedSearch.split(" ").join("|")})`, "gi");
       const modelId = item[0];
       const title = item[1];
+      // The terms are already escaped but when they are rendered to a data
+      // attribute, they get unescaped when those values are used. The only
+      // character we need to replace is the ampersand
+      const value = title.replace(/&/g, "&");
+
       const val = `${title} - ${modelId}`;
-      return `<div class="autocomplete-suggestion" data-model-id="${modelId}" data-val="${title}">${val.replace(re, "<b>$1</b>")}</div>`;
+      return `<div class="autocomplete-suggestion" data-model-id="${modelId}" data-val="${value}">${val.replace(re, "<b>$1</b>")}</div>`;
     },
     onSelect: function(event, term, item) {
       const $suggestions = $search.data("sc");

data/app/commands/decidim/term_customizer/admin/create_translation.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new translation
       # set in the system.
       class CreateTranslation < Rectify::Command
+        include TermCustomizer::PluralFormsForm
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -24,6 +26,7 @@ module Decidim
 
           transaction do
             @translations = create_translations
+            create_plural_forms(@translations)
           end
 
           if @translations.length.positive?

data/app/commands/decidim/term_customizer/admin/destroy_translations.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when an admin destroys
       # translations from a translation set.
       class DestroyTranslations < Rectify::Command
+        include TermCustomizer::PluralFormsForm
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -22,6 +24,7 @@ module Decidim
         def call
           return broadcast(:invalid) unless form.valid?
 
+          destroy_plural_forms(form.translations)
           destroy_translations
 
           broadcast(:ok)

data/app/commands/decidim/term_customizer/admin/duplicate_translation_set.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module TermCustomizer
+    module Admin
+      # This command is executed when the user duplicates a translation set from
+      # the admin panel.
+      class DuplicateTranslationSet < Rectify::Command
+        # Initializes a DuplicateTranslationSet Command.
+        #
+        # form - A form object with the params.
+        # set  - The instance of the translation set to be duplicated.
+        def initialize(form, set)
+          @form = form
+          @set = set
+        end
+
+        # Updates the blog if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          transaction do
+            duplicate_translation_set!
+          end
+
+          broadcast(:ok, set)
+        end
+
+        private
+
+        attr_reader :form, :set
+
+        def duplicate_translation_set!
+          duplicated = TermCustomizer::TranslationSet.create!(name: form.name)
+
+          # Add the constraints
+          set.constraints.each do |c|
+            duplicated.constraints.create!(
+              organization: form.current_organization,
+              subject: c.subject,
+              subject_type: c.subject_type
+            )
+          end
+
+          # Add the translations
+          set.translations.each do |t|
+            duplicated.translations.create!(
+              locale: t.locale,
+              key: t.key,
+              value: t.value
+            )
+          end
+
+          duplicated
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/term_customizer/admin/import_set_translations.rb

@@ -10,6 +10,8 @@ module Decidim
       # supported import formats or a ZIP file containing a supported import
       # file.
       class ImportSetTranslations < Rectify::Command
+        include TermCustomizer::PluralFormsForm
+
         # Public: Initializes the command.
         #
         # form            - A form object with the params.
@@ -30,6 +32,7 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           @translations = import_translations
+          create_plural_forms(@translations)
 
           if @translations.length.positive?
             broadcast(:ok, @translations)

data/app/commands/decidim/term_customizer/admin/import_translation_keys.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating new translations
       # from the keys submitted through the form.
       class ImportTranslationKeys < Rectify::Command
+        include TermCustomizer::PluralFormsForm
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -24,6 +26,7 @@ module Decidim
 
           transaction do
             @translations = create_translations
+            create_plural_forms(@translations)
           end
 
           if @translations.length.positive?

data/app/commands/decidim/term_customizer/admin/update_translation.rb

@@ -6,6 +6,8 @@ module Decidim
       # This command is executed when the user changes a translation from the
       # admin panel.
       class UpdateTranslation < Rectify::Command
+        include TermCustomizer::PluralFormsForm
+
         # Public: Initializes the command.
         #
         # form        - A form object with the params.
@@ -25,7 +27,8 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           transaction do
-            update_translations!
+            @translations = update_translations!
+            create_plural_forms(@translations)
           end
 
           broadcast(:ok, translation)
@@ -36,7 +39,7 @@ module Decidim
         attr_reader :form, :translation
 
         def update_translations!
-          form.value.each do |locale, value|
+          form.value.map do |locale, value|
             l_translation = TermCustomizer::Translation.find_by(
               translation_set: translation.translation_set,
               key: translation.key,
@@ -50,13 +53,15 @@ module Decidim
                 locale: locale
               )
             else
-              TermCustomizer::Translation.create!(
+              l_translation = TermCustomizer::Translation.create!(
                 translation_set: translation.translation_set,
                 key: form.key,
                 value: value,
                 locale: locale
               )
             end
+
+            l_translation
           end
         end
       end

data/app/controllers/decidim/term_customizer/admin/add_translations_controller.rb

@@ -16,6 +16,7 @@ module Decidim
           enforce_permission_to :create, :translation
           @form = form(TranslationKeyImportForm).from_params(
             params,
+            current_organization: current_organization,
             translation_set: set
           )
 
@@ -40,7 +41,7 @@ module Decidim
           translations = directory.translations_search(params[:term])
           translations.reject! { |k| reject_keys.include?(k) }
 
-          render json: translations.map { |k, v| [k, v] }
+          render json: translations.map { |k, v| [k, ERB::Util.html_escape(v)] }
         end
 
         private

data/app/controllers/decidim/term_customizer/admin/translation_sets_controller.rb

@@ -60,7 +60,7 @@ module Decidim
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("translation_sets.update.invalid", scope: "decidim.term_customizer.admin")
+              flash.now[:alert] = I18n.t("translation_sets.update.error", scope: "decidim.term_customizer.admin")
               render action: "edit"
             end
           end
@@ -75,15 +75,37 @@ module Decidim
           redirect_to translation_sets_path
         end
 
-        def export
-          enforce_permission_to :export, :translation_set, translation_set: set
-          name = "set-translations"
+        def duplicate
+          enforce_permission_to :create, :translation_set
+
+          # Automatically generate the name
+          name_attrs = {}.tap do |hash|
+            current_organization.available_locales.each do |locale|
+              hash["name_#{locale}"] = I18n.t(
+                "translation_sets.duplicate.copied_set_name",
+                name: set.name[locale],
+                locale: locale,
+                scope: "decidim.term_customizer.admin"
+              )
+            end
+          end
 
-          ExportJob.perform_later(current_user, set, name, params[:format] || "json")
+          @form = form(TranslationSetForm).from_params(
+            params.merge(name_attrs),
+            current_organization: current_organization
+          )
 
-          flash[:notice] = I18n.t("exports.notice", scope: "decidim.admin")
+          DuplicateTranslationSet.call(@form, set) do
+            on(:ok) do
+              flash[:notice] = I18n.t("translation_sets.duplicate.success", scope: "decidim.term_customizer.admin")
+              redirect_to translation_sets_path
+            end
 
-          redirect_to translation_set_translations_path(set)
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("translation_sets.duplicate.error", scope: "decidim.term_customizer.admin")
+              redirect_to translation_sets_path
+            end
+          end
         end
 
         private

data/app/controllers/decidim/term_customizer/admin/translations_controller.rb

@@ -59,7 +59,7 @@ module Decidim
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("translations.update.invalid", scope: "decidim.term_customizer.admin")
+              flash.now[:alert] = I18n.t("translations.update.error", scope: "decidim.term_customizer.admin")
               render action: "edit"
             end
           end
@@ -69,16 +69,30 @@ module Decidim
           enforce_permission_to :destroy, :translation, translation: translation
 
           # Destroy all locales of the translation key
-          Decidim::TermCustomizer::Translation.where(
+          pfm = TermCustomizer::PluralFormsManager.new(current_organization)
+          translations = Decidim::TermCustomizer::Translation.where(
             translation_set: set,
             key: translation.key
-          ).destroy_all
+          )
+          pfm.destroy!(translations)
+          translations.destroy_all
 
           flash[:notice] = I18n.t("translations.destroy.success", scope: "decidim.term_customizer.admin")
 
           redirect_to translation_set_translations_path(set)
         end
 
+        def export
+          enforce_permission_to :export, :translation_set, translation_set: set
+          name = "set-translations"
+
+          ExportJob.perform_later(current_user, set, name, params[:format] || "json")
+
+          flash[:notice] = I18n.t("exports.notice", scope: "decidim.admin")
+
+          redirect_to translation_set_translations_path(set)
+        end
+
         def new_import
           enforce_permission_to :import, :translation_set, translation_set: set
 
@@ -88,7 +102,10 @@ module Decidim
         def import
           enforce_permission_to :import, :translation_set, translation_set: set
 
-          @import = form(Admin::TranslationsImportForm).from_params(params)
+          @import = form(Admin::TranslationsImportForm).from_params(
+            params,
+            current_organization: current_organization
+          )
           ImportSetTranslations.call(@import, set) do
             on(:ok) do
               flash[:notice] = I18n.t("translations.import.success", scope: "decidim.term_customizer.admin")

data/app/controllers/decidim/term_customizer/admin/translations_destroys_controller.rb

@@ -38,7 +38,10 @@ module Decidim
         def set_form
           @form = form(Admin::TranslationsDestroyForm).from_params(
             params
-          ).with_context(translation_set: set)
+          ).with_context(
+            current_organization: current_organization,
+            translation_set: set
+          )
         end
 
         def translation_set

data/app/forms/decidim/term_customizer/admin/translations_destroy_form.rb

@@ -20,7 +20,7 @@ module Decidim
 
           @translations ||= translation_set.translations.where(
             key: translation_keys
-          )
+          ).order(:id)
         end
 
         # Only the translations passed with the IDs (current locale).
@@ -28,8 +28,8 @@ module Decidim
           return [] unless translation_set
 
           @translations_current ||= translation_set.translations.where(
-            id: translation_ids
-          ).uniq
+            id: translation_ids.uniq
+          ).order(:id)
         end
 
         private

data/app/views/decidim/term_customizer/admin/add_translations/index.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
-        <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+        <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
         &gt;
         <%= link_to translated_attribute(set.name), translation_set_translations_path(set) %>
         &gt;

data/app/views/decidim/term_customizer/admin/translation_sets/_form.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title flex--sbc">
       <div>
-        <%= link_to t("decidim.term_customizer.menu.term_customizer"), root_path %>
+        <%= link_to t("decidim.term_customizer.menu.term_customizer"), translation_sets_path %>
         &gt;
         <%= t "translation_sets.form.title", scope: "decidim.term_customizer.admin" %>
 
@@ -14,7 +14,7 @@
 
       <div class="flex--cc flex-gap--1">
         <div id="js-other-actions-wrapper">
-          <%= link_to t("actions.back", scope: "decidim.term_customizer.admin"), root_path, class: "button hollow tiny button--simple" %>
+          <%= link_to t("actions.back", scope: "decidim.term_customizer.admin"), translation_sets_path, class: "button hollow tiny button--simple" %>
         </div>
       </div>
     </h2>

data/app/views/decidim/term_customizer/admin/translation_sets/index.html.erb

@@ -38,10 +38,18 @@
                   <% end %>
                 </td>
                 <td class="table-list__actions">
+                  <% if allowed_to? :read, :translation %>
+                    <%= icon_link_to "eye", translation_set_translations_path(set), t("actions.view", scope: "decidim.term_customizer.admin"), class: "action-icon--show" %>
+                  <% end %>
+
                   <% if allowed_to? :update, :translation_set, translation_set: set %>
                     <%= icon_link_to "pencil", edit_translation_set_path(set), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
                   <% end %>
 
+                  <% if allowed_to? :create, :translation_set %>
+                    <%= icon_link_to "fork", duplicate_translation_set_path(set), t("actions.duplicate", scope: "decidim.term_customizer.admin"), method: :post, class: "action-icon--new", data: { confirm: t("actions.confirm_duplicate", scope: "decidim.term_customizer.admin") } %>
+                  <% end %>
+
                   <% if allowed_to? :destroy, :translation_set, translation_set: set %>
                     <%= icon_link_to "circle-x", translation_set_path(set), t("actions.destroy", scope: "decidim.admin"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                   <% end %>

data/app/views/decidim/term_customizer/admin/translations/_export_dropdown.html.erb

@@ -2,7 +2,7 @@
 <div class="dropdown-pane" id="export-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% %w{CSV JSON Excel}.each do |format| %>
-      <li class="exports--format--<%= format.downcase %> exports--translations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.term_customizer.admin.titles.translations"), export_format: format.upcase), export_translation_set_path(set, format: format), method: :post %></li>
+      <li class="exports--format--<%= format.downcase %> exports--translations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.term_customizer.admin.titles.translations"), export_format: format.upcase), export_translation_set_translations_path(set, format: format), method: :post %></li>
     <% end %>
   </ul>
 </div>