atomic_admin 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a60af477fc58d9334de687508e1eb0ef56f2bef8ec96e5fabd726133e0934b2
-  data.tar.gz: f17e627608ebc01b5b9281cff0af01ebf17d10d06cd4db62744d833fc4b790e9
+  metadata.gz: 9fcb9d4217719b4cf883630148626b1a212bdd1512bec4c3aa7a6584abc1a253
+  data.tar.gz: db0ae794f2c1f4ff8de5e896ab806193d2c7ce1e0f3c5d1e24c920f35b8cd9d2
 SHA512:
-  metadata.gz: 1ca007af30664fd22c363cff5a2e76b8bf818928d9100a9b43af07dcf1ac18a93034d0ec3f89107226ac9e1755e0ec055167f0680d607b0f4bc0eadbeaaa96fb
-  data.tar.gz: f15c1ea152ef5869f3465a1a47bb36dfa7685808cffad13989c42b34d1e8368a984116cf00d5d703202ee4c671a73bd80afbe4fd526a1925b4b78cc57e5237c3
+  metadata.gz: 2a262801ae054590fd97e3335604ccec397537bd04c04474b2d73ae39a5311c28bff4ef8f72e6b3eddda20801b9b3a97f5eebdc46c7c1ce30d48ecf2f3d9e8cf
+  data.tar.gz: 03ce10d91f332d48af7bf3686baed86b8bcbdce48d9127c4c8b50716dd9fbb4bd48c22284f1c387296c68ba0f59404c4cf4de0cee54d52407545051be068173d

data/app/controllers/atomic_admin/v1/application_instances_controller.rb

@@ -61,8 +61,12 @@ module AtomicAdmin::V1
 
     def destroy
       instance = ApplicationInstance.find(params[:id])
-      instance.destroy
-      render json: { success: true }
+
+      if destroy_instance(instance)
+        render json: { success: true }
+      else
+        render json: { errors: instance.errors }, status: 422
+      end
     end
 
     def interactions
@@ -71,8 +75,21 @@ module AtomicAdmin::V1
       render json: { interactions: interactions }
     end
 
+    # Host apps store the tenant on an application instance in one of two ways:
+    # older schemas have a `tenant` string column, newer ones have `tenant_key`
+    # plus a `tenant` association. Returns nil if the app has neither, in which
+    # case we skip stats rather than raising.
+    def tenant_column
+      return @tenant_column if defined?(@tenant_column)
+
+      columns = ApplicationInstance.column_names
+      @tenant_column = ["tenant", "tenant_key"].find { |column| columns.include?(column) }&.to_sym
+    end
+
     def get_stats_for_instances(instances)
-      tenants = instances.pluck(:tenant)
+      return {} if tenant_column.nil?
+
+      tenants = instances.pluck(tenant_column)
       stats = {}
       stats[:errors] = RequestStatistic.total_errors_grouped(tenants) if defined?(RequestStatistic)
       stats[:unique_users] = CachedUniqueUsersByContractDate.unique_users_by_contract_date(instances) if defined?(CachedUniqueUsersByContractDate)
@@ -82,12 +99,15 @@ module AtomicAdmin::V1
     end
 
     def request_stats(instance)
-      tenant = instance.tenant
+      tenant = instance[tenant_column] if tenant_column
 
       {
         unique_users_in_contract: @stats.dig(:unique_users, tenant) || 0,
+        # total_errors_grouped returns one tenant => count hash per window,
+        # ordered [today, 7 days, 30 days, 365 days]. These are array indexes,
+        # not day counts.
         day_1_errors: @stats.dig(:errors, 0, tenant) || 0,
-        day_7_errors: @stats.dig(:errors, 7, tenant) || 0,
+        day_7_errors: @stats.dig(:errors, 1, tenant) || 0,
         max_users_month: @stats.dig(:max_users_month, tenant) || 0,
       }
     end
@@ -109,6 +129,33 @@ module AtomicAdmin::V1
 
     protected
 
+    # Deletes an application instance.
+    #
+    # Host apps whose ApplicationInstance implements soft-delete semantics get
+    # them automatically. This matters because a hard destroy strands the
+    # Apartment tenant schema along with any tenant-keyed data (request
+    # statistics and the like), and removes the only row naming that tenant --
+    # which hides it from reapers that discover tenants by grouping
+    # ApplicationInstance rows, making the orphan permanent rather than delayed.
+    #
+    # Override this method for anything more involved, such as notifying an
+    # external service before deleting.
+    #
+    # Returns truthy on success. Note that #soft_delete is typically implemented
+    # with #update, so it runs validations: an instance that is invalid for
+    # unrelated reasons will return false here rather than being deleted.
+    def destroy_instance(instance)
+      return instance.soft_delete if instance.respond_to?(:soft_delete)
+
+      Rails.logger.warn(
+        "AtomicAdmin: #{instance.class} does not respond to #soft_delete, falling back to a hard " \
+        "destroy. This may orphan the tenant schema and tenant-keyed data. Define " \
+        "#soft_delete on #{instance.class} to opt into soft deletion.",
+      )
+
+      instance.destroy
+    end
+
     def sortable_columns
       [
         "created_at",
@@ -140,7 +187,7 @@ module AtomicAdmin::V1
     end
 
     def create_params
-      params.require(:application_instance).except(:is_paid, :lti_config_xml, :site, :application).permit!
+      params.require(:application_instance).except(:is_paid, :lti_config_xml, :site, :application, :request_stats).permit!
     end
 
     def update_params

data/app/controllers/atomic_admin/v1/lti_installs_controller.rb

@@ -21,8 +21,12 @@ module AtomicAdmin::V1
 
     def destroy
       install = find_install
-      install.destroy
-      render json: install
+
+      if install.destroy
+        render json: install
+      else
+        render json: { errors: install.errors }, status: 422
+      end
     end
 
     protected

data/app/controllers/atomic_admin/v1/lti_platforms_controller.rb

@@ -29,8 +29,12 @@ module AtomicAdmin::V1
 
     def destroy
       platform = find_platform
-      platform.destroy
-      render json: platform
+
+      if platform.destroy
+        render json: platform
+      else
+        render json: { errors: platform.errors }, status: 422
+      end
     end
 
     protected

data/app/controllers/atomic_admin/v1/sites_controller.rb

@@ -24,8 +24,12 @@ module AtomicAdmin::V1
 
     def destroy
       @site = Site.find(params[:id])
-      @site.destroy!
-      render json: { site: json_for(@site) }
+
+      if @site.destroy
+        render json: { site: json_for(@site) }
+      else
+        render json: { errors: @site.errors }, status: 422
+      end
     end
 
     protected

data/app/controllers/atomic_admin/v1/tenant_client_id_strategies_controller.rb

@@ -29,8 +29,12 @@ module AtomicAdmin::V1
 
     def destroy
       pinned_client_id = find_pinned_client_id
-      pinned_client_id.destroy
-      render json: { pinned_client_id: pinned_client_id }
+
+      if pinned_client_id.destroy
+        render json: { pinned_client_id: pinned_client_id }
+      else
+        render json: { errors: pinned_client_id.errors }, status: 422
+      end
     end
 
     protected

data/app/controllers/atomic_admin/v1/tenant_deployments_controller.rb

@@ -26,8 +26,12 @@ module AtomicAdmin::V1
 
     def destroy
       deployment = find_deployment
-      deployment.destroy
-      render json: { deployment: deployment }
+
+      if deployment.destroy
+        render json: { deployment: deployment }
+      else
+        render json: { errors: deployment.errors }, status: 422
+      end
     end
 
     protected

data/app/controllers/atomic_admin/v1/tenant_platform_guid_strategies_controller.rb

@@ -34,8 +34,12 @@ module AtomicAdmin::V1
 
     def destroy
       pinned_platform_guid = find_pinned_platform_guid
-      pinned_platform_guid.destroy
-      render json: { pinned_platform_guid: pinned_platform_guid }
+
+      if pinned_platform_guid.destroy
+        render json: { pinned_platform_guid: pinned_platform_guid }
+      else
+        render json: { errors: pinned_platform_guid.errors }, status: 422
+      end
     end
 
     protected

data/lib/atomic_admin/version.rb

@@ -1,3 +1,3 @@
 module AtomicAdmin
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic_admin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Nick Benoit
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-16 00:00:00.000000000 Z
+date: 2026-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Engine to provide apis that power the Atomic Jolt admin app