web47core 2.2.15 → 2.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3b62063f81c04f52de1b3c56a36801555c8294f69e677142754897ec64fd6e
-  data.tar.gz: e2cad54d84e6155e83819d8ea5691df3f4eeba9625f60ffd52ad9ac996967b97
+  metadata.gz: cea55e6cdb8a0620d0823966d23d42cd560f533463adea0ac56859ada94f460a
+  data.tar.gz: 63b6fed27581b79c6d7d9a0f3fa0771520955422c0534ef181efd50e92bc7cfc
 SHA512:
-  metadata.gz: f080ed702713ff2258b811d91de55e53e92e1fe9e3a04ab762ef9a870f4eceda71e048e80440be2efa709bd2c5768e3f0f47070dce2fdbc0c89ea2be97fc9a0d
-  data.tar.gz: 62e0a0483e20b47b5c48370f1643a76ad5abc77075033bf76b17b21fdf2642359ff8fb2336c1ab24aadc29e8855dd194e38c65b71376656c0d61869fe66248dd
+  metadata.gz: '057486e473ce760a06579ee99a27f585edb72ff5651cc4df0c9e3ac6cce63115ea3b9c928c6b96f8d4167673471fe97b51b6cdeb69a66fce34f243ba63a62270'
+  data.tar.gz: 2861256498eb159eb2d5f30bfb272828eafa1341730fc85be2326ba326c5188616249cea13aba3c9f1a2dae0bf758b49f8ff11f477930b6dedb72189fe997d6e

data/app/views/system_configurations/_show.html.haml

@@ -7,6 +7,7 @@
           .card-title=SystemConfiguration.environment.titleize
           .card-tray
             = edit_link_tag(SystemConfiguration, class_action_path(:edit))
+            = replay_link_tag(SystemConfiguration, class_action_path(:sync))
       .card
         .card-content.section-data-tables
           %table.highlight.striped.data-table
@@ -15,7 +16,7 @@
                 =table_header_tag :field
                 =table_header_tag :value
             %tbody
-              - SystemConfiguration.allowed_param_names.each do |field|
+              - SystemConfiguration.allowed_param_names.sort.each do |field|
                 %tr
                   %td=field
                   %td=mask_system_configuration(field)

data/lib/app/controllers/concerns/core_system_configuration_controller.rb

@@ -10,15 +10,26 @@ module CoreSystemConfigurationsController
   # Edit the system configuration
   #
   def edit
-    load_configuration
+    system_configuration
+  end
+
+  # @abstract Cause the system configuration to be synced with the switchboard server
+  def sync
+    raise 'System Configuration not configured to sync' unless SystemConfiguration.switchboard_configured?
+
+    Cron::SwitchboardSyncConfiguration.perform_later
+    flash[:info] = 'System Configuration Refreshing in the Background'
+    redirect_to index_path
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to index_path
   end
 
   #
   # Update and log the system configuration changes
   #
   def update
-    # @system_configuration.update_attributes_and_log! @current_admin_user, system_configuration_params
-    SystemConfiguration.configuration.update! system_configuration_params
+    system_configuration.update! system_configuration_params
     if SystemConfiguration.switchboard_configured?
       flash[:info] = 'System Configuration Updated, sync job running in the background'
       Cron::SwitchboardSyncConfiguration.perform_later
@@ -28,7 +39,7 @@ module CoreSystemConfigurationsController
     redirect_to index_path
   rescue StandardError => error
     log_controller_error error
-    load_configuration
+    system_configuration
     render :edit
   end
 
@@ -44,7 +55,7 @@ module CoreSystemConfigurationsController
   #
   # Load the current system configuration
   #
-  def load_configuration
+  def system_configuration
     @system_configuration = SystemConfiguration.configuration
   end
 end

data/lib/app/models/concerns/aws_configuration.rb

@@ -58,7 +58,7 @@ module AwsConfiguration
 
     # We want this to remake itself each time because it is possible that the
     # => user would change the access keys in between actions. Huh?
-    @aws_s3_client ||= Aws::S3::Client.new(region: aws_vault_bucket_region,
+    @aws_s3_client ||= Aws::S3::Client.new(region: aws_region,
                                            access_key_id: aws_access_key_id,
                                            secret_access_key: aws_secret_access_key)
   end

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '2.2.15'
+  VERSION = '2.2.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 2.2.15
+  version: 2.2.17
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-29 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel