decidim-friendly_signup 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c631ec440674f278ea3a0f3369435831014443e36f2f4247d1a87d914e7e66c8
-  data.tar.gz: cf5ca968cfe4459a63471e02ff36dd38f28cfb042c3146e175c3766dab4a6571
+  metadata.gz: 88bd76deb088270153f2b8d9dc3376d1f6333c0429e2433c2f896870027cbd30
+  data.tar.gz: d2e2efec13ef916c6835e8f09b4d50e8e20ddef3c05a1f41bf24b51a1054c074
 SHA512:
-  metadata.gz: cdd1a58fad3b2b40cb5f73497c3ca408a621afce743073b40c9fee720a4e9050e0d5a8f3b495e5024b6e807ce7fe8c61859e264259fd3ccec30424d025114bb3
-  data.tar.gz: b0437d886f9018aaed1a3f405f52032d77c8c01ec7f1f40bb8a61b708138f1eeedbacb424ab394d26048c7bb643d14b3579ddce4954cd5c2af521fea6ffc8f38
+  metadata.gz: 4a23dbcb2623314b4fcfbe30b8025b97309049beb28a2ab66ab0bb070498624509805054e2fc476f04f078fd56ed3161f49c66accae5b5d06b9537547d1fcbdd
+  data.tar.gz: f5312068c52ccb019f87e1af5beabc72e7f85396aee34ab4b1799001dcb905e17962c042186c55b749af4a4a69bdb19b7b915cfad4581e17bccb8e96529e31fe

data/README.md

@@ -18,7 +18,7 @@ This module simply substitutes some pages to ease up the registration process in
 
 - [x] Simplify the password field and add a button with a "show password". ![Show/hide password](examples/passwords.png)
  
-- [ ] Remove the nickname field from the registration process and automatically create one on registering
+- [x] Remove the nickname field from the registration process and automatically create one on registering. ![Hide nickname](examples/nickname.png)
 - [x] Instant validate parameters when registering without having to send it for backend validation. ![Instant validation](examples/instant_validation.png)
 - [ ] Use checkout codes to validate the email instead of a link
 
@@ -51,6 +51,7 @@ Depending on your Decidim version, choose the corresponding FriendlySignup versi
 
 | FriendlySignup version | Compatible Decidim versions |
 |---|---|
+| 0.3.x | 0.26.x |
 | 0.2.x | 0.26.x |
 | 0.1.x | 0.26.x |
 
@@ -67,6 +68,9 @@ Decidim::FriendlySignup.configure do |config|
 
   # Automatically validate user inputs in the register form (default is true):
   config.use_instant_validation = false
+
+  # Hide nickname field and create one automatically from user's name or email (default is true)
+  config.hide_nickname = false
 end
 ```
 

data/app/forms/concerns/decidim/friendly_signup/auto_nickname.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module FriendlySignup
+    module AutoNickname
+      extend ActiveSupport::Concern
+
+      included do
+        def nickname
+          return super unless FriendlySignup.hide_nickname
+
+          UserBaseEntity.nicknamize(name || email, organization: current_organization)
+        end
+
+        private
+
+        # nickname is removed from the view, so put any (that shouldn't ever happen) error on the base
+        def nickname_unique_in_organization
+          return false unless nickname
+
+          if valid_users.find_by("LOWER(nickname)= ? AND decidim_organization_id = ?", nickname.downcase, current_organization.id).present?
+            errors.add :base, :taken
+            errors.add :nickname, :taken
+          end
+        end
+
+        def valid_users
+          UserBaseEntity.where(invitation_token: nil)
+        end
+      end
+    end
+  end
+end

data/app/packs/src/decidim/friendly_signup/lib/instant_validator.js

@@ -15,6 +15,7 @@ export default class InstantValidator {
   }
 
   init() {
+    this.$form.foundation("disableValidation");
     // this final validation prevents abide from resetting the field when user loses focus
     this.$inputs.on("blur", (evt) => {
       this.validate($(evt.currentTarget));

data/app/views/decidim/devise/registrations/new.html.erb

@@ -34,15 +34,17 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "off" %>
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "off", data: { "instant-attribute": "nickname" } %>
               </div>
             </div>
 
-            <div class="user-nickname">
-              <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "off" %>
+            <% unless friendly_override_activated?(:hide_nickname) %>
+              <div class="user-nickname">
+                <div class="field">
+                  <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "off", data: { "instant-attribute": "nickname" } %>
+                </div>
               </div>
-            </div>
+            <% end %>
 
             <div class="field">
               <%= f.email_field :email, autocomplete: "email", data: { "instant-attribute": "email" } %>

data/lib/decidim/friendly_signup/engine.rb

@@ -21,6 +21,7 @@ module Decidim
         Decidim::Devise::InvitationsController.include(Decidim::FriendlySignup::NeedsHeaderSnippets)
         Decidim::Devise::PasswordsController.include(Decidim::FriendlySignup::NeedsHeaderSnippets)
         Decidim::AccountController.include(Decidim::FriendlySignup::NeedsHeaderSnippets)
+        Decidim::RegistrationForm.include(Decidim::FriendlySignup::AutoNickname)
       end
 
       initializer "FriendlySignup.webpacker.assets_path" do

data/lib/decidim/friendly_signup/version.rb

@@ -5,6 +5,6 @@ module Decidim
   module FriendlySignup
     DECIDIM_VERSION = "0.26.2"
     COMPAT_DECIDIM_VERSION = "~> 0.26.0"
-    VERSION = "0.2"
+    VERSION = "0.3"
   end
 end

data/lib/decidim/friendly_signup.rb

@@ -18,6 +18,11 @@ module Decidim
     config_accessor :use_instant_validation do
       true
     end
+
+    # Whether to hide nickname and generate it automatically
+    config_accessor :hide_nickname do
+      true
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-friendly_signup
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -51,6 +51,7 @@ files:
 - app/controllers/concerns/decidim/friendly_signup/needs_header_snippets.rb
 - app/controllers/decidim/friendly_signup/application_controller.rb
 - app/controllers/decidim/friendly_signup/validator_controller.rb
+- app/forms/concerns/decidim/friendly_signup/auto_nickname.rb
 - app/packs/entrypoints/decidim_friendly_signup.js
 - app/packs/entrypoints/decidim_friendly_signup.scss
 - app/packs/images/decidim/friendly_signup/icon.svg