toggled framework defaults

.ruby-version

-2.7.8
+3.1.4
\ No newline at end of file

Gemfile.lock

@@ -264,8 +264,6 @@ GEM
     nokogiri (1.15.2)
     nokogiri (1.15.2)
       mini_portile2 (~> 2.8.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
       racc (~> 1.4)
-    nokogiri (1.15.2-x64-mingw32)
-      racc (~> 1.4)
     notiffany (0.1.3)
     notiffany (0.1.3)
       nenv (~> 0.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
       shellany (~> 0.0)
@@ -276,7 +274,6 @@ GEM
       ast (~> 2.4.1)
       ast (~> 2.4.1)
       racc
       racc
     pg (1.5.3)
     pg (1.5.3)
-    pg (1.5.3-x64-mingw32)
     pry (0.14.2)
     pry (0.14.2)
       coderay (~> 1.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
       method_source (~> 1.0)
@@ -394,7 +391,6 @@ GEM
       spring (>= 0.9.1)
       spring (>= 0.9.1)
     sqlite3 (1.6.3)
     sqlite3 (1.6.3)
       mini_portile2 (~> 2.8.0)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (1.6.3-x64-mingw32)
     sshkit (1.21.4)
     sshkit (1.21.4)
       net-scp (>= 1.1.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
       net-ssh (>= 2.8.0)

app/services/nilm/add_nilm_by_key.rb

@@ -12,7 +12,8 @@ class AddNilmByKey
     required_keys =
     required_keys =
         [:port, :scheme, :name, :api_key, :auth_key]
         [:port, :scheme, :name, :api_key, :auth_key]
 
 
-
+    # sanitize parameters so the next line doesn't raise an exception:
+    request_params.slice!(*required_keys+[:name_is_host, :base_uri])
     joule_params = request_params.permit(required_keys+[:name_is_host, :base_uri])
     joule_params = request_params.permit(required_keys+[:name_is_host, :base_uri])
     # since we're not explicitly checking for base_uri, give it a default value
     # since we're not explicitly checking for base_uri, give it a default value
     # it should always be present but may be "" which causes the require action to fail
     # it should always be present but may be "" which causes the require action to fail

config/application.rb

@@ -24,6 +24,7 @@ module ControlPanel
     config.load_defaults 7.0
     config.load_defaults 7.0
 
 
     config.active_support.cache_format_version = 7.0
     config.active_support.cache_format_version = 7.0
+    config.active_support.disable_to_s_conversion = true
 
 
     config.middleware.use Rack::Deflater
     config.middleware.use Rack::Deflater
 
 

config/initializers/new_framework_defaults_7_0.rb

@@ -113,7 +113,7 @@ Rails.application.config.action_dispatch.default_headers = {
 # If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
 # If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
 # is `:marshal`. The default for new apps is `:json`.
 # is `:marshal`. The default for new apps is `:json`.
 #
 #
-# Rails.application.config.action_dispatch.cookies_serializer = :json
+Rails.application.config.action_dispatch.cookies_serializer = :json
 #
 #
 #
 #
 # To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
 # To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
@@ -135,12 +135,12 @@ Rails.application.config.action_dispatch.default_headers = {
 # See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
 # See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
 
 
 # Change the return value of `ActionDispatch::Request#content_type` to the Content-Type header without modification.
 # Change the return value of `ActionDispatch::Request#content_type` to the Content-Type header without modification.
-# Rails.application.config.action_dispatch.return_only_request_media_type_on_content_type = false
+Rails.application.config.action_dispatch.return_only_request_media_type_on_content_type = false
 
 
 # Active Storage `has_many_attached` relationships will default to replacing the current collection instead of appending to it.
 # Active Storage `has_many_attached` relationships will default to replacing the current collection instead of appending to it.
 # Thus, to support submitting an empty collection, the `file_field` helper will render an hidden field `include_hidden` by default when `multiple_file_field_include_hidden` is set to `true`.
 # Thus, to support submitting an empty collection, the `file_field` helper will render an hidden field `include_hidden` by default when `multiple_file_field_include_hidden` is set to `true`.
 # See https://guides.rubyonrails.org/configuring.html#config-active-storage-multiple-file-field-include-hidden for more information.
 # See https://guides.rubyonrails.org/configuring.html#config-active-storage-multiple-file-field-include-hidden for more information.
-# Rails.application.config.active_storage.multiple_file_field_include_hidden = true
+Rails.application.config.active_storage.multiple_file_field_include_hidden = true
 
 
 # ** Please read carefully, this must be configured in config/application.rb (NOT this file) **
 # ** Please read carefully, this must be configured in config/application.rb (NOT this file) **
 # Disables the deprecated #to_s override in some Ruby core classes
 # Disables the deprecated #to_s override in some Ruby core classes