decidim-admin 0.29.2 → 0.30.0.rc1

data/app/views/decidim/admin/moderations/_moderation-tr.html.erb

@@ -0,0 +1,50 @@
+<tr data-id="<%= moderation.id %>">
+  <td><%= check_box_tag "moderation_ids_s[]", moderation.id, false, class: "js-check-all-moderations js-moderation-list-check  js-moderation-id-#{moderation.id}" %><br></td>
+  <td><%= moderation.reportable.id %></td>
+  <td>
+    <%= moderation.reportable.class.model_name.human %>
+  </td>
+  <% if !respond_to?(:current_participatory_space) %>
+    <td>
+      <%= participatory_space_title_for(moderation.reportable) %>
+    </td>
+  <% end %>
+  <td>
+    <% if (reportable_url = moderation.reportable.reported_content_url) %>
+      <%=
+      with_tooltip strip_tags(reported_content_excerpt_for(moderation.reportable, limit: 250)), class: :top do
+      link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), reportable_url
+      end
+      %>
+    <% else %>
+      <%= t("models.moderation.fields.deleted_resource", scope: "decidim.moderations") %>
+    <% end %>
+  </td>
+  <td>
+    <% reports = moderation.reports.map { |report| render "report", report: } %>
+    <%= safe_join(reports, ",") %>
+  </td>
+  <td>
+    <%= l(moderation.created_at, format: :long) %>
+  </td>
+  <td>
+    <%= moderation.report_count %>
+  </td>
+  <% if params[:hidden] %>
+    <td>
+      <%= l(moderation.hidden_at, format: :long) if moderation.hidden_at.present? %>
+    </td>
+  <% end %>
+  <td>
+    <%= icon_link_to "fullscreen-line", moderation_reports_path(moderation_id: moderation), t("actions.expand", scope: "decidim.moderations"), class: "action-icon--expand" %>
+    <% if !moderation.reportable.hidden? && allowed_to?(:unreport, authorization_scope) %>
+      <%= icon_link_to "arrow-go-back-line", unreport_moderation_path(id: moderation), t("actions.unreport", scope: "decidim.moderations"), class: "action-icon--unreport", method: :put %>
+    <% end %>
+    <% if !moderation.reportable.hidden? && allowed_to?(:hide, authorization_scope) %>
+      <%= icon_link_to "eye-line", hide_moderation_path(id: moderation), t("actions.hide", scope: "decidim.moderations"), class: "action-icon--hide", method: :put %>
+    <% end %>
+    <% if moderation.reportable.hidden? && allowed_to?(:unhide, authorization_scope) %>
+      <%= icon_link_to "eye-line", unhide_moderation_path(id: moderation), t("actions.unhide", scope: "decidim.moderations"), method: :put %>
+    <% end %>
+  </td>
+</tr>

data/app/views/decidim/admin/moderations/_moderations-thead.html.erb

@@ -0,0 +1,18 @@
+<thead>
+  <tr>
+    <th><%= check_box_tag "moderations_bulk", "all", false, class: "js-check-all" %></th>
+    <th><%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %></th>
+    <th><%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %></th>
+    <% if !respond_to?(:current_participatory_space) %>
+      <th><%= t("models.moderation.fields.participatory_space", scope: "decidim.moderations") %></th>
+    <% end %>
+    <th><%= t("models.moderation.fields.reported_content_url", scope: "decidim.moderations") %></th>
+    <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
+    <th><%= sort_link(query, :created_at, t("models.moderation.fields.created_at", scope: "decidim.moderations")) %></th>
+    <th><%= sort_link(query, :report_count, t("models.moderation.fields.report_count", scope: "decidim.moderations")) %></th>
+    <% if params[:hidden] %>
+      <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+    <% end %>
+    <th><%= t("actions.title", scope: "decidim.moderations") %></th>
+  </tr>
+</thead>

data/app/views/decidim/admin/moderations/bulk_actions/_dropdown.html.erb

@@ -0,0 +1,43 @@
+<div id="js-bulk-actions-wrapper">
+  <button
+    id="js-bulk-actions-button"
+    class="button button__sm button__secondary"
+    type="button"
+    data-toggle="js-bulk-actions-dropdown">
+    <%= t("decidim.admin.moderations.index.actions.actions_dropdown") %>
+    <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
+  </button>
+
+  <div
+    id="js-bulk-actions-dropdown"
+    class="dropdown-pane"
+    data-position="bottom"
+    data-alignment="right"
+    data-dropdown="dropdown"
+    data-auto-focus="false"
+    data-events="resize">
+    <ul>
+      <% if !params[:hidden] && allowed_to?(:hide, authorization_scope) %>
+        <li>
+          <button type="button" data-action="hide-global-moderations">
+            <%= t("decidim.admin.moderations.index.actions.hide.title") %>
+          </button>
+        </li>
+      <% end %>
+      <% if !params[:hidden] && allowed_to?(:unreport, authorization_scope) %>
+        <li>
+          <button type="button" data-action="unreport-global-moderations">
+            <%= t("decidim.admin.moderations.index.actions.unreport.title") %>
+          </button>
+        </li>
+      <% end %>
+      <% if params[:hidden] %>
+        <li>
+          <button type="button" data-action="unhide-global-moderations">
+            <%= t("decidim.admin.moderations.index.actions.unhide.title") %>
+          </button>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/admin/moderations/bulk_actions/_hide.html.erb

@@ -0,0 +1,20 @@
+<div id="js-hide-global-moderations-actions" class="hide js-bulk-action-form">
+  <%= form_tag(bulk_action_moderations_path(bulk_action: :hide), method: :patch, id: "js-form-hide-global-moderations", class: "form form-defaults flex items-center gap-x-2") do %>
+
+    <div class="hide">
+      <% moderations.each do |moderation| %>
+        <%= check_box_tag "moderation_ids[]", moderation.id, false, class: "js-check-all-moderations js-moderation-id-#{moderation.id}" %>
+      <% end %>
+    </div>
+
+    <%= submit_tag(
+          t("decidim.admin.moderations.index.actions.hide.update_moderation_button"),
+          id: "js-submit-hide-global-moderations",
+          class: "button button__sm button__secondary small button--simple float-left"
+        ) %>
+
+    <button id="js-cancel-hide-global-moderations" class="button button__sm button__secondary js-cancel-bulk-action" type="button">
+      <%= t("decidim.admin.moderations.index.cancel") %>
+    </button>
+  <% end %>
+</div>

data/app/views/decidim/admin/moderations/bulk_actions/_unhide.html.erb

@@ -0,0 +1,20 @@
+<div id="js-unhide-global-moderations-actions" class="hide js-bulk-action-form">
+  <%= form_tag(bulk_action_moderations_path(bulk_action: :unhide), method: :patch, id: "js-form-unhide-global-moderations", class: "form form-defaults flex items-center gap-x-2") do %>
+
+    <div class="hide">
+      <% moderations.each do |moderation| %>
+        <%= check_box_tag "moderation_ids[]", moderation.id, false, class: "js-check-all-moderations js-moderation-id-#{moderation.id}" %>
+      <% end %>
+    </div>
+
+    <%= submit_tag(
+          t("decidim.admin.moderations.index.actions.unhide.update_moderation_button"),
+          id: "js-submit-unhide-global-moderations",
+          class: "button button__sm button__secondary small button--simple float-left"
+        ) %>
+
+    <button id="js-cancel-unhide-global-moderations" class="button button__sm button__secondary js-cancel-bulk-action" type="button">
+      <%= t("decidim.admin.moderations.index.cancel") %>
+    </button>
+  <% end %>
+</div>

data/app/views/decidim/admin/moderations/bulk_actions/_unreport.html.erb

@@ -0,0 +1,20 @@
+<div id="js-unreport-global-moderations-actions" class="hide js-bulk-action-form">
+  <%= form_tag(bulk_action_moderations_path(bulk_action: :unreport), method: :patch, id: "js-form-unreport-global-moderations", class: "form form-defaults flex items-center gap-x-2") do %>
+
+    <div class="hide">
+      <% moderations.each do |moderation| %>
+        <%= check_box_tag "moderation_ids[]", moderation.id, false, class: "js-check-all-moderations js-moderation-id-#{moderation.id}" %>
+      <% end %>
+    </div>
+
+    <%= submit_tag(
+          t("decidim.admin.moderations.index.actions.unreport.update_moderation_button"),
+          id: "js-submit-unreport-global-moderations",
+          class: "button button__sm button__secondary small button--simple float-left"
+        ) %>
+
+    <button id="js-cancel-unreport-global-moderations" class="button button__sm button__secondary js-cancel-bulk-action" type="button">
+      <%= t("decidim.admin.moderations.index.cancel") %>
+    </button>
+  <% end %>
+</div>

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

@@ -1,95 +1,27 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t(".title") %>
+    <div>
+      <%= t(".title") %>
+      <span id="js-selected-moderations-count" class="component-counter " title="<%= t("decidim.admin.moderations.index.selected") %>"></span>
+    </div>
 
-    <div class="card__filter">
-      <%= link_to t("actions.not_hidden", scope: "decidim.moderations"), moderations_path %>
-      |
-      <%= link_to t("actions.hidden", scope: "decidim.moderations"), moderations_path(hidden: true) %>
+    <div class="flex items-center gap-x-4">
+      <%= render partial: "bulk-actions" %>
+      <div class="card__filter">
+        <%= link_to t("actions.not_hidden", scope: "decidim.moderations"), moderations_path %>
+        |
+        <%= link_to t("actions.hidden", scope: "decidim.moderations"), moderations_path(hidden: true) %>
+      </div>
     </div>
   </h1>
 </div>
 <%= admin_filter_selector(:moderations) %>
 <div class="table-scroll">
   <table class="table-list">
-    <thead>
-      <tr>
-        <th><%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %></th>
-        <th><%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %></th>
-        <% if !respond_to?(:current_participatory_space) %>
-          <th><%= t("models.moderation.fields.participatory_space", scope: "decidim.moderations") %></th>
-        <% end %>
-        <th><%= t("models.moderation.fields.reported_content_url", scope: "decidim.moderations") %></th>
-        <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
-        <th><%= sort_link(query, :created_at, t("models.moderation.fields.created_at", scope: "decidim.moderations")) %></th>
-        <th><%= sort_link(query, :report_count, t("models.moderation.fields.report_count", scope: "decidim.moderations")) %></th>
-        <% if params[:hidden] %>
-          <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
-        <% end %>
-        <th><%= t("actions.title", scope: "decidim.moderations") %></th>
-      </tr>
-    </thead>
+    <%= render partial: "moderations-thead" %>
     <tbody>
-      <% moderations.each do |moderation| %>
-        <% next unless moderation.reportable %>
-        <tr data-id="<%= moderation.id %>">
-          <td><%= moderation.reportable.id %></td>
-          <td>
-            <%= moderation.reportable.class.model_name.human %>
-          </td>
-          <% if !respond_to?(:current_participatory_space) %>
-            <td>
-              <%= participatory_space_title_for(moderation.reportable) %>
-            </td>
-          <% end %>
-          <td>
-            <% if (reportable_url = moderation.reportable.reported_content_url) %>
-              <%=
-              with_tooltip strip_tags(reported_content_excerpt_for(moderation.reportable, limit: 250)), class: :top do
-                link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), reportable_url
-              end
-              %>
-            <% else %>
-              <%= t("models.moderation.fields.deleted_resource", scope: "decidim.moderations") %>
-            <% end %>
-          </td>
-          <td>
-            <% reports = moderation.reports.map { |report| render "report", report: } %>
-            <%= safe_join(reports, ",") %>
-          </td>
-          <td>
-            <%= l(moderation.created_at, format: :long) %>
-          </td>
-          <td>
-            <%= moderation.report_count %>
-          </td>
-          <% if params[:hidden] %>
-            <td>
-              <%= l(moderation.hidden_at, format: :long) if moderation.hidden_at.present? %>
-            </td>
-          <% end %>
-          <td>
-            <%= icon_link_to "fullscreen-line",
-                             moderation_reports_path(moderation_id: moderation),
-                             t("actions.expand", scope: "decidim.moderations"),
-                             class: "action-icon--expand" %>
-            <% if !moderation.reportable.hidden? && allowed_to?(:unreport, authorization_scope) %>
-              <%= icon_link_to "arrow-go-back-line",
-                               unreport_moderation_path(id: moderation),
-                               t("actions.unreport", scope: "decidim.moderations"),
-                               class: "action-icon--unreport",
-                               method: :put %>
-            <% end %>
-            <% if !moderation.reportable.hidden? && allowed_to?(:hide, authorization_scope) %>
-              <%= icon_link_to "eye-line", hide_moderation_path(id: moderation), t("actions.hide", scope: "decidim.moderations"), class: "action-icon--hide", method: :put %>
-            <% end %>
-            <% if moderation.reportable.hidden? && allowed_to?(:unhide, authorization_scope) %>
-              <%= icon_link_to "eye-line", unhide_moderation_path(id: moderation), t("actions.unhide", scope: "decidim.moderations"), method: :put %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
+      <%= render partial: "decidim/admin/moderations/moderation-tr", collection: moderations.select(&:reportable), as: :moderation, locals: { view: :index } %>
     </tbody>
   </table>
 </div>

data/app/views/decidim/admin/newsletters/confirm_recipients.html.erb

@@ -0,0 +1,64 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t ".title" %>
+  </h1>
+  <div class="flex ml-auto items-center gap-x-4">
+    <%= link_to t("actions.edit", scope: "decidim.admin"),
+                select_recipients_to_deliver_newsletter_path(@newsletter, newsletter: newsletter_params),
+                class: "button button__sm button__secondary" %>
+  </div>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <div class="table-scroll">
+      <table class="stack table-list">
+        <thead>
+        <tr>
+          <th><%= t(".name") %></th>
+          <th><%= t(".email") %></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% @recipients.each do |user| %>
+          <tr>
+            <td><%= user.name %><br></td>
+            <td><%= user.email %><br></td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <% unless @newsletter.sent? %>
+          <%= form_with url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form form-defaults newsletter_deliver" } do |f| %>
+            <%= hidden_field_tag "newsletter[send_to_all_users]", params.dig(:newsletter, :send_to_all_users) || "0" %>
+            <%= hidden_field_tag "newsletter[send_to_verified_users]", params.dig(:newsletter, :send_to_verified_users) %>
+            <%= hidden_field_tag "newsletter[send_to_participants]", params.dig(:newsletter, :send_to_participants) %>
+            <%= hidden_field_tag "newsletter[send_to_followers]", params.dig(:newsletter, :send_to_followers) %>
+            <%= hidden_field_tag "newsletter[send_to_private_members]", params.dig(:newsletter, :send_to_private_members) %>
+
+            <% @form.participatory_space_types.each do |space_type| %>
+              <%= f.fields_for "newsletter[participatory_space_types][#{space_type.manifest_name}]", space_type do |ff| %>
+                <%= ff.hidden_field :manifest_name, value: space_type.manifest_name %>
+                <% space_type.ids.each do |id| %>
+                  <%= hidden_field_tag "newsletter[participatory_space_types][#{space_type.manifest_name}][ids][]", id %>
+                <% end %>
+              <% end %>
+            <% end %>
+
+            <% @form.verification_types.each do |verification_type| %>
+              <%= hidden_field_tag "newsletter[verification_types][]", verification_type, id: "verification_types_#{verification_type}" %>
+            <% end %>
+
+            <%= submit_tag t("select_recipients_to_deliver.deliver", scope: "decidim.admin.newsletters"),
+                           id: "deliver-button", class: "button button__sm button__secondary",
+                           data: { confirm: t("select_recipients_to_deliver.confirm_deliver", scope: "decidim.admin.newsletters") } %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+<%= decidim_paginate @recipients %>

data/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb

@@ -16,19 +16,49 @@
       <%= cell("decidim/announcement", newsletter_recipients_count_callout_announcement, callout_class: "warning") %>
       <div class="form__wrapper">
         <div class="card mb-2">
-          <div class="card-divider">
-            <h2 class="card-title"><%= t ".select_users" %></h2>
-          </div>
           <div class="card-section">
             <div class="row column">
               <% if current_user.admin? %>
-                <div class="grid-x">
+                <div class="mt-4">
+                  <h2 class="card-title"><%= t ".select_users_general" %></h2>
+                </div>
+                <div class="grid-x mb-4">
                   <div class="cell small-12" id="send_newsletter_to_all_users">
-                    <%= f.check_box :send_to_all_users, help_text: t(".all_users_help") %>
+                    <%= label_tag "newsletter_send_to_all_users" do %>
+                      <%= radio_button_tag "newsletter[send_to_all_users]", "1", @form.send_to_all_users == true, id: "newsletter_send_to_all_users" %>
+                      <%= t(".send_to_all_users") %>
+                    <% end %>
+                    <span class="help-text"><%= t(".all_users_help", default: "Sends a newsletter to all users.") %></span>
+                  </div>
+                  <div class="cell small-12" id="send_newsletter_to_verified_users">
+                    <%= label_tag "newsletter_send_to_verified_users" do %>
+                      <%= radio_button_tag "newsletter[send_to_verified_users]", "1", @form.send_to_verified_users == true, id: "newsletter_send_to_verified_users" %>
+                      <%= t(".send_to_verified_users") %>
+                    <% end %>
+                    <span class="help-text"><%= t(".verified_users_help", default: "Sends a newsletter to all confirmed and verified users via any selected verification method.") %></span>
+                  </div>
+                  <div id="verification_types_for_select" class="my-4 hidden">
+                    <%= cell(
+                          "decidim/admin/multi_select_picker",
+                          nil,
+                          context: {
+                            view_context: self,
+                            current_user:,
+                            select_id: "verification-types-select",
+                            field_name: "newsletter[verification_types][]",
+                            options_for_select: find_verification_types_for_select(current_organization),
+                            selected_values: selected_options(:verification_types).values.flatten,
+                            placeholder: t(".select_verification_types"),
+                            class: "mt-2 js-verification-multiselect"
+                          }
+                        ) %>
                   </div>
                 </div>
                 <hr>
               <% end %>
+              <div class="mt-4">
+                <h2 class="card-title"><%= t ".select_users_for_participatory_space" %></h2>
+              </div>
               <div class="grid-x">
                 <div class="cell small-12 medium-6" id="send_newsletter_to_followers">
                   <%= f.check_box :send_to_participants, help_text: t(".participants_help") %>
@@ -37,6 +67,10 @@
                 <div class="cell small-12 medium-6" id="send_newsletter_to_participants">
                   <%= f.check_box :send_to_followers, help_text: t(".followers_help") %>
                 </div>
+
+                <div class="cell small-12 medium-6" id="send_newsletter_to_private_members">
+                  <%= f.check_box :send_to_private_members, help_text: t(".private_members_help") %>
+                </div>
               </div>
             </div>
           </div>
@@ -52,25 +86,15 @@
             </div>
           </div>
         </div>
-
-        <% if current_user.admin? %>
-          <div class="card mb-2">
-            <div class="card-divider">
-              <h2 class="card-title"><%= t ".select_scopes" %></h2>
-            </div>
-            <div class="card-section">
-              <div class="cell small-12 medium-6 m-4">
-                <%= scopes_select_field f, :scope_ids, options: { include_blank: false }, html_options: { class: "chosen-select", multiple: true, size: 5 } %>
-                <span class="help-text"> <%= t(".scopes_help") %> </span>
-              </div>
-            </div>
-          </div>
-        <% end %>
       </div>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <% unless @newsletter.sent? %>
-            <%= f.submit t(".deliver"), class: "button button__sm button__secondary", data: { confirm: t(".confirm_deliver") } %>
+            <%= f.submit t(".deliver"), id: "deliver-button", class: "button button__sm button__secondary", data: { confirm: t(".confirm_deliver") } %>
+            <%= link_to t(".confirm_recipients"), "#",
+                        id: "confirm-recipients-link",
+                        class: "button button__sm button__secondary hidden",
+                        data: { base_url: confirm_recipients_newsletter_path(@newsletter) } %>
           <% end %>
         </div>
       </div>

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

@@ -8,6 +8,12 @@
         <div class="columns">
           <%= form.email_field :email, readonly: @form.persisted? %>
         </div>
+        <div class="columns">
+          <%= form.translated :text_field, :role %>
+        </div>
+        <div class="columns">
+          <%= form.check_box :published %>
+        </div>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,19 @@
+<% 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">
+    <%= 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 %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -4,6 +4,8 @@
     <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__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__secondary unpublish-all", method: :post %>
         <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button button__sm button__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" %>
       <% end %>
@@ -11,7 +13,7 @@
   </div>
   <%= admin_filter_selector(:participatory_space_private_users) %>
   <% if participatory_space_private_users.any? %>
-    <div class="table-scroll">
+    <div class="table-scroll mt-4">
       <table class="table-list">
         <thead>
           <tr>
@@ -21,6 +23,9 @@
             <th>
               <%= sort_link(query, :email, t("models.user.fields.email", scope: "decidim.admin"), default_order: :desc ) %>
             </th>
+            <th>
+              <%= sort_link(query, :published, t("models.user.fields.published", scope: "decidim.admin"), default_order: :desc ) %>
+            </th>
             <th>
               <%= sort_link(query, :invitation_sent_at, t("models.user.fields.invitation_sent_at", scope: "decidim.admin"), default_order: :desc ) %>
             </th>
@@ -39,6 +44,11 @@
               <td>
                 <%= private_user.user.email %><br>
               </td>
+              <td>
+                <% if private_user.published %>
+                  <%= icon "check-line", class: "text-success" %>
+                <% end %>
+              </td>
               <td>
                 <% if private_user.user.invitation_sent_at %>
                   <%= l private_user.user.invitation_sent_at, format: :short %>
@@ -57,6 +67,10 @@
                 <% if allowed_to? :destroy, :space_private_user, private_user: private_user %>
                   <%= icon_link_to "delete-bin-line", participatory_space_private_user_path(current_participatory_space, private_user), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                 <% end %>
+
+                <% if allowed_to? :edit, :space_private_user, private_user: private_user %>
+                  <%= icon_link_to "pencil-line", edit_participatory_space_private_user_path(current_participatory_space, private_user), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
               </td>
             </tr>
           <% end %>

data/app/views/decidim/admin/resource_permissions/_options_form.html.erb

@@ -1,9 +1,14 @@
 <%
   handler_name = local_assigns[:handler_name]
+  ephemeral_warning = local_assigns[:ephemeral_warning]
   schema = form.object.options_schema(handler_name)
   attributes = form.object.options_attributes(handler_name)
 %>
 
+<% if ephemeral_warning %>
+  <%= cell("decidim/announcement", t(".ephemeral_warning", path: decidim_admin.authorization_workflows_path), callout_class: "warning" ) %>
+<% end %>
+
 <%= form.fields_for(:authorization_handlers_options) do |options_form| %>
   <%= options_form.fields_for(handler_name, schema) do |attribute_options_form| %>
     <% attributes.each do |name, attribute| %>

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

@@ -28,13 +28,13 @@
                     <%= b.label { b.check_box + b.text } %>
                     <% if permission.authorization_handlers_names.include? b.value %>
                       <div id="authorization-handler-<%= b.value %>" class="authorization-handler">
-                        <%= render "options_form", form: permission_form, handler_name: b.value %>
+                        <%= render "options_form", form: permission_form, handler_name: b.value, ephemeral_warning: b.object.ephemeral? %>
                       </div>
                     <% else %>
                       <% missing_permission = Decidim::Admin::PermissionForm.new(authorization_handlers: { b.value => {} }) %>
                       <%= action_permission_form.fields_for(action, missing_permission) do |missing_permission_form| %>
                         <div id="authorization-handler-<%= b.value %>" class="authorization-handler" style="display:none">
-                          <%= render "options_form", form: missing_permission_form, handler_name: b.value %>
+                          <%= render "options_form", form: missing_permission_form, handler_name: b.value, ephemeral_warning: b.object.ephemeral? %>
                         </div>
                       <% end %>
                     <% end %>

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

@@ -9,6 +9,9 @@
       <% end %>
     </h1>
   </div>
+
+<div class="callout warning"><%= t("scopes.deprecated", scope: "decidim.admin") %></div>
+
   <div class="table-scroll">
     <table class="table-list">
       <thead>

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

@@ -9,6 +9,9 @@
       <% end %>
     </h1>
   </div>
+
+  <div class="callout warning"><%= t("scopes.deprecated", scope: "decidim.admin") %></div>
+
   <% if @scopes.any? %>
     <div class="table-scroll">
       <table class="table-list">

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

@@ -0,0 +1,52 @@
+<div class="row column">
+  <label><%= t("share_tokens.form.expires_at", scope: "decidim.admin") %></label>
+  <%= form.collection_radio_buttons :no_expiration, [[true, t("share_tokens.form.never_expire", scope: "decidim.admin")], [false, t("share_tokens.form.custom", scope: "decidim.admin")]], :first, :last do |b| %>
+    <div>
+      <%= b.radio_button %>
+      <%= b.label %>
+    </div>
+  <% end %>
+  <div id="expires_at_field_wrapper" class="hidden mt-4 row column">
+    <%= form.datetime_field :expires_at, label: t("share_tokens.form.custom_expiration", scope: "decidim.admin") %>
+  </div>
+</div>
+
+<div class="row column">
+  <label><%= t("share_tokens.form.registered_only", scope: "decidim.admin") %></label>
+  <%= form.collection_radio_buttons :registered_only, [
+      [t("share_tokens.form.true", scope: "decidim.admin"), true],
+      [t("share_tokens.form.false", scope: "decidim.admin"), false]
+    ], :last, :first do |b| %>
+    <div>
+      <%= b.label do %>
+        <%= b.radio_button %>
+        <%= b.text %>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
+    const expiresButton = document.querySelector("input[name='share_token[no_expiration]'][value='false']");
+    const expiresAtRadioButtons = document.querySelectorAll("input[name='share_token[no_expiration]']");
+    const expiresAtWrapper = document.getElementById("expires_at_field_wrapper");
+    const expiresAtInput = document.querySelector("input[name='share_token[expires_at]']");
+
+    const toggleExpiresAtField = () => {
+      if (expiresButton.checked) {
+        expiresAtWrapper.classList.remove("hidden");
+      } else {
+        expiresAtWrapper.classList.add("hidden");
+        expiresAtInput.value = "";
+        expiresAtInput.removeAttribute("required");
+      }
+    };
+
+    expiresAtRadioButtons.forEach(expiresAtRadioButton => {
+      expiresAtRadioButton.addEventListener("change", toggleExpiresAtField);
+    });
+
+    toggleExpiresAtField();
+  });
+</script>