decidim-core 0.30.3 → 0.31.0.rc2

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

@@ -1,86 +1,86 @@
-@import "tailwindcss/base";
-@import "tailwindcss/components";
-@import "tailwindcss/utilities";
+@use "sass:meta";
+@use "tailwindcss/base";
+@use "tailwindcss/components";
+@use "tailwindcss/utilities";
+
+// Datepicker
+@use "stylesheets/decidim/vendor/datepicker_light";
+@use "stylesheets/decidim/datepicker";
+// On the other hand, the following styles match with specific routes
+@use "stylesheets/decidim/header";
+@use "stylesheets/decidim/footer";
+@use "stylesheets/decidim/login";
+@use "stylesheets/decidim/pages";
+@use "stylesheets/decidim/notifications";
+@use "stylesheets/decidim/profile";
+@use "stylesheets/decidim/conversations";
+@use "stylesheets/decidim/versions";
+@use "stylesheets/decidim/home";
+@use "stylesheets/decidim/search";
+@use "stylesheets/decidim/cookies";
+// participatory spaces are quite similar between processes and assemblies (different modules), so their stylesheets are placed in the core
+@use "stylesheets/decidim/participatory_spaces";
+@use "stylesheets/decidim/omnipresent_banner";
+// This imports all the Decidim module stylesheet imports registered at
+// `config/assets.rb` of the module for the "app" group. The import contains
+// a mixing named `styles` which is included at the bottom of this file.
+@use "decidim:style-imports[app]" as extra;
 
 @layer base {
-  @import "stylesheets/decidim/_fonts.scss";
-  @import "stylesheets/decidim/_typography.scss";
+  @include meta.load-css("stylesheets/decidim/fonts");
+  @include meta.load-css("stylesheets/decidim/typography");
   // Keep this in separate file as long as we are maintaining Foundation compatibility
-  @import "stylesheets/decidim/_rich_text.scss";
+  @include meta.load-css("stylesheets/decidim/rich_text");
 }
 
 // The CSS components must work identically all along the application,
 // no matter which view are being displayed in.
 @layer components {
-  @import "stylesheets/decidim/_layout.scss";
-  @import "stylesheets/decidim/_buttons.scss";
-  @import "stylesheets/decidim/_labels.scss";
-  @import "stylesheets/decidim/_forms.scss";
-  @import "stylesheets/decidim/_dropdown.scss";
-  @import "stylesheets/decidim/_login_box.scss";
-  @import "stylesheets/decidim/_callout.scss";
-  @import "stylesheets/decidim/_accordion.scss";
-  @import "stylesheets/decidim/_tos.scss";
-  @import "stylesheets/decidim/_vertical_tabs.scss";
-  @import "stylesheets/decidim/_flash.scss";
-  @import "stylesheets/decidim/_static-map.scss";
-  @import "stylesheets/decidim/_filters.scss";
-  @import "stylesheets/decidim/_tags.scss";
-  @import "stylesheets/decidim/_tabs_x.scss";
-  @import "stylesheets/decidim/_metadata.scss";
-  @import "stylesheets/decidim/_modal.scss";
-  @import "stylesheets/decidim/_modal_share.scss";
-  @import "stylesheets/decidim/_modal_flag.scss";
-  @import "stylesheets/decidim/_modal_identities.scss";
-  @import "stylesheets/decidim/_modal_authorization.scss";
-  @import "stylesheets/decidim/_modal_update.scss";
-  @import "stylesheets/decidim/_modal_tos_refuse.scss";
-  @import "stylesheets/decidim/_modal_fingerprint.scss";
-  @import "stylesheets/decidim/_address.scss";
-  @import "stylesheets/decidim/_statistics.scss";
-  @import "stylesheets/decidim/_content_blocks.scss";
-  @import "stylesheets/decidim/_documents.scss";
-  @import "stylesheets/decidim/_floating_help.scss";
-  @import "stylesheets/decidim/_cards.scss";
-  @import "stylesheets/decidim/_floating_help.scss";
-  @import "stylesheets/decidim/_metrics.scss";
-  @import "stylesheets/decidim/_order-by.scss";
-  @import "stylesheets/decidim/_photos.scss";
-  @import "stylesheets/decidim/_endorsers_list.scss";
-  @import "stylesheets/decidim/_activity.scss";
-  @import "stylesheets/decidim/_tooltip.scss";
-  @import "stylesheets/decidim/_author.scss";
-  @import "stylesheets/decidim/_order-by.scss";
-  @import "stylesheets/decidim/_wizard_steps.scss";
-  @import "stylesheets/decidim/_progress-bar.scss";
-  @import "stylesheets/decidim/_spinner.scss";
-  @import "stylesheets/decidim/_toggle_switch.scss";
-  @import "stylesheets/decidim/_hero.scss";
-  @import "stylesheets/decidim/_actions.scss";
-  @import "stylesheets/decidim/_emoji.scss";
-  @import "stylesheets/decidim/_success_image.scss";
-  @import "stylesheets/decidim/_hashtags.scss";
+  @include meta.load-css("stylesheets/decidim/layout");
+  @include meta.load-css("stylesheets/decidim/buttons");
+  @include meta.load-css("stylesheets/decidim/labels");
+  @include meta.load-css("stylesheets/decidim/forms");
+  @include meta.load-css("stylesheets/decidim/dropdown");
+  @include meta.load-css("stylesheets/decidim/login_box");
+  @include meta.load-css("stylesheets/decidim/callout");
+  @include meta.load-css("stylesheets/decidim/accordion");
+  @include meta.load-css("stylesheets/decidim/tos");
+  @include meta.load-css("stylesheets/decidim/vertical_tabs");
+  @include meta.load-css("stylesheets/decidim/flash");
+  @include meta.load-css("stylesheets/decidim/static-map");
+  @include meta.load-css("stylesheets/decidim/filters");
+  @include meta.load-css("stylesheets/decidim/tags");
+  @include meta.load-css("stylesheets/decidim/tabs_x");
+  @include meta.load-css("stylesheets/decidim/metadata");
+  @include meta.load-css("stylesheets/decidim/modal");
+  @include meta.load-css("stylesheets/decidim/modal_share");
+  @include meta.load-css("stylesheets/decidim/modal_flag");
+  @include meta.load-css("stylesheets/decidim/modal_authorization");
+  @include meta.load-css("stylesheets/decidim/modal_update");
+  @include meta.load-css("stylesheets/decidim/modal_tos_refuse");
+  @include meta.load-css("stylesheets/decidim/modal_fingerprint");
+  @include meta.load-css("stylesheets/decidim/address");
+  @include meta.load-css("stylesheets/decidim/statistics");
+  @include meta.load-css("stylesheets/decidim/content_blocks");
+  @include meta.load-css("stylesheets/decidim/documents");
+  @include meta.load-css("stylesheets/decidim/floating_help");
+  @include meta.load-css("stylesheets/decidim/cards");
+  @include meta.load-css("stylesheets/decidim/order-by");
+  @include meta.load-css("stylesheets/decidim/photos");
+  @include meta.load-css("stylesheets/decidim/likes_list");
+  @include meta.load-css("stylesheets/decidim/activity");
+  @include meta.load-css("stylesheets/decidim/tooltip");
+  @include meta.load-css("stylesheets/decidim/author");
+  @include meta.load-css("stylesheets/decidim/address");
+  @include meta.load-css("stylesheets/decidim/wizard_steps");
+  @include meta.load-css("stylesheets/decidim/progress-bar");
+  @include meta.load-css("stylesheets/decidim/spinner");
+  @include meta.load-css("stylesheets/decidim/toggle_switch");
+  @include meta.load-css("stylesheets/decidim/hero");
+  @include meta.load-css("stylesheets/decidim/actions");
+  @include meta.load-css("stylesheets/decidim/emoji");
+  @include meta.load-css("stylesheets/decidim/success_image");
 }
 
-@import "stylesheets/decidim/vendor/datepicker_light.scss";
-@import "stylesheets/decidim/datepicker.scss";
-
-// On the other hand, the following styles match with specific routes
-@import "stylesheets/decidim/_header.scss";
-@import "stylesheets/decidim/_footer.scss";
-@import "stylesheets/decidim/_login.scss";
-@import "stylesheets/decidim/_pages.scss";
-@import "stylesheets/decidim/_notifications.scss";
-@import "stylesheets/decidim/_profile.scss";
-@import "stylesheets/decidim/_conversations.scss";
-@import "stylesheets/decidim/_versions.scss";
-@import "stylesheets/decidim/_home.scss";
-@import "stylesheets/decidim/_search.scss";
-@import "stylesheets/decidim/_cookies.scss";
-// participatory spaces are quite similar between processes and assemblies (different modules), so their stylesheets are placed in the core
-@import "stylesheets/decidim/_participatory_spaces.scss";
-@import "stylesheets/decidim/_omnipresent_banner.scss";
-
-// This imports all the Decidim module stylesheet imports registered at
-// `config/assets.rb` of the module for the "app" group.
-@import "!decidim-style-imports[app]";
+// This applies the custom style imports registered at the application.
+@include extra.styles;

data/app/packs/stylesheets/decidim/editor.scss

@@ -1,6 +1,5 @@
 .editor-props {
   --editor-active-color: #487bda;
-  --editor-border-color: #ccc;
   --editor-disabled-color: #eee;
   --editor-bubble-border-color: #ccc;
   --editor-bubble-shadow-color: #333;
@@ -8,20 +7,16 @@
 
 .editor-suggestions-props {
   --editor-suggestions-border-color: #000;
-  --editor-suggestions-background-color: #fff;
-  --editor-suggestions-selected-highlight-color: #c7c7c7;
+  --editor-suggestions-background-color: #eee;
+  --editor-suggestions-selected-highlight-color: #ccc;
 }
 
 .editor-active {
   @apply outline outline-4 outline-[var(--editor-active-color)];
 }
 
-.editor-border {
-  @apply border-solid border-[#ccc];
-}
-
 .editor-container {
-  @apply editor-props editor-suggestions-props flex flex-col mt-4 border editor-border;
+  @apply editor-props editor-suggestions-props flex flex-col border border-neutral-200 rounded mt-2;
 
   &.editor-disabled {
     .editor-input .ProseMirror {
@@ -30,7 +25,7 @@
   }
 
   .editor-toolbar {
-    @apply py-1.5 px-2.5 border-0 border-b editor-border;
+    @apply py-1.5 px-2.5 border-b border-b-neutral-200;
 
     .editor-toolbar-group {
       @apply inline-block mx-2.5;
@@ -183,7 +178,7 @@
 }
 
 .editor-suggestions {
-  @apply editor-suggestions-props border border-solid border-[var(--editor-suggestions-border-color)] bg-[var(--editor-suggestions-background-color)];
+  @apply editor-suggestions-props border-0 bg-[var(--editor-suggestions-background-color)] max-w-sm drop-shadow-md rounded-md;
 
   &:hover {
     .editor-suggestions-item[data-selected]:not(:hover) {
@@ -192,10 +187,14 @@
   }
 
   .editor-suggestions-item {
-    @apply block w-full text-left py-2.5 px-1.5 border-0 border-t border-solid border-[var(--editor-suggestions-border-color)] rounded-none;
+    @apply block w-full text-left py-[0.375rem] px-1.5 border-0 rounded-none truncate text-sm;
 
     &:first-child {
-      @apply border-t-0;
+      @apply rounded-t-md;
+    }
+
+    &:last-child {
+      @apply rounded-b-md;
     }
 
     &:hover,

data/app/packs/stylesheets/decidim/legacy/email.scss

@@ -1,4 +1,5 @@
-@import "stylesheets/decidim/legacy/variables";
+@use "sass:meta";
+@use "stylesheets/decidim/legacy/variables";
 
 /* Index:
   1 - Foundation settings
@@ -1190,8 +1191,8 @@ table.button {
 table.button table td {
   text-align: left;
   color: #fefefe;
-  background: $primary;
-  border: 2px solid $primary;
+  background: variables.$primary;
+  border: 2px solid variables.$primary;
 }
 
 table.button table td a {
@@ -1201,7 +1202,7 @@ table.button table td a {
   text-decoration: none;
   display: inline-block;
   padding: 8px 16px;
-  border: 0 solid $primary;
+  border: 0 solid variables.$primary;
   border-radius: 3px;
 }
 
@@ -1290,7 +1291,7 @@ table.button.expanded center {
 table.button:hover table td,
 table.button:visited table td,
 table.button:active table td {
-  background: $primary;
+  background: variables.$primary;
   color: #fefefe;
 }
 

data/app/packs/stylesheets/decidim/map.scss

@@ -1,6 +1,8 @@
-@import "leaflet/dist/leaflet";
-@import "leaflet.markercluster/dist/MarkerCluster";
-@import "leaflet.markercluster/dist/MarkerCluster.Default";
+@use "sass:meta";
+
+@include meta.load-css("leaflet/dist/leaflet");
+@include meta.load-css("leaflet.markercluster/dist/MarkerCluster");
+@include meta.load-css("leaflet.markercluster/dist/MarkerCluster.Default");
 
 /* overwrite leaflet and card styles */
 .leaflet-popup-content-wrapper {

data/app/packs/stylesheets/decidim/qr.scss

@@ -0,0 +1,65 @@
+@use "sass:meta";
+@use "tailwindcss/base";
+@use "tailwindcss/components";
+@use "tailwindcss/utilities";
+
+@layer base {
+  @include meta.load-css("stylesheets/decidim/fonts");
+  @include meta.load-css("stylesheets/decidim/typography");
+  // Keep this in separate file as long as we are maintaining Foundation compatibility
+  @include meta.load-css("stylesheets/decidim/rich_text");
+}
+
+body {
+  @apply text-center mt-16 px-8;
+
+  > * {
+    @apply mx-auto w-full;
+  }
+
+  h1 {
+    @apply text-2xl text-black mb-6;
+  }
+
+  h3 {
+    @apply text-lg text-black mt-4;
+  }
+
+  .code-qr {
+    @apply mx-auto w-[80%] md:w-[40%] lg:w-[20%];
+  }
+
+  .card__grid-img {
+    @apply aspect-[21/9] rounded-t overflow-hidden mx-auto w-full lg:w-96 mb-12;
+
+    img {
+      @apply w-full h-full object-cover;
+    }
+  }
+
+  .logo {
+    @apply mt-10;
+
+    a {
+      @apply inline-block;
+
+      img {
+        @apply h-20 w-full;
+      }
+    }
+  }
+}
+
+@media print {
+  body {
+    zoom: 0.75;
+
+    h1 {
+      @apply text-2xl text-black mb-12;
+    }
+
+    .card__grid-img {
+      @apply w-[80%];
+    }
+  }
+}

data/app/permissions/decidim/default_permissions.rb

@@ -4,6 +4,7 @@ module Decidim
   # Default permissions class for all components and spaces. It deauthorizes all
   # actions by any kind of user. Also works as a default implementation so other
   # components can inherit from it and get some convenience methods.
+  # Delegates the admin permission check on :subject and :action to the permissions of each module.
   class DefaultPermissions
     include Decidim::UserRoleChecker
 
@@ -14,6 +15,13 @@ module Decidim
     end
 
     def permissions
+      return permission_action if permission_action.scope != target_scope
+
+      return permission_action unless subject == target_subject
+
+      permission_method = "can_#{action}?"
+      toggle_allow(send(permission_method)) if respond_to?(permission_method, true)
+
       permission_action
     end
 
@@ -21,6 +29,14 @@ module Decidim
 
     attr_reader :user, :permission_action, :context
 
+    delegate :subject, :action, to: :permission_action
+
+    def target_scope = ""
+
+    def target_subject
+      raise NotImplementedError "You need to implement target_subject"
+    end
+
     def disallow!
       permission_action.trace(self.class.name, :disallowed)
       permission_action.disallow!

data/app/permissions/decidim/permissions.rb

@@ -21,9 +21,7 @@ module Decidim
       amend_action?
       notification_action?
       conversation_action?
-      user_group_action?
-      user_group_invitations_action?
-      apply_endorsement_permissions if permission_action.subject == :endorsement
+      apply_like_permissions if permission_action.subject == :like
       show_my_location_button?
 
       permission_action
@@ -127,10 +125,10 @@ module Decidim
       toggle_allow(amendment&.amender == user)
     end
 
-    def apply_endorsement_permissions
-      is_allowed = current_settings.endorsements_enabled &&
-                   !current_settings.endorsements_blocked &&
-                   authorized?(:endorse, resource: context.fetch(:resource, nil))
+    def apply_like_permissions
+      is_allowed = current_settings.likes_enabled &&
+                   !current_settings.likes_blocked &&
+                   authorized?(:like, resource: context.fetch(:resource, nil))
 
       toggle_allow(is_allowed)
     end
@@ -155,25 +153,6 @@ module Decidim
       toggle_allow(conversation&.participating?(interlocutor))
     end
 
-    def user_group_action?
-      return unless permission_action.subject == :user_group
-      return allow! if [:join, :create].include?(permission_action.action)
-
-      user_group = context.fetch(:user_group)
-
-      if permission_action.action == :leave
-        user_can_leave_group = Decidim::UserGroupMembership.where(user:, user_group:).any?
-        return toggle_allow(user_can_leave_group)
-      end
-
-      user_manages_group = Decidim::UserGroups::ManageableUserGroups.for(user).include?(user_group)
-      toggle_allow(user_manages_group) if permission_action.action == :manage
-    end
-
-    def user_group_invitations_action?
-      allow! if permission_action.subject == :user_group_invitations
-    end
-
     def user_can_preview_component?
       context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token], user:)
     rescue ActiveRecord::RecordNotFound, StandardError

data/app/presenters/decidim/admin_log/base_user_presenter.rb

@@ -2,8 +2,8 @@
 
 module Decidim
   module AdminLog
-    # This class holds the shared logic for `Decidim::User` and `Decidim::UserGroup`
-    # presenters for the `AdminLog`.
+    # This class holds the shared logic for `Decidim::User`
+    # presenter for the `AdminLog`.
     class BaseUserPresenter < Decidim::Log::BasePresenter
       private
 

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -19,7 +19,6 @@ module Decidim
 
         settings_attributes_mapping
           .merge(omnipresent_banner_attributes_mapping)
-          .merge(highlighted_content_banner_attributes_mapping)
           .merge(appearance_attributes_mapping)
           .merge(id_documents_attributes_mapping)
       end
@@ -47,22 +46,8 @@ module Decidim
         }
       end
 
-      def highlighted_content_banner_attributes_mapping
-        {
-          highlighted_content_banner_enabled: :boolean,
-          highlighted_content_banner_action_url: :string,
-          highlighted_content_banner_image: :string,
-          highlighted_content_banner_title: :i18n,
-          highlighted_content_banner_short_description: :i18n,
-          highlighted_content_banner_action_title: :i18n,
-          highlighted_content_banner_action_subtitle: :i18n
-        }
-      end
-
       def appearance_attributes_mapping
         {
-          cta_button_path: :string,
-          cta_button_text: :i18n,
           description: :i18n,
           logo: :string,
           header_snippets: :string,

data/app/presenters/decidim/home_stats_presenter.rb

@@ -2,63 +2,13 @@
 
 module Decidim
   # A presenter to render statistics in the homepage.
-  class HomeStatsPresenter < SimpleDelegator
-    def organization
+  class HomeStatsPresenter < StatsPresenter
+    def scope_entity
       __getobj__.fetch(:organization)
     end
 
-    # Public: Render a collection of primary stats.
-    def highlighted
-      highlighted_stats = Decidim.stats.only([:users_count, :processes_count]).with_context(organization).map { |name, data| [name, data] }
-      highlighted_stats.concat(global_stats(priority: StatsRegistry::HIGH_PRIORITY))
-      highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
-      highlighted_stats = highlighted_stats.reject(&:empty?)
-      highlighted_stats = highlighted_stats.reject { |_name, data| data.zero? }
-
-      highlighted_stats.map do |name, data|
-        { stat_title: name, stat_number: data }
-      end
-    end
-
-    # Public: Render a collection of stats that are not primary.
-    def not_highlighted
-      not_highlighted_stats = global_stats(priority: StatsRegistry::MEDIUM_PRIORITY)
-      not_highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
-      not_highlighted_stats = not_highlighted_stats.reject(&:empty?)
-      not_highlighted_stats = not_highlighted_stats.reject { |_name, data| data.zero? }
-
-      not_highlighted_stats.map do |name, data|
-        { stat_title: name, stat_number: data }
-      end
-    end
-
-    private
-
-    def global_stats(conditions)
-      Decidim.stats.except([:users_count, :processes_count, :followers_count])
-             .filter(conditions)
-             .with_context(organization)
-             .map { |name, data| [name, data] }
-    end
-
-    def component_stats(conditions)
-      stats = {}
-      Decidim.component_manifests.flat_map do |component|
-        component
-          .stats.except([:votes_count])
-          .filter(conditions)
-          .with_context(published_components)
-          .each do |name, data|
-            stats[name] ||= 0
-            stats[name] += data
-          end
-      end
-
-      stats.to_a
-    end
-
-    def published_components
-      @published_components ||= organization.published_components
+    def collection(priority: StatsRegistry::HIGH_PRIORITY)
+      super
     end
   end
 end

data/app/presenters/decidim/log/base_presenter.rb

@@ -157,7 +157,7 @@ module Decidim
       # Returns an HTML-safe String.
       def present_action_log
         classes = ["logs__log"] + action_log_extra_classes.to_a
-        h.content_tag(:div, id: "accordion-#{h.dom_id(action_log)}", class: classes.join(" "), data: { component: "accordion" }) do
+        h.content_tag(:div, id: "accordion-#{h.dom_id(action_log)}", class: classes.join(" "), data: { controller: "accordion" }) do
           h.concat(present_content)
           h.concat(present_diff)
         end

data/app/presenters/decidim/menu_item_presenter.rb

@@ -13,6 +13,9 @@ module Decidim
     # @option options [String] :element_class
     #         The CSS class to be used for the item
     #
+    # @option options [String] :element_wrapper_class
+    #         The CSS class to be used for the wrapper of the item
+    #
     # @option options [String] :active_class
     #         The CSS class to be used for the active item
     #
@@ -49,17 +52,21 @@ module Decidim
         { aria: { current: "page" } }
       else
         {}
-      end
+      end.merge({ class: link_classes })
     end
 
     def composed_label
       icon_name.present? ? icon(icon_name) + label : label
     end
 
+    def link_classes
+      @options.element_class.nil? ? "" : @options.element_class
+    end
+
     def link_wrapper_classes
-      return @options.element_class unless is_active_link?(url, active)
+      return @options.element_wrapper_class unless is_active_link?(url, active)
 
-      [@options.element_class, active_class].compact.join(" ")
+      [@options.element_wrapper_class, active_class].compact.join(" ")
     end
 
     def active_class

data/app/presenters/decidim/official_author_presenter.rb

@@ -36,9 +36,5 @@ module Decidim
     def can_be_contacted?
       false
     end
-
-    def has_tooltip?
-      false
-    end
   end
 end

data/app/presenters/decidim/participatory_space_private_user_presenter.rb

@@ -31,10 +31,6 @@ module Decidim
       attached_uploader(:non_user_avatar)
     end
 
-    def has_tooltip?
-      false
-    end
-
     def deleted?
       false
     end

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -119,7 +119,18 @@ module Decidim
     def manifest_for(record)
       record.try(:resource_manifest) ||
         record.class.try(:resource_manifest) ||
-        record.class.try(:participatory_space_manifest)
+        record.class.try(:participatory_space_manifest) ||
+        record.to_s
+    end
+
+    def route_name_for(record)
+      manifest = manifest_for(record)
+
+      if manifest.respond_to?(:route_name)
+        manifest.route_name
+      else
+        manifest.to_s
+      end
     end
 
     def component
@@ -130,14 +141,14 @@ module Decidim
       if polymorphic?
         polymorphic_member_route_name
       else
-        manifest_for(target).route_name
+        route_name_for(target)
       end
     end
 
     def polymorphic_member_route_name
       return unless polymorphic?
 
-      resource.map { |record| manifest_for(record).route_name }.join("_")
+      resource.map { |record| route_name_for(record) }.join("_")
     end
 
     def collection_route_name
@@ -149,7 +160,7 @@ module Decidim
 
       parent_resources = {}
       (resource - [target]).each do |parent|
-        parent_resources["#{manifest_for(parent).route_name}_id"] = parent.id
+        parent_resources["#{route_name_for(parent)}_id"] = parent.id unless parent.is_a?(String)
       end
       parent_resources
     end