Merge remote-tracking branch 'origin/develop' into feature/cw-7513

# Conflicts:
#	app/javascript/dashboard/featureFlags.js
#	config/features.yml

app/views/api/v1/accounts/data_imports/_data_import.json.jbuilder

@@ -0,0 +1,24 @@
+json.id data_import.id
+json.name data_import.name
+json.data_type data_import.data_type
+json.source_type data_import.source_type
+json.source_provider data_import.source_provider
+json.import_types data_import.import_types
+json.status data_import.status
+json.total_records data_import.total_records
+json.processed_records data_import.processed_records
+json.stats data_import.stats
+json.cursor data_import.cursor
+json.created_at data_import.created_at
+json.updated_at data_import.updated_at
+json.started_at data_import.started_at
+json.completed_at data_import.completed_at
+json.abandoned_at data_import.abandoned_at
+json.initiated_by data_import.initiated_by&.slice(:id, :name, :email)
+if @import_errors_counts
+  json.import_errors_count @import_errors_counts.fetch(data_import.id, 0)
+  json.skip_logs_count (@skip_logs_counts || {}).fetch(data_import.id, 0)
+else
+  json.import_errors_count data_import.import_errors.non_skip_logs.count
+  json.skip_logs_count data_import.import_errors.skip_logs.count
+end

app/views/api/v1/accounts/data_imports/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.payload do
+  json.array! @data_imports do |data_import|
+    json.partial! 'api/v1/accounts/data_imports/data_import', formats: [:json], data_import: data_import
+  end
+end

app/views/api/v1/accounts/data_imports/show.json.jbuilder

@@ -0,0 +1,31 @@
+json.partial! 'api/v1/accounts/data_imports/data_import', formats: [:json], data_import: @data_import
+
+json.import_errors do
+  json.array! @import_errors_finder.import_errors do |import_error|
+    json.id import_error.id
+    json.error_code import_error.error_code
+    json.message import_error.message
+    json.source_object_type import_error.source_object_type
+    json.source_object_id import_error.source_object_id
+    json.details import_error.details
+    json.created_at import_error.created_at
+  end
+end
+
+json.skip_logs do
+  json.array! @skip_logs_finder.skip_logs do |skip_log|
+    json.id skip_log.id
+    json.kind skip_log.details['kind']
+    json.error_code skip_log.error_code
+    json.message skip_log.message
+    json.source_object_type skip_log.source_object_type
+    json.source_object_id skip_log.source_object_id
+    json.details skip_log.details
+    json.created_at skip_log.created_at
+  end
+end
+
+json.skip_logs_filters do
+  json.selected_source_object_type @skip_logs_finder.selected_source_object_type
+  json.counts_by_type @skip_logs_finder.counts_by_type
+end

app/views/api/v1/models/_agent_bot.json.jbuilder

@@ -6,6 +6,6 @@ json.outgoing_url resource.outgoing_url unless resource.system_bot?
 json.bot_type resource.bot_type
 json.bot_config resource.bot_config
 json.account_id resource.account_id
-json.access_token resource.access_token if resource.access_token.present?
+json.access_token resource.access_token if resource.access_token.present? && Current.account_user&.administrator?
 json.secret resource.secret if !resource.system_bot? && Current.account_user&.administrator?
 json.system_bot resource.system_bot?