From d06d2db3eb6327f03bd195a2395fc916d014a5a7 Mon Sep 17 00:00:00 2001
From: Joonas <joonas.aapro@mainiotech.fi>
Date: Mon, 9 Dec 2024 14:51:15 +0200
Subject: [PATCH] Fix specs / Modify views

---
 Rakefile                                      |  1 -
 app/cells/decidim/ideas/idea_g_cell.rb        |  2 +-
 .../decidim/ideas/ideas_controller.rb         |  1 +
 .../decidim/ideas/admin/component_settings.rb |  2 +-
 .../decidim/ideas/admin/ideas_helper.rb       |  4 ++--
 .../decidim/ideas/admin/component_settings.js |  4 ++--
 app/packs/src/decidim/ideas/admin/ideas.js    | 14 ++++++-------
 .../src/decidim/ideas/admin/ideas_form.js     |  6 +++---
 app/packs/src/decidim/ideas/idea_form.js      |  2 +-
 .../decidim/ideas/admin/ideas/_form.html.erb  |  2 +-
 .../bulk_actions/_area_scope_change.html.erb  | 10 +++-------
 .../ideas/bulk_actions/_dropdown.html.erb     |  2 +-
 .../admin/ideas/bulk_actions/_merge.html.erb  |  4 ++--
 .../bulk_actions/_publish_answers.html.erb    |  4 ++--
 .../ideas/bulk_actions/_recategorize.html.erb |  4 ++--
 .../decidim/ideas/ideas/_flag_modal.html.erb  | 20 -------------------
 app/views/decidim/ideas/ideas/_form.html.erb  |  4 ++--
 .../decidim/ideas/ideas/_idea_aside.html.erb  |  4 ++--
 spec/cells/decidim/ideas/idea_g_cell_spec.rb  |  2 +-
 spec/system/admin/admin_creates_idea_spec.rb  |  2 +-
 spec/system/admin/admin_filters_ideas_spec.rb | 15 ++++++--------
 .../admin_manages_component_settings_spec.rb  |  6 +++---
 spec/system/admin/admin_manages_ideas_spec.rb |  4 ++--
 spec/system/browse_ideas_spec.rb              | 10 +++++++---
 24 files changed, 53 insertions(+), 76 deletions(-)
 delete mode 100644 app/views/decidim/ideas/ideas/_flag_modal.html.erb

diff --git a/Rakefile b/Rakefile
index 38c74c8..2d82310 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,7 +24,6 @@ end
 desc "Generates a dummy app for testing"
 task test_app: "decidim:generate_external_test_app" do
   ENV["RAILS_ENV"] = "test"
-  fix_babel_config("spec/decidim_dummy_app")
   install_module("spec/decidim_dummy_app")
 end
 
diff --git a/app/cells/decidim/ideas/idea_g_cell.rb b/app/cells/decidim/ideas/idea_g_cell.rb
index eb8e768..18c89ec 100644
--- a/app/cells/decidim/ideas/idea_g_cell.rb
+++ b/app/cells/decidim/ideas/idea_g_cell.rb
@@ -64,7 +64,7 @@ def body
       end
 
       def category
-        translated_attribute(model.category.name) if has_category?
+        decidim_sanitize translated_attribute(model.category.name) if has_category?
       end
 
       def full_category
diff --git a/app/controllers/decidim/ideas/ideas_controller.rb b/app/controllers/decidim/ideas/ideas_controller.rb
index f1337b2..f7c9c31 100644
--- a/app/controllers/decidim/ideas/ideas_controller.rb
+++ b/app/controllers/decidim/ideas/ideas_controller.rb
@@ -8,6 +8,7 @@ class IdeasController < Decidim::Ideas::ApplicationController
 
       include Decidim::ApplicationHelper
       include FormFactory
+      include Flaggable
       include FilterResource
       include Decidim::Ideas::Orderable
       include Paginable
diff --git a/app/helpers/concerns/decidim/ideas/admin/component_settings.rb b/app/helpers/concerns/decidim/ideas/admin/component_settings.rb
index 28deb84..7b82d9f 100644
--- a/app/helpers/concerns/decidim/ideas/admin/component_settings.rb
+++ b/app/helpers/concerns/decidim/ideas/admin/component_settings.rb
@@ -28,7 +28,7 @@ def settings_attribute_input(form, attribute, name, i18n_scope, options = {})
                 end
               when :idea_area_scope_coordinates
                 component_id = @component.new_record? ? "new" : @component.id
-                visibility_class = @component.settings.geocoding_enabled ? "" : "hide"
+                visibility_class = @component.settings.geocoding_enabled ? "" : "hidden"
                 value = area_scopes_coordinates(@component)
                 label = t(name, scope: i18n_scope)
                 coordinates_element = render(
diff --git a/app/helpers/decidim/ideas/admin/ideas_helper.rb b/app/helpers/decidim/ideas/admin/ideas_helper.rb
index b63e689..486263e 100644
--- a/app/helpers/decidim/ideas/admin/ideas_helper.rb
+++ b/app/helpers/decidim/ideas/admin/ideas_helper.rb
@@ -111,12 +111,12 @@ def ideas_admin_filter_applied_filters
         def icon_with_link_to_idea(idea)
           icon, tooltip = if allowed_to?(:create, :idea_answer, idea: idea) && !idea.emendation?
                             [
-                              "comment-square",
+                              "question-answer-line",
                               t(:answer_idea, scope: "decidim.ideas.actions")
                             ]
                           else
                             [
-                              "info",
+                              "information-line",
                               t(:show, scope: "decidim.ideas.actions")
                             ]
                           end
diff --git a/app/packs/src/decidim/ideas/admin/component_settings.js b/app/packs/src/decidim/ideas/admin/component_settings.js
index e63cfc1..b2c50dc 100644
--- a/app/packs/src/decidim/ideas/admin/component_settings.js
+++ b/app/packs/src/decidim/ideas/admin/component_settings.js
@@ -17,9 +17,9 @@ $(() => {
 
   $("input[name='component[settings][geocoding_enabled]']").on("change", (ev) => {
     if ($(ev.target).is(":checked")) {
-      $coordinatesElement.removeClass("hide");
+      $coordinatesElement.removeClass("hidden");
     } else {
-      $coordinatesElement.addClass("hide");
+      $coordinatesElement.addClass("hidden");
     }
   });
 
diff --git a/app/packs/src/decidim/ideas/admin/ideas.js b/app/packs/src/decidim/ideas/admin/ideas.js
index 0b9fee5..3464983 100644
--- a/app/packs/src/decidim/ideas/admin/ideas.js
+++ b/app/packs/src/decidim/ideas/admin/ideas.js
@@ -33,32 +33,32 @@ $(document).ready(function () {
 
   let showBulkActionsButton = function() {
     if (selectedIdeasCount() > 0) {
-      $("#js-bulk-actions-button").removeClass("hide");
+      $("#js-bulk-actions-button").removeClass("hidden");
     }
   }
 
   window.hideBulkActionsButton = function(force = false) {
     if (selectedIdeasCount() === 0 || force === true) {
-      $("#js-bulk-actions-button").addClass("hide");
+      $("#js-bulk-actions-button").addClass("hidden");
       $("#js-bulk-actions-dropdown").removeClass("is-open");
     }
   }
 
   window.showOtherActionsButtons = function() {
-    $("#js-other-actions-wrapper").removeClass("hide");
+    $("#js-other-actions-wrapper").removeClass("hidden");
   }
 
   window.hideOtherActionsButtons = function() {
-    $("#js-other-actions-wrapper").addClass("hide");
+    $("#js-other-actions-wrapper").addClass("hidden");
   }
 
   window.hideBulkActionForms = function() {
-    $(".js-bulk-action-form").addClass("hide");
+    $(".js-bulk-action-form").addClass("hidden");
   }
 
   if ($(".js-bulk-action-form").length) {
     window.hideBulkActionForms();
-    $("#js-bulk-actions-button").addClass("hide");
+    $("#js-bulk-actions-button").addClass("hidden");
 
     $("#js-bulk-actions-dropdown ul li button").click(function(ev) {
       ev.preventDefault();
@@ -69,7 +69,7 @@ $(document).ready(function () {
           $(".layout-content > .callout-wrapper").html("");
         })
 
-        $(`#js-${action}-actions`).removeClass("hide");
+        $(`#js-${action}-actions`).removeClass("hidden");
         window.hideBulkActionsButton(true);
         window.hideOtherActionsButtons();
       }
diff --git a/app/packs/src/decidim/ideas/admin/ideas_form.js b/app/packs/src/decidim/ideas/admin/ideas_form.js
index 7b9a34a..5a691b1 100644
--- a/app/packs/src/decidim/ideas/admin/ideas_form.js
+++ b/app/packs/src/decidim/ideas/admin/ideas_form.js
@@ -10,7 +10,7 @@
     const subcategorySelects = {};
     $sections.each((_i, el) => {
       const $sub = $(el);
-      $sub.removeClass("hide");
+      $sub.removeClass("hidden");
       subcategorySelects[$sub.data("parent")] = $sub;
     });
 
@@ -28,9 +28,9 @@
 
     $geocodingToggle.on("change.decidim.ideas", () => {
       if ($geocodingToggle.is(":checked")) {
-        $(".geocoding-field").addClass("hide");
+        $(".geocoding-field").addClass("hidden");
       } else {
-        $(".geocoding-field").removeClass("hide");
+        $(".geocoding-field").removeClass("hidden");
       }
     }).trigger("change.decidim.ideas");
   };
diff --git a/app/packs/src/decidim/ideas/idea_form.js b/app/packs/src/decidim/ideas/idea_form.js
index c4cfcf2..06da5cd 100644
--- a/app/packs/src/decidim/ideas/idea_form.js
+++ b/app/packs/src/decidim/ideas/idea_form.js
@@ -237,7 +237,7 @@ import "src/decidim/ideas/info_modals";
     const subcategorySelects = {};
     $sections.each((_i, el) => {
       const $sub = $(el);
-      $sub.removeClass("hide");
+      $sub.removeClass("hidden");
       subcategorySelects[$sub.data("parent")] = $sub;
     });
 
diff --git a/app/views/decidim/ideas/admin/ideas/_form.html.erb b/app/views/decidim/ideas/admin/ideas/_form.html.erb
index ddc6ffe..53b4de7 100644
--- a/app/views/decidim/ideas/admin/ideas/_form.html.erb
+++ b/app/views/decidim/ideas/admin/ideas/_form.html.erb
@@ -72,7 +72,7 @@
         <% @form.top_categories.each do |category| %>
           <% next if category.subcategories.blank? %>
 
-          <div class="subcategories hide" data-parent="<%= category.id %>">
+          <div class="subcategories hidden" data-parent="<%= category.id %>">
             <div class="row column">
               <%= form.categories_select :sub_category_id, category.subcategories, { disable_parents: false, prompt: t(".select_a_sub_category") }, id: "sub_category_id_for_#{category.id}" %>
             </div>
diff --git a/app/views/decidim/ideas/admin/ideas/bulk_actions/_area_scope_change.html.erb b/app/views/decidim/ideas/admin/ideas/bulk_actions/_area_scope_change.html.erb
index 29beb5d..8106f34 100644
--- a/app/views/decidim/ideas/admin/ideas/bulk_actions/_area_scope_change.html.erb
+++ b/app/views/decidim/ideas/admin/ideas/bulk_actions/_area_scope_change.html.erb
@@ -1,16 +1,12 @@
-<div id="js-scope-change-ideas-actions" class="hide js-bulk-action-form">
+<div id="js-scope-change-ideas-actions" class="hidden js-bulk-action-form">
   <%= form_tag(update_area_scope_ideas_path, method: :post, remote: true, id: "js-form-scope-change-ideas", class: "flex--cc flex-gap--1") do %>
-    <div class="checkboxes hide">
+    <div class="checkboxes hidden">
       <% ideas.each do |idea| %>
         <%= check_box_tag "idea_ids[]", idea.id, false, class: "js-check-all-idea js-idea-id-#{idea.id}" %>
       <% end %>
     </div>
 
-    <%= scopes_picker_tag(
-          :area_scope_id,
-          current_component.settings.area_scope_parent_id,
-          field: t("models.idea.fields.area_scope", scope: "decidim.ideas")
-        ) %>
+    <%= scopes_select_tag(:area_scope_id, options: { selected: current_component.settings.area_scope_parent_id }) %>
 
     <%= submit_tag(
           t("decidim.ideas.admin.ideas.index.update_scope_button"),
diff --git a/app/views/decidim/ideas/admin/ideas/bulk_actions/_dropdown.html.erb b/app/views/decidim/ideas/admin/ideas/bulk_actions/_dropdown.html.erb
index 1339e6c..8c82a8d 100644
--- a/app/views/decidim/ideas/admin/ideas/bulk_actions/_dropdown.html.erb
+++ b/app/views/decidim/ideas/admin/ideas/bulk_actions/_dropdown.html.erb
@@ -1,7 +1,7 @@
 <div id="js-bulk-actions-wrapper">
   <button
     id="js-bulk-actions-button"
-    class="button button--nomargin tiny success light dropdown hide"
+    class="button button--nomargin tiny success light dropdown hidden"
     type="button"
     data-toggle="js-bulk-actions-dropdown">
     <%= t("decidim.ideas.admin.ideas.index.actions") %>
diff --git a/app/views/decidim/ideas/admin/ideas/bulk_actions/_merge.html.erb b/app/views/decidim/ideas/admin/ideas/bulk_actions/_merge.html.erb
index aee70d7..4731406 100644
--- a/app/views/decidim/ideas/admin/ideas/bulk_actions/_merge.html.erb
+++ b/app/views/decidim/ideas/admin/ideas/bulk_actions/_merge.html.erb
@@ -1,6 +1,6 @@
-<div id="js-merge-ideas-actions" class="hide js-bulk-action-form">
+<div id="js-merge-ideas-actions" class="hidden js-bulk-action-form">
   <%= form_tag(ideas_merge_path, method: :post, id: "js-form-merge-ideas", class: "flex--cc flex-gap--1") do %>
-    <div class="checkboxes hide">
+    <div class="checkboxes hidden">
       <% ideas.each do |idea| %>
         <%= check_box_tag "idea_ids[]", idea.id, false, class: "js-check-all-idea js-idea-id-#{idea.id}" %>
       <% end %>
diff --git a/app/views/decidim/ideas/admin/ideas/bulk_actions/_publish_answers.html.erb b/app/views/decidim/ideas/admin/ideas/bulk_actions/_publish_answers.html.erb
index 1bec42f..3627636 100644
--- a/app/views/decidim/ideas/admin/ideas/bulk_actions/_publish_answers.html.erb
+++ b/app/views/decidim/ideas/admin/ideas/bulk_actions/_publish_answers.html.erb
@@ -1,6 +1,6 @@
-<div id="js-publish-answers-actions" class="hide js-bulk-action-form">
+<div id="js-publish-answers-actions" class="hidden js-bulk-action-form">
   <%= form_tag(publish_answers_ideas_path, method: :post, remote: true, id: "js-form-publish-answers", class: "flex--cc flex-gap--1") do %>
-    <div class="checkboxes hide">
+    <div class="checkboxes hidden">
       <% ideas.each do |idea| %>
         <%= check_box_tag "idea_ids[]", idea.id, false, class: "js-check-all-idea js-idea-id-#{idea.id}" %>
       <% end %>
diff --git a/app/views/decidim/ideas/admin/ideas/bulk_actions/_recategorize.html.erb b/app/views/decidim/ideas/admin/ideas/bulk_actions/_recategorize.html.erb
index 549c596..8a65a10 100644
--- a/app/views/decidim/ideas/admin/ideas/bulk_actions/_recategorize.html.erb
+++ b/app/views/decidim/ideas/admin/ideas/bulk_actions/_recategorize.html.erb
@@ -1,6 +1,6 @@
-<div id="js-recategorize-ideas-actions" class="hide js-bulk-action-form">
+<div id="js-recategorize-ideas-actions" class="hidden js-bulk-action-form">
   <%= form_tag(update_category_ideas_path, method: :post, remote: true, id: "js-form-recategorize-ideas", class: "flex--cc flex-gap--1") do %>
-    <div class="checkboxes hide">
+    <div class="checkboxes hidden">
       <% ideas.each do |idea| %>
         <%= check_box_tag "idea_ids[]", idea.id, false, class: "js-check-all-idea js-idea-id-#{idea.id}" %>
       <% end %>
diff --git a/app/views/decidim/ideas/ideas/_flag_modal.html.erb b/app/views/decidim/ideas/ideas/_flag_modal.html.erb
deleted file mode 100644
index 6afd7a7..0000000
--- a/app/views/decidim/ideas/ideas/_flag_modal.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="reveal flag-modal" id="flagModal" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".title") %></h3>
-    <button class="close-button" data-close aria-label="<%= t(".close") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <% if reportable.reported_by? current_user %>
-    <p><%= t(".already_reported") %></p>
-  <% else %>
-    <p><%= t(".description") %></p>
-    <%= decidim_form_for form, url: url, method: :post do |f| %>
-      <%= f.collection_radio_buttons :reason, [[:spam, t(".spam")], [:offensive, t(".offensive")], [:does_not_belong, t(".does_not_belong", organization_name: current_organization.name)]], :first, :last do |builder| %>
-        <%= builder.label { builder.radio_button + builder.text } %>
-      <% end %>
-      <%= f.text_area :details, rows: 4 %>
-      <%= f.submit t(".report") %>
-    <% end %>
-  <% end %>
-</div>
diff --git a/app/views/decidim/ideas/ideas/_form.html.erb b/app/views/decidim/ideas/ideas/_form.html.erb
index f5ce1da..f625d38 100644
--- a/app/views/decidim/ideas/ideas/_form.html.erb
+++ b/app/views/decidim/ideas/ideas/_form.html.erb
@@ -102,7 +102,7 @@
       <div class="field" id="address_input">
         <div class="input-group">
           <span class="input-group-label">
-            <%= icon "map-marker", aria_hidden: true %>
+            <%= icon "map-pin-line", aria_hidden: true %>
           </span>
           <%= form.geocoding_field :address, label: false, class: "input-group-field", data: {
             "coordinates-url": geocoding_path,
@@ -149,7 +149,7 @@
     <% @form.top_categories.each do |category| %>
       <% next if category.subcategories.blank? %>
 
-      <div class="subcategories hide" data-parent="<%= category.id %>">
+      <div class="subcategories hidden" data-parent="<%= category.id %>">
         <%= form.plain_label :sub_category_id %>
 
         <div class="row">
diff --git a/app/views/decidim/ideas/ideas/_idea_aside.html.erb b/app/views/decidim/ideas/ideas/_idea_aside.html.erb
index 4bd4fad..d8f2ef2 100644
--- a/app/views/decidim/ideas/ideas/_idea_aside.html.erb
+++ b/app/views/decidim/ideas/ideas/_idea_aside.html.erb
@@ -1,6 +1,6 @@
 <% if show_actions %>
   <section class="layout-aside__section actions__secondary">
-    <%= cell("decidim/favorites/favorite_button", idea, button_class: "link text-secondary", disable_tooltip: true) %>
+    <%= cell("decidim/favorites/favorite_button", idea, button_class: "link-text text-secondary", disable_tooltip: true) %>
   </section>
 <% end %>
 
@@ -28,7 +28,7 @@
   </section>
 
   <section class="layout-aside__section actions__secondary">
-    <%= cell "decidim/report_button", idea, only_button: true%>
+    <%= cell "decidim/report_button", idea %>
   </section>
 <% end %>
 
diff --git a/spec/cells/decidim/ideas/idea_g_cell_spec.rb b/spec/cells/decidim/ideas/idea_g_cell_spec.rb
index 8701852..97ca461 100644
--- a/spec/cells/decidim/ideas/idea_g_cell_spec.rb
+++ b/spec/cells/decidim/ideas/idea_g_cell_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Decidim::Ideas
-  describe IdeaMCell, type: :cell do
+  describe IdeaGCell, type: :cell do
     controller Decidim::Ideas::IdeasController
 
     subject { cell_html }
diff --git a/spec/system/admin/admin_creates_idea_spec.rb b/spec/system/admin/admin_creates_idea_spec.rb
index f9d17f9..ae96b43 100644
--- a/spec/system/admin/admin_creates_idea_spec.rb
+++ b/spec/system/admin/admin_creates_idea_spec.rb
@@ -54,7 +54,7 @@
 
     before do
       visit current_path
-      find(".icon--pencil").click
+      find(".action-icon--edit-idea").click
     end
 
     it "updates the idea" do
diff --git a/spec/system/admin/admin_filters_ideas_spec.rb b/spec/system/admin/admin_filters_ideas_spec.rb
index 8d57661..dd9586c 100644
--- a/spec/system/admin/admin_filters_ideas_spec.rb
+++ b/spec/system/admin/admin_filters_ideas_spec.rb
@@ -33,9 +33,7 @@
     let!(:idea5) { create(:idea, :withdrawn, title: idea5_title, component: component) }
 
     before do
-      within ".fcell.filter" do
-        find(".dropdown.button").hover
-      end
+      click_on "Filter"
       find("a", text: "State").hover
     end
 
@@ -73,8 +71,9 @@
 
     before do
       visit current_path
-      within ".fcell.filter" do
-        find(".dropdown.button").hover
+      click_on "Filter"
+
+      within ".card-section" do
         find("a", text: "Area").hover
       end
     end
@@ -93,10 +92,8 @@
 
     before do
       visit current_path
-      within ".fcell.filter" do
-        find(".dropdown.button").hover
-        find("a", text: "Category").hover
-      end
+      click_on "Filter"
+      find("a", text: "Category").hover
     end
 
     it "filters by category" do
diff --git a/spec/system/admin/admin_manages_component_settings_spec.rb b/spec/system/admin/admin_manages_component_settings_spec.rb
index eec85ca..64b4f83 100644
--- a/spec/system/admin/admin_manages_component_settings_spec.rb
+++ b/spec/system/admin/admin_manages_component_settings_spec.rb
@@ -39,7 +39,7 @@ def components_path(component)
     let(:coordinates) { "60.1699,24.9384" }
 
     before do
-      find(".icon--cog", match: :first).click
+      find(".action-icon--configure", match: :first).click
     end
 
     it "updates component's settings" do
@@ -60,8 +60,8 @@ def components_path(component)
   end
 
   describe "delete" do
-    it "delets component" do
-      find(".icon--circle-x").click
+    it "deletes component" do
+      find(".action-icon--remove").click
       expect(page).to have_content("Component deleted successfully")
     end
   end
diff --git a/spec/system/admin/admin_manages_ideas_spec.rb b/spec/system/admin/admin_manages_ideas_spec.rb
index addfbc4..ef13376 100644
--- a/spec/system/admin/admin_manages_ideas_spec.rb
+++ b/spec/system/admin/admin_manages_ideas_spec.rb
@@ -64,12 +64,12 @@
     end
 
     it "unreports" do
-      find(".icon--action-undo").click
+      find(".action-icon--unreport").click
       expect(page).to have_content("Resource successfully unreported")
     end
 
     it "hides" do
-      find(".icon--eye").click
+      find(".action-icon--hide").click
       expect(page).to have_content("Resource successfully hidden")
       expect(Decidim::Ideas::Idea.find(idea.id).hidden?).to be(true)
     end
diff --git a/spec/system/browse_ideas_spec.rb b/spec/system/browse_ideas_spec.rb
index 0eb7d93..1659be9 100644
--- a/spec/system/browse_ideas_spec.rb
+++ b/spec/system/browse_ideas_spec.rb
@@ -91,10 +91,14 @@
 
     it "creates report" do
       click_link idea.title
-      click_button "Report idea"
+      click_button "Report"
       choose "report[reason]", option: reason
       fill_in "report[details]", with: report_body
-      click_button "Report"
+
+      within "#flagModal-content" do
+        click_button "Report"
+      end
+
       expect(page).to have_content("The report has been created successfully and it will be reviewed by an admin")
       expect(Decidim::Report.last.details).to eq(report_body)
       expect(Decidim::Report.last.reason).to eq(reason)
@@ -115,7 +119,7 @@
     it "follows link" do
       click_link idea2.title
       fill_in "add-comment-Idea-#{idea2.id}", with: add_comment
-      click_button "Send"
+      click_button "Publish comment"
       click_link idea3_title
       expect(page).to have_content(idea3_body)
       expect(page).to have_content(idea3.category.name["en"])