decidim-decidim_awesome 0.11.2 → 0.11.4

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

@@ -12,20 +12,16 @@ module Decidim
           return permission_action if user.read_attribute("admin").blank?
           return permission_action unless permission_action.action == :edit_config
 
-          if permission_action.subject == :admin_accountability && DecidimAwesome.admin_accountability.respond_to?(:include?)
-            if global?
-              toggle_allow(DecidimAwesome.admin_accountability.include?(:admin_roles))
-            else
-              toggle_allow(DecidimAwesome.admin_accountability.include?(:participatory_space_roles))
-            end
-          elsif permission_action.subject == :private_data && config_enabled?(:proposal_private_custom_fields)
-            if private_data.present?
-              allow! if private_data.destroyable?
+          apply_private_data_permissions!
+          if config_enabled?(*permission_action.subject)
+            case permission_action.subject
+            when :admins_available_authorizations
+              apply_admin_authorizations_permissions!
+            when :admin_accountability
+              apply_admin_accountability_permissions!
             else
               allow!
             end
-          else
-            toggle_allow(config_enabled?(*permission_action.subject))
           end
 
           permission_action
@@ -33,6 +29,30 @@ module Decidim
 
         private
 
+        def apply_admin_authorizations_permissions!
+          allow! if awesome_admin_authorizations.present? && handler.in?(awesome_admin_authorizations)
+        end
+
+        def apply_admin_accountability_permissions!
+          if DecidimAwesome.admin_accountability.respond_to?(:include?)
+            if global?
+              allow! if DecidimAwesome.admin_accountability.include?(:admin_roles)
+            elsif DecidimAwesome.admin_accountability.include?(:participatory_space_roles)
+              allow!
+            end
+          end
+        end
+
+        def apply_private_data_permissions!
+          return unless permission_action.subject == :private_data && config_enabled?(:proposal_private_custom_fields)
+
+          if private_data.present?
+            allow! if private_data.destroyable?
+          else
+            allow!
+          end
+        end
+
         def global?
           context.fetch(:global, nil)
         end
@@ -40,6 +60,17 @@ module Decidim
         def private_data
           context.fetch(:private_data, nil)
         end
+
+        def handler
+          context.fetch(:handler, "")
+        end
+
+        def awesome_admin_authorizations
+          @awesome_admin_authorizations ||= begin
+            handlers = AwesomeConfig.find_by(var: :admins_available_authorizations, organization: user.organization)&.value || []
+            user.organization.available_authorizations.intersection(handlers)
+          end
+        end
       end
     end
   end

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -9,6 +9,7 @@ module Decidim
         return Decidim::DecidimAwesome::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
 
         editor_image_action?
+        required_authorizations_action?
 
         permission_action
       end
@@ -23,6 +24,12 @@ module Decidim
         return allow! if config[:allow_images_in_editors]
         return allow! if config[:allow_videos_in_editors]
       end
+
+      def required_authorizations_action?
+        return false unless permission_action.subject == :required_authorizations
+
+        return allow! unless context[:user_is_authorized]
+      end
     end
   end
 end

data/app/presenters/decidim/decidim_awesome/admin_log/component_presenter_override.rb

@@ -17,11 +17,9 @@ module Decidim
           end
 
           def i18n_params
-            if action == "destroy_private_data"
-              decidim_original_i18n_params.merge({ count: action_log.extra["count"] })
-            else
-              decidim_original_i18n_params
-            end
+            return decidim_original_i18n_params unless action == "destroy_private_data"
+
+            decidim_original_i18n_params.merge({ count: action_log.extra["count"] })
           end
         end
       end

data/app/presenters/decidim/decidim_awesome/admin_log/user_presenter_override.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module AdminLog
+      module UserPresenterOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :decidim_original_action_string, :action_string
+          alias_method :decidim_original_i18n_params, :i18n_params
+          alias_method :decidim_original_resource_presenter, :resource_presenter
+
+          def action_string
+            return "decidim.decidim_awesome.admin_log.user.#{action}" if authorization_action?
+
+            decidim_original_action_string
+          end
+
+          def i18n_params
+            return decidim_original_i18n_params unless authorization_action?
+
+            decidim_original_i18n_params.merge({
+                                                 handler_name: h.content_tag(:span, action_log.extra["handler_name"], class: "logs__log__resource"),
+                                                 reason: h.content_tag(:em, action_log.extra["reason"])
+                                               })
+          end
+
+          def resource_presenter
+            return decidim_original_resource_presenter unless authorization_action? && authorization_user
+
+            @resource_presenter ||= Decidim::Log::UserPresenter.new(authorization_user, h, { "name" => authorization_user.name, "nickname" => authorization_user.nickname })
+          end
+
+          def authorization_user
+            @authorization_user ||= Decidim::User.find_by(id: action_log.extra["user_id"])
+          end
+
+          def authorization_action?
+            action.in?(%w(admin_creates_authorization admin_forces_authorization admin_destroys_authorization))
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/decidim/decidim_awesome/account/_timezone_select.html.erb

@@ -0,0 +1,3 @@
+<% if awesome_config[:user_timezone].present? %>
+  <%= f.time_zone_select :user_time_zone, nil, help_text: t(".time_zone_helper") %>
+<% end %>

data/app/views/decidim/decidim_awesome/admin/admin_authorizations/authorization.html.erb

@@ -0,0 +1,20 @@
+<h4><%= t("decidim.decidim_awesome.required_authorizations.index.granted_title") %></h4>
+
+<div class="verification__container">
+  <div class="verification">
+    <%= icon "checkbox-circle-line", class: "verification__icon is-granted self-start" %>
+
+    <div class="verification__text">
+      <h2 class="h5 text-secondary"><%= workflow.fullname %></h2>
+      <p><%= t(".granted_at", date: l(authorization.granted_at), format: :decidim_short) %></p>
+      <p><%= t(".metadata", metadata: content_tag("strong", t("booleans.#{authorization.metadata.present?}"))).html_safe %></p>
+    </div>
+
+    <div class="verification__actions">
+      <%= link_to decidim_admin_decidim_awesome.admin_authorization_path(id: user.id, handler: authorization.name), method: :delete, remote: true, class: "button button__lg button__primary", data: { confirm: t(".confirm_destroy") }  do %>
+        <%= icon "delete-bin-line", class: "icon" %>
+        <%= t(".destroy") %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/admin/admin_authorizations/callout.html.erb

@@ -0,0 +1,3 @@
+<%= cell("decidim/announcement",
+    local_assigns[:message].presence || t("decidim.decidim_awesome.admin.admin_authorizations.#{i18n_key}", name: workflow&.fullname, user: user.name),
+    callout_class: klass) %>

data/app/views/decidim/decidim_awesome/admin/admin_authorizations/conflict.html.erb

@@ -0,0 +1,5 @@
+<%= cell("decidim/announcement", {
+                                  title: t("decidim.decidim_awesome.admin.admin_authorizations.conflict"),
+                                  body: t("decidim.decidim_awesome.admin.admin_authorizations.conflict_help_html", user: link_to(conflict.user.name, decidim_admin.officializations_path(q: { name_or_nickname_or_email_cont: conflict.user.email })))
+                                  },
+                                callout_class: "alert") %>

data/app/views/decidim/decidim_awesome/admin/admin_authorizations/edit.html.erb

@@ -0,0 +1,41 @@
+<div class="form-defaults">
+  <%= decidim_form_for(handler,
+                      builder: Decidim::AuthorizationFormBuilder,
+                      as: "authorization_handler",
+                      url: decidim_admin_decidim_awesome.admin_authorization_path(id: user.id, handler: params[:handler]),
+                      method: :patch,
+                      remote: true) do |form| %>
+    <% if lookup_context.exists?(handler.to_partial_path, [], true) %>
+      <%= render partial: handler.to_partial_path, locals: { handler:, form: } %>
+    <% else %>
+      <div class="form__wrapper">
+        <%= form.all_fields %>
+      </div>
+    <% end %>
+
+    <% if defined?(with_override) %>
+      <div class="form__wrapper flash alert">
+        <label class="flex-col">
+          <div class="flash__title">
+            <%= check_box_tag "force_verification_check", true %>
+            <%= t(".force_verification") %>
+          </div>
+          <p class="help-text"><%= t(".force_verification_help") %></p>
+        </label>
+        <label>
+          <%= t(".force_verification_reason") %>
+          <%= text_area_tag "force_verification", nil, disabled: true %>
+        </label>
+      </div>
+    <% else %>
+      <%= cell("decidim/announcement", { title: t(".warning"), body: t(".do_it_if_sure") }, callout_class: "warning") %>
+    <% end %>
+
+    <div class="text-center mt-8">
+      <button type="submit" class="button button__lg button__primary">
+          <%= icon "alert-line", class: "fill-current" %>
+          <span><%= t(".authorize", name: workflow.fullname, user: user.name) %></span>
+      </button>
+    </div>
+  <% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/config/_form_scoped_admin_styles.html.erb

@@ -0,0 +1 @@
+<%= render "form_scoped_styles", **local_assigns %>

data/app/views/decidim/decidim_awesome/admin/config/_form_scoped_styles.html.erb

@@ -0,0 +1,48 @@
+<%
+  admin_styles = (config_var == "scoped_admin_styles")
+  style = admin_styles ? "scoped_admin_style" : "scoped_style"
+%>
+<div class="form__wrapper row column decidim_awesome-form">
+  <% if config_enabled? config_var %>
+    <% if admin_styles %>
+      <div class="colors-help">
+        <p><%= t("help.scoped_admin_styles_warning", scope: "decidim.decidim_awesome.admin.config.form").html_safe %></p>
+        <p><%= t("help.scoped_admin_styles", scope: "decidim.decidim_awesome.admin.config.form") %>
+          <%= t("help.scoped_admin_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %>
+        </p>
+        <p class="colors">
+          <% ["primary", "secondary", "tertiary", "success", "warning", "alert"].each do |color| %>
+          <span class="color-box <%= color %>" style="background-color: <%= current_organization.colors[color] %>"></span>
+          <code>var(--<%= color %>)</code>
+        <% end %>
+        </p>
+      </div>
+    <% else %>
+      <div class="colors-help">
+        <p><%= t("help.scoped_styles", scope: "decidim.decidim_awesome.admin.config.form") %>
+          <%= t("help.scoped_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %>
+        </p>
+        <p class="colors">
+          <% ["primary", "secondary", "tertiary", "success", "warning", "alert"].each do |color| %>
+          <span class="color-box <%= color %>" style="background-color: <%= current_organization.colors[color] %>"></span>
+          <code>var(--<%= color %>)</code>
+        <% end %>
+        </p>
+      </div>
+    <% end %>
+    <% form.object.send(config_var)&.each do |key, value| %>
+      <div class="card p-4 scoped_styles_container<%= " private" if admin_styles %> js-box-container" data-key="<%= key %>" data-var="<%= config_var %>">
+        <%= render("decidim/decidim_awesome/admin/config/autoedit_box_label", var: config_var, key: key, scope: "#{style}_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_style_path(key: key, admin_panel: admin_styles)) %>
+        <p class="form-error is-visible" id="custom-style-error-<%= key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
+        <%= text_area_tag key, value, name: "config[#{config_var}][#{key}]", rows: 5 %>
+        <%= render("decidim/decidim_awesome/admin/config/constraints", key: "#{style}_#{key}", constraints: constraints_for("#{style}_#{key}")) %>
+      </div>
+    <% end %>
+
+    <%= link_to decidim_admin_decidim_awesome.scoped_styles_path(admin_panel: admin_styles), method: :post, class: "button button__sm button__text-secondary mr-auto" do %>
+      <%= icon("add-box-line") %>
+      <%= t("new", scope: "decidim.decidim_awesome.admin.config.form_#{config_var}") %>
+    <% end %>
+
+  <% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/config/_form_surveys.html.erb

@@ -8,4 +8,12 @@
       <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :auto_save_forms, constraints: constraints_for(:auto_save_forms) }) %>
     </div>
   <% end %>
+  <% if config_enabled? :user_timezone %>
+    <div class="row column">
+      <%= form.check_box :user_timezone %>
+      <span class="help-text mb-4" style="margin-top: -1rem;">
+        <%= t("help.user_timezone", scope: "decidim.decidim_awesome.admin.config.form") %>
+      </span>
+    </div>
+  <% end %>
 </div>

data/app/views/decidim/decidim_awesome/admin/config/_form_verifications.html.erb

@@ -0,0 +1,15 @@
+<div class="form__wrapper row column decidim_awesome-form">
+  <div class="callout warning"><%= t("help.verifications_html", scope: "decidim.decidim_awesome.admin.config.form") %></div>
+
+  <% if config_enabled? :force_authorization_after_login %>
+    <div>
+        <%= form.select :force_authorization_after_login, available_authorizations.map {|workflow| [workflow.fullname, workflow.name]}, { include_blank: false }, { multiple: true } %>
+        <p class="help-text"><%= t("help.force_authorization_after_login", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+        <%= form.check_box :force_authorization_with_any_method %>
+
+        <%= form.translated :editor, :force_authorization_help_text, lines: 10, aria: { label: :force_authorization_help_text } %>
+        <p class="help-text"><%= t("help.force_authorization_help_text", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+      </div>
+  <% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/constraints/no_permissions.html.erb

@@ -0,0 +1,6 @@
+<div data-dialog-container>
+  <%= icon "lock-line" %>
+  <h2 tabindex="-1" data-dialog-title>
+    No permissions for <%= constraint_key %>
+  </h2>
+</div>

data/app/views/decidim/decidim_awesome/admin/officializations/_participants_td.html.erb

@@ -0,0 +1,25 @@
+<td class="awesome_participants-td">
+  <% awesome_authorizations_for(user).authorizations.each do |auth| %>
+    <%
+      data = {
+        verification_user: user.name,
+        verification_user_id: user.id,
+        verification_handler: auth[:name],
+        verification_url: decidim_admin_decidim_awesome.edit_admin_authorization_path(id: user.id, handler: auth[:name])
+      }
+      classes = []
+      classes << "granted" if auth[:granted]
+      classes << "pending" if auth[:pending]
+      if auth[:managed]
+        classes << "managed"
+        data[:dialog_open] = "awesome-verification-modal"
+      end
+    %>
+    <%= content_tag(auth[:managed] ? "a" : "div", href: "#", class: classes, data:) do %>
+      <%= icon "check-line", class: "checked" %>
+      <%= icon "time-line", class: "undeterminated" %>
+      <%= icon "close-line", class: "unchecked" %>
+      <%= auth[:fullname] %>
+    <% end %>
+  <% end %>
+</td>

data/app/views/decidim/decidim_awesome/admin/officializations/_participants_th.html.erb

@@ -0,0 +1 @@
+<th class="awesome_participants-th"><%= t("decidim.decidim_awesome.admin.officializations.authorizations") %></th>

data/app/views/decidim/decidim_awesome/admin/officializations/_verification_modal.html.erb

@@ -0,0 +1,9 @@
+<%= decidim_modal id: "awesome-verification-modal", class:"reveal awesome_participants-modal" do %>
+  <div data-dialog-container>
+  </div>
+  <div data-dialog-actions>
+    <button data-dialog-close="awesome-verification-modal" class="button button__lg button__transparent-secondary">
+       <%= t(".close") %>
+    </button>
+  </div>
+<% end %>

data/app/views/decidim/decidim_awesome/required_authorizations/index.html.erb

@@ -0,0 +1,66 @@
+<div class="text-center py-10">
+  <h1 class="title-decorator inline-block text-left mb-12">
+    <%= t(".title") %>
+  </h1>
+  <p class="text-lg text-gray-2 text-left">
+    <%= t(awesome_config[:force_authorization_with_any_method] ? ".verify_with_any_of_these_options" : ".verify_with_all_these_options") %>
+  </p>
+</div>
+
+<div class="space-y-8">
+  <% if granted_authorizations.any? %>
+    <div class="verification__container-title"><%= t(".granted_title") %></div>
+    <div class="verification__container">
+        <% granted_authorizations.each do |method| %>
+            <div class="verification verification__no_clickable">
+                <%= icon "checkbox-circle-line", class: "verification__icon is-granted" %>
+                <div class="verification__text">
+                    <h2 class="h5 text-secondary">
+                    <%= method.fullname %>
+                    </h2>
+                </div>
+            </div>
+        <% end %>
+    </div>
+  <% end %>
+
+  <% if pending_authorizations.any? %>
+    <div class="verification__container-title"><%= t(".resume_title") %></div>
+    <div class="verification__container">
+      <% pending_authorizations.each do |method| %>
+          <%= link_to method.resume_authorization_path(redirect_url:), class: "verification" do %>
+            <%= icon "time-line", class: "verification__icon" %>
+            <div class="verification__text">
+              <h2 class="h5 text-secondary">
+                <%= t(".resume_with_method", name: method.fullname) %>
+              </h2>
+            </div>
+          <% end %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if missing_authorizations.any? %>
+    <div class="verification__container-title"><%= t(".missing_title") %></div>
+    <div class="verification__container">
+      <% missing_authorizations.each do |method| %>
+          <%= link_to method.root_path(redirect_url:), class: "verification" do %>
+            <%= icon(method.icon || "login-circle-line", class: "verification__icon") %>
+            <div class="verification__text">
+              <h2 class="h5 text-secondary">
+                <%= t(".verify_with_method", name: method.fullname) %>
+              </h2>
+            </div>
+          <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+
+<div class="space-y-8 prose-a:text-secondary mt-8">
+  <%= translated_attribute(awesome_config[:force_authorization_help_text]).html_safe %>
+
+  <p class="prose-a:text-secondary italic">
+    <%= t(".cancel", link: link_to("#{icon("logout-box-r-line", class: "inline-block").html_safe} #{t(".logout")}".html_safe, decidim.destroy_user_session_path(redirect_url:), method: :delete).html_safe).html_safe %>
+  </p>
+</div>

data/app/views/decidim/decidim_awesome/system/organizations/_admin_allowed_authorizations.html.erb

@@ -0,0 +1,5 @@
+<%= field_set_tag f.label(:awesome_admins_available_authorizations, nil, for: nil), class: "border-2 border-background p-4"  do %>
+  <%= f.collection_check_boxes :awesome_admins_available_authorizations, Decidim.authorization_handlers, :name, :description, help_text: t("decidim.decidim_awesome.system.organizations.admin_allowed_authoritzations_help_html") do |builder|
+    builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.check_box(id: nil) + builder.text }
+  end %>
+<% end %>

data/app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb

@@ -1,3 +1,3 @@
 <style media="all">
-  <%== awesome_custom_styles.join("\n").html_safe %>
+  <%== awesome_scoped_styles.join("\n").html_safe %>
 </style>

data/app/views/layouts/decidim/decidim_awesome/admin/_custom_styles.html.erb

@@ -0,0 +1,3 @@
+<style media="all">
+  <%== awesome_scoped_admin_styles.join("\n").html_safe %>
+</style>

data/app/views/layouts/decidim/decidim_awesome/admin/admin_authorizations.html.erb

@@ -0,0 +1,7 @@
+<%= icon "lock-line" %>
+<h3 tabindex="-1" data-dialog-title>
+  <%= t("decidim.decidim_awesome.admin.officializations.verification_modal.authorizations_for", user: user.name) %>
+</h3>
+<div data-dialog-content>
+  <%= yield %>
+</div>

data/config/i18n-tasks.yml

@@ -17,6 +17,8 @@ ignore_unused:
   - "decidim.admin.filters.search_placeholder.*"
   - "activemodel.attributes.constraint.*"
   - "activemodel.attributes.custom_redirect.*"
+  - "activemodel.attributes.user.*"
+  -  activemodel.attributes.organization.awesome_admins_available_authorizations
   - "decidim.components.decidim_awesome.name"
   - "decidim.components.awesome_iframe.settings.*"
   - "decidim.components.awesome_map.settings.*"
@@ -24,6 +26,8 @@ ignore_unused:
   - "decidim.components.proposals.settings.step.*"
   - "decidim.decidim_awesome.admin.config.*"
   - "decidim.decidim_awesome.admin.admin_accountability.*"
+  - "decidim.decidim_awesome.admin.scoped_admin_styles.*"
+  - "decidim.decidim_awesome.admin.scoped_styles.*"
   - "decidim.decidim_awesome.admin.menu.*"
   - "decidim.decidim_awesome.admin.menu_hacks.*"
   - "decidim.decidim_awesome.admin.proposal_custom_fields.*"
@@ -32,6 +36,8 @@ ignore_unused:
   - "decidim.decidim_awesome.voting.voting_cards.*"
   - "decidim.decidim_awesome.content_blocks.*"
   - "decidim.decidim_awesome.admin_log.*"
+  - "decidim.decidim_awesome.required_authorizations.index.verify_with_all_these_options"
+  - "decidim.decidim_awesome.required_authorizations.index.verify_with_any_of_these_options"
   - "layouts.decidim.decidim_awesome.admin.maintenance.titles.*"
   - "decidim.proposals.*"
   - "decidim.meetings.*"