Merge pull request #282 from AlchemyCMS/alchemy-8.3

Update Alchemy to 8.3

Author: tvdeyen

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - "8.2-stable"
+          - "8.3-stable"
         ruby:
           - "3.3"
           - "3.4"

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "8.2-stable")
+alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "8.3-stable")
 gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
 
 rails_version = ENV.fetch("RAILS_VERSION", "8.0")

alchemy-devise.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
 
-  s.add_dependency "alchemy_cms", [">= 8.2.0", "< 9.0"]
+  s.add_dependency "alchemy_cms", [">= 8.3.0", "< 9.0"]
   s.add_dependency "devise", ">= 4.9", "< 6.0"
   s.add_dependency "flickwerk", ["~> 0.3.6"]
 

app/assets/builds/alchemy-devise.css

@@ -1 +1 @@
-@import "alchemy-devise/login";
+@use "alchemy-devise/login";

app/assets/stylesheets/alchemy-devise.scss

@@ -25,10 +25,11 @@ body.passwords {
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
+  --form-right-column-width: 1.65fr;
 
   alchemy-message {
-    width: 300px;
-    margin-left: var(--form-left-column-width);
+    width: 281px;
+    margin-left: auto;
   }
 
   .no-js & {
@@ -40,17 +41,6 @@ body.passwords {
   }
 
   .submit {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: var(--spacing-4);
-    margin-left: var(--form-left-column-width);
-    padding-left: var(--spacing-0);
-
-    &.align-right {
-      justify-content: end;
-    }
-
     > label {
       text-align: start;
 
@@ -63,6 +53,8 @@ body.passwords {
       display: inline-flex;
       align-items: center;
       gap: var(--spacing-0);
+      grid-column: 2;
+      grid-row: 1;
 
       &:hover {
         alchemy-icon {

app/assets/stylesheets/alchemy-devise/login.scss

@@ -87,7 +87,7 @@ def secure_attributes
       end
 
       def while_signup?
-        User.count == 0
+        @_while_signup ||= User.count == 0
       end
 
       def signup_admin_or_redirect

app/controllers/alchemy/admin/users_controller.rb

@@ -1,21 +1,22 @@
-<%= f.input :firstname, input_html: {autocomplete: "given-name"} %>
-<%= f.input :lastname, input_html: {autocomplete: "family-name"} %>
-<%= f.input :login, autofocus: true, required: f.object.login_required?, input_html: {autocomplete: "username"} %>
-<%= f.input :email, required: f.object.email_required?, input_html: {autocomplete: "email"} %>
+<%= f.input :firstname, input_html: {autocomplete: while_signup? ? "given-name" : "off"} %>
+<%= f.input :lastname, input_html: {autocomplete: while_signup? ? "family-name" : "off"} %>
+<%= f.input :login, autofocus: true, required: f.object.login_required?, input_html: {autocomplete: while_signup? ? "username" : "off"} %>
+<%= f.input :email, required: f.object.email_required?, input_html: {autocomplete: while_signup? ? "email" : "off"} %>
 <% if Alchemy::I18n.available_locales.many? %>
   <div class="input select">
     <%= f.label(:language) %>
     <%= render Alchemy::Admin::LocaleSelect.new(f.field_name(:language), auto_submit: false) %>
   </div>
 <% end %>
-<%= f.input :password, required: while_signup?, input_html: {autocomplete: "new-password"} %>
-<%= f.input :password_confirmation, required: while_signup?, input_html: {autocomplete: "new-password"} %>
+<%= f.input :password, required: while_signup?, input_html: {autocomplete: while_signup? ? "new-password" : "off"} %>
+<%= f.input :password_confirmation, required: while_signup?, input_html: {autocomplete: while_signup? ? "new-password" : "off"} %>
 <%= f.input :timezone,
   collection: ActiveSupport::TimeZone.all, label_method: :to_s, value_method: :name,
+  include_blank: Alchemy.t("Default"),
   input_html: {
     is: "alchemy-select",
     data: {allow_clear: true}
-  } %>
+  }, hint: Alchemy.t("admin.users.preferred_timezone", server_timezone: Time.zone) %>
 <% if local_assigns[:user_roles] && can_update_role? %>
   <%= f.input :alchemy_roles,
     collection: user_roles,
@@ -35,8 +36,11 @@
       object: f.object %>
   </div>
 <% end %>
-<%= f.input :send_credentials, as: 'boolean' %>
-<div class="submit align-right">
+<div class="submit">
+  <label class="checkbox">
+    <%= f.check_box :send_credentials %>
+    <%= Alchemy.config.user_class.human_attribute_name :send_credentials %>
+  </label>
   <button type="submit">
     <%= Alchemy.t(:save) %>
   </button>

app/views/alchemy/admin/users/_fields.html.erb

@@ -8,7 +8,7 @@
         alchemy.edit_admin_user_path(user), {
           title: Alchemy.t(:edit_user),
           overflow: true,
-          size: "430x530"
+          size: "460x530"
         },
         title: Alchemy.t(:edit_user) %>
     <% else %>
@@ -28,5 +28,5 @@
     <%= user.human_roles_string %>
   <% end %>
   <% table.delete_button tooltip: Alchemy.t(:delete_user), confirm_message: Alchemy.t(:confirm_to_delete_user) %>
-  <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "430x530" %>
+  <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "460x530" %>
 <% end %>

app/views/alchemy/admin/users/_resource_table.html.erb

@@ -12,7 +12,7 @@
     tooltip_placement: "top-start",
     dialog_options: {
       title: Alchemy.t(:create_user),
-      size: "430x530"
+      size: "460x530"
     },
     if_permitted_to: [:create, Alchemy::User]
   ) %>