activeadmin-graphql 0.3.0 → 0.3.2

data/docs/issues/20261010111500_graphql-federation-support.md

@@ -0,0 +1,46 @@
+# GraphQL Federation support
+
+## Participants
+
+Andrei Makarov
+
+## Decisions
+
+activeadmin-graphql does not implement GraphQL Federation (Apollo Federation
+v1/v2, subgraph/supergraph, `@key` entities, `_entities` / `_service`). The
+product is one graphql-ruby schema per ActiveAdmin namespace for that admin
+HTTP endpoint.
+
+RFC 0007 `graphql { identity ... }` and `ActiveAdminResource.id` are record
+lookup identity inside that schema. They are not federation entity keys and
+do not emit federation SDL directives.
+
+## Effects
+
+Searched lib, docs, rfcs, spec, and the gemspec for federation, subgraph,
+supergraph, Apollo, `@key`, shareable, apollo-federation, `_entities`, and
+`_service`. No product hits.
+
+Runtime dependencies are `activeadmin` and `graphql` only. Schema build is
+`Class.new(::GraphQL::Schema)` with query, mutation, dataloader, and optional
+visibility (`lib/active_admin/graphql/schema_builder/build.rb`).
+`ResourceInterface` is a local interface for fragment reuse, not a federation
+entity type.
+
+An app could in principle call `graphql_configure_schema` on the built schema
+and layer a federation library itself. That path is neither documented nor
+tested here.
+
+## Next
+
+Keep federation out of scope until a host names a concrete subgraph contract
+and an RFC. Prefer documenting “single-schema admin API; federation
+unsupported” if readers keep asking.
+
+## Source
+
+activeadmin-graphql.gemspec
+lib/active_admin/graphql/schema_builder/build.rb
+lib/active_admin/graphql/resource_interface.rb
+rfcs/0007-graphql-identity.md
+docs/issues/20261010111300_partitions-and-shards-support.md

data/docs/plan/20260817201500_rfc-starter.md

@@ -0,0 +1,31 @@
+# RFC starter pack
+
+## Participants
+
+Andrei Makarov
+
+## Decisions
+
+Pilot the portable RFC form: README, template, RFC 0001 Proposed, RFC 0002 Informational positioning, ids/0001 and ids/0002, CONTRIBUTING and GOVERNANCE pointers.
+
+Isolation is off. Sequential numbering. An RFC specifies a design. Version numbers belong in changelogs. Shipped design specified after the fact is Stable.
+
+## Effects
+
+Starter files written on plan/rfc-process. Process RFC remains Proposed until 2026-08-31.
+
+Later pass 2026-08-18: RFC 0002 marked as positioning. Types and statuses cite rfcs/README.md. Relates dropped from RFC 0002. Process text stays aligned with kiskolabs/pray RFC 0001 until that RFC is Stable.
+
+Later pass 2026-08-18: RFC 0002 rewritten with concrete problems, shipped solutions, and which surfaces need a later Standards Track RFC. RFC 0001 Motivation names those surfaces.
+
+Later pass 2026-08-18: as-built Informational RFCs added for each public contract named in RFC 0002. Describes stays on the current version. Status is Stable. RFC 0002 Relates those documents.
+
+Later pass 2026-08-18: product RFCs specify a design. Suggestion, motivation, specification, effects, alternatives, and prior art. Version numbers belong in changelogs. RFC 0002 stays Informational. RFC 0003 and later are Standards Track Stable. Describes dropped.
+
+## Next
+
+Discuss RFC 0001. Extract amkisko/rfc-process after kiskolabs/pray RFC 0001 is Stable. Replace this hand-copied pack if the prayer differs.
+
+## Source
+
+Upstream: kiskolabs/pray rfcs/0001-rfc-process.md and usr/docs/plan/20260817200400_library-rfc-adoption.md.

data/lib/active_admin/graphql/policy_set_cache.rb

@@ -34,7 +34,7 @@ module ActiveAdmin
 
         def cache_key(subject_owner, subject)
           owner_key = subject_owner_key(subject_owner)
-          "#{owner_key}:#{subject_key(subject)}"
+          "#{owner_key}:#{subject_key(subject_owner, subject)}"
         end
 
         private
@@ -47,13 +47,20 @@ module ActiveAdmin
           end
         end
 
-        def subject_key(subject)
+        def subject_key(subject_owner, subject)
           if subject.is_a?(Class)
             "class:#{subject.name}"
           elsif subject.is_a?(ActiveAdmin::Page)
             "page:#{subject.name}"
           elsif subject.is_a?(ActiveRecord::Base)
-            "record:#{subject.class.name}:#{PrimaryKey.graphql_id_value(subject)}"
+            identity =
+              if subject_owner.respond_to?(:graphql_config)
+                ResourceIdentity.graphql_id_value(subject_owner, subject)
+              else
+                PrimaryKey.graphql_id_value(subject)
+              end
+            identity = "#{identity}:object:#{subject.object_id}" if subject.class.primary_key.blank?
+            "record:#{subject.class.name}:#{identity}"
           else
             "object:#{subject.object_id}"
           end

data/lib/active_admin/graphql/record_source.rb

@@ -6,13 +6,14 @@ module ActiveAdmin
     class RecordSource < ::GraphQL::Dataloader::Source
       def initialize(model_class)
         @model_class = model_class
-        @pk = model_class.primary_key
+        @pk_columns = ActiveAdmin::PrimaryKey.columns(model_class)
+        @pk = ActiveAdmin::PrimaryKey.composite?(model_class) ? model_class.primary_key : @pk_columns.first
       end
 
       def fetch(ids)
         keys = normalized_keys(ids)
         uniq = keys.compact.uniq
-        return Array.new(ids.size) { nil } if uniq.empty?
+        return Array.new(ids.size) { nil } if uniq.empty? || @pk.nil?
 
         indexed = load_records(uniq)
         keys.map { |key| key.nil? ? nil : indexed[key] }

data/lib/active_admin/graphql/resource_config.rb

@@ -14,6 +14,10 @@ module ActiveAdmin
       attr_accessor :permit_params_attributes
       attr_accessor :html_permit_params_attributes
       attr_accessor :extension_block
+      attr_accessor :identity_columns
+      attr_accessor :identity_separator
+      attr_accessor :identity_encode_proc
+      attr_accessor :identity_decode_proc
 
       # Optional resolver overrides (set from +graphql do+). SchemaBuilder still owns field names,
       # arguments, and types; procs replace only the Ruby resolution body.

data/lib/active_admin/graphql/resource_definition_dsl.rb

@@ -16,6 +16,15 @@ module ActiveAdmin
         @config.enabled = false
       end
 
+      # Declare GraphQL identity columns when ActiveRecord has no primary key / id column.
+      # See RFC 0007.
+      def identity(*columns, separator: nil, encode: nil, decode: nil)
+        @config.identity_columns = columns.flatten.map(&:to_s)
+        @config.identity_separator = separator
+        @config.identity_encode_proc = encode
+        @config.identity_decode_proc = decode
+      end
+
       def type_name(name)
         @config.graphql_type_name = name.to_s
       end

data/lib/active_admin/graphql/resource_identity.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "json"
+
+module ActiveAdmin
+  module GraphQL
+    # Resolves GraphQL identity columns and id encode/decode for a registered resource.
+    # Prefer `graphql { identity ... }` when ActiveRecord has no primary key / id column.
+    module ResourceIdentity
+      module_function
+
+      def configured?(aa_res)
+        aa_res.graphql_config.identity_columns.present?
+      end
+
+      def columns(aa_res)
+        configured = aa_res.graphql_config.identity_columns
+        return configured if configured.present?
+
+        ActiveAdmin::PrimaryKey.columns(aa_res.resource_class)
+      end
+
+      def graphql_id_value(aa_res, record)
+        cfg = aa_res.graphql_config
+        if (encode = cfg.identity_encode_proc)
+          return encode.call(record).to_s
+        end
+
+        cols = columns(aa_res)
+        return ActiveAdmin::PrimaryKey.graphql_id_value(record) unless configured?(aa_res)
+
+        encode_columns(record, cols, cfg.identity_separator)
+      end
+
+      def attributes_for_id(aa_res, id)
+        cfg = aa_res.graphql_config
+        if (decode = cfg.identity_decode_proc)
+          return stringify_attrs(decode.call(id))
+        end
+
+        cols = columns(aa_res)
+        return ActiveAdmin::PrimaryKey.find_attributes(aa_res.resource_class, id) unless configured?(aa_res)
+
+        decode_columns(cols, id, cfg.identity_separator)
+      end
+
+      def encode_columns(record, cols, separator)
+        if cols.size == 1
+          record.public_send(cols.first).to_s
+        elsif separator
+          cols.map { |c| record.public_send(c) }.join(separator)
+        else
+          payload = cols.each_with_object({}) { |c, memo| memo[c] = record.read_attribute(c) }
+          JSON.generate(payload)
+        end
+      end
+
+      def decode_columns(cols, id, separator)
+        if cols.size == 1
+          {cols.first => id.to_s}
+        elsif separator
+          parts = id.to_s.split(separator, cols.size)
+          raise ArgumentError, "identity id segment count mismatch" if parts.size != cols.size
+
+          cols.zip(parts).to_h
+        else
+          parsed = JSON.parse(id.to_s)
+          raise ArgumentError, "composite id must be a JSON object" unless parsed.is_a?(Hash)
+
+          parsed.stringify_keys.slice(*cols)
+        end
+      end
+
+      def field_kw_to_param_hash(aa_res, id:, **kw)
+        return ActiveAdmin::PrimaryKey.field_kw_to_param_hash(aa_res.resource_class, id: id, **kw) unless configured?(aa_res)
+
+        raise ArgumentError, "id is required" if id.blank?
+
+        {"id" => id.to_s}
+      end
+
+      def member_param_hash(aa_res, blob)
+        return ActiveAdmin::PrimaryKey.member_param_hash(aa_res.resource_class, blob) unless configured?(aa_res)
+
+        blob = blob.stringify_keys
+        raise ArgumentError, "id is required" if blob["id"].blank?
+
+        {"id" => blob["id"].to_s}
+      end
+
+      def stringify_attrs(hash)
+        raise ArgumentError, "identity decode must return a Hash" unless hash.is_a?(Hash)
+
+        hash.stringify_keys.transform_values { |value| value&.to_s }
+      end
+    end
+  end
+end

data/lib/active_admin/graphql/resource_methods.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
         def graphql_assignable_attribute_names
           names = attributes_for_graphql.map(&:to_s)
-          pk_cols = ActiveAdmin::PrimaryKey.columns(resource_class)
+          pk_cols = ActiveAdmin::GraphQL::ResourceIdentity.columns(self)
           return names if pk_cols.size > 1
 
           names - pk_cols

data/lib/active_admin/graphql/resource_query_proxy/identity.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module ActiveAdmin
+  module GraphQL
+    class ResourceQueryProxy
+      module Identity
+        private
+
+        def find_identity_member(controller, model, id)
+          attrs = ActiveAdmin::GraphQL::ResourceIdentity.attributes_for_id(@aa_resource, id)
+          raise ActiveRecord::RecordNotFound if attrs.blank?
+
+          records = controller.send(:scoped_collection).where(attrs).limit(2).to_a
+          raise_ambiguous_id!(model) if records.size > 1
+
+          records.first || raise(ActiveRecord::RecordNotFound)
+        end
+
+        def index_records_by_id(relation, model, primary_key)
+          if model.primary_key.present?
+            return relation.index_by { |record| record.public_send(primary_key).to_s }
+          end
+
+          grouped = relation.to_a.group_by { |record| record.public_send(primary_key).to_s }
+          if grouped.any? { |_id, matches| matches.size > 1 }
+            raise_ambiguous_id!(model)
+          end
+
+          grouped.transform_values(&:first)
+        end
+
+        def raise_ambiguous_id!(model)
+          raise ::GraphQL::ExecutionError, "ambiguous GraphQL id for #{model.name}"
+        end
+      end
+    end
+  end
+end

data/lib/active_admin/graphql/resource_query_proxy.rb

@@ -4,14 +4,14 @@ require "rack/mock"
 require "stringio"
 
 require_relative "resource_query_proxy/controller"
+require_relative "resource_query_proxy/identity"
 
 module ActiveAdmin
   module GraphQL
-    # Reuses {ResourceController} data-access behaviour (+scoped_collection+, +find_collection+,
-    # +find_resource+, authorization scoping, Ransack, menu scopes, +sorting+, +includes+)
-    # so GraphQL list/detail mutations align with the HTML/JSON list and member REST endpoints.
+    # Reuses ResourceController data access so GraphQL operations align with the REST endpoints.
     class ResourceQueryProxy
       include Controller
+      include Identity
 
       def initialize(aa_resource:, user:, namespace:, graph_params: {})
         @aa_resource = aa_resource
@@ -26,8 +26,13 @@ module ActiveAdmin
 
       def find_member(id)
         extra = member_route_params_for_find(id)
-        controller_for("show", extra).send(:find_resource)
-      rescue ActiveRecord::RecordNotFound
+        controller = controller_for("show", extra)
+        model = @aa_resource.resource_class
+        finder = controller.send(:method_for_find)
+        return controller.send(:find_resource) if model.primary_key.present? || finder != :find
+
+        find_identity_member(controller, model, extra.fetch("id"))
+      rescue ActiveRecord::RecordNotFound, ArgumentError
         nil
       end
 
@@ -36,16 +41,17 @@ module ActiveAdmin
         return {} if string_ids.empty?
 
         model = @aa_resource.resource_class
-        if ActiveAdmin::PrimaryKey.composite?(model)
+        identity_cols = ActiveAdmin::GraphQL::ResourceIdentity.columns(@aa_resource)
+        if ActiveAdmin::PrimaryKey.composite?(model) || identity_cols.size > 1
           return string_ids.index_with { |identifier| find_member(identifier) }
         end
 
         controller = controller_for("index")
         relation = controller.send(:apply_authorization_scope, controller.send(:scoped_collection))
-        primary_key = model.primary_key.to_sym
-        indexed = relation.where(primary_key => string_ids).index_by do |record|
-          record.public_send(primary_key).to_s
-        end
+        primary_key = identity_cols.first&.to_sym
+        return string_ids.index_with { nil } if primary_key.nil?
+
+        indexed = index_records_by_id(relation.where(primary_key => string_ids), model, primary_key)
         string_ids.index_with { |identifier| indexed[identifier] }
       end
 

data/lib/active_admin/graphql/schema_builder/mutation_update_destroy.rb

@@ -24,7 +24,7 @@ module ActiveAdmin
               blob = where.to_h.stringify_keys
               graph = sb.graph_params_from_find_blob(aa_res, blob)
               begin
-                rid = ActiveAdmin::PrimaryKey.member_param_hash(model, blob)
+                rid = ActiveAdmin::GraphQL::ResourceIdentity.member_param_hash(aa_res, blob)
               rescue ArgumentError => e
                 raise ::GraphQL::ExecutionError, e.message
               end
@@ -90,7 +90,7 @@ module ActiveAdmin
               blob = where.to_h.stringify_keys
               graph = sb.graph_params_from_find_blob(aa_res, blob)
               begin
-                rid = ActiveAdmin::PrimaryKey.member_param_hash(model, blob)
+                rid = ActiveAdmin::GraphQL::ResourceIdentity.member_param_hash(aa_res, blob)
               rescue ArgumentError => e
                 raise ::GraphQL::ExecutionError, e.message
               end

data/lib/active_admin/graphql/schema_builder/query_type_member.rb

@@ -51,10 +51,12 @@ module ActiveAdmin
                 if where
                   blob = where.to_h.stringify_keys
                   graph = builder.graph_params_from_find_blob(aa_res, blob)
-                  rid = ActiveAdmin::PrimaryKey.member_param_hash(model, blob)
+                  rid = ActiveAdmin::GraphQL::ResourceIdentity.member_param_hash(aa_res, blob)
                 else
                   graph = builder.graph_params_for_mutation(aa_res, kw)
-                  rid = ActiveAdmin::PrimaryKey.field_kw_to_param_hash(model, id: id, **kw)
+                  rid = ActiveAdmin::GraphQL::ResourceIdentity.field_kw_to_param_hash(
+                    aa_res, id: id, **kw
+                  )
                 end
               rescue ArgumentError => e
                 raise ::GraphQL::ExecutionError, e.message

data/lib/active_admin/graphql/schema_builder/types_object.rb

@@ -82,13 +82,32 @@ module ActiveAdmin
             define_singleton_method(:activeadmin_graphql_resource) { aa_res }
           end
 
-          pk_cols = ActiveAdmin::PrimaryKey.columns(model)
+          pk_cols = ActiveAdmin::GraphQL::ResourceIdentity.columns(aa_res)
+          if pk_cols.empty?
+            raise ArgumentError,
+              "#{model.name} has no primary key for GraphQL `id`; set self.primary_key on the model " \
+              "or graphql { identity ... }"
+          end
 
           type_class.field :id, ::GraphQL::Types::ID, null: false, authorize: false
-          type_class.define_method(:id) { ActiveAdmin::PrimaryKey.graphql_id_value(object) }
+          type_class.define_method(:id) do
+            ActiveAdmin::GraphQL::ResourceIdentity.graphql_id_value(
+              self.class.activeadmin_graphql_resource,
+              object
+            )
+          end
 
-          attr_names.each do |name|
-            next if pk_cols.include?(name) && pk_cols.size == 1
+          # ActiveAdmin omits a single-column primary key from resource_attributes; still expose
+          # non-id key columns as scalars (composite keys already remain in attributes).
+          # ActiveAdminResource owns GraphQL `id`; never emit a second field from an `id` column.
+          configured_pk_cols = pk_cols
+          if (only = aa_res.graphql_config.only_attributes)
+            configured_pk_cols &= only.map(&:to_s)
+          end
+          configured_pk_cols -= aa_res.graphql_config.exclude_attributes.map(&:to_s)
+          readable_names = (attr_names + configured_pk_cols).uniq
+          readable_names.each do |name|
+            next if name == "id"
 
             col = cols_by_name[name]
             next unless col

data/lib/active_admin/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module GraphQL
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

data/lib/active_admin/graphql.rb

@@ -71,6 +71,7 @@ module ActiveAdmin
           graphql/schema_field
           graphql/auth_context
           graphql/record_source
+          graphql/resource_identity
           graphql/resource_query_proxy
           graphql/run_action_payload
           graphql/run_action_mutation_config

data/lib/active_admin/primary_key.rb

@@ -14,13 +14,22 @@ unless defined?(ActiveAdmin::PrimaryKey)
       end
 
       def ordered_columns(model)
-        Array(model.primary_key).map(&:to_s)
-      end
+        cols = case (pk = model.primary_key)
+        when nil, false then []
+        when Array then pk.map(&:to_s).reject(&:empty?)
+        else
+          (name = pk.to_s).empty? ? [] : [name]
+        end
+        return cols if cols.any?
+        return %w[id] if model.respond_to?(:columns_hash) && model.columns_hash.key?("id")
 
-      def columns(model)
-        ordered_columns(model)
+        []
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished
+        []
       end
 
+      def columns(model) = ordered_columns(model)
+
       def composite_attribute_hash(model, id_param)
         cols = ordered_columns(model)
         hash = normalize_composite_input(cols, id_param)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-graphql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrei Makarov
@@ -366,7 +366,34 @@ files:
 - README.md
 - activeadmin-graphql.gemspec
 - app/controllers/active_admin/graphql_controller.rb
+- docs/changelogs/20260818111600_rfc-0002-problems.md
+- docs/changelogs/20260818114000_rfc-as-built-coverage.md
+- docs/changelogs/20260818114700_rfc-design-not-version.md
+- docs/changelogs/20260907141000_advisory-lockfile-refresh.md
+- docs/changelogs/20260921103000_mutation-attribute-allowlists.md
+- docs/changelogs/20260921111000_release-0-3-0.md
+- docs/changelogs/20260921112800_drop-standard-rubocop-direct.md
+- docs/changelogs/20260921120000_graphql-floor-and-activeadmin-4.md
+- docs/changelogs/20261010101500_nonconventional-id-fields.md
+- docs/changelogs/20261010103800_release-0-3-1.md
+- docs/changelogs/20261010110600_graphql-identity-dsl.md
+- docs/changelogs/20261010111800_release-0-3-2.md
+- docs/dependencies/20260907141000_json-cve-2026-71847.md
+- docs/dependencies/20260907141000_sqlite3-ghsa-mwm8-39rw-8826.md
+- docs/dependencies/20260921114000_rails-json-parse-kwargs.md
+- docs/dependencies/20260921114500_graphql-ghsa-rmxg-5p3r-j6hh.md
+- docs/dependencies/20261007161308_association-list-combobox.md
 - docs/graphql-api.md
+- docs/issues/20260907141000_engineering-and-dependency-audit.md
+- docs/issues/20260917123253_ci-drop-automatic-dependency-audit.md
+- docs/issues/20260921103000_mutation-attribute-allowlists.md
+- docs/issues/20260921104400_convention-alignment-audit.md
+- docs/issues/20260921114500_dependency-audit.md
+- docs/issues/20260921115500_file-length-metrics.md
+- docs/issues/20261010111159_rails-composite-primary-keys-alignment.md
+- docs/issues/20261010111300_partitions-and-shards-support.md
+- docs/issues/20261010111500_graphql-federation-support.md
+- docs/plan/20260817201500_rfc-starter.md
 - lib/active_admin/graphql.rb
 - lib/active_admin/graphql/auth_context.rb
 - lib/active_admin/graphql/engine.rb
@@ -380,10 +407,12 @@ files:
 - lib/active_admin/graphql/record_source.rb
 - lib/active_admin/graphql/resource_config.rb
 - lib/active_admin/graphql/resource_definition_dsl.rb
+- lib/active_admin/graphql/resource_identity.rb
 - lib/active_admin/graphql/resource_interface.rb
 - lib/active_admin/graphql/resource_methods.rb
 - lib/active_admin/graphql/resource_query_proxy.rb
 - lib/active_admin/graphql/resource_query_proxy/controller.rb
+- lib/active_admin/graphql/resource_query_proxy/identity.rb
 - lib/active_admin/graphql/run_action_mutation_config.rb
 - lib/active_admin/graphql/run_action_mutation_dsl.rb
 - lib/active_admin/graphql/run_action_payload.rb