decidim-system 0.27.9 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d888e7c3b1c8a38ecea2e6a9f4883bfebf9a6deb55fc523f30373c1b1a6aa631
-  data.tar.gz: 9450f0e7ecfeb04e58a24b945ed13e11447e504cf3429cdc26680928338eed3e
+  metadata.gz: 70370fff5369d1099a226723a77145a27c19ee6ff1e214ff4bb6d8fc445934bd
+  data.tar.gz: 9d38c13b4de6dc0348aeeb2d38038e73241aebf162f967aa2d706e57f20f856c
 SHA512:
-  metadata.gz: 3471c6c4dc5de5cfc2b316e00de9019b7969272417844db85e64929e08111bd9ee231e1b2914e4e680848df2ae09fd9b48fd9c9a4a86af28767d0fa8269aaa08
-  data.tar.gz: 0bbc56016de6b0e6a58927210931d38142ce139da58e5dfb5d9b090423925ee4da73c245f41e0cc1b19a0ad5682da9565aca67b58253cfe2fa76aa12bf34917c
+  metadata.gz: c81b3698abfbfda68d44bd5c5c33609358ce58d63d2b7bbbad7fa7eca463ac72b3a9bf36d58316f1bc9a11083e6a48c25fe7450518425b6106fc4b1eb03eac6e
+  data.tar.gz: 55060e2ef6cd99807b4c9e61ea110e7cbdc43724ef1963a54c1011fbfcabd7f41140c9db0d523d78a25ead5d3ce7b053663d36bc70f90ed0b268ca7ac2010aec

data/README.md

@@ -27,9 +27,9 @@ When using Decidim as multi-tenant, you should keep these in mind:
 
 * All organizations share the same database.
 * Each organization must have a different hostname.
-* Users aren't shared between each organization (the same email can be registered in different organizations and it will be considered as different users).
+* Users are not shared between each organization (the same email can be registered in different organizations and it will be considered as different users).
 * All configuration related to Decidim (`Decidim.config`) is shared between the organizations.
-* Stylesheets aren't customizable per-tenant so UI styles (colors and other variables) are shared.
+* Stylesheets are not customizable per-tenant so UI styles (colors and other variables) are shared.
 
 ## Glossary
 
@@ -40,26 +40,29 @@ When using Decidim as multi-tenant, you should keep these in mind:
 
 ## Managing System admins
 
-For logging in to this dashboard, you'll need to create a system admin account from your terminal:
+For logging in to this dashboard, you will need to create a system admin account from your terminal:
 
 ```bash
 bin/rails decidim_system:create_admin
 ```
 
-You'll be asked for an email and a password. For security, the password will not get displayed back at you and you'll need to confirm it.
+You will be asked for an email and a password. For security, the password will not get displayed back at you and you will need to confirm it.
 
 Once you have created your first admin you can access the system dashboard at `/system`. For instance, if you have Decidim running at `https://example.org`, this URL would be `https://example.org/system`.
-You'll be able to login with your newly created user.
+You will be able to login with your newly created user.
 
 From the system dashboard you can add new admins.
 
-⚠️ If you need to reset your administrator password you'll need to do it by entering the Rails console and changing it manually. ⚠️
+⚠️ If you need to reset your administrator password you will need to do it by entering the Rails console and changing it manually. ⚠️
 
 . Open the rails console:
+
 ```bash
 bin/rails console
 ```
+
 . Run the following instructions, changing them accordingly:
+
 ```ruby
 system_admin = Decidim::System::Admin.order(:id).first                        # for the first system admin
 system_admin = Decidim::System::Admin.find_by_email "system@example.org"      # if you already know the email
@@ -73,7 +76,7 @@ system_admin.save
 Once you have your system admin setup you can also start managing the organizations in your deploy. To do it, login at the system dashboard and create a new organization
 following the form instructions. After creating it, a new admin user will be created and invited to start managing it.
 
-Remember that System admins and regular Admins are completely different users (they don't even share the same database table), so you can't use your
+Remember that System admins and regular Admins are completely different users (they do not even share the same database table), so you cannot use your
 system user to login in as an organization admin.
 
 ## Contributing

data/app/commands/decidim/system/create_admin.rb

@@ -15,7 +15,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/system/create_default_content_blocks.rb

@@ -19,24 +19,11 @@ module Decidim
       #
       # Returns nothing.
       def call
-        content_blocks.each_with_index do |manifest, index|
-          weight = (index + 1) * 10
-          Decidim::ContentBlock.create(
-            decidim_organization_id: organization.id,
-            weight: weight,
-            scope_name: :homepage,
-            manifest_name: manifest.name,
-            published_at: Time.current
-          )
-        end
+        Decidim::ContentBlocksCreator.new(organization).create_default!
       end
 
       private
 
-      def content_blocks
-        Decidim.content_blocks.for(:homepage).select(&:default)
-      end
-
       attr_reader :organization
     end
   end

data/app/commands/decidim/system/create_default_pages.rb

@@ -14,16 +14,20 @@ module Decidim
       end
 
       # Executes the command.
+      # i18n-tasks-use t('decidim.system.default_pages.terms-of-service')
       #
       # Returns nothing.
       def call
         Decidim::StaticPage::DEFAULT_PAGES.map do |slug|
-          Decidim::StaticPage.find_or_create_by!(organization: organization, slug: slug) do |page|
-            page.title = localized_attribute(slug, :title)
-            page.content = localized_attribute(slug, :content)
+          static_page = Decidim::StaticPage.find_or_create_by!(organization:, slug:) do |page|
+            translated_slug = I18n.t(slug, scope: "decidim.system.default_pages")
+            page.title = localized_attribute(translated_slug, :title)
+            page.content = localized_attribute(translated_slug, :content)
             page.show_in_footer = true
-            page.allow_public_access = true if slug == "terms-and-conditions"
+            page.allow_public_access = true if slug == "terms-of-service"
           end
+
+          create_summary_content_blocks_for(static_page) if slug == "terms-of-service"
         end
       end
 
@@ -40,6 +44,21 @@ module Decidim
           result.update(locale => text)
         end
       end
+
+      def create_summary_content_blocks_for(page)
+        content_block_summary = Decidim::ContentBlock.create(
+          organization:,
+          scope_name: :static_page,
+          manifest_name: :summary,
+          weight: 1,
+          scoped_resource_id: page.id,
+          published_at: Time.current
+        )
+
+        translated_slug = I18n.t(page.slug, scope: "decidim.system.default_pages")
+        content_block_summary.settings = { summary: localized_attribute(translated_slug, :summary) }
+        content_block_summary.save!
+      end
     end
   end
 end

data/app/commands/decidim/system/populate_help.rb

@@ -27,7 +27,7 @@ module Decidim
             slug: "help",
             title: multi_translation("decidim.help.main_topic.default_page.title", organization: @organization.name),
             content: multi_translation("decidim.help.main_topic.default_page.content", organization: @organization.name),
-            topic: topic,
+            topic:,
             organization: @organization,
             weight: 0
           )
@@ -40,7 +40,7 @@ module Decidim
               title: multi_translation("#{scope}.title"),
               content: multi_translation("#{scope}.page"),
               slug: manifest.name,
-              topic: topic,
+              topic:,
               organization: @organization
             )
 

data/app/commands/decidim/system/register_organization.rb

@@ -2,9 +2,6 @@
 
 module Decidim
   module System
-    class InvitationFailedError < ActiveRecord::RecordInvalid
-    end
-
     # A command with all the business logic when creating a new organization in
     # the system. It creates the organization and invites the admin to the
     # system.
@@ -19,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -27,6 +24,7 @@ module Decidim
 
         @organization = nil
         invite_form = nil
+        invitation_failed = false
 
         transaction do
           @organization = create_organization
@@ -34,14 +32,13 @@ module Decidim
           PopulateHelp.call(@organization)
           CreateDefaultContentBlocks.call(@organization)
           invite_form = invite_user_form(@organization)
-          raise InvitationFailedError if invite_form.invalid?
+          invitation_failed = invite_form.invalid?
         end
+        return broadcast(:invalid) if invitation_failed
 
         Decidim::InviteUser.call(invite_form) if @organization && invite_form
 
         broadcast(:ok)
-      rescue InvitationFailedError
-        broadcast(:invalid_invitation)
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         broadcast(:invalid)
       end
@@ -67,10 +64,23 @@ module Decidim
           omniauth_settings: form.encrypted_omniauth_settings,
           smtp_settings: form.encrypted_smtp_settings,
           send_welcome_notification: true,
-          file_upload_settings: form.file_upload_settings.final
+          file_upload_settings: form.file_upload_settings.final,
+          colors: default_colors,
+          content_security_policy: form.content_security_policy
         )
       end
 
+      def default_colors
+        {
+          alert: "#ec5840",
+          primary: "#53bf40",
+          success: "#57d685",
+          warning: "#ffae00",
+          tertiary: "#bf4053",
+          secondary: "#4053bf"
+        }
+      end
+
       def invite_user_form(organization)
         Decidim::InviteUserForm.from_params(
           name: form.organization_admin_name,

data/app/commands/decidim/system/update_admin.rb

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/system/update_organization.rb

@@ -17,7 +17,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -53,6 +53,7 @@ module Decidim
         organization.omniauth_settings = form.encrypted_omniauth_settings
         organization.smtp_settings = form.encrypted_smtp_settings
         organization.file_upload_settings = form.file_upload_settings.final
+        organization.content_security_policy = form.content_security_policy
 
         organization.save!
       end

data/app/controllers/decidim/system/application_controller.rb

@@ -6,7 +6,7 @@ module Decidim
     class ApplicationController < ActionController::Base
       include FormFactory
       include PayloadInfo
-      include HttpCachingDisabler
+      include Headers::HttpCachingDisabler
       include DisableRedirectionToExternalHost
 
       protect_from_forgery with: :exception, prepend: true

data/app/controllers/decidim/system/dashboard_controller.rb

@@ -7,6 +7,7 @@ module Decidim
 
       def show
         @organizations = Organization.all
+        @admins = Admin.all
       end
 
       def check_organizations_presence

data/app/controllers/decidim/system/organizations_controller.rb

@@ -9,7 +9,7 @@ module Decidim
       helper Decidim::OmniauthHelper
 
       def new
-        @form = form(RegisterOrganizationForm).instance
+        @form = form(RegisterOrganizationForm).from_params(default_params)
         @form.file_upload_settings = form(FileUploadSettingsForm).from_model({})
       end
 
@@ -18,15 +18,10 @@ module Decidim
 
         RegisterOrganization.call(@form) do
           on(:ok) do
-            flash[:notice] = t("organizations.create.success", scope: "decidim.system")
+            flash[:notice] = t("organizations.create.success_html", scope: "decidim.system", host: @form.host, email: @form.organization_admin_email)
             redirect_to organizations_path
           end
 
-          on(:invalid_invitation) do
-            flash.now[:alert] = t("organizations.create.error_invitation", scope: "decidim.system")
-            render :new
-          end
-
           on(:invalid) do
             flash.now[:alert] = t("organizations.create.error", scope: "decidim.system")
             render :new
@@ -43,8 +38,8 @@ module Decidim
       end
 
       def edit
-        organization = Organization.find(params[:id])
-        @form = form(UpdateOrganizationForm).from_model(organization)
+        @organization = Organization.find(params[:id])
+        @form = form(UpdateOrganizationForm).from_model(@organization)
       end
 
       def update
@@ -63,8 +58,34 @@ module Decidim
         end
       end
 
+      def resend_invitation
+        organization = Organization.find(params[:id])
+        InviteUserAgain.call(organization.users.first, "invite_admin") do
+          on(:ok) do
+            flash[:notice] = t("organizations.resend_invitation.success", scope: "decidim.system")
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("organizations.resend_invitation.error", scope: "decidim.system")
+          end
+        end
+
+        redirect_to organizations_path
+      end
+
       private
 
+      def default_params
+        {
+          host: request.host,
+          organization_admin_name: current_admin.email.split("@")[0],
+          organization_admin_email: current_admin.email,
+          available_locales: Decidim.available_locales.map(&:to_s),
+          default_locale: Decidim.default_locale,
+          users_registration_mode: "enabled"
+        }
+      end
+
       # The current organization for the request.
       #
       # Returns an Organization.

data/app/forms/decidim/system/admin_form.rb

@@ -22,7 +22,7 @@ module Decidim
       private
 
       def email_uniqueness
-        return unless Admin.where(email: email).where.not(id: id).any?
+        return unless Admin.where(email:).where.not(id:).any?
 
         errors.add(:email, I18n.t("models.admin.validations.email_uniqueness",
                                   scope: "decidim.system"))

data/app/forms/decidim/system/update_organization_form.rb

@@ -29,6 +29,18 @@ module Decidim
         [:authentication, String],
         [:enable_starttls_auto, Boolean]
       ]
+
+      jsonb_attribute :content_security_policy, [
+        [:"default-src", String],
+        [:"img-src", String],
+        [:"media-src", String],
+        [:"script-src", String],
+        [:"style-src", String],
+        [:"frame-src", String],
+        [:"font-src", String],
+        [:"connect-src", String]
+      ]
+
       attribute :password, String
       attribute :file_upload_settings, FileUploadSettingsForm
 
@@ -46,7 +58,6 @@ module Decidim
 
       validates :name, :host, :users_registration_mode, presence: true
       validate :validate_organization_uniqueness
-      validate :validate_secret_key_base_for_encryption
       validates :users_registration_mode, inclusion: { in: Decidim::Organization.users_registration_modes }
 
       def map_model(model)
@@ -76,9 +87,7 @@ module Decidim
       def encrypted_smtp_settings
         smtp_settings["from"] = set_from
 
-        encrypted = smtp_settings.merge(encrypted_password: Decidim::AttributeEncryptor.encrypt(password))
-        # if all are empty, nil is returned so it does not break ENV vars configuration
-        encrypted.values.all?(&:blank?) ? nil : encrypted
+        smtp_settings.merge(encrypted_password: Decidim::AttributeEncryptor.encrypt(password))
       end
 
       def set_from
@@ -88,26 +97,16 @@ module Decidim
       end
 
       def encrypted_omniauth_settings
-        encrypted = omniauth_settings.transform_values do |v|
+        omniauth_settings.transform_values do |v|
           Decidim::OmniauthProvider.value_defined?(v) ? Decidim::AttributeEncryptor.encrypt(v) : v
         end
-        # if all are empty, nil is returned so it does not break ENV vars configuration
-        encrypted.values.all?(&:blank?) ? nil : encrypted
       end
 
       private
 
       def validate_organization_uniqueness
-        errors.add(:name, :taken) if Decidim::Organization.where(name: name).where.not(id: id).exists?
-        errors.add(:host, :taken) if Decidim::Organization.where(host: host).where.not(id: id).exists?
-      end
-
-      # We need a valid secret key base for encrypting the SMTP password with it
-      # It is also necessary for other things in Rails (like Cookies encryption)
-      def validate_secret_key_base_for_encryption
-        return if Rails.application.secrets.secret_key_base&.length == 128
-
-        errors.add(:password, I18n.t("activemodel.errors.models.organization.attributes.password.secret_key"))
+        errors.add(:name, :taken) if Decidim::Organization.where(name:).where.not(id:).exists?
+        errors.add(:host, :taken) if Decidim::Organization.where(host:).where.not(id:).exists?
       end
     end
   end

data/app/jobs/decidim/system/application_job.rb

@@ -4,7 +4,7 @@ module Decidim
   module System
     # Custom ApplicationJob scoped to the system panel.
     #
-    class ApplicationJob < ActiveJob::Base
+    class ApplicationJob < Decidim::ApplicationJob
     end
   end
 end

data/app/mailers/decidim/system/application_mailer.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # Custom application mailer, scoped to the system mailer.
+    #
+    class ApplicationMailer < ActionMailer::Base
+      default from: Decidim.config.mailer_sender
+      layout "mailer"
+    end
+  end
+end

data/app/packs/entrypoints/decidim_system.js

@@ -1,3 +1,5 @@
-import "src/decidim/system/application"
-import "entrypoints/decidim_system.scss"
-import "src/decidim/direct_uploads/upload_field"
+// Images
+require.context("../images", true)
+
+// CSS
+import "stylesheets/decidim/system/application.scss"

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

@@ -1,22 +1,109 @@
-$primary-color: null;
-$secondary-color: null;
-$success-color: null;
-$warning-color: null;
-$alert-color: null;
-$-zf-size: null;
-$-zf-bp-value: null;
-
-@import "stylesheets/decidim/system/foundation_and_overrides";
-@import "stylesheets/decidim/system/layout";
-@import "stylesheets/decidim/system/login";
-@import "stylesheets/decidim/system/sidebar";
-@import "stylesheets/decidim/system/tables";
-@import "stylesheets/decidim/system/actions";
-@import "stylesheets/decidim/system/forms";
-@import "stylesheets/decidim/editor";
-@import "stylesheets/decidim/utils/fontface";
-@import "stylesheets/decidim/modules/upload_modal";
-
-body{
-  font-family: 'Source Sans Pro', sans-serif;
+@import "tom-select/dist/scss/tom-select";
+
+:root {
+  --primary: #e02d2d;
+  --primary-rgb: 224 45 45;
+  --secondary: #155abf;
+  --secondary-rgb: 21 90 191;
+  --tertiary: #ebc34b;
+  --tertiary-rgb: 235 195 75;
+  --success: #28a745;
+  --success-rgb: 40 167 69;
+  --warning: #ffb703;
+  --warning-rgb: 255 183 3;
+  --alert: #e7131a;
+  --alert-rgb: 231 19 26;
+}
+
+aside {
+  @apply bg-gray-4 w-full md:w-1/6 min-w-[250px] flex-none text-white relative translate-x-0 transition;
+
+  &[aria-hidden="true"] {
+    @apply absolute -translate-x-full;
+  }
+}
+
+.main-nav {
+  li {
+    @apply border-l-2 border-transparent font-semibold hover:bg-black transition;
+
+    &.active {
+      @apply border-primary bg-black;
+    }
+  }
+
+  a {
+    @apply block p-4;
+  }
+}
+
+table {
+  @apply w-full border-collapse;
+
+  th {
+    @apply font-semibold bg-background;
+  }
+
+  td,
+  th {
+    @apply p-2 text-center first:text-left;
+  }
+
+  tr:nth-child(even) td {
+    @apply bg-gray-3;
+  }
+
+  a {
+    @apply text-primary underline;
+  }
+}
+
+[id^="advanced-settings"] {
+  &[aria-expanded="false"] span:first-child,
+  &[aria-expanded="true"] span:last-child {
+    @apply block;
+  }
+
+  &[aria-expanded="false"] span:last-child,
+  &[aria-expanded="true"] span:first-child {
+    @apply hidden;
+  }
+
+  &[aria-hidden="true"] {
+    @apply hidden;
+  }
+}
+
+dl {
+  dt {
+    @apply font-semibold;
+  }
+
+  dd {
+    @apply text-gray-2;
+  }
+
+  dt + dd,
+  dd + dt {
+    @apply mt-4;
+  }
+}
+
+.flash__message {
+  p {
+    @apply my-4;
+  }
+
+  ol {
+    @apply list-decimal;
+  }
+}
+
+/* overwrite tom-select defaults */
+.ts-control {
+  margin-bottom: 0.5rem;
+}
+
+.ts-dropdown {
+  margin: 0;
 }

data/app/views/decidim/system/admins/_form.html.erb

@@ -1,11 +1,5 @@
-<div class="field">
+<div class="form__wrapper">
   <%= form.text_field :email, autofocus: true %>
-</div>
-
-<div class="field">
   <%= form.password_field :password %>
-</div>
-
-<div class="field">
   <%= form.password_field :password_confirmation %>
 </div>

data/app/views/decidim/system/admins/edit.html.erb

@@ -1,13 +1,13 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <% provide :title do %>
-  <h2><%= t ".title" %></h2>
+  <h1 class="h1"><%= t ".title" %></h1>
 <% end %>
 
 <%= decidim_form_for(@form) do |f| %>
   <%= render partial: "form", object: f %>
 
-  <div class="actions">
-    <%= f.submit t(".update") %>
+  <div class="form__wrapper-block">
+    <%= f.submit t(".update"), class: "button button__sm md:button__lg button__primary" %>
   </div>
 <% end %>