KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: DEPRECATION WARNING: Rendering actions with '.' in the name is deprecated (#5560)

Browse source 
fixes the warning: Rendering actions with '.' in the name is deprecated
This commit is contained in:
Geophilus Durairaj 2022-10-06 05:54:34 +05:30 committed by GitHub
parent cd4c1ef27e
commit bd445216e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
127 changed files with 145 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
View file

@ -22,7 +22,7 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
def download
response.headers['Content-Type'] = 'text/csv'
response.headers['Content-Disposition'] = 'attachment; filename=csat_report.csv'
render layout: false, template: 'api/v1/accounts/csat_survey_responses/download.csv.erb', format: 'csv'
render layout: false, template: 'api/v1/accounts/csat_survey_responses/download', formats: [:csv]
end
private

4
app/controllers/api/v1/accounts_controller.rb
View file

@ -24,7 +24,7 @@ class Api::V1::AccountsController < Api::BaseController
).perform
if @user
send_auth_headers(@user)
render 'api/v1/accounts/create.json', locals: { resource: @user }
render 'api/v1/accounts/create', format: :json, locals: { resource: @user }
else
render_error_response(CustomExceptions::Account::SignupFailed.new({}))
end
@ -32,7 +32,7 @@ class Api::V1::AccountsController < Api::BaseController
def show
@latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
render 'api/v1/accounts/show.json'
render 'api/v1/accounts/show', format: :json
end
def update

10
app/controllers/api/v2/accounts/reports_controller.rb
View file

@ -14,22 +14,22 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
def agents
@report_data = generate_agents_report
generate_csv('agents_report', 'api/v2/accounts/reports/agents.csv.erb')
generate_csv('agents_report', 'api/v2/accounts/reports/agents')
end
def inboxes
@report_data = generate_inboxes_report
generate_csv('inboxes_report', 'api/v2/accounts/reports/inboxes.csv.erb')
generate_csv('inboxes_report', 'api/v2/accounts/reports/inboxes')
end
def labels
@report_data = generate_labels_report
generate_csv('labels_report', 'api/v2/accounts/reports/labels.csv.erb')
generate_csv('labels_report', 'api/v2/accounts/reports/labels')
end
def teams
@report_data = generate_teams_report
generate_csv('teams_report', 'api/v2/accounts/reports/teams.csv.erb')
generate_csv('teams_report', 'api/v2/accounts/reports/teams')
end
def conversations
@ -43,7 +43,7 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
def generate_csv(filename, template)
response.headers['Content-Type'] = 'text/csv'
response.headers['Content-Disposition'] = "attachment; filename=#{filename}.csv"
render layout: false, template: template, format: 'csv'
render layout: false, template: template, formats: [:csv]
end
def check_authorization

2
app/controllers/devise_overrides/confirmations_controller.rb
View file

@ -14,7 +14,7 @@ class DeviseOverrides::ConfirmationsController < Devise::ConfirmationsController
def render_confirmation_success
send_auth_headers(@confirmable)
render partial: 'devise/auth.json', locals: { resource: @confirmable }
render partial: 'devise/auth', formats: [:json], locals: { resource: @confirmable }
end
def render_confirmation_error

2
app/controllers/devise_overrides/sessions_controller.rb
View file

@ -16,7 +16,7 @@ class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsControlle
end
def render_create_success
render partial: 'devise/auth.json', locals: { resource: @resource }
render partial: 'devise/auth', formats: [:json], locals: { resource: @resource }
end
private

2
app/controllers/devise_overrides/token_validations_controller.rb
View file

@ -2,7 +2,7 @@ class DeviseOverrides::TokenValidationsController < ::DeviseTokenAuth::TokenVali
def validate_token
# @resource will have been set by set_user_by_token concern
if @resource
render 'devise/token.json'
render 'devise/token', formats: [:json]
else
render_validate_token_error
end

2
app/views/api/v1/accounts/agent_bots/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: AgentBotPresenter.new(@agent_bot)
json.partial! 'api/v1/models/agent_bot', formats: [:json], resource: AgentBotPresenter.new(@agent_bot)

2
app/views/api/v1/accounts/agent_bots/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @agent_bots do |agent_bot|
json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: AgentBotPresenter.new(agent_bot)
json.partial! 'api/v1/models/agent_bot', formats: [:json], resource: AgentBotPresenter.new(agent_bot)
end

2
app/views/api/v1/accounts/agent_bots/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: AgentBotPresenter.new(@agent_bot)
json.partial! 'api/v1/models/agent_bot', formats: [:json], resource: AgentBotPresenter.new(@agent_bot)

2
app/views/api/v1/accounts/agent_bots/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: AgentBotPresenter.new(@agent_bot)
json.partial! 'api/v1/models/agent_bot', formats: [:json], resource: AgentBotPresenter.new(@agent_bot)

2
app/views/api/v1/accounts/agents/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/agent.json.jbuilder', resource: @user
json.partial! 'api/v1/models/agent', formats: [:json], resource: @user

2
app/views/api/v1/accounts/agents/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @agents do |agent|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: agent
end

2
app/views/api/v1/accounts/agents/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/agent.json.jbuilder', resource: @agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: @agent

6
app/views/api/v1/accounts/articles/_article.json.jbuilder
View file

@ -15,7 +15,7 @@ end
if article.portal.present?
json.portal do
json.partial! 'api/v1/accounts/portals/portal.json.jbuilder', portal: article.portal
json.partial! 'api/v1/accounts/portals/portal', formats: [:json], portal: article.portal
end
end
@ -23,14 +23,14 @@ json.views article.views
if article.author.present?
json.author do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: article.author
json.partial! 'api/v1/models/agent', formats: [:json], resource: article.author
end
end
json.associated_articles do
if article.associated_articles.any?
json.array! article.associated_articles.each do |associated_article|
json.partial! 'api/v1/accounts/articles/associated_article.json.jbuilder', article: associated_article
json.partial! 'api/v1/accounts/articles/associated_article', formats: [:json], article: associated_article
end
end
end

4
app/views/api/v1/accounts/articles/_associated_article.json.jbuilder
View file

@ -8,7 +8,7 @@ json.account_id article.account_id
if article.portal.present?
json.portal do
json.partial! 'api/v1/accounts/portals/portal.json.jbuilder', portal: article.portal
json.partial! 'api/v1/accounts/portals/portal', formats: [:json], portal: article.portal
end
end
@ -16,6 +16,6 @@ json.views article.views
if article.author.present?
json.author do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: article.author
json.partial! 'api/v1/models/agent', formats: [:json], resource: article.author
end
end

2
app/views/api/v1/accounts/assignable_agents/index.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @assignable_agents do |agent|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: agent
end
end

2
app/views/api/v1/accounts/automation_rules/clone.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule', formats: [:json], automation_rule: @automation_rule
end

2
app/views/api/v1/accounts/automation_rules/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule', formats: [:json], automation_rule: @automation_rule

2
app/views/api/v1/accounts/automation_rules/index.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @automation_rules do |automation_rule|
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: automation_rule
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule', formats: [:json], automation_rule: automation_rule
end
end

2
app/views/api/v1/accounts/automation_rules/show.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule', formats: [:json], automation_rule: @automation_rule
end

2
app/views/api/v1/accounts/automation_rules/update.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule.json.jbuilder', automation_rule: @automation_rule
json.partial! 'api/v1/accounts/automation_rules/partials/automation_rule', formats: [:json], automation_rule: @automation_rule
end

2
app/views/api/v1/accounts/callbacks/reauthorize_page.json.jbuilder
View file

@ -1,3 +1,3 @@
json.data do
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: @inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: @inbox
end

2
app/views/api/v1/accounts/campaigns/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/campaign.json.jbuilder', resource: @campaign
json.partial! 'api/v1/models/campaign', formats: [:json], resource: @campaign

2
app/views/api/v1/accounts/campaigns/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @campaigns do |campaign|
json.partial! 'api/v1/models/campaign.json.jbuilder', resource: campaign
json.partial! 'api/v1/models/campaign', formats: [:json], resource: campaign
end

2
app/views/api/v1/accounts/campaigns/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/campaign.json.jbuilder', resource: @campaign
json.partial! 'api/v1/models/campaign', formats: [:json], resource: @campaign

2
app/views/api/v1/accounts/campaigns/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/campaign.json.jbuilder', resource: @campaign
json.partial! 'api/v1/models/campaign', formats: [:json], resource: @campaign

6
app/views/api/v1/accounts/categories/_category.json.jbuilder
View file

@ -9,20 +9,20 @@ json.account_id category.account_id
json.related_categories do
if category.related_categories.any?
json.array! category.related_categories.each do |related_category|
json.partial! 'api/v1/accounts/categories/associated_category.json.jbuilder', category: related_category
json.partial! 'api/v1/accounts/categories/associated_category', formats: [:json], category: related_category
end
end
end
if category.parent_category.present?
json.parent_category do
json.partial! 'api/v1/accounts/categories/associated_category.json.jbuilder', category: category.parent_category
json.partial! 'api/v1/accounts/categories/associated_category', formats: [:json], category: category.parent_category
end
end
if category.root_category.present?
json.root_category do
json.partial! 'api/v1/accounts/categories/associated_category.json.jbuilder', category: category.root_category
json.partial! 'api/v1/accounts/categories/associated_category', formats: [:json], category: category.root_category
end
end

2
app/views/api/v1/accounts/channels/twilio_channels/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: @inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: @inbox

2
app/views/api/v1/accounts/contacts/active.json.jbuilder
View file

@ -5,6 +5,6 @@ end
json.payload do
json.array! @contacts do |contact|
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: true
json.partial! 'api/v1/models/contact', formats: [:json], resource: contact, with_contact_inboxes: true
end
end

2
app/views/api/v1/accounts/contacts/avatar.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: false
json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: false
end

2
app/views/api/v1/accounts/contacts/contact_inboxes/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/contact_inbox.json.jbuilder', resource: @contact_inbox
json.partial! 'api/v1/models/contact_inbox', formats: [:json], resource: @contact_inbox

2
app/views/api/v1/accounts/contacts/contactable_inboxes.json.jbuilder
View file

@ -1,7 +1,7 @@
json.payload do
json.array! @contactable_inboxes do |contactable_inbox|
json.inbox do
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: contactable_inbox[:inbox]
json.partial! 'api/v1/models/inbox', formats: [:json], resource: contactable_inbox[:inbox]
end
json.source_id contactable_inbox[:source_id]
end

2
app/views/api/v1/accounts/contacts/conversations/index.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @conversations do |conversation|
json.partial! 'api/v1/conversations/partials/conversation.json.jbuilder', conversation: conversation
json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: conversation
end
end

2
app/views/api/v1/accounts/contacts/create.json.jbuilder
View file

@ -1,6 +1,6 @@
json.payload do
json.contact do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: true
end
json.contact_inbox do
json.inbox @contact_inbox&.inbox

2
app/views/api/v1/accounts/contacts/destroy_custom_attributes.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: true
end

2
app/views/api/v1/accounts/contacts/filter.json.jbuilder
View file

@ -5,6 +5,6 @@ end
json.payload do
json.array! @contacts do |contact|
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: @include_contact_inboxes
json.partial! 'api/v1/models/contact', formats: [:json], resource: contact, with_contact_inboxes: @include_contact_inboxes
end
end

2
app/views/api/v1/accounts/contacts/index.json.jbuilder
View file

@ -5,6 +5,6 @@ end
json.payload do
json.array! @contacts do |contact|
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: @include_contact_inboxes
json.partial! 'api/v1/models/contact', formats: [:json], resource: contact, with_contact_inboxes: @include_contact_inboxes
end
end

2
app/views/api/v1/accounts/contacts/notes/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/note.json.jbuilder', resource: @note
json.partial! 'api/v1/models/note', formats: [:json], resource: @note

2
app/views/api/v1/accounts/contacts/notes/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @notes do |note|
json.partial! 'api/v1/models/note.json.jbuilder', resource: note
json.partial! 'api/v1/models/note', formats: [:json], resource: note
end

2
app/views/api/v1/accounts/contacts/notes/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/note.json.jbuilder', resource: @note
json.partial! 'api/v1/models/note', formats: [:json], resource: @note

2
app/views/api/v1/accounts/contacts/notes/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/note.json.jbuilder', resource: @note
json.partial! 'api/v1/models/note', formats: [:json], resource: @note

2
app/views/api/v1/accounts/contacts/search.json.jbuilder
View file

@ -5,6 +5,6 @@ end
json.payload do
json.array! @contacts do |contact|
json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact, with_contact_inboxes: @include_contact_inboxes
json.partial! 'api/v1/models/contact', formats: [:json], resource: contact, with_contact_inboxes: @include_contact_inboxes
end
end

2
app/views/api/v1/accounts/contacts/show.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: true
end

2
app/views/api/v1/accounts/contacts/update.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact, with_contact_inboxes: true
json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: true
end

2
app/views/api/v1/accounts/conversations/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/conversations/partials/conversation.json.jbuilder', conversation: @conversation
json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: @conversation

2
app/views/api/v1/accounts/conversations/filter.json.jbuilder
View file

@ -5,6 +5,6 @@ json.meta do
end
json.payload do
json.array! @conversations do |conversation|
json.partial! 'api/v1/conversations/partials/conversation.json.jbuilder', conversation: conversation
json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: conversation
end
end

2
app/views/api/v1/accounts/conversations/index.json.jbuilder
View file

@ -7,7 +7,7 @@ json.data do
end
json.payload do
json.array! @conversations do |conversation|
json.partial! 'api/v1/conversations/partials/conversation.json.jbuilder', conversation: conversation
json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: conversation
end
end
end

2
app/views/api/v1/accounts/conversations/search.json.jbuilder
View file

@ -5,6 +5,6 @@ json.meta do
end
json.payload do
json.array! @conversations do |conversation|
json.partial! 'api/v1/models/conversation.json.jbuilder', conversation: conversation
json.partial! 'api/v1/models/conversation', formats: [:json], conversation: conversation
end
end

2
app/views/api/v1/accounts/conversations/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/conversations/partials/conversation.json.jbuilder', conversation: @conversation
json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: @conversation

2
app/views/api/v1/accounts/conversations/update_last_seen.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/conversations/partials/conversation.json.jbuilder', conversation: @conversation
json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: @conversation

2
app/views/api/v1/accounts/csat_survey_responses/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @csat_survey_responses do |csat_survey_response|
json.partial! 'api/v1/models/csat_survey_response.json.jbuilder', resource: csat_survey_response
json.partial! 'api/v1/models/csat_survey_response', formats: [:json], resource: csat_survey_response
end

2
app/views/api/v1/accounts/custom_attribute_definitions/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/custom_attribute_definition.json.jbuilder', resource: @custom_attribute_definition
json.partial! 'api/v1/models/custom_attribute_definition', formats: [:json], resource: @custom_attribute_definition

2
app/views/api/v1/accounts/custom_attribute_definitions/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @custom_attribute_definitions do |custom_attribute_definition|
json.partial! 'api/v1/models/custom_attribute_definition.json.jbuilder', resource: custom_attribute_definition
json.partial! 'api/v1/models/custom_attribute_definition', formats: [:json], resource: custom_attribute_definition
end

2
app/views/api/v1/accounts/custom_attribute_definitions/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/custom_attribute_definition.json.jbuilder', resource: @custom_attribute_definition
json.partial! 'api/v1/models/custom_attribute_definition', formats: [:json], resource: @custom_attribute_definition

2
app/views/api/v1/accounts/custom_attribute_definitions/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/custom_attribute_definition.json.jbuilder', resource: @custom_attribute_definition
json.partial! 'api/v1/models/custom_attribute_definition', formats: [:json], resource: @custom_attribute_definition

2
app/views/api/v1/accounts/custom_filters/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/custom_filter.json.jbuilder', resource: @custom_filter
json.partial! 'api/v1/models/custom_filter', formats: [:json], resource: @custom_filter

2
app/views/api/v1/accounts/custom_filters/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @custom_filters do |custom_filter|
json.partial! 'api/v1/models/custom_filter.json.jbuilder', resource: custom_filter
json.partial! 'api/v1/models/custom_filter', formats: [:json], resource: custom_filter
end

2
app/views/api/v1/accounts/custom_filters/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/custom_filter.json.jbuilder', resource: @custom_filter
json.partial! 'api/v1/models/custom_filter', formats: [:json], resource: @custom_filter

2
app/views/api/v1/accounts/custom_filters/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/custom_filter.json.jbuilder', resource: @custom_filter
json.partial! 'api/v1/models/custom_filter', formats: [:json], resource: @custom_filter

2
app/views/api/v1/accounts/dashboard_apps/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: @dashboard_app
json.partial! 'api/v1/models/dashboard_app', formats: [:json], resource: @dashboard_app

2
app/views/api/v1/accounts/dashboard_apps/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @dashboard_apps do |dashboard_app|
json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: dashboard_app
json.partial! 'api/v1/models/dashboard_app', formats: [:json], resource: dashboard_app
end

2
app/views/api/v1/accounts/dashboard_apps/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: @dashboard_app
json.partial! 'api/v1/models/dashboard_app', formats: [:json], resource: @dashboard_app

2
app/views/api/v1/accounts/dashboard_apps/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: @dashboard_app
json.partial! 'api/v1/models/dashboard_app', formats: [:json], resource: @dashboard_app

2
app/views/api/v1/accounts/inbox_members/create.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @agents do |agent|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: agent
end
end

2
app/views/api/v1/accounts/inbox_members/show.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @agents do |agent|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: agent
end
end

2
app/views/api/v1/accounts/inbox_members/update.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @agents do |agent|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: agent
end
end

2
app/views/api/v1/accounts/inboxes/agent_bot.json.jbuilder
View file

@ -1,3 +1,3 @@
json.agent_bot do
json.partial! 'api/v1/models/agent_bot.json.jbuilder', resource: @agent_bot if @agent_bot.present?
json.partial! 'api/v1/models/agent_bot', formats: [:json], resource: @agent_bot if @agent_bot.present?
end

2
app/views/api/v1/accounts/inboxes/assignable_agents.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @assignable_agents do |agent|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: agent
end
end

2
app/views/api/v1/accounts/inboxes/campaigns.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @campaigns do |campaign|
json.partial! 'api/v1/models/campaign.json.jbuilder', resource: campaign
json.partial! 'api/v1/models/campaign', formats: [:json], resource: campaign
end

2
app/views/api/v1/accounts/inboxes/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: @inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: @inbox

2
app/views/api/v1/accounts/inboxes/index.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @inboxes do |inbox|
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: inbox
end
end

2
app/views/api/v1/accounts/inboxes/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: @inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: @inbox

2
app/views/api/v1/accounts/inboxes/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: @inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: @inbox

2
app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @apps do |app|
json.partial! 'api/v1/models/app.json.jbuilder', resource: app
json.partial! 'api/v1/models/app', formats: [:json], resource: app
end
end

2
app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/app.json.jbuilder', resource: @app
json.partial! 'api/v1/models/app', formats: [:json], resource: @app

2
app/views/api/v1/accounts/integrations/hooks/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/hook.json.jbuilder', resource: @hook
json.partial! 'api/v1/models/hook', formats: [:json], resource: @hook

2
app/views/api/v1/accounts/integrations/hooks/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/hook.json.jbuilder', resource: @hook
json.partial! 'api/v1/models/hook', formats: [:json], resource: @hook

2
app/views/api/v1/accounts/macros/create.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/macro.json.jbuilder', macro: @macro
json.partial! 'api/v1/models/macro', formats: [:json], macro: @macro
end

2
app/views/api/v1/accounts/macros/index.json.jbuilder
View file

@ -1,5 +1,5 @@
json.payload do
json.array! @macros do |macro|
json.partial! 'api/v1/models/macro.json.jbuilder', macro: macro
json.partial! 'api/v1/models/macro', formats: [:json], macro: macro
end
end

2
app/views/api/v1/accounts/macros/show.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/macro.json.jbuilder', macro: @macro
json.partial! 'api/v1/models/macro', formats: [:json], macro: @macro
end

2
app/views/api/v1/accounts/macros/update.json.jbuilder
View file

@ -1,3 +1,3 @@
json.payload do
json.partial! 'api/v1/models/macro.json.jbuilder', macro: @macro
json.partial! 'api/v1/models/macro', formats: [:json], macro: @macro
end

4
app/views/api/v1/accounts/portals/_portal.json.jbuilder
View file

@ -11,7 +11,7 @@ json.archived portal.archived
json.config do
json.allowed_locales do
json.array! portal.config['allowed_locales'].each do |locale|
json.partial! 'api/v1/models/portal_config.json.jbuilder', locale: locale, portal: portal
json.partial! 'api/v1/models/portal_config', formats: [:json], locale: locale, portal: portal
end
end
end
@ -21,7 +21,7 @@ json.logo portal.file_base_data if portal.logo.present?
json.portal_members do
if portal.members.any?
json.array! portal.members.each do |member|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: member
json.partial! 'api/v1/models/agent', formats: [:json], resource: member
end
end
end

2
app/views/api/v1/accounts/show.json.jbuilder
View file

@ -1,2 +1,2 @@
json.partial! 'api/v1/models/account.json.jbuilder', resource: @account
json.partial! 'api/v1/models/account', formats: [:json], resource: @account
json.latest_chatwoot_version @latest_chatwoot_version

2
app/views/api/v1/accounts/team_members/create.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @team_members do |team_member|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: team_member
json.partial! 'api/v1/models/agent', formats: [:json], resource: team_member
end

2
app/views/api/v1/accounts/team_members/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @team_members do |team_member|
json.partial! 'api/v1/models/agent.json.jbuilder', resource: team_member
json.partial! 'api/v1/models/agent', formats: [:json], resource: team_member
end

2
app/views/api/v1/accounts/teams/create.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/team.json.jbuilder', resource: @team
json.partial! 'api/v1/models/team', formats: [:json], resource: @team

2
app/views/api/v1/accounts/teams/index.json.jbuilder
View file

@ -1,3 +1,3 @@
json.array! @teams do |team|
json.partial! 'api/v1/models/team.json.jbuilder', resource: team
json.partial! 'api/v1/models/team', formats: [:json], resource: team
end

2
app/views/api/v1/accounts/teams/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/team.json.jbuilder', resource: @team
json.partial! 'api/v1/models/team', formats: [:json], resource: @team

2
app/views/api/v1/accounts/teams/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/team.json.jbuilder', resource: @team
json.partial! 'api/v1/models/team', formats: [:json], resource: @team

2
app/views/api/v1/accounts/update.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/account.json.jbuilder', resource: @account
json.partial! 'api/v1/models/account', formats: [:json], resource: @account

6
app/views/api/v1/conversations/partials/_conversation.json.jbuilder
View file

@ -1,16 +1,16 @@
json.meta do
json.sender do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: conversation.contact
json.partial! 'api/v1/models/contact', formats: [:json], resource: conversation.contact
end
json.channel conversation.inbox.try(:channel_type)
if conversation.assignee&.account
json.assignee do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: conversation.assignee
json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assignee
end
end
if conversation.team.present?
json.team do
json.partial! 'api/v1/models/team.json.jbuilder', resource: conversation.team
json.partial! 'api/v1/models/team', formats: [:json], resource: conversation.team
end
end
json.hmac_verified conversation.contact_inbox&.hmac_verified

2
app/views/api/v1/models/_app.json.jbuilder
View file

@ -6,6 +6,6 @@ json.action resource.action
json.button resource.action
json.hooks do
json.array! @current_account.hooks.where(app_id: resource.id) do |hook|
json.partial! 'api/v1/models/hook.json.jbuilder', resource: hook
json.partial! 'api/v1/models/hook', formats: [:json], resource: hook
end
end

4
app/views/api/v1/models/_campaign.json.jbuilder
View file

@ -3,10 +3,10 @@ json.title resource.title
json.description resource.description
json.account_id resource.account_id
json.inbox do
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: resource.inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: resource.inbox
end
json.sender do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: resource.sender if resource.sender.present?
json.partial! 'api/v1/models/agent', formats: [:json], resource: resource.sender if resource.sender.present?
end
json.message resource.message
json.campaign_status resource.campaign_status

2
app/views/api/v1/models/_contact.json.jbuilder
View file

@ -14,7 +14,7 @@ json.last_activity_at resource.last_activity_at.to_i if resource[:last_activity_
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
json.partial! 'api/v1/models/contact_inbox', formats: [:json], resource: contact_inbox
end
end
end

2
app/views/api/v1/models/_contact_inbox.json.jbuilder
View file

@ -1,4 +1,4 @@
json.source_id resource.source_id
json.inbox do
json.partial! 'api/v1/models/inbox.json.jbuilder', resource: resource.inbox
json.partial! 'api/v1/models/inbox', formats: [:json], resource: resource.inbox
end

4
app/views/api/v1/models/_csat_survey_response.json.jbuilder
View file

@ -5,13 +5,13 @@ json.account_id resource.account_id
json.message_id resource.message_id
if resource.contact
json.contact do
json.partial! 'api/v1/models/contact.json.jbuilder', resource: resource.contact
json.partial! 'api/v1/models/contact', formats: [:json], resource: resource.contact
end
end
json.conversation_id resource.conversation.display_id
if resource.assigned_agent
json.assigned_agent do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: resource.assigned_agent
json.partial! 'api/v1/models/agent', formats: [:json], resource: resource.assigned_agent
end
end
json.created_at resource.created_at.to_i

4
app/views/api/v1/models/_macro.json.jbuilder
View file

@ -4,13 +4,13 @@ json.visibility macro.visibility
if macro.created_by.present?
json.created_by do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: macro.created_by
json.partial! 'api/v1/models/agent', formats: [:json], resource: macro.created_by
end
end
if macro.updated_by.present?
json.updated_by do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: macro.updated_by
json.partial! 'api/v1/models/agent', formats: [:json], resource: macro.updated_by
end
end

2
app/views/api/v1/models/_note.json.jbuilder
View file

@ -4,7 +4,7 @@ json.account_id json.account_id
json.contact_id json.contact_id
if resource.user.present?
json.user do
json.partial! 'api/v1/models/agent.json.jbuilder', resource: resource.user
json.partial! 'api/v1/models/agent', formats: [:json], resource: resource.user
end
end
json.created_at resource.created_at.to_i

2
app/views/api/v1/profiles/availability.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/user.json.jbuilder', resource: @user
json.partial! 'api/v1/models/user', formats: [:json], resource: @user

2
app/views/api/v1/profiles/show.json.jbuilder
View file

@ -1 +1 @@
json.partial! 'api/v1/models/user.json.jbuilder', resource: @user
json.partial! 'api/v1/models/user', formats: [:json], resource: @user

Some files were not shown because too many files have changed in this diff Show more