Skip to content

Commit

Permalink
chore: Control rendering contact inbox (#1157)
Browse files Browse the repository at this point in the history
  • Loading branch information
sojan-official committed Aug 19, 2020
1 parent e891265 commit 507b40a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/views/api/v1/accounts/contacts/create.json.jbuilder
@@ -1,6 +1,6 @@
json.payload do
json.contact do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
end
json.contact_inbox do
json.inbox @contact_inbox&.inbox
Expand Down
2 changes: 1 addition & 1 deletion app/views/api/v1/accounts/contacts/index.json.jbuilder
@@ -1,5 +1,5 @@
json.payload do
json.array! @contacts do |contact|
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: true
end
end
2 changes: 1 addition & 1 deletion app/views/api/v1/accounts/contacts/search.json.jbuilder
@@ -1,5 +1,5 @@
json.payload do
json.array! @contacts do |contact|
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: true
end
end
2 changes: 1 addition & 1 deletion app/views/api/v1/accounts/contacts/show.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
end
2 changes: 1 addition & 1 deletion app/views/api/v1/accounts/contacts/update.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
end
10 changes: 7 additions & 3 deletions app/views/api/v1/models/_contact.json.jbuilder
Expand Up @@ -5,8 +5,12 @@ json.id resource.id
json.name resource.name
json.phone_number resource.phone_number
json.thumbnail resource.avatar_url
json.contact_inboxes do
json.array! resource.contact_inboxes do |contact_inbox|
json.partial! 'api/v1/models/contact_inbox.json.jbuilder', resource: contact_inbox

# we only want to output contact inbox when its /contacts endpoints
if defined?(with_contact_inboxes) && with_contact_inboxes.present?
json.contact_inboxes do
json.array! resource.contact_inboxes do |contact_inbox|
json.partial! 'api/v1/models/contact_inbox.json.jbuilder', resource: contact_inbox
end
end
end

0 comments on commit 507b40a

Please sign in to comment.