decidim-admin 0.31.6 → 0.32.0.rc1

data/app/packs/src/decidim/admin/controllers/access_mode/controller.js

@@ -0,0 +1,52 @@
+import { Controller } from "@hotwired/stimulus"
+
+/**
+ * Toggles the visibility of the access mode options according to the
+ * "This space has members" checkbox.
+ *
+ * The controller expects to sit on the access accordion so it can
+ * query the checkbox and the `#access_mode` fieldset that lives inside.
+ */
+export default class extends Controller {
+
+  /**
+   * Find the relevant inputs and attach the change listener.
+   * @returns {void}
+   */
+  connect() {
+    this.hasMembersCheckbox = this.element.querySelector("#has_members input[type='checkbox']")
+    this.accessModeFieldset = this.element.querySelector("#access_mode")
+
+    if (!this.hasMembersCheckbox || !this.accessModeFieldset) {
+      return
+    }
+
+    this.toggleAccessMode = this.toggleAccessMode.bind(this)
+    this.hasMembersCheckbox.addEventListener("change", this.toggleAccessMode)
+    this.toggleAccessMode()
+  }
+
+  /**
+   * Remove the listener bound during `connect`.
+   * @returns {void}
+   */
+  disconnect() {
+    if (this.hasMembersCheckbox && this.toggleAccessMode) {
+      this.hasMembersCheckbox.removeEventListener("change", this.toggleAccessMode)
+    }
+  }
+
+  /**
+   * Show or hide the access mode fieldset depending on the checkbox state.
+   * @returns {void}
+   */
+  toggleAccessMode() {
+    const showAccessMode = this.hasMembersCheckbox.checked
+
+    this.accessModeFieldset.disabled = !showAccessMode
+    this.accessModeFieldset.hidden = !showAccessMode
+    this.accessModeFieldset.style.display = showAccessMode
+      ? ""
+      : "none"
+  }
+}

data/app/packs/src/decidim/admin/newsletters.js

@@ -9,7 +9,7 @@ document.addEventListener("turbo:load", () => {
     sendToVerifiedUsers: document.querySelector("#newsletter_send_to_verified_users"),
     sendToParticipants: document.querySelector("#newsletter_send_to_participants"),
     sendToFollowers: document.querySelector("#newsletter_send_to_followers"),
-    sendToPrivateMembers: document.querySelector("#newsletter_send_to_private_members"),
+    sendToMembers: document.querySelector("#newsletter_send_to_members"),
     verificationTypesSelect: document.querySelector("#verification_types_for_select"),
     participatorySpacesForSelect: document.querySelector("#participatory_spaces_for_select"),
     deliverButton: document.querySelector("#deliver-button"),
@@ -24,7 +24,7 @@ document.addEventListener("turbo:load", () => {
     checkboxes: [
       selectors.sendToParticipants,
       selectors.sendToFollowers,
-      selectors.sendToPrivateMembers
+      selectors.sendToMembers
     ].filter(Boolean)
   };
 

data/app/packs/stylesheets/decidim/admin/_datepicker.scss

@@ -22,10 +22,6 @@
     @apply top-2;
   }
 
-  &__pick-calendar {
-    @apply z-[3];
-  }
-
   &__close-calendar {
     @apply z-[3];
   }

data/app/packs/stylesheets/decidim/admin/application.scss

@@ -24,7 +24,7 @@
 @use "stylesheets/decidim/admin/datepicker";
 @use "stylesheets/decidim/admin/minimap";
 @use "stylesheets/decidim/admin/proposal_status";
-@use "stylesheets/decidim/editor_suggestions";
+@use "stylesheets/decidim/tribute";
 
 :root {
   --primary: #e02d2d;

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

@@ -46,14 +46,14 @@ module Decidim
       end
 
       def filters_present?
-        @form.send_to_followers || @form.send_to_participants || @form.send_to_private_members
+        @form.send_to_followers || @form.send_to_participants || @form.send_to_members
       end
 
       def apply_filters(recipients)
         filters = [
           user_id_of_followers,
           participant_ids,
-          private_member_ids
+          member_ids
         ].compact.flatten.uniq
 
         filters.empty? ? recipients.none : recipients.where(id: filters)
@@ -119,17 +119,17 @@ module Decidim
         participant_ids.flatten.compact.uniq
       end
 
-      def private_spaces
+      def spaces_with_members
         return [] if spaces.blank?
 
-        spaces.select { |space| space.try(:private_space?) }
+        spaces.select { |space| space.respond_to?(:members) && space.members.exists? }
       end
 
-      def private_member_ids
-        return unless @form.send_to_private_members
-        return [] if private_spaces.blank?
+      def member_ids
+        return unless @form.send_to_members
+        return [] if spaces_with_members.blank?
 
-        Decidim::ParticipatorySpacePrivateUser.private_user_ids_for_participatory_spaces(private_spaces)
+        Decidim::ParticipatorySpace::Member.member_ids_for_participatory_spaces(spaces_with_members)
       end
     end
   end

data/app/views/decidim/admin/admin_terms/show.html.erb

@@ -1,8 +1,10 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("title", scope: "decidim.admin.admin_terms_of_service") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="area-types">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.area_types" %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :area_type %>
         <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
       <% end %>

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="areas">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.areas" %>
+      <%= t ".title" %>
       <% if allowed_to? :create, :area %>
         <%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
       <% end %>

data/app/views/decidim/admin/attachment_collections/edit.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card" id="attachment_collections">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :attachment_collection %>
         <%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
@@ -51,7 +51,7 @@
                           <% end %>
                         <% else %>
                           <div class="dropdown__button-disabled">
-                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin"), class: :left do %>
+                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin") do %>
                               <%= icon "delete-bin-line", class: "text-gray" %>
                               <span>
                                 <%= t("actions.destroy", scope: "decidim.admin") %>

data/app/views/decidim/admin/attachment_collections/new.html.erb

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t(".attachments_title")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="attachments">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t(".attachments_title") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :attachment %>
         <%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>

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

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/block_user/new.html.erb

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(t(".title", name: user.name)) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= t(".title", name: user.name) %>

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

@@ -98,7 +98,7 @@
           <hr>
           <li class="dropdown__item">
             <div class="dropdown__button-disabled">
-              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin"), class: :left do %>
+              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin") do %>
                 <%= icon "delete-bin-line", class: "text-gray" %>
                 <span>
                   <%= t("actions.soft_delete", scope: "decidim.admin") %>

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

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("components.title", scope: "decidim.admin") %>
+      <%= t(".title") %>
 
       <% if allowed_to?(:create, :component) %>
       <div class="relative">

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

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+      <%= t(".title") %>
     </h1>
   </div>
 </div>

data/app/views/decidim/admin/conflicts/edit.html.erb

@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="card-divider">
-    <div class="card-title">Transfer User</div>
+    <div class="card-title"><%= t(".title") %></div>
   </div>
   <div class="table-scroll">
     <table class="table-list">

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

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("title", scope: "decidim.admin.conflicts") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/dashboard/show.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-  <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+  <%= t(".title") %> <%= current_organization_name %>
   </h1>
 </div>
 
@@ -14,7 +14,7 @@
   <% if count_pending_moderations.positive? && allowed_to?(:read, :global_moderation) %>
     <div class="grid-x grid-margin-x">
       <div class="cell small-6 medium-6 large-6">
-        <%= render "pending_moderations" %>
+        <%= render "decidim/admin/dashboard/pending_moderations" %>
       </div>
     </div>
   <% end %>
@@ -46,6 +46,6 @@
     <% end %>
 
   <% if current_user.admin_terms_accepted? %>
-    <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+    <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
   <% end %>
 </div>

data/app/views/decidim/admin/help_sections/update.html.erb

@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <%= render partial: "form", object: @form %>

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

@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <% if current_organization.available_authorizations.empty? %>
   <div>
     <%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t "decidim.admin.titles.impersonatable_users" %>
+    <%= t ".title" %>
     <% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
       <%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
     <% end %>

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

@@ -28,7 +28,7 @@
         <div class="row column">
           <div id="authorization-handler-<%= f.object.handler_name %>"
                  class="authorization-handler">
-            <%= render "handler_form", handler_form: f %>
+            <%= render "decidim/admin/impersonations/handler_form", handler_form: f %>
           </div>
         </div>
       <% end %>
@@ -40,7 +40,7 @@
               <div id="authorization-handler-<%= authorization.handler_name %>"
                    class="authorization-handler"
                    style="display:none">
-                <%= render "handler_form", handler_form: f %>
+                <%= render "decidim/admin/impersonations/handler_form", handler_form: f %>
               </div>
             </div>
           <% end %>

data/app/views/decidim/admin/impersonations/new.html.erb

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <% if creating_managed_user? %>
-      <%= t(".impersonate_new_managed_user") %>
+      <%= t(".title") %>
     <% else %>
       <% if @form.user.managed? %>
         <%= t(".impersonate_existing_managed_user", name: @form.user.name) %>

data/app/views/decidim/admin/imports/new.html.erb

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= import_manifest.message(:title, self) %>

data/app/views/decidim/admin/logs/_logs_list.html.erb

@@ -1,7 +1,7 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t "decidim.admin.titles.admin_log" %>
+      <%= t "decidim.admin.logs.index.title" %>
     </h2>
   </div>
   <%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>

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

@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
 <%= decidim_paginate logs %>

data/app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.impersonations" %>
+      <%= t ".title" %>
     </h1>
   </div>
   <div class="table-scroll">
@@ -23,9 +24,9 @@
             <td><%= impersonation_log.admin.name %></td>
             <td><%= impersonation_log.user.name %></td>
             <td><%= impersonation_log.reason %></td>
-            <td><%= impersonation_log.started_at ? l(impersonation_log.started_at, format: :long) : nil %></td>
-            <td><%= impersonation_log.ended_at ? l(impersonation_log.ended_at, format: :long) : nil %></td>
-            <td><%= impersonation_log.expired_at ? l(impersonation_log.expired_at, format: :long) : nil %></td>
+            <td><%= impersonation_log.started_at ? l(impersonation_log.started_at, format: :decidim_short) : nil %></td>
+            <td><%= impersonation_log.ended_at ? l(impersonation_log.ended_at, format: :decidim_short) : nil %></td>
+            <td><%= impersonation_log.expired_at ? l(impersonation_log.expired_at, format: :decidim_short) : nil %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/decidim/admin/managed_users/promotions/new.html.erb

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t(".new_managed_user_promotion") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/{participatory_space_private_users → members}/edit.html.erb

@@ -7,8 +7,8 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: participatory_space_private_user_path(current_participatory_space, @private_user), html: { class: "form-defaults form edit_participatory_space_private_user" }) do |f| %>
-      <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f %>
+    <%= decidim_form_for(@form, url: member_path(current_participatory_space, @member), html: { class: "form-defaults form edit_member" }) do |f| %>
+      <%= render partial: "decidim/admin/members/form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>

data/app/views/decidim/admin/{participatory_space_private_users → members}/index.html.erb

@@ -1,18 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card" id="private_users">
+<div class="card" id="members">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
-      <% if allowed_to? :create, :space_private_user %>
-        <%= link_to t(".publish_all"), publish_all_participatory_space_private_users_path(current_participatory_space), class: "button button__sm button__transparent-secondary publish-all", method: :post %>
-        <%= link_to t(".unpublish_all"), unpublish_all_participatory_space_private_users_path(current_participatory_space), class: "button button__sm button__transparent-secondary unpublish-all", method: :post %>
-        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button button__sm button__transparent-secondary import" %>
-        <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
+      <% if allowed_to? :create, :space_member %>
+        <%= link_to t(".publish_all"), publish_all_members_path(current_participatory_space), class: "button button__sm button__transparent-secondary publish-all", method: :post %>
+        <%= link_to t(".unpublish_all"), unpublish_all_members_path(current_participatory_space), class: "button button__sm button__transparent-secondary unpublish-all", method: :post %>
+        <%= link_to t(".import_via_csv"), new_members_csv_imports_path, class: "button button__sm button__transparent-secondary import" %>
+        <%= link_to t("actions.member.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
     </h1>
   </div>
-  <%= admin_filter_selector(:participatory_space_private_users) %>
-  <% if participatory_space_private_users.any? %>
+  <%= admin_filter_selector(:members) %>
+  <% if members.any? %>
     <div class="table-stacked mt-4">
       <table class="table-list">
         <thead>
@@ -36,39 +36,39 @@
           </tr>
         </thead>
         <tbody>
-          <% participatory_space_private_users.each do |private_user| %>
+          <% members.each do |member| %>
             <tr>
               <td data-label="<%= t("models.user.fields.name", scope: "decidim.admin") %>">
-                <%= private_user.user.name %>
+                <%= member.user.name %>
               </td>
               <td data-label="<%= t("models.user.fields.email", scope: "decidim.admin") %>">
-                <%= private_user.user.email %>
+                <%= member.user.email %>
               </td>
               <td data-label="<%= t("models.user.fields.published", scope: "decidim.admin") %>">
-                <% if private_user.published %>
+                <% if member.published %>
                   <%= icon "check-line", class: "text-success" %>
                 <% end %>
               </td>
               <td data-label="<%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %>">
-                <% if private_user.user.invitation_sent_at %>
-                  <%= l private_user.user.invitation_sent_at, format: :short %>
+                <% if member.user.invitation_sent_at %>
+                  <%= l member.user.invitation_sent_at, format: :short %>
                 <% end %>
               </td>
               <td data-label="<%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %>">
-                <% if private_user.user.invitation_accepted_at %>
-                  <%= l private_user.user.invitation_accepted_at, format: :short %>
+                <% if member.user.invitation_accepted_at %>
+                  <%= l member.user.invitation_accepted_at, format: :short %>
                 <% end %>
               </td>
               <td data-label="<%= t("decidim.admin.actions.actions") %>" class="table-list__actions">
-                <button type="button" data-controller="dropdown" data-target="actions-private-user-<%= private_user.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: private_user.user.name) %>">
+                <button type="button" data-controller="dropdown" data-target="actions-private-user-<%= member.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: member.user.name) %>">
                   <%= icon "more-fill", class: "text-secondary" %>
                 </button>
 
                 <div class="inline-block relative">
-                  <ul id="actions-private-user-<%= private_user.id %>" class="dropdown dropdown__action" aria-hidden="true">
-                    <% if allowed_to?(:edit, :space_private_user, private_user: private_user) %>
+                  <ul id="actions-private-user-<%= member.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                    <% if allowed_to?(:edit, :space_member, member: member) %>
                       <li class="dropdown__item">
-                        <%= link_to edit_participatory_space_private_user_path(current_participatory_space, private_user), class: "dropdown__button" do %>
+                        <%= link_to edit_member_path(current_participatory_space, member), class: "dropdown__button" do %>
                           <%= icon "pencil-line" %>
                           <%= t("actions.edit", scope: "decidim.admin") %>
                         <% end %>
@@ -77,9 +77,9 @@
                       <hr>
                     <% end %>
 
-                    <% if allowed_to?(:invite, :space_private_user, private_user: private_user) && private_user.user.invited_to_sign_up? %>
+                    <% if allowed_to?(:invite, :space_member, member: member) && member.user.invited_to_sign_up? %>
                       <li class="dropdown__item">
-                        <%= link_to resend_invitation_participatory_space_private_user_path(current_participatory_space, private_user), method: :post, class: "dropdown__button" do %>
+                        <%= link_to resend_invitation_member_path(current_participatory_space, member), method: :post, class: "dropdown__button" do %>
                           <%= icon "refresh-line" %>
                           <%= t("actions.resend_invitation", scope: "decidim.admin") %>
                         <% end %>
@@ -88,9 +88,9 @@
                       <hr>
                     <% end %>
 
-                    <% if allowed_to?(:destroy, :space_private_user, private_user: private_user) %>
+                    <% if allowed_to?(:destroy, :space_member, member: member) %>
                       <li class="dropdown__item">
-                        <%= link_to participatory_space_private_user_path(current_participatory_space, private_user), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                        <%= link_to member_path(current_participatory_space, member), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
                           <%= icon "delete-bin-line" %>
                           <%= t("actions.destroy", scope: "decidim.admin") %>
                         <% end %>
@@ -104,6 +104,6 @@
         </tbody>
       </table>
     </div>
-    <%= decidim_paginate participatory_space_private_users %>
+    <%= decidim_paginate members %>
   <% end %>
 </div>

data/app/views/decidim/admin/{participatory_space_private_users → members}/new.html.erb

@@ -7,8 +7,8 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_path(current_participatory_space), html: { class: "form-defaults form new_participatory_space_private_user" }) do |f| %>
-      <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f %>
+    <%= decidim_form_for(@form, url: members_path(current_participatory_space), html: { class: "form-defaults form new_member" }) do |f| %>
+      <%= render partial: "decidim/admin/members/form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".create"), class: "button button__sm button__secondary" %>

data/app/views/decidim/admin/{participatory_space_private_users_csv_imports → members_csv_imports}/new.html.erb

@@ -18,7 +18,7 @@
     <% if @count != 0 %>
       <p><%= t(".destroy.explanation", count: @count) %></p>
       <%= link_to t(".destroy.button"),
-                  destroy_all_participatory_space_private_users_csv_imports_path,
+                  destroy_all_members_csv_imports_path,
                   method: :delete,
                   class: "button button__sm button__secondary alert",
                   data: { confirm: t(".destroy.confirm") } %>
@@ -35,7 +35,7 @@
     </h2>
   </div>
   <div class="card-section p-4">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
+    <%= decidim_form_for(@form, url: members_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
       <div>
         <p><%= t(".explanation") %></p>
         <p><%= t(".example_file") %></p>