Merge branch 'develop' into feature/cw-7513

app/views/api/v1/accounts/articles/_article.json.jbuilder

@@ -4,6 +4,8 @@ json.title article.title
 json.content article.content
 json.description article.description
 json.status article.status
+json.draft_title article.draft_title
+json.draft_content article.draft_content
 json.position article.position
 json.account_id article.account_id
 json.updated_at article.updated_at.to_i

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

@@ -0,0 +1 @@
+json.branded_email_layout @branded_email_layout

app/views/api/v1/accounts/branded_email_layouts/update.json.jbuilder

@@ -0,0 +1 @@
+json.branded_email_layout @branded_email_layout

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

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

app/views/api/v1/accounts/inboxes/update.json.jbuilder

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

app/views/api/v1/accounts/portals/_portal.json.jbuilder

@@ -19,6 +19,7 @@ json.config do
   json.layout portal.layout
   json.social_profiles portal.social_profiles
   json.locale_translations portal.config['locale_translations'] || {}
+  json.popular_content portal.config['popular_content'] || {}
 end
 
 if portal.channel_web_widget

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

@@ -81,6 +81,10 @@ if resource.email?
   json.email resource.channel.try(:email)
   json.forwarding_enabled ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', '').present?
   json.forward_to_email resource.channel.try(:forward_to_email) if ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', '').present?
+  if Current.account_user&.administrator? && defined?(with_branded_email_layout) && with_branded_email_layout.present? &&
+     Current.account.feature_enabled?(:branded_email_templates)
+    json.branded_email_layout resource.branded_email_layout
+  end
 
   ## IMAP
   if Current.account_user&.administrator?

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

@@ -1,4 +1,4 @@
-json.access_token resource.access_token.token
+json.access_token resource.accounts.any?(&:api_and_webhooks_enabled?) ? resource.access_token.token : ''
 json.account_id resource.active_account_user&.account_id
 json.available_name resource.available_name
 json.avatar_url resource.avatar_url
@@ -31,6 +31,7 @@ json.accounts do
     # availability derived from presence
     json.availability_status account_user.availability_status
     json.auto_offline account_user.auto_offline
+    json.api_and_webhooks account_user.account.feature_enabled?('api_and_webhooks')
     json.partial! 'api/v1/models/account_user', account_user: account_user if ChatwootApp.enterprise?
   end
 end