decidim-admin 0.20.0 → 0.23.1.rc1

data/app/assets/stylesheets/decidim/admin/modules/_process-header.scss

@@ -1,6 +1,5 @@
 .assembly-header__title,
 .process-header__title{
-  text-transform: uppercase;
   font-size: .8rem;
   margin-bottom: 1rem;
   color: $muted;

data/app/assets/stylesheets/decidim/admin/modules/_secondary-nav.scss

@@ -49,7 +49,11 @@ $process-title-height: 3rem;
 
 .secondary-nav--subnav,
 .process-content{
-  padding-top: 2rem;
+  padding-top: 1rem;
+
+  & > .card:first-child{
+    margin-top: -2rem;
+  }
 
   @include breakpoint(large){
     min-height: calc(100% - #{$process-title-height});
@@ -60,7 +64,6 @@ $process-title-height: 3rem;
 .secondary-nav__title,
 .process-title-content{
   margin-bottom: 1.5rem;
-  text-transform: uppercase;
   font-size: .8rem;
   letter-spacing: .1em;
   font-weight: bold;

data/app/assets/stylesheets/decidim/admin/modules/_table-list.scss

@@ -7,10 +7,7 @@
 //Table list
 .table-list{
   border-collapse: collapse;
-
-  th{
-    text-transform: uppercase;
-  }
+  border-spacing: 0;
 
   th,
   td{
@@ -24,18 +21,18 @@
 
   th:first-child,
   td:first-child{
-    padding-left: 0;
+    padding-left: $global-padding;
   }
 
   th:last-child,
   td:last-child{
-    padding-right: 0;
+    padding-right: $global-padding;
     text-align: right;
   }
 
   th [type="checkbox"]:only-child,
   td [type="checkbox"]:only-child{
-    margin-bottom: 0;
+    margin-bottom: .5rem;
   }
 
   &.table-list--lastcenter{
@@ -115,3 +112,22 @@
 .table-list__state{
   text-align: center;
 }
+
+.table-list__type-icon{
+  position: relative;
+  top: 1px;
+  cursor: pointer;
+}
+
+.table-list__type-label{
+  display: none;
+  position: relative;
+  top: -1px;
+  margin-left: -1.5 * $global-padding;
+  font-size: 80%;
+  font-weight: 600;
+
+  &.expanded{
+    display: inline-block;
+  }
+}

data/app/assets/stylesheets/decidim/admin/modules/_tabs.scss

@@ -40,6 +40,13 @@
   }
 }
 
+.form{
+  .language-change{
+    height: 2rem;
+    margin-bottom: 1rem;
+  }
+}
+
 .tab-custom-error-wrapper{
   display: flex;
   flex-wrap: wrap;

data/app/assets/stylesheets/decidim/admin/modules/_users_statistics.scss

@@ -0,0 +1,18 @@
+.table-list.users_count tbody tr td.title{
+  text-align: center;
+  color: $medium-gray;
+}
+
+.table-list.users_count th:not(:first-child),
+.table-list.users_count td:not(:first-child){
+  text-align: center;
+}
+
+.table-list.users_count th:last-child,
+.table-list.users_count td:last-child{
+  text-align: center;
+}
+
+.table-list.users_count th{
+  text-transform: capitalize;
+}

data/app/assets/stylesheets/decidim/admin/utils/_mixins.scss

@@ -18,6 +18,13 @@
   font-size: .9em;
 }
 
+//Small emphasis
+@mixin smallemphasis{
+  font-weight: 600;
+  letter-spacing: .1em;
+  font-size: .9em;
+}
+
 // Status modifier mixin
 $palette: $foundation-palette;
 
@@ -80,3 +87,38 @@ $side:(
 }
 
 @include make-spaces()
+
+  @mixin animation($animation){
+  -webkit-animation: $animation;
+  -o-animation: $animation;
+  animation: $animation;
+}
+
+@mixin spinner($size, $orbit, $satellite, $time){
+  @include animation( animation-spin $time infinite linear );
+  @include square($size);
+
+  box-sizing: border-box;
+  border-radius: 50%;
+  border: floor(($size / 8)) solid $orbit;
+  border-right-color: $satellite;
+  display: inline-block;
+  position: relative;
+}
+
+@mixin size($width, $height){
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size){
+  @include size($size, $size);
+}
+
+@keyframes animation-spin{
+  to{ transform: rotate(1turn); }
+}
+
+@-webkit-keyframes animation-spin{
+  to{ -webkit-transform: rotate(1turn); }
+}

data/app/assets/stylesheets/decidim/admin/utils/_settings.scss

@@ -276,7 +276,7 @@ $breadcrumbs-item-color: $primary-color;
 $breadcrumbs-item-color-current: $black;
 $breadcrumbs-item-color-disabled: $medium-gray;
 $breadcrumbs-item-margin: .75rem;
-$breadcrumbs-item-uppercase: true;
+$breadcrumbs-item-uppercase: false;
 $breadcrumbs-item-separator: true;
 $breadcrumbs-item-separator-color: $medium-gray;
 
@@ -443,6 +443,9 @@ $input-background-focus: $white;
 $input-background-disabled: $light-gray;
 $input-border: 1px solid $light-gray;
 $input-border-focus: 1px solid map-get($foundation-palette, primary);
+$input-outline: 0;
+$input-outline-focus: 2px solid $primary-color;
+$input-outline-offset: 2px;
 $input-padding: $form-spacing / 2;
 $input-shadow: inset 0 1px 2px rgba($black, .1);
 $input-shadow-focus: 0 0 5px $medium-gray;

data/app/cells/decidim/admin/content_block/show.erb

@@ -4,10 +4,10 @@
     <div>
       <% if has_settings? %>
         <%= link_to decidim_admin.edit_organization_homepage_content_block_path(manifest_name), class: "mr-s text-muted" do %>
-          <%= icon "pencil" %>
+          <%= icon "pencil", role: "img" %>
         <% end %>
       <% end %>
-      <%= icon "menu" %>
+      <%= icon "menu", role: "img" %>
     </div>
   </div>
 </li>

data/app/cells/decidim/admin/results_per_page/show.erb

@@ -0,0 +1,16 @@
+<span class="dropdown-menu-inverted_label"><%= t("decidim.admin.actions.per_page") %> :</span>
+<ul class="results-per-page__dropdown dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
+  <li class="is-dropdown-submenu-parent">
+    <a title="<%= %{#{per_page} #{t("decidim.admin.actions.per_page")}} %>">
+      <%= per_page %>
+    </a>
+
+    <ul class="menu">
+      <% per_page_range.each do |num_per_page| %>
+        <li>
+          <%= link_to num_per_page, path_for_num_per_page(num_per_page) %>
+        </li>
+      <% end %>
+    </ul>
+  </li>
+</ul>

data/app/cells/decidim/admin/results_per_page_cell.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ResultsPerPageCell < Decidim::ViewModel
+      property :per_page, :per_page_range
+      delegate :params, to: :controller, prefix: false
+
+      def path_for_num_per_page(num_per_page = per_page_range.first)
+        controller.url_for(params.to_unsafe_h.merge(per_page: num_per_page))
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/create_attachment.rb

@@ -43,10 +43,10 @@ module Decidim
         @attachment = Attachment.new(
           title: form.title,
           description: form.description,
-          file: form.file,
           attached_to: @attached_to,
           weight: form.weight,
-          attachment_collection: form.attachment_collection
+          attachment_collection: form.attachment_collection,
+          file: form.file # Define attached_to before this
         )
       end
 

data/app/commands/decidim/admin/create_newsletter.rb

@@ -8,25 +8,50 @@ module Decidim
       # Initializes the command.
       #
       # form - The source fo data for this newsletter.
+      # content_block - An instance of `Decidim::ContentBlock` that holds the
+      #     newsletter attributes.
       # user - The User that authored this newsletter.
-      def initialize(form, user)
+      def initialize(form, content_block, user)
         @form = form
+        @content_block = content_block
         @user = user
       end
 
       def call
-        return broadcast(:invalid) unless @form.valid?
+        return broadcast(:invalid) unless form.valid?
 
-        newsletter = Decidim.traceability.create!(
+        transaction do
+          create_newsletter
+          create_content_block
+        end
+
+        broadcast(:ok, newsletter)
+      end
+
+      private
+
+      attr_reader :user, :form, :newsletter, :content_block
+
+      def create_newsletter
+        @newsletter = Decidim.traceability.create!(
           Newsletter,
-          @user,
-          subject: @form.subject,
-          body: @form.body,
-          author: @user,
-          organization: @user.organization
+          user,
+          subject: form.subject,
+          author: user,
+          organization: user.organization
         )
+      end
 
-        broadcast(:ok, newsletter)
+      def create_content_block
+        UpdateContentBlock.call(form, content_block, user) do
+          on(:ok) do |content_block|
+            content_block.update(scoped_resource_id: newsletter.id)
+            @content_block = content_block
+          end
+          on(:invalid) do
+            raise "There was a problem persisting the changes to the content block"
+          end
+        end
       end
     end
   end

data/app/commands/decidim/admin/deliver_newsletter.rb

@@ -43,7 +43,7 @@ module Decidim
       end
 
       def recipients
-        @recipients ||= Decidim::Admin::NewsletterRecipients.new(@newsletter, @form).query
+        @recipients ||= Decidim::Admin::NewsletterRecipients.for(@form)
       end
     end
   end

data/app/commands/decidim/admin/destroy_share_token.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic to destroy a share token.
+    class DestroyShareToken < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # share_token - The share_token to destroy
+      # current_user - the user performing the action
+      def initialize(share_token, current_user)
+        @share_token = share_token
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        begin
+          destroy_share_token
+        rescue StandardError
+          broadcast(:invalid)
+        end
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :current_user
+
+      def destroy_share_token
+        Decidim.traceability.perform_action!(
+          "delete",
+          @share_token,
+          current_user
+        ) do
+          @share_token.destroy!
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/reorder_content_blocks.rb

@@ -77,7 +77,7 @@ module Decidim
       def create_content_block(manifest_name, weight)
         Decidim::ContentBlock.create!(
           organization: organization,
-          scope: scope,
+          scope_name: scope,
           weight: weight,
           manifest_name: manifest_name
         )

data/app/commands/decidim/admin/update_component.rb

@@ -33,13 +33,15 @@ module Decidim
       private
 
       def update_component
-        @previous_settings = @component.attributes["settings"].dup
-
+        @previous_settings = @component.attributes["settings"].with_indifferent_access
         @component.name = form.name
+        @component.weight = form.weight
+
+        restore_readonly_settings!
+
         @component.settings = form.settings
         @component.default_step_settings = form.default_step_settings
         @component.step_settings = form.step_settings
-        @component.weight = form.weight
 
         @settings_changed = @component.settings_changed?
 
@@ -57,6 +59,28 @@ module Decidim
       def current_settings
         @component.attributes["settings"]
       end
+
+      # Keep previous values for readonly settings
+      def restore_readonly_settings!
+        browse_readonly_settings("global") do |attribute|
+          form.settings[attribute] = @previous_settings.dig("global", attribute)
+        end
+
+        browse_readonly_settings("step") do |attribute|
+          form.default_step_settings[attribute] = @previous_settings.dig("default_step", attribute) if form.default_step_settings.present?
+          if form.step_settings.present?
+            form.step_settings.each do |step_name, step|
+              step[attribute] = @previous_settings.dig("steps", step_name, attribute)
+            end
+          end
+        end
+      end
+
+      def browse_readonly_settings(settings_name)
+        @component.manifest.settings(settings_name).attributes
+                  .select { |_attribute, obj| obj.readonly?(component: @component) }
+                  .each { |attribute, _obj| yield(attribute) }
+      end
     end
   end
 end

data/app/commands/decidim/admin/update_content_block.rb

@@ -24,13 +24,37 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
+        images_valid = true
+
         transaction do
           update_content_block_settings
+          content_block.save!
+
+          # Saving the images will cause the image file validations to run
+          # according to their uploader settings and the organization settings.
+          # The content block validation will fail in case there are processing
+          # errors on the image files.
+          #
+          # NOTE:
+          # The images can be only stored correctly if the content block is
+          # already persisted. This is not the case e.g. when creating a new
+          # newsletter which uses the content blocks through newsletter
+          # templates. This is why this needs to happen after the initial
+          # `content_block.save!` call.
           update_content_block_images
+          unless content_block.valid?
+            images_valid = false
+            raise ActiveRecord::Rollback
+          end
+
+          # The save method needs to be called another time in order to store
+          # the image information.
           content_block.save!
         end
 
-        broadcast(:ok)
+        return broadcast(:invalid) unless images_valid
+
+        broadcast(:ok, content_block)
       end
 
       private