Merge branch 'release/0.31-stable' into 0.31-backports

Author: microstudi

.github/actions/spelling/expect.txt

@@ -33,35 +33,6 @@ def update
           end
         end
       end
-
-      def users
-        search(current_organization.users.available)
-      end
-
-      private
-
-      def search(relation)
-        respond_to do |format|
-          format.json do
-            if (term = params[:term].to_s).present?
-              query = if term.start_with?("@")
-                        nickname = term.delete("@")
-                        relation.where("nickname LIKE ?", "#{nickname}%")
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("similarity(nickname, '#{nickname}') DESC")))
-                      else
-                        relation.where("name ILIKE ?", "%#{term}%").or(
-                          relation.where("email ILIKE ?", "%#{term}%")
-                        )
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("GREATEST(similarity(name, '#{term}'), similarity(email, '#{term}')) DESC")))
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("(similarity(name, '#{term}') + similarity(email, '#{term}')) / 2 DESC")))
-                      end
-              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
-            else
-              render json: []
-            end
-          end
-        end
-      end
     end
   end
 end

decidim-admin/app/controllers/decidim/admin/organization_controller.rb

@@ -10,15 +10,13 @@ import AutoComplete from "src/decidim/refactor/moved/autocomplete";
  * - name: assembly_member[user_id],
  * - options: [],
  * - placeholder: "Select a participant",
- * - searchURL: "http://..."
  * - selected: "",
  *
  * @param {HTMLElement} el The element to generate the autocomplete for.
  * @returns {AutoComplete} An instance of the AutoComplete class.
  */
 const autoConfigure = (el) => {
   const config = JSON.parse(el.dataset.autocomplete);
-  const searchUrl = new URL(config.searchURL);
   const textInput = document.createElement("input");
   textInput.type = "text";
   textInput.className = "autocomplete-input";
@@ -46,16 +44,24 @@ const autoConfigure = (el) => {
     }
   }
 
+  const graphqlEscapedQuery = (query) => query.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+
   const dataSource = (query, callback) => {
-    const params = new URLSearchParams({
-      ...Object.fromEntries(searchUrl.searchParams),
-      term: query
-    });
-    fetch(`${searchUrl.origin}${searchUrl.pathname}?${params.toString()}`, {
-      method: "GET",
-      headers: { "Content-Type": "application/json" }
+    const apiPath = window.Decidim.config.get("api_path");
+    fetch(apiPath, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        query: `{users(filter:{wildcard:"${graphqlEscapedQuery(query)}"}){id,nickname,name,__typename}}`
+      })
     }).then((response) => response.json()).then((data) => {
-      callback(data)
+      const users = data?.data?.users || [];
+      callback(users.map((user) => ({
+        value: user.id,
+        label: `${user.name} (${user.nickname})`
+      })))
+    }).catch(() => {
+      callback([])
     });
   };
 

decidim-admin/app/packs/src/decidim/admin/admin_autocomplete.js

@@ -8,10 +8,6 @@
         resources :content_blocks, only: [:edit, :update, :destroy, :create], controller: "organization_homepage_content_blocks"
       end
       resource :external_domain_allowlist, only: [:edit, :update], controller: "organization_external_domain_allowlist"
-
-      member do
-        get :users
-      end
     end
 
     resources :static_pages do

decidim-admin/config/routes.rb

@@ -19,7 +19,6 @@ class FormBuilder < Decidim::FormBuilder
       #   - :class (string) You can provide custom class name for the container (ex. autocomplete-field--results-inline)
       # @param [Hash] prompt_options
       #   Prompt configuration. A hash with options:
-      #   - :url (String) The url where the ajax endpoint to fill the select
       #   - :placeholder (String) Text to use as placeholder
       #   - :no_results (String) (optional) Text to use when there are no matching results (default: No results found)
       #   - :search_prompt (String) (optional) Text to prompt for search input (default: Type at least three characters to search)
@@ -30,7 +29,7 @@ class FormBuilder < Decidim::FormBuilder
       #   - label: This will be the label of the option select.
       #
       # @example How to use it
-      #   <% prompt_options = { url: users_url, text: t(".select_user") }
+      #   <% prompt_options = { placeholder: t(".select_user") }
       #      options = { label: t(".user") } %>
       #   <%= form.autocomplete_select(:user_id, form.object.user.presence, options, prompt_options) do |user|
       #      { value: user.id, label: "#{user.name} (#{user.nickname})" }
@@ -48,7 +47,6 @@ def autocomplete_select(attribute, selected = nil, options = {}, prompt_options
                                     name: options[:name] || "#{@object_name}[#{attribute}]",
                                     options: (options[:default_options].to_a + [selected]).compact,
                                     placeholder: prompt_options[:placeholder],
-                                    searchURL: prompt_options[:url],
                                     changeURL: prompt_options[:change_url],
                                     selected: selected ? selected[:value] : "",
                                     searchPromptText: options[:search_prompt] || I18n.t("autocomplete.search_prompt", scope: "decidim.admin"),

decidim-admin/lib/decidim/admin/form_builder.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe OrganizationController do
+      routes { Decidim::Admin::Engine.routes }
+
+      let(:organization) { create(:organization) }
+      let(:current_user) { create(:user, :admin, :confirmed, organization:) }
+
+      before do
+        request.env["decidim.current_organization"] = organization
+        sign_in current_user, scope: :user
+      end
+
+      describe "GET #edit" do
+        it "renders the edit template" do
+          get :edit
+
+          expect(response).to render_template(:edit)
+          expect(assigns(:form).id).to eq(organization.id)
+          expect(assigns(:form).name).to eq(organization.name)
+        end
+      end
+
+      describe "PATCH #update" do
+        let(:attributes) { attributes_for(:organization) }
+        let(:params) do
+          {
+            organization: attributes.merge(
+              name: attributes[:name].merge(en: "My updated organization"),
+              description: attributes[:description].merge(en: "Updated description")
+            )
+          }
+        end
+
+        it "updates the organization and redirects" do
+          patch(:update, params:)
+
+          expect(response).to redirect_to(edit_organization_path)
+          expect(flash[:notice]).to eq(I18n.t("organization.update.success", scope: "decidim.admin"))
+          expect(translated(organization.reload.name)).to eq("My updated organization")
+        end
+
+        it "renders edit when invalid" do
+          patch :update, params: params.deep_merge(organization: { name: { en: "" } })
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response).to render_template(:edit)
+          expect(flash.now[:alert]).to eq(I18n.t("organization.update.error", scope: "decidim.admin"))
+        end
+      end
+    end
+  end
+end

decidim-admin/spec/controllers/organization_controller_spec.rb

@@ -34,7 +34,7 @@ def self.model_name
       let(:category) { nil }
       let(:selected) { category }
       let(:options) { {} }
-      let(:prompt_options) { { url: "/some/url", text: "Pick a category", change_url: "/some/other/url" } }
+      let(:prompt_options) { { text: "Pick a category", change_url: "/some/other/url" } }
       let(:output) { builder.autocomplete_select(:category_id, selected, options, prompt_options) }
       let(:autocomplete_data) { JSON.parse(subject.xpath("//div[@data-autocomplete]/@data-autocomplete").first.value) }
 
@@ -59,7 +59,6 @@ def self.model_name
             "options" => [],
             "placeholder" => nil,
             "searchPromptText" => t("autocomplete.search_prompt", scope: "decidim.admin"),
-            "searchURL" => "/some/url",
             "selected" => ""
           )
         end

decidim-admin/spec/controllers/organizations_controller_spec.rb

@@ -5,8 +5,7 @@
 describe "Autocomplete multiselect" do
   let(:organization) { create(:organization) }
   let(:user) { create(:user, :admin, :confirmed, organization:) }
-  let(:path) { URI.parse(decidim_admin.users_organization_url).path }
-  let(:url) { "http://#{organization.host}:#{Capybara.current_session.server.port}#{path}" }
+  let(:api_path) { "/api" }
   let(:selected) { '""' }
 
   before do
@@ -34,15 +33,16 @@
             "mode": "multi",
             "options":[],
             "placeholder":"Select user",
-            "searchURL":"#{url}",
             "selected":#{selected}
           }'
           data-autocomplete-for="user_id" data-plugin="autocomplete">
         </div>
       )
     end
 
-    let(:html_head) { "" }
+    let(:html_head) do
+      %(<script>window.Decidim = { config: { get: (key) => key === "api_path" ? "#{api_path}" : null } };</script>)
+    end
     let(:html_document) do
       head_extra = html_head
       body_extra = autocomplete_multifield_select
@@ -104,16 +104,6 @@
           text_input = find("input[type='text']")
           expect(text_input.value).to eq("")
         end
-
-        context "when the URL has extra parameters in it" do
-          let(:url) { "http://#{organization.host}:#{Capybara.current_session.server.port}#{path}?locale=ca" }
-
-          it "shows selected participant" do
-            find("input[type='text']").fill_in with: participant.name.slice(0..2)
-            find(".autoComplete_wrapper ul#autoComplete_list_1 li", match: :first, wait: 2).click
-            expect(page).to have_content(participant.name)
-          end
-        end
       end
 
       describe "remove selected item" do

decidim-admin/spec/lib/admin/form_builder_spec.rb

@@ -36,7 +36,7 @@ def context
       end
 
       def api_user
-        @api_user = current_api_user || current_user
+        @api_user ||= organization_user(current_api_user || current_user)
       end
 
       # Determines the scopes for the user for API requests.
@@ -84,6 +84,13 @@ def prepare_variables(variables_param)
           raise ArgumentError, "Unexpected parameter: #{variables_param}"
         end
       end
+
+      def organization_user(user)
+        return if user.blank? || current_organization.blank?
+        return unless user.decidim_organization_id == current_organization.id
+
+        user
+      end
     end
   end
 end