decidim-core 0.29.5 → 0.30.0.rc1

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

@@ -1,6 +1,11 @@
+$facebook_background: #0866ff;
+$facebook_background_hover: #155cba; // 30% opacity
+$google_background: #f2f2f2;
+$google_background_hover: #dcdcdc; // 30% opacity
+
 .login {
   &__info {
-    @apply text-gray-2 text-lg space-y-4 mb-10 prose-a:text-secondary prose-a:underline;
+    @apply text-gray-2 text-lg space-y-4 mt-10 prose-a:text-secondary prose-a:underline;
   }
 
   &__info-required {
@@ -12,18 +17,50 @@
   }
 
   &__omniauth {
-    @apply flex flex-col items-center gap-8 text-gray-2 font-semibold w-fit mx-auto mt-10;
+    @apply flex flex-row items-center gap-8 text-gray-2 font-semibold w-fit mx-auto mt-10 [&>a]:w-auto;
 
     &-button {
-      @apply button button__xl border border-gray shadow-[0_4px_6px_rgba(211,211,211,0.25)] justify-start gap-8 text-lg w-full;
+      @apply button__lg border border-gray shadow-[0_4px_6px_rgba(211,211,211,0.25)] justify-start gap-8 text-lg w-full rounded;
 
       svg {
-        @apply w-6 h-6 fill-current flex-none;
+        @apply w-6 h-6 flex-none fill-white;
+      }
+
+      span {
+        @apply hidden 2xl:inline;
+      }
+
+      &--developer {
+        @apply flex;
+      }
+
+      &--facebook {
+        @apply flex flex-row text-white border border-background;
+
+        background-color: $facebook_background;
+      }
+
+      &--facebook:hover {
+        background-color: $facebook_background_hover;
+      }
+
+      &--x {
+        @apply flex flex-row text-white bg-black;
+      }
+
+      &--google {
+        @apply flex flex-row text-black border border-background;
+
+        background-color: $google_background;
+      }
+
+      &--google:hover {
+        background-color: $google_background_hover;
       }
     }
 
     &-separator {
-      @apply mt-10 flex items-center justify-center gap-12 after:content-[''] before:content-[''] after:h-px before:h-px after:bg-background before:bg-background after:grow before:grow;
+      @apply mt-10 flex items-center justify-center gap-8 after:content-[''] before:content-[''] after:h-0.5 before:h-0.5 after:bg-background before:bg-background after:grow before:grow;
     }
 
     &__horizontal {
@@ -32,7 +69,7 @@
   }
 
   &__links {
-    @apply flex flex-col gap-4 py-10 border-t-2 border-background;
+    @apply flex flex-col gap-4 pb-10 border-background items-center;
 
     a {
       @apply w-fit text-secondary hover:underline;
@@ -40,10 +77,20 @@
   }
 
   &__modal {
+    @apply p-8;
+
     &-links {
       @apply flex flex-col md:flex-row gap-4 justify-between items-start md:items-center [&>a]:text-secondary;
     }
 
+    &-remember {
+      @apply flex flex-row justify-between;
+
+      a {
+        @apply underline;
+      }
+    }
+
     [data-announcement] {
       @apply mt-4;
     }

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

@@ -18,11 +18,15 @@
   }
 
   [data-dialog-container] {
-    @apply grid grid-rows-[auto_1fr] items-start md:items-center gap-2 text-left;
+    @apply grid grid-cols-[auto_1fr] items-start md:items-center gap-2 text-left;
 
     > svg {
       @apply w-6 h-6 text-gray fill-current flex-none;
     }
+
+    > :last-child {
+      @apply col-span-2 md:col-span-1 md:col-start-2;
+    }
   }
 
   [data-dialog-title] {
@@ -38,4 +42,46 @@
       @apply w-full md:w-auto;
     }
   }
+
+  &[data-drawer] {
+    & > * {
+      @apply h-full max-h-full w-0 inset-0 translate-x-0 translate-y-0 right-0 left-auto max-w-[90%] lg:max-w-[900px] transition-none transition-[width] duration-500 overflow-visible;
+    }
+
+    &[aria-hidden="false"] {
+      > * {
+        @apply w-[60%];
+      }
+    }
+
+    [data-dialog-container] {
+      @apply grid-cols-none;
+
+      &.layout-content {
+        @apply bg-white;
+
+        > .spinner-container {
+          @apply sticky h-screen;
+        }
+      }
+    }
+
+    [data-dialog-closable] {
+      @apply absolute top-0 right-auto -left-10 p-4 py-2 bg-white rounded-bl;
+    }
+
+    .form-defaults {
+      h1 {
+        @apply text-2xl font-semibold text-black my-10 mx-4 border-b border-gray border-b-[1px] pb-8;
+
+        > .button {
+          @apply text-sm float-right;
+        }
+      }
+    }
+
+    .card {
+      @apply p-4 my-4 bg-background-2;
+    }
+  }
 }

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

@@ -3,4 +3,8 @@
   [data-dialog-actions] {
     @apply flex-nowrap;
   }
+
+  a {
+    @apply underline text-secondary;
+  }
 }

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

@@ -132,12 +132,8 @@
       }
 
       span {
-        @apply text-sm text-gray-2 mx-auto w-full break-all mb-2;
+        @apply text-sm text-gray-2 mx-auto;
       }
     }
   }
-
-  &__span {
-    @apply w-full break-all mb-2;
-  }
 }

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

@@ -19,6 +19,52 @@
     > [id^="html-block"] {
       @apply w-full prose max-w-none [&+*]:border-t-0;
     }
+
+    .content-block {
+      @apply gap-0;
+
+      &__title {
+        @apply pb-8;
+      }
+
+      .documents {
+        &__container > div {
+          @apply border-b border-[#D3D5D9] border-t-0 pb-4 pt-6;
+        }
+
+        &__dropdown-container {
+          @apply border-b border-[#D3D5D9];
+        }
+
+        &__collection-trigger {
+          @apply bg-transparent max-w-full mt-0 pb-4 pt-6 px-0 rounded-none;
+
+          .documents-details {
+            @apply flex flex-col gap-2.5;
+
+            span {
+              @apply flex items-center text-lg leading-6 text-[var(--secondary)] font-semibold gap-1.5;
+            }
+          }
+        }
+
+        &__collection-content {
+          @apply w-auto ml-6 my-4 pl-4 lg:pl-8 border-l border-[#D3D5D9];
+
+          p {
+            @apply pt-4;
+          }
+
+          & > .documents__container {
+            @apply border-t-0 pt-0 mt-0;
+
+            & > :last-child {
+              @apply border-b-0;
+            }
+          }
+        }
+      }
+    }
   }
 
   &__content-block {

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

@@ -166,7 +166,7 @@
       }
 
       &-container {
-        @apply w-12 h-12 relative flex-none;
+        @apply w-20 h-20 relative flex-none mr-4;
       }
 
       &-badge {

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

@@ -0,0 +1,64 @@
+.success-image {
+  --success: #28a745;
+
+  width: 100px;
+  height: 100px;
+  margin: auto;
+
+  .animation-success__checkmark {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    display: block;
+    stroke-width: 5;
+    stroke: var(--success);
+    stroke-miterlimit: 10;
+    box-shadow: inset 0 0 0 #4bb71b;
+    animation: fill 0.4s ease-in-out 0.4s forwards,
+      scale 0.3s ease-in-out 0.09s both;
+    position: relative;
+    top: 5px;
+    right: 5px;
+    margin: 0 auto;
+  }
+
+  .animation-success__checkmark__circle {
+    stroke-dasharray: 166;
+    stroke-dashoffset: 166;
+    stroke-width: 5;
+    stroke-miterlimit: 10;
+    stroke: var(--success);
+    fill: #fff;
+    animation: stroke 0.6s cubic-bezier(0.65, 0, 0.45, 1) forwards;
+  }
+
+  .animation-success__checkmark__check {
+    transform-origin: 50% 50%;
+    stroke-dasharray: 48;
+    stroke-dashoffset: 48;
+    animation: stroke 0.3s cubic-bezier(0.65, 0, 0.45, 1) 0.8s forwards;
+  }
+
+  @keyframes stroke {
+    100% {
+      stroke-dashoffset: 0;
+    }
+  }
+
+  @keyframes scale {
+    0%,
+    100% {
+      transform: none;
+    }
+
+    50% {
+      transform: scale3d(1.1, 1.1, 1);
+    }
+  }
+
+  @keyframes fill {
+    100% {
+      box-shadow: inset 0 0 0 30 var(--success);
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+.tribute-container {
+  @apply w-full relative;
+
+  #results {
+    @apply absolute max-h-[225px] top-full left-0 right-0 p-0 my-2 rounded z-50 overflow-y-scroll bg-white border border-gray-3;
+
+    li {
+      @apply flex items-center gap-2 cursor-pointer px-4 py-2;
+    }
+
+    li:hover {
+      @apply cursor-pointer bg-background;
+    }
+
+    img {
+      @apply rounded-full w-6 h-6 object-cover;
+    }
+
+    span,
+    strong {
+      @apply font-semibold text-sm text-secondary;
+    }
+
+    small {
+      @apply font-normal text-gray-2 text-xs;
+    }
+
+    svg {
+      @apply w-4 h-4 text-primary fill-current;
+    }
+
+    .is-group {
+      @apply ml-auto flex items-center gap-1;
+    }
+  }
+}

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

@@ -58,7 +58,7 @@
   @import "stylesheets/decidim/_hero.scss";
   @import "stylesheets/decidim/_actions.scss";
   @import "stylesheets/decidim/_emoji.scss";
-  @import "stylesheets/decidim/_hashtags.scss";
+  @import "stylesheets/decidim/_success_image.scss";
 }
 
 @import "stylesheets/decidim/vendor/datepicker_light.scss";

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

@@ -0,0 +1,5 @@
+.geocoding-container {
+  .user-device-location button {
+    @apply mt-4;
+  }
+}

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

@@ -1,13 +1,6 @@
-/*
-  NOTE: Bad practice. These dependencies should not be loaded in this way (as static files),
-  but leaflet makes use of image files, which are being wrong resolved by webpack,
-  as currently is missing the "file-loader" in the webpack.config.js
-
-  See https://github.com/Leaflet/Leaflet/issues/4849 for further info
-*/
-@import "stylesheets/decidim/legacy/leaflet";
-@import "stylesheets/decidim/legacy/MarkerCluster";
-@import "stylesheets/decidim/legacy/MarkerCluster.Default";
+@import "leaflet/dist/leaflet";
+@import "leaflet.markercluster/dist/MarkerCluster";
+@import "leaflet.markercluster/dist/MarkerCluster.Default";
 
 /* overwrite leaflet and card styles */
 .leaflet-popup-content-wrapper {
@@ -30,6 +23,10 @@
       @apply font-sans text-white;
     }
 
+    &-metadata svg {
+      @apply fill-current;
+    }
+
     &-title {
       @apply truncate;
     }

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

@@ -0,0 +1,31 @@
+.resource_history {
+  @apply flex flex-col gap-3.5 lg:gap-[20px] p-4;
+
+  &__item {
+    @apply flex flex-row gap-2.5;
+
+    &_icon {
+      @apply w-8 h-8 rounded-full border-secondary border flex justify-center items-center;
+
+      &-creation {
+        @apply bg-secondary w-6 h-6 rounded-full flex justify-center items-center;
+      }
+    }
+
+    &_content {
+      @apply flex flex-col lg:items-center lg:flex-row lg:gap-1;
+    }
+
+    &_date {
+      @apply text-sm text-gray-2;
+    }
+  }
+
+  &_text {
+    @apply flex flex-col lg:flex-none lg:block relative;
+  }
+
+  &__line {
+    @apply absolute -left-[26px] lg:-left-[130px] top-3.5 lg:top-[26px] w-px h-full bg-secondary;
+  }
+}

data/app/permissions/decidim/default_permissions.rb

@@ -5,8 +5,6 @@ module Decidim
   # actions by any kind of user. Also works as a default implementation so other
   # components can inherit from it and get some convenience methods.
   class DefaultPermissions
-    include Decidim::UserRoleChecker
-
     def initialize(user, permission_action, context = {})
       @user = user
       @permission_action = permission_action

data/app/permissions/decidim/permissions.rb

@@ -24,6 +24,7 @@ module Decidim
       user_group_action?
       user_group_invitations_action?
       apply_endorsement_permissions if permission_action.subject == :endorsement
+      show_my_location_button?
 
       permission_action
     end
@@ -56,7 +57,6 @@ module Decidim
 
       return allow! if component.published?
       return allow! if user_can_preview_component?
-      return allow! if user_can_admin_component?
       return allow! if user_can_admin_component_via_space?
 
       disallow!
@@ -106,19 +106,7 @@ module Decidim
         return allow! if component.current_settings.amendment_creation_enabled
       when :accept,
           :reject
-        return disallow! unless component.current_settings.amendment_reaction_enabled
-
-        amendable = context.fetch(:amendable, nil)
-
-        if amendable.respond_to?(:official?) && amendable.official?
-          return allow! if user.admin?
-
-          return disallow!
-        end
-
-        return disallow! unless amendable.authored_by?(user)
-
-        return allow!
+        return allow! if component.current_settings.amendment_reaction_enabled
       when :promote
         return allow! if component.current_settings.amendment_promotion_enabled
       end
@@ -175,7 +163,7 @@ module Decidim
     end
 
     def user_can_preview_component?
-      return allow! if context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token])
+      context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token], user:)
     rescue ActiveRecord::RecordNotFound, StandardError
       nil
     end
@@ -205,6 +193,12 @@ module Decidim
       end
     end
 
+    def show_my_location_button?
+      return unless permission_action.action == :locate && permission_action.subject == :geolocation
+
+      allow!
+    end
+
     def not_already_active?(authorization)
       Verifications::Authorizations.new(organization: user.organization, user:, name: authorization.name).none?
     end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the shared logic for `Decidim::User` and `Decidim::UserGroup`
+    # presenters for the `AdminLog`.
+    class BaseUserPresenter < Decidim::Log::BasePresenter
+      private
+
+      def i18n_params
+        super.merge(
+          blocked_count: blocked_users.count,
+          unblocked_count: unblocked_users.count,
+          unreported_users_count: unreported_users.count
+        )
+      end
+
+      def blocked_users
+        action_log.extra.dig("extra", "blocked")&.values || []
+      end
+
+      def unblocked_users
+        action_log.extra.dig("extra", "unblocked")&.values || []
+      end
+
+      def unreported_users
+        action_log.extra.dig("extra", "unreported")&.values || []
+      end
+
+      def current_justification
+        action_log.extra.dig("extra", "current_justification") || Hash.new("")
+      end
+
+      def changeset
+        config = changeset_config[action.to_s]
+        return {} unless config
+
+        original = config[:original].call
+        return {} if original.values.flatten.all?(&:empty?)
+
+        Decidim::Log::DiffChangesetCalculator.new(original, config[:fields], i18n_labels_scope).changeset
+      end
+
+      def changeset_config
+        {
+          "bulk_block" => {
+            original: -> { { justification: [blocked_users.join(", "), current_justification] } },
+            fields: { justification: :string }
+          },
+          "bulk_unblock" => {
+            original: -> { { unblocked_users: ["", unblocked_users.join(", ")] } },
+            fields: { unblocked_users: :string }
+          },
+          "bulk_ignore" => {
+            original: -> { { unreported_users: ["", unreported_users.join(", ")] } },
+            fields: { unreported_users: :string }
+          }
+        }
+      end
+
+      # override this as it not depend on the old version
+      def has_diff?
+        diff_actions.include?(action.to_s) && changeset.any?
+      end
+    end
+  end
+end

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

@@ -29,9 +29,9 @@ module Decidim
 
       def action_string
         case action
-        when "export_component"
+        when "export_component", "soft_delete", "restore"
           "decidim.admin_log.component.#{action}"
-        when "create", "delete", "publish", "unpublish", "update_permissions"
+        when "create", "delete", "publish", "unpublish", "update_permissions", "update_filters"
           generate_action_string(action)
         else
           super
@@ -48,7 +48,7 @@ module Decidim
       end
 
       def diff_actions
-        super + %w(unpublish update_permissions)
+        super + %w(unpublish update_permissions update_filters)
       end
 
       def i18n_params
@@ -70,6 +70,35 @@ module Decidim
                       })
         end
       end
+
+      def changeset
+        changes = action_log.version.changeset
+        mapping = diff_fields_mapping
+        if action == "update_filters"
+          changes = {
+            "taxonomy_filters" => [
+              filters_for(action_log.version.changeset["settings"].first.dig("global", "taxonomy_filters")),
+              filters_for(action_log.version.changeset["settings"].last.dig("global", "taxonomy_filters"))
+            ]
+          }
+          mapping = { taxonomy_filters: :array }
+        end
+        Decidim::Log::DiffChangesetCalculator.new(
+          changes,
+          mapping,
+          i18n_labels_scope
+        ).changeset
+      end
+
+      def filters_for(ids)
+        return [] if ids.blank?
+
+        @filters_ids ||= {}
+        ids.map do |id|
+          @filters_ids[id] ||= Decidim::TaxonomyFilter.find_by(id: ids)
+          @filters_ids[id] ? "#{id}: #{@filters_ids[id].translated_internal_name}" : id
+        end
+      end
     end
   end
 end

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

@@ -12,6 +12,8 @@ module Decidim
     #    view_helpers # => this comes from the views
     #    ModerationPresenter.new(action_log, view_helpers).present
     class ModerationPresenter < Decidim::Log::BasePresenter
+      include Decidim::TranslatableAttributes
+
       private
 
       def diff_fields_mapping
@@ -23,7 +25,7 @@ module Decidim
 
       def action_string
         case action
-        when "hide", "unreport"
+        when "hide", "unreport", "bulk_hide", "bulk_unhide", "bulk_unreport"
           "decidim.admin_log.moderation.#{action}"
         else
           super
@@ -36,12 +38,37 @@ module Decidim
 
       def i18n_params
         super.merge(
-          resource_type: action_log.extra.dig("extra", "reportable_type").try(:demodulize)
+          resource_type: action_log.extra.dig("extra", "reportable_type").try(:demodulize),
+          reported_count: action_log.extra.dig("extra", "reported_count") || "?"
         )
       end
 
+      def reported_content
+        action_log.extra.dig("extra", "reported_content") || {}
+      end
+
+      # Overwrite the changeset.
+      def changeset
+        types = changeset_config.keys.index_with { |_key| :string }
+        Decidim::Log::DiffChangesetCalculator.new(changeset_config, types, "decidim.admin.admin_log.changeset").changeset
+      end
+
+      def changeset_config
+        reported_content.to_h do |key, items|
+          [
+            key.to_sym,
+            ["", items.values.map { |title| translated_attribute(title) }.join(", ")]
+          ]
+        end
+      end
+
+      # override this as it not depend on the old version
+      def has_diff?
+        diff_actions.include?(action.to_s) && changeset.any?
+      end
+
       def diff_actions
-        super + %w(unreport)
+        super + %w(unreport bulk_hide bulk_unhide bulk_unreport)
       end
     end
   end