forest_admin_datasource_zendesk 1.30.2 → 1.30.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef8a3dea2e99838d420324d8e77fbf49e7deacf8ce2baa405e64bdfc589d06da
-  data.tar.gz: 3a2e6250ee561c2a8340c30e773e7687b8e6485be425a1258d8b2a64dd271314
+  metadata.gz: 56d7779570984b30a375c7bedc606ec039d0d31276ef69b52beb010f37a0a365
+  data.tar.gz: f9de2c9d176da92da99d0235538cf3b07a980fd59a94d4a980f08e58a6e3a6ed
 SHA512:
-  metadata.gz: 2b2a076b8ffedccbb6ca1933250211d88dd2eef1a0b6cc98608e4e3df9151e876344acaf2fbbe386fdc152472410a12e520707eb5b5f164b4c7677ce7a9cabac
-  data.tar.gz: f26981c9b370ff053015f42e6e656b1110091cb18eb8af0975fe310faa4fbf56ee544e16cc26f28494671947546652a92d921e29f6f0da8c3c7a4dfab19a0b11
+  metadata.gz: 163575ce33bbcd0581e4d2cb8ffc0c8c2fba342a8695ada0256e20fc7a0d110627e0b35d9ef9089a7920524ca5bb115cc343a2a72a6248b6f1199d9b88b649a7
+  data.tar.gz: '094dc242cd1781c40b7d6a9fbed7274c39651930047b69fc4749754f11c9d7ffbe23b81f2520463939767036a16f077a04b7377d2fe0a2bd8d7b41cc5040138e'

data/lib/forest_admin_datasource_zendesk/collections/base_collection.rb

@@ -95,6 +95,26 @@ module ForestAdminDatasourceZendesk
         [translated, filter.search].compact.reject(&:empty?).join(' ')
       end
 
+      # Adds custom fields, skipping any whose column name collides with a
+      # field already declared on the collection (native column or relation).
+      # Returns the list of fields actually added so callers can keep their
+      # serializer in sync with the schema.
+      def add_custom_fields(custom_fields)
+        custom_fields.reject do |cf|
+          column_name = cf[:column_name]
+          if schema[:fields].key?(column_name)
+            ForestAdminDatasourceZendesk.logger.warn(
+              "[forest_admin_datasource_zendesk] Custom field '#{column_name}' on collection " \
+              "'#{name}' conflicts with an existing field; skipping."
+            )
+            true
+          else
+            add_field(column_name, cf[:schema])
+            false
+          end
+        end
+      end
+
       private
 
       def sort_field_and_direction(entry)

data/lib/forest_admin_datasource_zendesk/collections/organization.rb

@@ -3,6 +3,8 @@ module ForestAdminDatasourceZendesk
     class Organization < BaseCollection
       include Searchable
 
+      attr_reader :custom_fields
+
       OneToManySchema = ForestAdminDatasourceToolkit::Schema::Relations::OneToManySchema
 
       ZENDESK_SORTABLE = {
@@ -13,9 +15,9 @@ module ForestAdminDatasourceZendesk
 
       def initialize(datasource, custom_fields: [])
         super(datasource, 'ZendeskOrganization')
-        @custom_fields = custom_fields
         define_schema
         define_relations
+        @custom_fields = add_custom_fields(custom_fields)
         enable_search
         enable_count
       end
@@ -79,8 +81,6 @@ module ForestAdminDatasourceZendesk
                                                  is_read_only: true, is_sortable: true))
         add_field('updated_at', ColumnSchema.new(column_type: 'Date', filter_operators: DATE_OPS,
                                                  is_read_only: true, is_sortable: true))
-
-        @custom_fields.each { |cf| add_field(cf[:column_name], cf[:schema]) }
       end
 
       def define_relations

data/lib/forest_admin_datasource_zendesk/collections/ticket/schema_definition.rb

@@ -46,8 +46,6 @@ module ForestAdminDatasourceZendesk
                                                    is_read_only: true, is_sortable: true))
           add_field('updated_at', ColumnSchema.new(column_type: 'Date', filter_operators: DATE_OPS,
                                                    is_read_only: true, is_sortable: true))
-
-          @custom_fields.each { |cf| add_field(cf[:column_name], cf[:schema]) }
         end
 
         def define_relations

data/lib/forest_admin_datasource_zendesk/collections/ticket.rb

@@ -6,6 +6,8 @@ module ForestAdminDatasourceZendesk
       include CommentsEmbedder
       include Serializer
 
+      attr_reader :custom_fields
+
       ManyToOneSchema = ForestAdminDatasourceToolkit::Schema::Relations::ManyToOneSchema
 
       ZENDESK_SORTABLE = {
@@ -28,9 +30,9 @@ module ForestAdminDatasourceZendesk
 
       def initialize(datasource, custom_fields: [])
         super(datasource, 'ZendeskTicket')
-        @custom_fields = custom_fields
         define_schema
         define_relations
+        @custom_fields = add_custom_fields(custom_fields)
         enable_search
         enable_count
       end

data/lib/forest_admin_datasource_zendesk/collections/user.rb

@@ -3,6 +3,8 @@ module ForestAdminDatasourceZendesk
     class User < BaseCollection
       include Searchable
 
+      attr_reader :custom_fields
+
       ManyToOneSchema = ForestAdminDatasourceToolkit::Schema::Relations::ManyToOneSchema
       OneToManySchema = ForestAdminDatasourceToolkit::Schema::Relations::OneToManySchema
       ENUM_ROLE       = %w[end-user agent admin].freeze
@@ -17,9 +19,9 @@ module ForestAdminDatasourceZendesk
 
       def initialize(datasource, custom_fields: [])
         super(datasource, 'ZendeskUser')
-        @custom_fields = custom_fields
         define_schema
         define_relations
+        @custom_fields = add_custom_fields(custom_fields)
         enable_search
         enable_count
       end
@@ -89,8 +91,6 @@ module ForestAdminDatasourceZendesk
                                                  is_read_only: true, is_sortable: true))
         add_field('updated_at', ColumnSchema.new(column_type: 'Date', filter_operators: DATE_OPS,
                                                  is_read_only: true, is_sortable: true))
-
-        @custom_fields.each { |cf| add_field(cf[:column_name], cf[:schema]) }
       end
 
       def define_relations

data/lib/forest_admin_datasource_zendesk/datasource.rb

@@ -16,15 +16,16 @@ module ForestAdminDatasourceZendesk
     def register_collections
       introspector = Schema::CustomFieldsIntrospector.new(@client)
 
-      ticket_cf = introspector.ticket_custom_fields
-      user_cf   = introspector.user_custom_fields
-      org_cf    = introspector.organization_custom_fields
+      ticket = Collections::Ticket.new(self, custom_fields: introspector.ticket_custom_fields)
+      user = Collections::User.new(self, custom_fields: introspector.user_custom_fields)
+      org = Collections::Organization.new(self, custom_fields: introspector.organization_custom_fields)
 
-      add_collection(Collections::Ticket.new(self, custom_fields: ticket_cf))
-      add_collection(Collections::User.new(self, custom_fields: user_cf))
-      add_collection(Collections::Organization.new(self, custom_fields: org_cf))
+      add_collection(ticket)
+      add_collection(user)
+      add_collection(org)
 
-      @custom_field_mapping = build_custom_field_mapping(ticket_cf, user_cf, org_cf)
+      @custom_field_mapping = build_custom_field_mapping(ticket.custom_fields,
+                                                         user.custom_fields, org.custom_fields)
     end
 
     # Forest column name -> Zendesk Search field name. Lives on the instance

data/lib/forest_admin_datasource_zendesk/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceZendesk
-  VERSION = "1.30.2"
+  VERSION = "1.30.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_zendesk
 version: !ruby/object:Gem::Version
-  version: 1.30.2
+  version: 1.30.4
 platform: ruby
 authors:
 - Forest Admin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-21 00:00:00.000000000 Z
+date: 2026-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport