decidim-accountability 0.29.2 → 0.30.0.rc2

data/app/models/decidim/accountability/status.rb

@@ -22,6 +22,10 @@ module Decidim
       # Allow ransacker to search for a key in a hstore column (`name`.`en`)
       ransacker_i18n :name
 
+      def self.ransackable_attributes(_auth_object = nil)
+        %w(id name)
+      end
+
       def self.log_presenter_class_for(_log)
         Decidim::Accountability::AdminLog::StatusPresenter
       end

data/app/packs/entrypoints/decidim_accountability_admin_form.js

@@ -0,0 +1 @@
+import "src/decidim/accountability/admin/result_form"

data/app/packs/src/decidim/accountability/admin/imports.js

@@ -1,15 +1,38 @@
-const toggleInfo = (val) => {
-  document.querySelectorAll(".help-text").forEach((toBeHidden) => {
-    if (val === toBeHidden.id && toBeHidden.classList.value.includes("hide")) {
-      toBeHidden.classList.remove("hide")
-    } else {
-      toBeHidden.classList.add("hide")
+class AdminAccountabilityImportsComponent {
+  run() {
+    this.bindEvents();
+  }
+
+  bindEvents() {
+    const form = this.getForm();
+    const selects = form.querySelectorAll("select");
+
+    selects.forEach((select) => {
+      select.addEventListener("change", this.onSelectChange.bind(this));
+    });
+  }
+
+  onSelectChange() {
+    const form = this.getForm();
+    const formUrl = form.dataset.formUrl;
+
+    // Remove authenticity token input if it exists
+    const tokenInput = form.querySelector("input[name='authenticity_token']");
+    if (tokenInput) {
+      tokenInput.remove();
     }
-  });
-};
-export default () => {
-  const item = document.querySelector("#result_import_projects_origin_component_id");
-  item.addEventListener(("change"), (event) => {
-    toggleInfo(`component_${event.target.value}`);
-  });
-};
+
+    form.setAttribute("action", formUrl);
+    form.setAttribute("method", "get");
+    form.submit();
+  }
+
+  getForm() {
+    return document.getElementById("new_import_component");
+  }
+}
+
+window.Decidim.AdminAccountabilityImportsComponent = AdminAccountabilityImportsComponent;
+const component = new AdminAccountabilityImportsComponent();
+
+component.run();

data/app/packs/src/decidim/accountability/admin/index/action_button.js

@@ -0,0 +1,42 @@
+class ActionButton {
+  constructor(counter) {
+    this.counter = counter;
+    this.actionButton = document.querySelector("[data-action-button]");
+    this.actionForms = document.querySelectorAll("[data-action-form]");
+  }
+
+  init() {
+    this.counter.checkboxes.forEach((checkbox) => {
+      checkbox.addEventListener("change", () => this.onCheckboxChange());
+    });
+
+    this.toggleActionButton();
+  }
+
+  onCheckboxChange() {
+    this.toggleActionButton();
+    this.toggleActionForms();
+  }
+
+  toggleActionButton() {
+    const selectedIds = this.counter.getSelectedItems();
+
+    if (selectedIds.length > 0) {
+      this.actionButton.classList.remove("hide");
+    } else {
+      this.actionButton.classList.add("hide");
+    }
+  }
+
+  toggleActionForms() {
+    const selectedIds = this.counter.getSelectedItems();
+
+    if (selectedIds.length === 0) {
+      this.actionForms.forEach((form) => {
+        form.classList.add("hide");
+      });
+    }
+  }
+}
+
+export default ActionButton;

data/app/packs/src/decidim/accountability/admin/index/action_form.js

@@ -0,0 +1,46 @@
+class ActionForm {
+  constructor(counter) {
+    this.counter = counter;
+    this.checkboxes = document.querySelectorAll("[data-result-checkbox]");
+    this.idFields = document.querySelectorAll("[data-result-ids-field]");
+    this.cancelButtons = document.querySelectorAll("[data-cancel-button]");
+  }
+
+  init() {
+    this.checkboxes.forEach((checkbox) => {
+      checkbox.addEventListener("change", () => this.onCheckboxChange());
+    });
+
+    this.cancelButtons.forEach((button) => {
+      button.addEventListener("click", () => this.onCancelButtonClick());
+    });
+
+    this.updateResultIdsHiddenField();
+  }
+
+  onCheckboxChange() {
+    this.updateResultIdsHiddenField();
+  }
+
+  onCancelButtonClick() {
+    this.hideAllForms();
+  }
+
+  hideAllForms() {
+    const forms = document.querySelectorAll("[data-action-form]");
+    forms.forEach((form) => {
+      form.classList.add("hide");
+    });
+  }
+
+  updateResultIdsHiddenField() {
+    const selectedIds = this.counter.getSelectedItems().
+      map((checkbox) => checkbox.dataset.resultId);
+
+    this.idFields.forEach((field) => {
+      field.value = selectedIds.join(",");
+    });
+  }
+}
+
+export default ActionForm;

data/app/packs/src/decidim/accountability/admin/index/action_selector.js

@@ -0,0 +1,37 @@
+class ActionSelector {
+  init() {
+    this.dropdownElement = document.querySelector("#js-bulk-actions-dropdown");
+    const buttons = this.dropdownElement.querySelectorAll("button");
+
+    buttons.forEach((button) => {
+      button.addEventListener("click", this.onActionClick.bind(this));
+    });
+  }
+
+  onActionClick(event) {
+    const action = event.target.dataset.action;
+
+    this.closeDropdown();
+    this.hideAllForms();
+    this.showForm(action);
+  }
+
+  closeDropdown() {
+    this.dropdownElement.classList.remove("is-open");
+  }
+
+  showForm(action) {
+    const form = document.querySelector(`[data-action-form="${action}"]`);
+
+    form.classList.remove("hide");
+  }
+
+  hideAllForms() {
+    const forms = document.querySelectorAll("[data-action-form]");
+    forms.forEach((form) => {
+      form.classList.add("hide");
+    });
+  }
+}
+
+export default ActionSelector;

data/app/packs/src/decidim/accountability/admin/index/counter.js

@@ -0,0 +1,40 @@
+/**
+ * Counter class handles the selection of results and updates the counter
+ */
+class Counter {
+  constructor() {
+    this.checkboxes = document.querySelectorAll("[data-result-checkbox]");
+    this.counterElement = document.querySelector("[data-selected-count]");
+  }
+
+  init() {
+    if (!this.checkboxes.length) {
+      return;
+    }
+
+    this.checkboxes.forEach((checkbox) => {
+      checkbox.addEventListener("change", () => this.updateCounter());
+    });
+
+    this.updateCounter();
+  }
+
+  updateCounter() {
+    if (this.counterElement) {
+      const count = this.getSelectedItems().length;
+      this.counterElement.textContent = count;
+
+      if (count === 0) {
+        this.counterElement.classList.add("hide");
+      } else {
+        this.counterElement.classList.remove("hide");
+      }
+    }
+  }
+
+  getSelectedItems() {
+    return Array.from(this.checkboxes).filter((checkbox) => checkbox.checked);
+  }
+}
+
+export default Counter;

data/app/packs/src/decidim/accountability/admin/index/select_all.js

@@ -0,0 +1,29 @@
+class SelectAll {
+  constructor(counter) {
+    this.counter = counter;
+    this.checkboxes = this.counter.checkboxes;
+    this.selectAllButton = document.querySelector("[data-select-all]");
+  }
+
+  init() {
+    if (this.selectAllButton) {
+      this.selectAllButton.addEventListener("click", (event) => this.onSelectAllClick(event));
+    }
+  }
+
+  onSelectAllClick(event) {
+    event.preventDefault();
+
+    const someUnchecked = Array.from(this.checkboxes).some((checkbox) => !checkbox.checked);
+
+    // If some checkboxes are unchecked, check all of them
+    // Otherwise, uncheck all checkboxes
+    this.checkboxes.forEach((checkbox) => {
+      checkbox.checked = someUnchecked;
+      // Trigger change event to update other components
+      checkbox.dispatchEvent(new Event("change"));
+    });
+  }
+}
+
+export default SelectAll;

data/app/packs/src/decidim/accountability/admin/index.js

@@ -1,9 +1,19 @@
+import Counter from "src/decidim/accountability/admin/index/counter";
+import ActionButton from "src/decidim/accountability/admin/index/action_button";
+import ActionForm from "src/decidim/accountability/admin/index/action_form";
+import ActionSelector from "src/decidim/accountability/admin/index/action_selector";
+import SelectAll from "src/decidim/accountability/admin/index/select_all";
+
 $(() => {
-  $("#result_decidim_accountability_status_id").change(function () {
-    /* eslint-disable no-invalid-this */
-    const progress = $(this).find(":selected").data("progress")
-    if (progress || progress === 0) {
-      $("#result_progress").val(progress);
-    }
-  });
+  const counter = new Counter();
+  const actionButton = new ActionButton(counter);
+  const actionForm = new ActionForm(counter);
+  const actionSelector = new ActionSelector();
+  const selectAll = new SelectAll(counter);
+
+  counter.init();
+  actionButton.init();
+  actionForm.init();
+  actionSelector.init();
+  selectAll.init();
 })

data/app/packs/src/decidim/accountability/admin/result_form.js

@@ -0,0 +1,21 @@
+import attachGeocoding from "src/decidim/geocoding/attach_input"
+
+$(() => {
+  const $form = $(".result_form_admin");
+
+  if ($form.length > 0) {
+    const $resultAddress = $form.find("#result_address");
+
+    if ($resultAddress.length !== 0) {
+      attachGeocoding($resultAddress);
+    }
+  }
+
+  $("#result_decidim_accountability_status_id").change(function () {
+    /* eslint-disable no-invalid-this */
+    const progress = $(this).find(":selected").data("progress")
+    if (progress || progress === 0) {
+      $("#result_progress").val(progress);
+    }
+  });
+});

data/app/packs/stylesheets/accountability.scss

@@ -1,4 +1,9 @@
 .accountability {
+  &__map {
+    /* negative main padding values */
+    @apply md:-ml-16 -mt-6 md:-mt-12 aspect-square md:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 md:[&+*]:mt-12;
+  }
+
   &__status {
     @apply flex flex-col gap-3 w-full;
 

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

@@ -10,7 +10,8 @@ module Decidim
           permission_action.allow! if can_perform_actions_on?(:result, result)
           permission_action.allow! if can_perform_actions_on?(:status, status)
           permission_action.allow! if can_perform_actions_on?(:timeline_entry, timeline_entry)
-          permission_action.allow! if can_perform_actions_on?(:import_projects, nil)
+          permission_action.allow! if can_perform_actions_on?(:bulk_update, nil)
+          permission_action.allow! if can_perform_actions_on?(:import_component, nil)
 
           permission_action
         end
@@ -34,7 +35,7 @@ module Decidim
           return false if can_create_grandchildren_results?
 
           case permission_action.subject
-          when :import_projects
+          when :import_component
             case permission_action.action
             when :create, :new
               true if defined?(Decidim::Budgets::Project)

data/app/presenters/decidim/accountability/admin_log/result_presenter.rb

@@ -17,7 +17,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "delete", "update"
+          when "create", "delete", "update", "soft_delete", "restore"
             "decidim.accountability.admin_log.result.#{action}"
           else
             super

data/app/presenters/decidim/accountability/result_presenter.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    #
+    # Decorator for results
+    #
+    class ResultPresenter < Decidim::ResourcePresenter
+      include Rails.application.routes.mounted_helpers
+      include ActionView::Helpers::UrlHelper
+      include Decidim::SanitizeHelper
+
+      def result
+        __getobj__
+      end
+
+      # Render the result title
+      #
+      # links - should render hashtags as links?
+      # extras - should include extra hashtags?
+      #
+      # Returns a String.
+      def title(links: false, extras: true, html_escape: false, all_locales: false)
+        return unless result
+
+        super(result.title, links, html_escape, all_locales, extras:)
+      end
+    end
+  end
+end

data/app/queries/decidim/accountability/metrics/results_metric_manage.rb

@@ -13,11 +13,11 @@ module Decidim
             next if cumulative_value.zero?
 
             quantity_value = quantity[key] || 0
-            category_id, space_type, space_id, related_object_id = key
+            taxonomy_id, space_type, space_id, related_object_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s,
                                                            metric_type: @metric_name,
                                                            organization: @organization,
-                                                           decidim_category_id: category_id,
+                                                           decidim_taxonomy_id: taxonomy_id,
                                                            participatory_space_type: space_type,
                                                            participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Component",
@@ -38,9 +38,9 @@ module Decidim
           @query = Decidim::Accountability::Result.select(:decidim_component_id)
                                                   .where(component: visible_components_from_spaces(spaces))
                                                   .joins(:component)
-                                                  .left_outer_joins(:category)
-          @query = @query.where("decidim_accountability_results.created_at <= ?", end_time)
-          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                                  .left_outer_joins(:taxonomizations)
+          @query = @query.where(decidim_accountability_results: { created_at: ..end_time })
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id,
                                 :decidim_component_id)
@@ -48,7 +48,7 @@ module Decidim
         end
 
         def quantity
-          @quantity ||= query.where("decidim_accountability_results.created_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_accountability_results: { created_at: start_time.. }).count
         end
       end
     end

data/app/services/decidim/accountability/results_calculator.rb

@@ -5,10 +5,9 @@ module Decidim
     # This class handles the calculation of progress for a set of results
     class ResultsCalculator
       # Public: Initializes the service.
-      def initialize(component, scope_id, category_id)
+      def initialize(component, taxonomy_id)
         @component = component
-        @scope_id = scope_id
-        @category_id = category_id
+        @taxonomy_id = taxonomy_id
       end
 
       delegate :count, to: :results
@@ -19,7 +18,7 @@ module Decidim
 
       private
 
-      attr_reader :component, :scope_id, :category_id
+      attr_reader :component, :taxonomy_id
 
       def results
         @results ||= begin
@@ -27,8 +26,7 @@ module Decidim
             parent_id: nil,
             component:
           )
-          query = query.with_any_scope(scope_id) if scope_id
-          query = query.with_any_category(category_id) if category_id
+          query = query.with_taxonomies(taxonomy_id) if taxonomy_id
 
           query
         end

data/app/services/decidim/accountability/results_csv_importer.rb

@@ -80,7 +80,7 @@ module Decidim
         available_locales = component.participatory_space.organization.available_locales
         params["result"].merge!(get_locale_attributes(default_locale, available_locales, :title, row))
         params["result"].merge!(get_locale_attributes(default_locale, available_locales, :description, row))
-        params["result"]["decidim_category_id"] = row["category/id"] if row["category/id"].present?
+        params["result"]["taxonomies"] = row["taxonomies/ids"].split(",") if row["taxonomies/ids"].present?
         params["result"]["decidim_accountability_status_id"] = row["status/id"] if row["status/id"].present?
         params["result"].merge!(get_proposal_ids(row["proposal_urls"]))
         params

data/app/views/decidim/accountability/admin/import_components/_filters.html.erb

@@ -0,0 +1,26 @@
+<% if component.manifest_name == "proposals" %>
+  <div class="row column">
+    <%= f.select :proposal_state_id,
+                 form.proposal_states_collection,
+                 include_blank: t(".select_state"),
+                 label: t(".proposal_state") %>
+  </div>
+<% end %>
+
+<% if component.has_taxonomy_settings? %>
+  <% component.available_taxonomy_filters.each do |filter| %>
+    <div class="row column">
+      <%= filter_taxonomy_items_select_field f, :taxonomies, filter %>
+    </div>
+  <% end %>
+<% end %>
+
+<div class="row column">
+  <small class="help-text">
+    <% if component.manifest_name == "proposals" %>
+      <%= t(".new_items_proposals", count: form.filtered_items_count) %>
+    <% elsif component.manifest_name == "budgets" %>
+      <%= t(".new_items_projects", count: form.filtered_items_count) %>
+    <% end %>
+  </small>
+</div>

data/app/views/decidim/accountability/admin/import_components/_form.html.erb

@@ -0,0 +1,26 @@
+<%= form_for(@form, url: import_components_path(@accountability),
+                    html: { class: "form form-defaults", id: "new_import_component", data: { form_url: new_import_component_path(@accountability) } },
+                    method: :post) do |f| %>
+  <% if @form.origin_components.any? %>
+    <div class="form__wrapper">
+      <div class="card pt-4">
+        <div class="card-section">
+          <div class="row column">
+            <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component"), label: t(".origin_component_id") %>
+          </div>
+
+          <% if @form.origin_component %>
+            <%= render partial: "filters", locals: { f:, form: @form, component: @form.origin_component } %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+      </div>
+    </div>
+  <% else %>
+    <p><%= t(".no_components") %></p>
+  <% end %>
+<% end %>

data/app/views/decidim/accountability/admin/import_components/new.html.erb

@@ -0,0 +1,14 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= render "form" %>
+  </div>
+</div>
+
+<%= append_javascript_pack_tag "decidim_accountability_admin_imports" %>

data/app/views/decidim/accountability/admin/results/_actions.html.erb

@@ -0,0 +1,29 @@
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :result, trashable_deleted_resource: result %>
+    <%= icon_link_to "refresh-line", url_for(action: :restore, id: result, controller: "results"), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
+<% else %>
+  <% if allowed_to? :update, :result, result: result %>
+    <%= icon_link_to "pencil-line", edit_result_path(result), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
+  <% end %>
+
+  <% if allowed_to? :create_children, :result, result: result %>
+    <%= icon_link_to "add-line", results_path(parent_id: result.id), t("actions.new_result", scope: "decidim.accountability"), class: "action-icon--plus" %>
+  <% end %>
+
+  <% if allowed_to? :update, :result, result: result %>
+    <%= icon_link_to "time-line", result_timeline_entries_path(result), t("actions.timeline_entries", scope: "decidim.accountability"), class: "action-icon--clock" %>
+    <%= icon_link_to "folder-line", result_attachment_collections_path(result), t("actions.attachment_collections", scope: "decidim.accountability"), class: "action-icon--attachment_collections" %>
+    <%= icon_link_to "attachment-line", result_attachments_path(result), t("actions.attachments", scope: "decidim.accountability"), class: "action-icon--attachments" %>
+  <% end %>
+
+  <%= icon_link_to "eye-line", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <%= resource_permissions_link(result) %>
+
+  <% if allowed_to? :soft_delete, :result, trashable_deleted_resource: result %>
+    <%= icon_link_to "delete-bin-line", soft_delete_result_path(result), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_result", scope: "decidim.accountability") } %>
+  <% else %>
+    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+  <% end %>
+<% end %>

data/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -18,15 +18,14 @@
 
       <% else %>
 
-        <% if current_component.has_subscopes? %>
-          <div class="row column">
-            <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
-          </div>
-        <% end %>
-
-        <div class="row column">
-          <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
+        <% if @form.taxonomy_filters&.any? %>
+          <% @form.taxonomy_filters.each do |filter| %>
+            <div class="row column">
+              <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+            </div>
+          <% end %>
         </div>
+        <% end %>
 
       <% end %>
 
@@ -40,6 +39,14 @@
         </div>
       </div>
 
+      <% if @form.geocoding_enabled? %>
+        <div class="row">
+          <div class="columns">
+            <%= form.geocoding_field(:address) %>
+          </div>
+        </div>
+      <% end %>
+
       <div class="row">
         <div class="columns">
           <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>

data/app/views/decidim/accountability/admin/results/_result-tr.html.erb

@@ -0,0 +1,32 @@
+<tr data-id="<%= result.id %>">
+  <td>
+    <%= check_box_tag "result_ids_s[]", result.id, false, data: { result_id: result.id, result_checkbox: true } %><br>
+  </td>
+  <td>
+    <%= result.id %><br>
+  </td>
+  <td class="!text-left">
+    <% if result.parent_id.nil? %>
+      <%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %><br>
+    <% else %>
+      <%= translated_attribute(result.title) %>
+    <% end %>
+  </td>
+  <td>
+    <%= result.taxonomies.map { |taxonomy| decidim_sanitize_translated(taxonomy.name) }.join(", ") %>
+  </td>
+  <td>
+    <% if result.status %>
+      <%= translated_attribute result.status.name %>
+    <% end %>
+  </td>
+  <td>
+    <%= result.progress&.to_i %>
+  </td>
+  <td>
+    <%= l result.created_at, format: :decidim_short %>
+  </td>
+  <td class="table-list__actions">
+    <%= render partial: "decidim/accountability/admin/results/actions", locals: { result:, view: } %>
+  </td>
+</tr>