Fix admin interface User state can't save.

Author: huacnlee

Gemfile

@@ -3,14 +3,14 @@ source "https://rubygems.org"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem "jbuilder"
-gem "rails", "~> 8.0.0.beta1"
+gem "rails", "~> 8"
 gem "rails_autolink"
 gem "sass-rails"
 gem "shakapacker", "~> 7.2.1"
 gem "turbolinks"
 gem "uglifier"
 
-gem "view_component", "~> 2.83"
+gem "view_component"
 
 gem "pg"
 

Gemfile.lock

@@ -3,65 +3,65 @@ GEM
   specs:
     action-store (1.1.3)
       rails (>= 5.2)
-    actioncable (8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    actioncable (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      activejob (= 8.0.0.rc2)
-      activerecord (= 8.0.0.rc2)
-      activestorage (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    actionmailbox (8.0.2)
+      actionpack (= 8.0.2)
+      activejob (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
       mail (>= 2.8.0)
-    actionmailer (8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      actionview (= 8.0.0.rc2)
-      activejob (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    actionmailer (8.0.2)
+      actionpack (= 8.0.2)
+      actionview (= 8.0.2)
+      activejob (= 8.0.2)
+      activesupport (= 8.0.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.0.rc2)
-      actionview (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    actionpack (8.0.2)
+      actionview (= 8.0.2)
+      activesupport (= 8.0.2)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      activerecord (= 8.0.0.rc2)
-      activestorage (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    actiontext (8.0.2)
+      actionpack (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    activejob (8.0.2)
+      activesupport (= 8.0.2)
       globalid (>= 0.3.6)
-    activemodel (8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
-    activerecord (8.0.0.rc2)
-      activemodel (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    activemodel (8.0.2)
+      activesupport (= 8.0.2)
+    activerecord (8.0.2)
+      activemodel (= 8.0.2)
+      activesupport (= 8.0.2)
       timeout (>= 0.4.0)
-    activestorage (8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      activejob (= 8.0.0.rc2)
-      activerecord (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    activestorage (8.0.2)
+      actionpack (= 8.0.2)
+      activejob (= 8.0.2)
+      activerecord (= 8.0.2)
+      activesupport (= 8.0.2)
       marcel (~> 1.0)
-    activesupport (8.0.0.rc2)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -124,10 +124,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    date (3.3.4)
+    date (3.4.1)
     derailed_benchmarks (2.2.1)
       base64
       benchmark-ips (~> 2)
@@ -208,13 +208,14 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     http_accept_language (2.1.1)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
@@ -245,8 +246,8 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
-    loofah (2.23.1)
+    logger (1.6.6)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -264,7 +265,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.25.4)
+    minitest (5.25.5)
     minitest-spec-rails (7.3.0)
       minitest (>= 5.0)
       railties (>= 4.1)
@@ -276,24 +277,24 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.5.0)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
-    nokogiri (1.18.1-aarch64-linux-musl)
+    nokogiri (1.18.3-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-musl)
+    nokogiri (1.18.3-x86_64-linux-musl)
       racc (~> 1.4)
     notifications (1.1.0)
       kaminari (>= 0.15)
@@ -348,7 +349,10 @@ GEM
     postmark-rails (0.22.1)
       actionmailer (>= 3.0.0)
       postmark (>= 1.21.3, < 2.0)
-    psych (5.2.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.3)
       date
       stringio
     public_suffix (6.0.1)
@@ -364,7 +368,7 @@ GEM
       rexml (~> 3.2)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.12)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -374,46 +378,47 @@ GEM
       rack (>= 3.0.0, < 4)
     rack-proxy (0.7.7)
       rack
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.0.rc2)
-      actioncable (= 8.0.0.rc2)
-      actionmailbox (= 8.0.0.rc2)
-      actionmailer (= 8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      actiontext (= 8.0.0.rc2)
-      actionview (= 8.0.0.rc2)
-      activejob (= 8.0.0.rc2)
-      activemodel (= 8.0.0.rc2)
-      activerecord (= 8.0.0.rc2)
-      activestorage (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    rails (8.0.2)
+      actioncable (= 8.0.2)
+      actionmailbox (= 8.0.2)
+      actionmailer (= 8.0.2)
+      actionpack (= 8.0.2)
+      actiontext (= 8.0.2)
+      actionview (= 8.0.2)
+      activejob (= 8.0.2)
+      activemodel (= 8.0.2)
+      activerecord (= 8.0.2)
+      activestorage (= 8.0.2)
+      activesupport (= 8.0.2)
       bundler (>= 1.15.0)
-      railties (= 8.0.0.rc2)
+      railties (= 8.0.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.10)
+    rails-i18n (8.0.1)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
+      railties (>= 8.0.0, < 9)
     rails-settings-cached (2.9.5)
       activerecord (>= 5.0.0)
       railties (>= 5.0.0)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (8.0.0.rc2)
-      actionpack (= 8.0.0.rc2)
-      activesupport (= 8.0.0.rc2)
+    railties (8.0.2)
+      actionpack (= 8.0.2)
+      activesupport (= 8.0.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -425,7 +430,7 @@ GEM
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rb_sys (0.9.105)
-    rdoc (6.10.0)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
     recaptcha (5.17.0)
     redcarpet (3.6.0)
@@ -535,10 +540,10 @@ GEM
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.2)
+    stringio (3.1.5)
     thor (1.3.2)
     tilt (2.4.0)
-    timeout (0.4.1)
+    timeout (0.4.3)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -549,19 +554,20 @@ GEM
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.6.0)
-    uri (1.0.2)
+    uri (1.0.3)
     useragent (0.16.11)
     version_gem (1.1.4)
-    view_component (2.83.0)
-      activesupport (>= 5.2.0, < 8.0)
+    view_component (3.21.0)
+      activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   aarch64-linux-musl
@@ -619,7 +625,7 @@ DEPENDENCIES
   qiniu
   rack-attack
   rack-cors
-  rails (~> 8.0.0.beta1)
+  rails (~> 8)
   rails-i18n
   rails-settings-cached
   rails_autolink
@@ -639,7 +645,7 @@ DEPENDENCIES
   turbolinks
   twemoji
   uglifier
-  view_component (~> 2.83)
+  view_component
 
 BUNDLED WITH
    2.6.2

app/models/user.rb

@@ -1,7 +1,7 @@
 require "digest/md5"
 
 class User < ApplicationRecord
-  include Searchable
+  # include Searchable
   include User::SoftDelete
   include User::Avatar
   include User::Deviseable

app/models/user/roles.rb

@@ -7,7 +7,7 @@ module Roles
       enum :state, { deleted: -1, member: 1, blocked: 2, vip: 3, hr: 4, maintainer: 90, admin: 99 }
 
       def self.state_options
-        self.states.map { |key, value| [I18n.t("activerecord.enums.user.state.#{key}"), value] }
+        self.states.map { |key, _| [I18n.t("activerecord.enums.user.state.#{key}"), key] }
       end
 
       # user.admin?