decidim-decidim_awesome 0.11.2 → 0.11.3

data/app/controllers/decidim/decidim_awesome/admin/scoped_styles_controller.rb

@@ -6,7 +6,7 @@ module Decidim
       # Global configuration controller
       class ScopedStylesController < DecidimAwesome::Admin::ConfigController
         def create
-          CreateScopedStyle.call(current_organization) do
+          CreateScopedStyle.call(current_organization, config_var) do
             on(:ok) do |key|
               flash[:notice] = I18n.t("config.create_scoped_style.success", key:, scope: "decidim.decidim_awesome.admin")
             end
@@ -16,11 +16,11 @@ module Decidim
             end
           end
 
-          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
+          redirect_to decidim_admin_decidim_awesome.config_path(config_var)
         end
 
         def destroy
-          DestroyScopedStyle.call(params[:key], current_organization) do
+          DestroyScopedStyle.call(params[:key], current_organization, config_var) do
             on(:ok) do |key|
               flash[:notice] = I18n.t("config.destroy_scoped_style.success", key:, scope: "decidim.decidim_awesome.admin")
             end
@@ -30,7 +30,15 @@ module Decidim
             end
           end
 
-          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
+          redirect_to decidim_admin_decidim_awesome.config_path(config_var)
+        end
+
+        private
+
+        def config_var
+          return :scoped_admin_styles if params[:admin_panel] == "true"
+
+          :scoped_styles
         end
       end
     end

data/app/controllers/decidim/decidim_awesome/required_authorizations_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    # This controller handles image uploads for the Tiptap editor
+    class RequiredAuthorizationsController < DecidimAwesome::ApplicationController
+      layout "layouts/decidim/authorizations"
+      helper_method :granted_authorizations, :pending_authorizations, :missing_authorizations, :redirect_url
+
+      before_action do
+        redirect_to redirect_url unless user_signed_in?
+        redirect_to redirect_url if user_is_authorized?
+      end
+
+      def redirect_url
+        @redirect_url ||= begin
+          path = params[:redirect_url] || request.referer
+          if path.blank? || path.include?(decidim_decidim_awesome.required_authorizations_path.split("?").first)
+            decidim.root_path
+          else
+            path
+          end
+        end
+      end
+
+      def index
+        enforce_permission_to :read, :required_authorizations, user_is_authorized: user_is_authorized?
+      end
+
+      private
+
+      def missing_authorizations
+        @missing_authorizations ||= required_authorizations.filter do |manifest|
+          Decidim::Verifications::Authorizations.new(
+            organization: current_organization,
+            user: current_user,
+            name: required_authorizations.map(&:name)
+          ).pluck(:name).exclude?(manifest.name)
+        end
+      end
+
+      def pending_authorizations
+        @pending_authorizations ||= required_authorizations.filter do |manifest|
+          Decidim::Verifications::Authorizations.new(
+            organization: current_organization,
+            user: current_user,
+            name: required_authorizations.map(&:name),
+            granted: false
+          ).pluck(:name).include?(manifest.name)
+        end
+      end
+
+      def granted_authorizations
+        @granted_authorizations ||= required_authorizations.filter { |manifest| current_authorizations.pluck(:name).include?(manifest.name) }
+      end
+    end
+  end
+end

data/app/forms/concerns/decidim/decidim_awesome/account_form_override.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module AccountFormOverride
+      extend ActiveSupport::Concern
+
+      included do
+        attribute :user_time_zone
+        validates :user_time_zone, time_zone: true, if: -> { user_time_zone.present? }
+
+        def user_time_zone
+          return nil if awesome_config[:user_timezone].blank?
+
+          super.presence || current_user.extended_data["time_zone"].presence || current_organization.time_zone
+        end
+
+        # Used for the user_time_zone setting, which does not have constraints
+        def awesome_config
+          @awesome_config ||= Decidim::DecidimAwesome::Config.new(current_organization)&.organization_config || {}
+        end
+      end
+    end
+  end
+end

data/app/forms/concerns/decidim/decidim_awesome/system/organization_form_override.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module System
+      module OrganizationFormOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :decidim_original_map_model, :map_model
+
+          attribute :awesome_admins_available_authorizations, Array[String]
+
+          def map_model(model)
+            decidim_original_map_model(model)
+            map_awesome_configs(model)
+          end
+
+          def clean_awesome_admins_available_authorizations
+            return unless awesome_admins_available_authorizations
+
+            awesome_admins_available_authorizations.select(&:present?)
+          end
+
+          private
+
+          def map_awesome_configs(organization)
+            self.awesome_admins_available_authorizations = Decidim::DecidimAwesome::AwesomeConfig.find_by(var: :admins_available_authorizations, organization:)&.value
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/decidim_awesome/admin/config_form.rb

@@ -7,14 +7,20 @@ module Decidim
     module Admin
       class ConfigForm < Decidim::Form
         include ActionView::Helpers::SanitizeHelper
+        include TranslatableAttributes
 
         attribute :allow_images_in_editors, Boolean
         attribute :allow_videos_in_editors, Boolean
         attribute :allow_images_in_proposals, Boolean
         attribute :auto_save_forms, Boolean
         attribute :scoped_styles, Hash
+        attribute :scoped_admin_styles, Hash
         attribute :proposal_custom_fields, Hash
         attribute :proposal_private_custom_fields, Hash
+        attribute :user_timezone, Boolean
+        attribute :force_authorization_after_login, Array
+        attribute :force_authorization_with_any_method, Boolean
+        translatable_attribute :force_authorization_help_text, String
         attribute :scoped_admins, Hash
         attribute :menu, [MenuForm]
         attribute :intergram_for_admins, Boolean
@@ -31,10 +37,10 @@ module Decidim
         attribute :validate_body_start_with_caps, Boolean, default: true
         attribute :additional_proposal_sortings, Array, default: Decidim::DecidimAwesome.possible_additional_proposal_sortings
 
-        # collect all keys anything not specified in the params (UpdateConfig command ignores it)
+        # collect all keys specified in the params (UpdateConfig command ignores everything else)
         attr_accessor :valid_keys
 
-        validate :css_syntax, if: ->(form) { form.scoped_styles.present? }
+        validate :css_syntax
         validate :json_syntax
 
         validates :validate_title_min_length, presence: true, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 100 }
@@ -43,16 +49,29 @@ module Decidim
         validates :validate_body_min_length, presence: true, numericality: { greater_than_or_equal_to: 0 }
         validates :validate_body_max_caps_percent, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }
         validates :validate_body_max_marks_together, presence: true, numericality: { greater_than_or_equal_to: 1 }
-
+        validate :force_authorization_after_login_is_valid
         # TODO: validate non general admins are here
 
         def self.from_params(params, additional_params = {})
           instance = super(params, additional_params)
-          instance.valid_keys = params.keys.map(&:to_sym) || []
+          instance.force_authorization_after_login = instance.force_authorization_after_login.compact_blank if instance.force_authorization_after_login.present?
+          instance.valid_keys = extract_valid_keys_from_params(params)
           instance.sanitize_labels!
           instance
         end
 
+        def self.extract_valid_keys_from_params(params)
+          keys = []
+          params.each do |key, _value|
+            keys << if key.to_s.starts_with?("force_authorization_help_text_")
+                      :force_authorization_help_text if keys.exclude?(:force_authorization_help_text)
+                    else
+                      key.to_sym
+                    end
+          end
+          keys
+        end
+
         def additional_proposal_sorting_labels
           Decidim::DecidimAwesome.possible_additional_proposal_sortings.index_by do |sorting|
             I18n.t(sorting, scope: "decidim.proposals.proposals.orders")
@@ -60,12 +79,15 @@ module Decidim
         end
 
         def css_syntax
-          scoped_styles.each do |key, code|
-            next unless code
+          styles = {}
+          styles.merge!(scoped_styles: scoped_styles.values) if scoped_styles.present?
+          styles.merge!(scoped_admin_styles: scoped_admin_styles.values) if scoped_admin_styles.present?
+          styles.each do |key, values|
+            next if values.blank?
 
-            SassC::Engine.new(code).render
+            values.each { |code| SassC::Engine.new(code).render }
           rescue SassC::SyntaxError => e
-            errors.add(:scoped_styles, I18n.t("config.form.errors.incorrect_css", key:, scope: "decidim.decidim_awesome.admin"))
+            errors.add(key, I18n.t("config.form.errors.incorrect_css", key:, scope: "decidim.decidim_awesome.admin"))
             errors.add(key.to_sym, e.message)
           end
         end
@@ -112,6 +134,17 @@ module Decidim
             code
           end
         end
+
+        private
+
+        def force_authorization_after_login_is_valid
+          return if force_authorization_after_login.blank?
+
+          invalid = force_authorization_after_login - (current_organization.available_authorizations & Decidim.authorization_workflows.map(&:name))
+          return if invalid.empty?
+
+          errors.add(:force_authorization_after_login, :invalid)
+        end
       end
     end
   end

data/app/helpers/decidim/decidim_awesome/map_helper.rb

@@ -20,32 +20,34 @@ module Decidim
         end
 
         html_options = {
-          "class" => "awesome-map",
-          "id" => "awesome-map",
-          "data-components" => components.map do |component|
-                                 {
-                                   id: component.id,
-                                   type: component.manifest.name,
-                                   name: translated_attribute(component.name),
-                                   url: Decidim::EngineRouter.main_proxy(component).root_path,
-                                   amendments: component.manifest.name == :proposals ? Decidim::Proposals::Proposal.where(component:).only_emendations.count : 0
-                                 }
-                               end.to_json,
-          "data-hide-controls" => settings_source.try(:hide_controls),
-          "data-collapsed" => global_settings.collapse,
-          "data-truncate" => global_settings.truncate || 255,
-          "data-map-center" => global_settings.map_center,
-          "data-map-zoom" => global_settings.map_zoom || 8,
-          "data-menu-merge-components" => global_settings.menu_merge_components,
-          "data-menu-amendments" => global_settings.menu_amendments,
-          "data-menu-meetings" => global_settings.menu_meetings,
-          "data-menu-categories" => global_settings.menu_categories,
-          "data-menu-hashtags" => global_settings.menu_hashtags,
-          "data-show-not-answered" => step_settings&.show_not_answered,
-          "data-show-accepted" => step_settings&.show_accepted,
-          "data-show-withdrawn" => step_settings&.show_withdrawn,
-          "data-show-evaluating" => step_settings&.show_evaluating,
-          "data-show-rejected" => step_settings&.show_rejected
+          class: "awesome-map",
+          id: "awesome-map",
+          data: {
+            "components" => components.map do |component|
+                              {
+                                id: component.id,
+                                type: component.manifest.name,
+                                name: translated_attribute(component.name),
+                                url: Decidim::EngineRouter.main_proxy(component).root_path,
+                                amendments: component.manifest.name == :proposals ? Decidim::Proposals::Proposal.where(component:).only_emendations.count : 0
+                              }
+                            end.to_json,
+            "hide-controls" => settings_source.try(:hide_controls),
+            "collapsed" => global_settings.collapse,
+            "truncate" => global_settings.truncate || 255,
+            "map-center" => global_settings.map_center,
+            "map-zoom" => global_settings.map_zoom || 8,
+            "menu-merge-components" => global_settings.menu_merge_components,
+            "menu-amendments" => global_settings.menu_amendments,
+            "menu-meetings" => global_settings.menu_meetings,
+            "menu-categories" => global_settings.menu_categories,
+            "menu-hashtags" => global_settings.menu_hashtags,
+            "show-not-answered" => step_settings&.show_not_answered,
+            "show-accepted" => step_settings&.show_accepted,
+            "show-withdrawn" => step_settings&.show_withdrawn,
+            "show-evaluating" => step_settings&.show_evaluating,
+            "show-rejected" => step_settings&.show_rejected
+          }
         }
 
         content_tag(:div, html_options) do

data/app/overrides/decidim/account/show/add_timezone_select.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after 'erb[loud]:contains("@account.organization.available_locales")' -->
+
+<%= render partial: "decidim/decidim_awesome/account/timezone_select", locals: { f: f } %>

data/app/overrides/decidim/admin/officializations/index/add_modal.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('show_email_modal')" -->
+
+<%= render "decidim/decidim_awesome/admin/officializations/verification_modal" %>

data/app/overrides/decidim/admin/officializations/index/add_td.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "td.table-list__actions" -->
+
+<% if awesome_config[:admins_available_authorizations] %>
+  <%= render "decidim/decidim_awesome/admin/officializations/participants_td", user: %>
+<% end %>

data/app/overrides/decidim/admin/officializations/index/add_th.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "th:last" -->
+
+<% if awesome_config[:admins_available_authorizations] %>
+  <%= render "decidim/decidim_awesome/admin/officializations/participants_th" %>
+<% end %>

data/app/overrides/decidim/system/organizations/_advanced_settings/add_awesome_config.html.erb.deface

@@ -0,0 +1,9 @@
+<!-- insert_top '#advanced-settings-panel' -->
+
+<% if Decidim::DecidimAwesome.enabled?(:admins_available_authorizations) %>
+  <div class="awesome_available_authorizations border-2 rounded border-background p-4 form__wrapper mt-8 first:mt-0 last:pb-4">
+    <h3 class="h4"><%= t "decidim.decidim_awesome.system.organizations.awesome_tweaks" %></h3>
+
+    <%= render partial: "decidim/decidim_awesome/system/organizations/admin_allowed_authorizations", locals: { f: f } %>
+  </div>
+<% end %>

data/app/overrides/layouts/decidim/_head/add_awesome_tags.html.erb.deface

@@ -1,7 +1,7 @@
 <!-- insert_after "erb[loud]:contains('append_stylesheet_pack_tag')" -->
 
 <% append_stylesheet_pack_tag "decidim_decidim_awesome", media: "all" %>
-<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles.present? %>
+<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_scoped_styles.present? %>
 
 <% append_javascript_pack_tag "decidim_decidim_awesome", defer: false %>
 <% append_javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>

data/app/overrides/layouts/decidim/admin/_header/add_awesome_custom_styles.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('snippets.display(:head)')" -->
+
+<%= render(partial: "layouts/decidim/decidim_awesome/admin/custom_styles") if awesome_scoped_admin_styles.present? %>

data/app/overrides/layouts/decidim/admin/_header/add_awesome_tags.html.erb.deface

@@ -3,6 +3,7 @@
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 <% append_stylesheet_pack_tag("decidim_admin_decidim_awesome_global") %>
 <% append_javascript_pack_tag("decidim_admin_decidim_awesome_global") %>
+
 <% append_javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
 <% if awesome_config[:intergram_for_admins] %>
   <%= render partial: "layouts/decidim/decidim_awesome/intergram_widget", locals: { settings: organization_awesome_config[:intergram_for_admins_settings] } %>

data/app/packs/src/decidim/decidim_awesome/admin/proposal_sortings.js

@@ -15,11 +15,6 @@ document.addEventListener("DOMContentLoaded", () => {
     render: {
       option: function (data, escape) {
         return `<div>${escape(data.text)}</div>`;
-      },
-      item: function (data, escape) {
-        return Boolean(data.is_admin) || data.isAdmin === "true"
-          ? `<div class="is-admin">${escape(data.text)}</div>`
-          : `<div>${escape(data.text)}</div>`;
       }
     }
   });

data/app/packs/src/decidim/decidim_awesome/admin/verification_selects.js

@@ -0,0 +1,21 @@
+/* eslint-disable no-new */
+
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
+
+document.addEventListener("DOMContentLoaded", () => {
+  const selectContainer = document.getElementById("config_force_authorization_after_login");
+
+  if (!selectContainer) {
+    return;
+  }
+
+  new TomSelect(selectContainer, {
+    plugins: ["remove_button", "dropdown_input"],
+    create: false,
+    render: {
+      option: function (data, escape) {
+        return `<div>${escape(data.text)}</div>`;
+      }
+    }
+  });
+});

data/app/packs/src/decidim/decidim_awesome/admin/verifications.js

@@ -0,0 +1,43 @@
+document.addEventListener("DOMContentLoaded", () => {
+  const dialog = document.getElementById("awesome-verification-modal");
+  if (!dialog) {
+    return;
+  }
+  const container = dialog.querySelector("[data-dialog-container]");
+  
+  dialog.addEventListener("open.dialog", async (el) => {
+    const modal = window.Decidim.currentDialogs[el.target.id];
+    const button = modal.openingTrigger;
+    const url = button.dataset.verificationUrl;
+    container.innerHTML = '<br><br><span class="loading-spinner"></span>';
+    // console.log("open.dialog", el, "container", container, "button", button, "url", url);
+    fetch(url).then((res) => res.text()).then((html) => {
+      container.innerHTML = html;
+    });
+  });
+  
+  
+  document.body.addEventListener("ajax:complete", (responseText) => {
+    const response = JSON.parse(responseText.detail[0].response)
+    const button = document.querySelector(`[data-verification-handler="${response.handler}"][data-verification-user-id="${response.userId}"]`);
+    // console.log("ajax:complete", responseText, "response", response, "button", button);
+    container.innerHTML = response.message;
+
+    if (response.granted) {
+      button.classList.add("granted");
+    } else {
+      button.classList.remove("granted");
+      const forceVerificationCheck = container.querySelector("#force_verification_check");
+      const forceVerification = container.querySelector("#force_verification");
+    
+      if (forceVerificationCheck) {
+        forceVerificationCheck.addEventListener("change", function() {
+          forceVerification.disabled = !forceVerification.disabled;
+          if (forceVerificationCheck.checked) {
+            forceVerification.focus()
+          }
+        });
+      }
+    }
+  });
+});

data/app/packs/src/decidim/decidim_awesome/awesome_admin.js

@@ -9,5 +9,6 @@ import "src/decidim/decidim_awesome/admin/form_exit_warn"
 
 import "src/decidim/decidim_awesome/proposals/custom_fields"
 import "src/decidim/decidim_awesome/admin/custom_fields_builder"
+import "src/decidim/decidim_awesome/admin/verification_selects"
 
 window.DecidimAwesome = window.DecidimAwesome || {};

data/app/packs/src/decidim/decidim_awesome/awesome_admin_global.js

@@ -1 +1,2 @@
 import "src/decidim/decidim_awesome/admin/tabs_change"
+import "src/decidim/decidim_awesome/admin/verifications"

data/app/packs/stylesheets/decidim/decidim_awesome/admin/verifications.scss

@@ -0,0 +1,99 @@
+.table-list .awesome_participants {
+  &-th:not(:first-child) {
+    @apply text-left pl-3;
+  }
+
+  &-td:not(:first-child) {
+    @apply text-left;
+
+    a {
+      @apply text-sm font-normal block;
+
+      &:hover {
+        @apply text-secondary underline;
+      }
+    }
+
+    > * {
+      @apply text-gray;
+
+      &.managed {
+        @apply text-gray-2;
+      }
+
+      .checked {
+        @apply hidden;
+      }
+
+      .undeterminated {
+        @apply hidden;
+      }
+
+      .unchecked {
+        @apply text-alert;
+      }
+
+      &.granted {
+        .checked {
+          @apply text-success inline;
+        }
+
+        .undeterminated {
+          @apply hidden;
+        }
+
+        .unchecked {
+          @apply hidden;
+        }
+      }
+
+      &.pending {
+        .checked {
+          @apply hidden;
+        }
+
+        .undeterminated {
+          @apply text-warning inline;
+        }
+
+        .unchecked {
+          @apply hidden;
+        }
+      }
+    }
+  }
+}
+
+.awesome_participants-modal {
+  h4 {
+    @apply text-xl block my-8;
+  }
+
+  .verification {
+    @apply flex items-center justify-between gap-4 border-[3px] border-background rounded px-4 py-4 mt-4;
+
+    &__container {
+      @apply space-y-8;
+
+      &-title {
+        @apply uppercase font-semibold text-gray-2 mb-8 mt-16 first:mt-0;
+      }
+    }
+
+    &__icon {
+      @apply flex-none w-8 h-8 text-gray fill-current;
+
+      &.is-granted {
+        @apply text-success;
+      }
+    }
+
+    &__text {
+      @apply grow space-y-2.5;
+
+      span {
+        @apply inline-block text-sm text-gray-2;
+      }
+    }
+  }
+}

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin_global.scss

@@ -1,6 +1,7 @@
 @import "stylesheets/decidim/decidim_awesome/shared/spinner";
 @import "stylesheets/decidim/decidim_awesome/admin/intergram_fixes";
 @import "stylesheets/decidim/decidim_awesome/forms/custom_fields";
+@import "stylesheets/decidim/decidim_awesome/admin/verifications";
 
 .component__show {
   &_private_data {

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