decidim-admin 0.22.0 → 0.23.0

data/app/controllers/decidim/admin/organization_homepage_content_blocks_controller.rb

@@ -22,6 +22,7 @@ module Decidim
             redirect_to edit_organization_homepage_path
           end
           on(:invalid) do
+            edit # Sets the model to the view so that it can render the form
             render :edit
           end
         end

data/app/controllers/decidim/admin/share_tokens_controller.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ShareTokensController < Decidim::Admin::ApplicationController
+      def destroy
+        enforce_permission_to :destroy, :share_token, share_token: share_token
+
+        DestroyShareToken.call(share_token, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("share_tokens.destroy.success", scope: "decidim.admin")
+          end
+          on(:invalid) do
+            flash[:error] = I18n.t("share_tokens.destroy.error", scope: "decidim.admin")
+          end
+        end
+
+        redirect_back(fallback_location: root_path)
+      end
+
+      private
+
+      def share_token
+        @share_token ||= Decidim::ShareToken.where(
+          organization: current_organization
+        ).find(params[:id])
+      end
+    end
+  end
+end

data/app/forms/decidim/admin/attachment_form.rb

@@ -16,12 +16,15 @@ module Decidim
       mimic :attachment
 
       validates :file, presence: true, unless: :persisted?
+      validates :file, passthru: { to: Decidim::Attachment }
       validates :title, :description, translatable_presence: true
       validates :attachment_collection, presence: true, if: ->(form) { form.attachment_collection_id.present? }
       validates :attachment_collection_id, inclusion: { in: :attachment_collection_ids }, allow_blank: true
 
       delegate :attached_to, to: :context, prefix: false
 
+      alias organization current_organization
+
       def attachment_collections
         @attachment_collections ||= attached_to.attachment_collections
       end

data/app/forms/decidim/admin/component_form.rb

@@ -23,6 +23,8 @@ module Decidim
       attribute :default_step_settings, Object
       attribute :step_settings, Hash[String => Object]
 
+      attribute :share_tokens, Array[ShareToken]
+
       def settings?
         settings.manifest.attributes.any?
       end
@@ -31,6 +33,10 @@ module Decidim
         default_step_settings.manifest.attributes.any?
       end
 
+      def map_model(model)
+        self.share_tokens = model.share_tokens
+      end
+
       private
 
       # Overwrites Rectify::Form#form_attributes_valid? to validate nested `step_settings` attributes.

data/app/forms/decidim/admin/organization_appearance_form.rb

@@ -7,6 +7,7 @@ module Decidim
     #
     class OrganizationAppearanceForm < Form
       include TranslatableAttributes
+      include Decidim::HasUploadValidations
 
       mimic :organization
 
@@ -50,14 +51,12 @@ module Decidim
       validates :official_img_header,
                 :official_img_footer,
                 :logo,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
+                passthru: { to: Decidim::Organization }
 
       validates :highlighted_content_banner_action_url, presence: true, if: :highlighted_content_banner_enabled?
       validates :highlighted_content_banner_image,
                 presence: true,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] },
+                passthru: { to: Decidim::Organization },
                 if: :highlighted_content_banner_image_is_changed?
 
       validates :highlighted_content_banner_title,
@@ -76,6 +75,8 @@ module Decidim
       validates :omnipresent_banner_title, translatable_presence: true, if: :enable_omnipresent_banner?
       validates :omnipresent_banner_short_description, translatable_presence: true, if: :enable_omnipresent_banner?
 
+      alias organization current_organization
+
       private
 
       def highlighted_content_banner_enabled?

data/app/forms/decidim/admin/organization_form.rb

@@ -21,7 +21,10 @@ module Decidim
       attribute :default_locale, String
       attribute :badges_enabled, Boolean
       attribute :user_groups_enabled, Boolean
+      attribute :comments_max_length, Integer
       attribute :rich_text_editor_in_public_views, Boolean
+      attribute :enable_machine_translations, Boolean
+      attribute :machine_translation_display_priority, String
 
       attribute :send_welcome_notification, Boolean
       attribute :customize_welcome_notification, Boolean
@@ -39,12 +42,29 @@ module Decidim
       validates :default_locale, :reference_prefix, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
       validates :admin_terms_of_use_body, translatable_presence: true
+      validates :comments_max_length, numericality: { greater_than: 0 }, if: ->(form) { form.comments_max_length.present? }
+      validates :machine_translation_display_priority,
+                inclusion: { in: Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES },
+                if: :machine_translation_enabled?
+
+      def machine_translation_priorities
+        Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES.map do |priority|
+          [
+            priority,
+            I18n.t("activemodel.attributes.organization.machine_translation_display_priority_#{priority}")
+          ]
+        end
+      end
 
       private
 
       def available_locales
         current_organization.available_locales
       end
+
+      def machine_translation_enabled?
+        Decidim.config.enable_machine_translations
+      end
     end
   end
 end

data/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb

@@ -1,13 +1,27 @@
 # frozen_string_literal: true
 
+require "csv"
+
 module Decidim
   module Admin
     # A form object used to upload CSV to batch participatory space private users.
     #
     class ParticipatorySpacePrivateUserCsvImportForm < Form
       attribute :file
+      attribute :user_name, String
+      attribute :email, String
 
       validates :file, presence: true
+      validate :validate_csv
+
+      def validate_csv
+        if file.present?
+          CSV.foreach(file.path) do |email, user_name|
+            errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
+            errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
+          end
+        end
+      end
     end
   end
 end

data/app/forms/decidim/admin/participatory_space_private_user_form.rb

@@ -11,8 +11,14 @@ module Decidim
       attribute :name, String
       attribute :email, String
 
-      validates :email, presence: true
-      validates :name, presence: true
+      validates :name, :email, presence: true
+
+      validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+      validate :admin_uniqueness
+
+      def admin_uniqueness
+        errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
+      end
     end
   end
 end

data/app/frontend/components/autocomplete.component.test.tsx

@@ -11,9 +11,10 @@ describe("<Autocomplete />", () => {
   const noResultsText = "No results found";
   const searchPromptText = "Type to search";
   const searchURL = "/some/url";
+  const changeURL = "/some/other/url";
 
   it("renders a div of Select", () => {
-    const wrapper = shallow(<Autocomplete name={name} selected={selected} options={options} noResultsText={noResultsText} placeholder={placeholder} searchPromptText={searchPromptText} searchURL={searchURL} />);
+    const wrapper = shallow(<Autocomplete name={name} selected={selected} options={options} noResultsText={noResultsText} placeholder={placeholder} searchPromptText={searchPromptText} searchURL={searchURL} changeURL={changeURL} />);
     expect(wrapper.find(".autocomplete-field").exists()).toBeTruthy();
   });
 });

data/app/frontend/components/autocomplete.component.tsx

@@ -43,6 +43,10 @@ export interface AutocompleteProps {
    * The URL where fetch content
    */
   searchURL: string;
+  /**
+   * The URL to call when selected option changes
+   */
+  changeURL: string;
 }
 
 interface AutocompleteState {
@@ -112,6 +116,31 @@ export class Autocomplete extends React.Component<AutocompleteProps, Autocomplet
 
   private handleChange = (selectedOption: any) => {
     this.setState({ selectedOption });
+
+    if (this.props.changeURL) {
+      axios.get(this.props.changeURL, {
+        headers: {
+          Accept: "text/javascript"
+        },
+        withCredentials: true,
+        params: {
+          id: selectedOption.value
+        }
+      })
+      .then((response) => {
+        const script = document.createElement("script");
+        script.type = "text/javascript";
+        script.innerHTML = response.data;
+        document.getElementsByTagName("head")[0].appendChild(script);
+      })
+      .catch((error: any) => {
+        if (axios.isCancel(error)) {
+          // console.log("Request canceled", error.message);
+        } else {
+          //
+        }
+      });
+    }
   }
 
   private filterOptions = (options: any, filter: any, excludeOptions: any) => {

data/app/helpers/decidim/admin/application_helper.rb

@@ -13,6 +13,7 @@ module Decidim
       include Decidim::MapHelper
       include Decidim::Admin::LogRenderHelper
       include Decidim::Admin::UserRolesHelper
+      include Decidim::Admin::ResourceScopeHelper
 
       def title
         current_organization.name

data/app/helpers/decidim/admin/newsletters_helper.rb

@@ -141,9 +141,11 @@ module Decidim
       end
 
       def newsletter_recipients_count_callout_args
+        spinner = "<span id='recipients_count_spinner' class='loading-spinner hide'></span>"
+        body = "#{t("recipients_count", scope: "decidim.admin.newsletters.select_recipients_to_deliver", count: recipients_count_query)} #{spinner}"
         {
           announcement: {
-            body: t("recipients_count", scope: "decidim.admin.newsletters.select_recipients_to_deliver", count: recipients_count_query)
+            body: body
           },
           callout_class: "warning"
         }

data/app/helpers/decidim/admin/resource_scope_helper.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module includes helpers to show scopes in admin
+    module ResourceScopeHelper
+      # Public: This helper shows the th with the scope label.
+      #
+      # scope_label - I18n translation to show
+      #
+      def th_resource_scope_label(scope_label = t("decidim.admin.resources.index.headers.scope"))
+        return unless resource_with_scopes_enabled?
+
+        content_tag(:th, scope_label)
+      end
+
+      # Public: This helper shows the td for the given scope.
+      #
+      # current_scope - Scope object to show
+      #
+      def td_resource_scope_for(current_scope)
+        return unless resource_with_scopes_enabled?
+
+        scope_name = if current_scope
+                       translated_attribute(current_scope.name)
+                     else
+                       t("decidim.scopes.global")
+                     end
+        content_tag(:td, scope_name)
+      end
+
+      private
+
+      def resource_with_scopes_enabled?
+        if defined? current_component
+          current_component.scopes_enabled? || current_participatory_space.scopes_enabled?
+        else
+          current_participatory_space.scopes_enabled?
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/admin/settings_helper.rb

@@ -5,11 +5,14 @@ module Decidim
     # This class contains helpers needed in order for component settings to
     # properly render.
     module SettingsHelper
+      include Decidim::ScopesHelper
+
       TYPES = {
         boolean: :check_box,
         integer: :number_field,
         string: :text_field,
         text: :text_area,
+        scope: :scope_field,
         enum: :collection_radio_buttons
       }.freeze
 
@@ -45,6 +48,8 @@ module Decidim
             form.send(:translated, form_method, name, options)
           elsif form_method == :collection_radio_buttons
             render_enum_form_field(form, attribute, name, i18n_scope, options)
+          elsif form_method == :scope_field
+            scopes_picker_field(form, name)
           else
             form.send(form_method, name, options)
           end

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

@@ -45,13 +45,13 @@ module Decidim
           allow! if permission_action.subject == :scope_type
           allow! if permission_action.subject == :area
           allow! if permission_action.subject == :area_type
-          allow! if permission_action.subject == :oauth_application
           allow! if permission_action.subject == :user_group
           allow! if permission_action.subject == :officialization
           allow! if permission_action.subject == :authorization
           allow! if permission_action.subject == :authorization_workflow
           allow! if permission_action.subject == :static_page_topic
           allow! if permission_action.subject == :help_sections
+          allow! if permission_action.subject == :share_token
         end
 
         permission_action

data/app/queries/decidim/admin/newsletter_recipients.rb

@@ -46,7 +46,7 @@ module Decidim
       def spaces
         return if @form.participatory_space_types.blank?
 
-        @form.participatory_space_types.map do |type|
+        @spaces ||= @form.participatory_space_types.map do |type|
           next if type.ids.blank?
 
           object_class = "Decidim::#{type.manifest_name.classify}"
@@ -75,20 +75,24 @@ module Decidim
 
         participant_ids = []
         spaces.each do |space|
+          next unless defined? space.component_ids
+
           available_components = Decidim.component_manifests.map { |m| m.name.to_s if m.newsletter_participant_entities.present? }.compact
           Decidim::Component.where(id: space.component_ids, manifest_name: available_components).published.each do |component|
             Decidim.find_component_manifest(component.manifest_name).try(&:newsletter_participant_entities).flatten.each do |object|
               klass = Object.const_get(object)
-              participant_ids << klass.newsletter_participant_ids(component)
+              participant_ids |= klass.newsletter_participant_ids(component)
             end
           end
-          next unless defined?(Decidim::Comments)
+        end
 
-          Decidim::Comments.newsletter_participant_entities.flatten.each do |object|
+        if defined?(Decidim::Comments)
+          Decidim::Comments.newsletter_participant_entities.each do |object|
             klass = Object.const_get(object)
-            participant_ids << klass.newsletter_participant_ids(space)
+            participant_ids |= klass.newsletter_participant_ids(spaces.first)
           end
         end
+
         participant_ids.flatten.compact.uniq
       end
     end

data/app/views/decidim/admin/components/_component.html.erb

@@ -8,6 +8,7 @@
     <td>
       <%= t "decidim.components.#{component.manifest.name}.name" %>
     </td>
+    <%= td_resource_scope_for(component.scope) %>
     <td class="table-list__actions">
       <% if component.manifest.admin_engine %>
         <%= icon_link_to "pencil", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
@@ -33,6 +34,10 @@
         <% end %>
       <% end %>
 
+      <% if allowed_to? :share, :component, component: component %>
+        <%= icon_link_to "share", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), class: "action-icon--share", target: "_blank" %>
+      <% end %>
+
       <% if allowed_to? :destroy, :component, component: component %>
         <%= icon_link_to "circle-x", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
       <% end %>

data/app/views/decidim/admin/components/_form.html.erb

@@ -77,6 +77,10 @@
           </div>
         </fieldset>
       <% end %>
+
+      <% unless component.published? %>
+        <%= render partial: "decidim/admin/share_tokens/share_tokens", locals: { share_tokens: form.object.share_tokens } %>
+      <% end %>
     </div>
   </div>
 </div>

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

@@ -21,6 +21,7 @@
         <thead>
           <th><%= t(".headers.name") %></th>
           <th><%= t(".headers.type") %></th>
+          <%= th_resource_scope_label(t(".headers.scope")) %>
           <th><%= t(".headers.actions") %></th>
         </thead>
 

data/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -2,8 +2,12 @@
 <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">
     <% component.manifest.export_manifests.each do |manifest| %>
-      <% %w{CSV JSON Excel}.each do |format| %>
-        <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: format.upcase), exports_path(component, id: manifest.name, format: format), method: :post %></li>
+      <% manifest.formats.each do |format| %>
+        <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
+          <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")),
+            exports_path(component, id: manifest.name, format: format),
+            method: :post %>
+        </li>
       <% end %>
     <% end %>
   </ul>