decidim-system 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a7dfcd6e16bc1926175c0a8984d57f20765998e3756201065f079b4abb4eec8
-  data.tar.gz: 71ebfe9db5aa560a844bd23e773d1d3b5dca20decf775c16ee2fb0f7b43d1135
+  metadata.gz: 9a13e278028184766cd3a5a7a2f3c225a42a231e4d1ea790fdd3e2a7049b2446
+  data.tar.gz: 16990b3fb9011f5296039152d4017d689b4fa924f7f5877a7fcbba39a2aaa526
 SHA512:
-  metadata.gz: ec5d77a8da664af12298253509b6674e127af5c0c9a2d9bedd7f2be453691ec827d5060df53d3020e60bb47e767a3fac647ef96bda334144254b2bf39c0e9085
-  data.tar.gz: 7b20e019799d86f83568de5d0a5c5d7533a7f1f61fd141a9216e93fee5e9db5d29eeb12761beefa344b8eab9b06b127c14a484508622b9a92fe231b9ec57ef0d
+  metadata.gz: ccf6a125d14b87455c6d37eea06cb1bb65d8b6bb81c9f205c6ecd671d89a7f7538970684406689eddbf7fa16be0c8fb501c5ec0f7a740ebb1de676d1bde66a5e
+  data.tar.gz: 0d15b289d10046b71e486af2f553f909c6dd7edaba01e4f0666146207b725f3866c6818d002efb2211284936a68ea0f1d331b6eaa75d597f1db7c68c67c46c73

data/README.md

@@ -40,22 +40,34 @@ When using Decidim as multi-tenant, you should keep these in mind:
 
 ## Managing System admins
 
-Currently Decidim doesn't provide a way to create the first System Admin in a new deployment. To do it, you should open a Rails console in your application and
-create it:
+For logging in to this dashboard, you'll need to create a system admin account from your terminal:
 
-```ruby
-Decidim::System::Admin.create!(
-  email: "your-email@example.org",
-  password: "your-safe-password",
-  password_confirmation: "your-safe-password"
-)
+```bash
+bin/rails decidim_system:create_admin
 ```
 
-Once you have created your first admin you can access the system dashboard at `https://your-decidim-deployment-host/system` and login with your newly created user.
+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.
+
+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.
+
 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. ⚠️
 
+. 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
+system_admin.password = "decidim123456789"                                    # change for something secure
+system_admin.password_confirmation = "decidim123456789"
+system_admin.save
+```
+
 ## Managing organizations
 
 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

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

@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic when creating a new admin in
     # the system.
-    class CreateAdmin < Rectify::Command
+    class CreateAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic to create the default content blocks
     # for a newly-created organization.
-    class CreateDefaultContentBlocks < Rectify::Command
+    class CreateDefaultContentBlocks < Decidim::Command
       DEFAULT_CONTENT_BLOCKS =
         [:hero, :sub_hero, :highlighted_content_banner, :how_to_participate, :stats, :metrics, :footer_sub_hero].freeze
 

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

@@ -5,7 +5,7 @@ module Decidim
     # 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.
-    class CreateDefaultPages < Rectify::Command
+    class CreateDefaultPages < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

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

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # Creates an OAuthApplication.
-    class CreateOAuthApplication < Rectify::Command
+    class CreateOAuthApplication < Decidim::Command
       # Initializes the command.
       #
       # form - The source fo data for this OAuthApplication.

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

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # This command deals with destroying an application from the admin panel.
-    class DestroyOAuthApplication < Rectify::Command
+    class DestroyOAuthApplication < Decidim::Command
       # Public: Initializes the command.
       #
       # application - The OAuthApplication to be destroyed.

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

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # A command that will create default help pages for an organization.
-    class PopulateHelp < Rectify::Command
+    class PopulateHelp < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - An organization
@@ -49,8 +49,8 @@ module Decidim
         end
       end
 
-      def multi_translation(key, *arguments)
-        Decidim::TranslationsHelper.multi_translation(key, @organization.available_locales, *arguments)
+      def multi_translation(key, **arguments)
+        Decidim::TranslationsHelper.multi_translation(key, @organization.available_locales, **arguments)
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Decidim
     # 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.
-    class RegisterOrganization < Rectify::Command
+    class RegisterOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
@@ -24,6 +24,7 @@ module Decidim
 
         @organization = nil
         invite_form = nil
+        invitation_failed = false
 
         transaction do
           @organization = create_organization
@@ -31,8 +32,10 @@ module Decidim
           PopulateHelp.call(@organization)
           CreateDefaultContentBlocks.call(@organization)
           invite_form = invite_user_form(@organization)
-          return broadcast(:invalid) 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)

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

@@ -4,7 +4,7 @@ module Decidim
   module System
     # A command with all the business logic when updating an admin in
     # the system.
-    class UpdateAdmin < Rectify::Command
+    class UpdateAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

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

@@ -3,7 +3,7 @@
 module Decidim
   module System
     # Updates the OAuth application given form data.
-    class UpdateOAuthApplication < Rectify::Command
+    class UpdateOAuthApplication < Decidim::Command
       # Initializes the command.
       #
       # application - The OAuthApplication to update.

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

@@ -5,7 +5,7 @@ module Decidim
     # 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.
-    class UpdateOrganization < Rectify::Command
+    class UpdateOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

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

@@ -15,6 +15,8 @@ module Decidim
       validates :password, presence: true, unless: :admin_exists?
       validates :password_confirmation, presence: true, unless: :admin_exists?
 
+      validates :password, password: { email: :email }
+
       validate :email, :email_uniqueness
 
       private

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

@@ -10,34 +10,31 @@ module Decidim
 
       mimic :organization_file_uploads
 
-      attribute :allowed_file_extensions, Hash[Symbol => String]
-      attribute :allowed_content_types, Hash[Symbol => String]
-      attribute :maximum_file_size, Hash[Symbol => Float]
+      attribute(:allowed_file_extensions, { Symbol => String })
+      attribute(:allowed_content_types, { Symbol => String })
+      attribute(:maximum_file_size, { Symbol => Float })
 
       def map_model(settings_hash)
-        settings_hash = begin
-          if settings_hash.is_a?(Hash)
-            default_settings.deep_merge(settings_hash.deep_stringify_keys)
-          else
-            default_settings
-          end
-        end
+        settings_hash = if settings_hash.is_a?(Hash)
+                          default_settings.deep_merge(settings_hash.deep_stringify_keys)
+                        else
+                          default_settings
+                        end
 
-        attribute_set.each do |attr|
-          key = attr.name.to_s
-          next unless settings_hash.has_key?(key)
+        csv_attributes.each do |attr|
+          next unless settings_hash.has_key?(attr.to_s)
 
           # For the view, the array values need to be in comma separated format
           # in order for them to work correctly with the tags inputs.
-          value = Rectify::FormAttribute.new(attr).value_from(
-            settings_hash[key]
-          )
+          value = settings_hash[attr.to_s]
           value.each do |k, v|
             value[k] = v.join(",") if v.is_a?(Array)
           end
 
-          self[key] = value
+          send("#{attr}=", value)
         end
+
+        self.maximum_file_size = settings_hash["maximum_file_size"]
       end
 
       # This turns the attributes passed from the view into the final
@@ -46,8 +43,7 @@ module Decidim
       # the view layer. Before we save those attributes, they need to be
       # converted into arrays which is what this method does.
       def final
-        csv_attributes = [:allowed_file_extensions, :allowed_content_types]
-        attributes.tap do |attr|
+        to_h.tap do |attr|
           csv_attributes.each do |key|
             attr[key] = csv_array_setting(attr[key])
           end
@@ -60,6 +56,10 @@ module Decidim
         Decidim::OrganizationSettings.default(:upload)
       end
 
+      def csv_attributes
+        @csv_attributes ||= [:allowed_file_extensions, :allowed_content_types]
+      end
+
       def csv_array_setting(original)
         original.transform_values do |value|
           value.split(",")

data/app/models/decidim/system/admin.rb

@@ -8,6 +8,8 @@ module Decidim
 
       validates :email, uniqueness: true
 
+      validates :password, password: { email: :email }
+
       private
 
       # Changes default Devise behaviour to use ActiveJob to send async emails.

data/app/packs/entrypoints/decidim_system.js

@@ -1,2 +1,3 @@
 import "src/decidim/system/application"
 import "entrypoints/decidim_system.scss"
+import "src/decidim/direct_uploads/upload_field"

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

@@ -15,6 +15,7 @@ $-zf-bp-value: null;
 @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;

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,4 +1,14 @@
+---
 ar:
+  activemodel:
+    attributes:
+      oauth_application:
+        organization_name: المنظمة
+      organization:
+        from_email: عنوان البريد الإلكتروني
+        password: الكلمة السرية
+        port: المنفذ
+        user_name: اسم المستخدم
   decidim:
     system:
       actions:
@@ -41,6 +51,9 @@ ar:
           name: مشرف
           validations:
             email_uniqueness: يوجد مشرف آخر بنفس البريد الإلكتروني بالفعل
+        oauth_application:
+          fields:
+            organization_name: المنظمة
         organization:
           actions:
             save_and_invite: إنشاء منظمة ودعوة المشرف
@@ -72,6 +85,9 @@ ar:
           twitter:
             api_key: مفتاح API
             api_secret: سر API
+        smtp_settings:
+          fieldsets:
+            sender: المُرسِل
         update:
           error: حدثت مشكلة أثناء تحديث هذه المؤسسة.
           success: تم تحديث المنظمة بنجاح.

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   decidim:
     system:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:

data/config/locales/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -57,6 +58,9 @@ de:
         update:
           error: Beim Aktualisieren dieses Administrators ist ein Fehler aufgetreten.
           success: Administrator wurde erfolgreich aktualisiert
+      dashboard:
+        show:
+          current_organizations: Aktuelle Organisationen
       default_pages:
         placeholders:
           content: Fügen Sie der statischen Seite %{page} im Admin-Dashboard sinnvollen Inhalt hinzu.
@@ -112,6 +116,9 @@ de:
           error: Beim Erstellen dieser Anwendung ist ein Fehler aufgetreten.
           success: Die Anwendung wurde erfolgreich aktualisiert.
       organizations:
+        advanced_settings:
+          hide: Erweiterte Einstellungen ausblenden
+          show: Zeige erweiterte Einstellungen
         create:
           error: Beim Erstellen einer neuen Organisation ist ein Fehler aufgetreten.
           success: Organisation erfolgreich erstellt

data/config/locales/el.yml

@@ -1,3 +1,4 @@
+---
 el:
   decidim:
     system:

data/config/locales/eo.yml

@@ -1 +1,2 @@
+---
 eo:

data/config/locales/es-MX.yml

@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:

data/config/locales/es-PY.yml

@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:

data/config/locales/et.yml

@@ -1 +1,2 @@
+---
 et:

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:

data/config/locales/fi-plain.yml

@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:

data/config/locales/fr-CA.yml

@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:

data/config/locales/ga-IE.yml

@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:

data/config/locales/gl.yml

@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:

data/config/locales/hr.yml

@@ -1 +1,2 @@
+---
 hr:

data/config/locales/hu.yml

@@ -1,3 +1,4 @@
+---
 hu:
   decidim:
     system:

data/config/locales/id-ID.yml

@@ -1,3 +1,4 @@
+---
 id:
   decidim:
     system:

data/config/locales/is-IS.yml

@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     system:
       actions:

data/config/locales/it.yml

@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:

data/config/locales/ja.yml

@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:

data/config/locales/ko.yml

@@ -1 +1,2 @@
+---
 ko:

data/config/locales/lb.yml

@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:

data/config/locales/lt.yml

@@ -1 +1,2 @@
+---
 lt:

data/config/locales/lv.yml

@@ -1,3 +1,4 @@
+---
 lv:
   decidim:
     system:

data/config/locales/mt.yml

@@ -1 +1,2 @@
+---
 mt:

data/config/locales/nl.yml

@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:

data/config/locales/om-ET.yml

@@ -1 +1,2 @@
+---
 om:

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       oauth_application:

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   decidim:
     system:

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   decidim:
     system:

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   decidim:
     system:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

data/config/locales/sr-CS.yml

@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     system:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -62,11 +63,11 @@ sv:
           current_organizations: Nuvarande organisationer
       default_pages:
         placeholders:
-          content: Lägg till relevant innehåll på den statiska sidan %{page} på administratörspanelen.
+          content: Lägg till relevant innehåll på den statiska sidan %{page} på adminpanelen.
           title: Standardtitel för %{page}
       menu:
         admins: Administratörer
-        dashboard: Kontrollpanel
+        dashboard: Adminpanel
         oauth_applications: OAuth appar
         organizations: Organisationer
       models:
@@ -174,4 +175,4 @@ sv:
           no_organization_warning_html: Kom igång genom att skapa en organisation. Läs %{guide} innan du fortsätter.
           our_getting_started_guide: vår startguide
       titles:
-        dashboard: Kontrollpanel
+        dashboard: Adminpanel

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   decidim:
     system:

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/db/seeds.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-if !Rails.env.production? || ENV["SEED"]
+if !Rails.env.production? || ENV.fetch("SEED", nil)
   print "Creating seeds for decidim-system...\n" unless Rails.env.test?
 
-  password = ENV["DECIDIM_SYSTEM_USER_PASSWORD"] || "decidim123456"
+  password = ENV.fetch("DECIDIM_SYSTEM_USER_PASSWORD", "decidim123456789")
 
   Decidim::System::Admin.find_or_initialize_by(email: "system@example.org").update!(
     password: password,

data/lib/decidim/system/engine.rb

@@ -7,7 +7,6 @@ require "devise"
 require "devise-i18n"
 require "decidim/core"
 require "foundation_rails_helper"
-require "rectify"
 
 module Decidim
   module System

data/lib/decidim/system/test/factories.rb

@@ -4,8 +4,8 @@ require "decidim/core/test/factories"
 
 FactoryBot.define do
   factory :admin, class: "Decidim::System::Admin" do
-    sequence(:email) { |n| "admin#{n}@citizen.corp" }
-    password { "password1234" }
-    password_confirmation { "password1234" }
+    sequence(:email) { |n| "admin#{n}@example.org" }
+    password { "decidim123456789" }
+    password_confirmation { "decidim123456789" }
   end
 end

data/lib/decidim/system/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-system version.
   module System
     def self.version
-      "0.26.0"
+      "0.27.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-system
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 description: System administration to create new organization in an installation.
 email:
 - josepjaume@gmail.com
@@ -275,14 +275,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim system administration