From 947e4b59e897e7529b86f9c90a8be7fc35f93e1f Mon Sep 17 00:00:00 2001
From: Tanmay Deep Sharma <tanmaydeepsharma21@gmail.com>
Date: Thu, 29 May 2025 13:02:49 +0530
Subject: [PATCH] remove manual whastapp registeration

---
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  2 +-
 .../settings/inbox/channels/Whatsapp.vue      | 52 +++++++++++++++----
 app/views/layouts/vueapp.html.erb             |  4 +-
 ...00001_add_channel_attributes_to_inboxes.rb |  5 --
 db/schema.rb                                  |  4 +-
 5 files changed, 48 insertions(+), 19 deletions(-)
 delete mode 100644 db/migrate/20250526000001_add_channel_attributes_to_inboxes.rb

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index d2effe6fb..1663acae4 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -222,7 +222,7 @@
         "DESC": "Start supporting your customers via WhatsApp.",
         "PROVIDERS": {
           "LABEL": "API Provider",
-          "WHATSAPP_EMBEDDED": "WhatsApp Business (Embedded Signup)",
+          "WHATSAPP_EMBEDDED": "WhatsApp Business",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "WhatsApp Cloud",
           "360_DIALOG": "360Dialog"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index 9fdef416a..113c4cf19 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -15,9 +15,45 @@ export default {
   },
   data() {
     return {
-      provider: 'whatsapp_embedded',
+      provider: 'whatsapp_cloud',
     };
   },
+  computed: {
+    hasWhatsappAppId() {
+      return (
+        window.chatwootConfig?.whatsappAppId &&
+        window.chatwootConfig.whatsappAppId !== 'none'
+      );
+    },
+    availableProviders() {
+      const providers = [];
+
+      if (this.hasWhatsappAppId) {
+        providers.push({
+          value: 'whatsapp_embedded',
+          label: this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_EMBEDDED'),
+        });
+      } else {
+        providers.push({
+          value: 'whatsapp_cloud',
+          label: this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD'),
+        });
+      }
+
+      providers.push({
+        value: 'twilio',
+        label: this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO'),
+      });
+
+      return providers;
+    },
+  },
+  mounted() {
+    // Set the appropriate default provider based on configuration
+    this.provider = this.hasWhatsappAppId
+      ? 'whatsapp_embedded'
+      : 'whatsapp_cloud';
+  },
 };
 </script>
 
@@ -33,14 +69,12 @@ export default {
       <label>
         {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.LABEL') }}
         <select v-model="provider">
-          <option value="whatsapp_embedded">
-            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_EMBEDDED') }}
-          </option>
-          <option value="whatsapp_cloud">
-            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD') }}
-          </option>
-          <option value="twilio">
-            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO') }}
+          <option
+            v-for="providerOption in availableProviders"
+            :key="providerOption.value"
+            :value="providerOption.value"
+          >
+            {{ providerOption.label }}
           </option>
         </select>
       </label>
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 366ebc191..ac15c8531 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -39,8 +39,8 @@
         googleOAuthClientId: '<%= ENV.fetch('GOOGLE_OAUTH_CLIENT_ID', nil) %>',
         googleOAuthCallbackUrl: '<%= ENV.fetch('GOOGLE_OAUTH_CALLBACK_URL', nil) %>',
         fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
-        whatsappAppId: '<%= @global_config['WHATSAPP_APP_ID'] %>',
-        whatsappConfigurationId: '<%= @global_config['WHATSAPP_CONFIGURATION_ID'] %>',
+        whatsappAppId: '<%= ENV.fetch('WHATSAPP_APP_ID', nil) %>',
+        whatsappConfigurationId: '<%= ENV.fetch('WHATSAPP_CONFIGURATION_ID', nil) %>',
         signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>',
         isEnterprise: '<%= @global_config['IS_ENTERPRISE'] %>',
         <% if @global_config['IS_ENTERPRISE'] %>
diff --git a/db/migrate/20250526000001_add_channel_attributes_to_inboxes.rb b/db/migrate/20250526000001_add_channel_attributes_to_inboxes.rb
deleted file mode 100644
index 47a8440e7..000000000
--- a/db/migrate/20250526000001_add_channel_attributes_to_inboxes.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddChannelAttributesToInboxes < ActiveRecord::Migration[7.0]
-  def change
-    add_column :inboxes, :channel_attributes, :jsonb, default: {}
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 0f8ef41d8..78ea891df 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2025_05_26_000001) do
+ActiveRecord::Schema[7.1].define(version: 2025_05_29_031839) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -908,7 +908,7 @@ ActiveRecord::Schema[7.0].define(version: 2025_05_26_000001) do
     t.text "header_text"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.jsonb "config", default: {"allowed_locales"=>["en"]}
+    t.jsonb "config", default: {"allowed_locales" => ["en"]}
     t.boolean "archived", default: false
     t.bigint "channel_web_widget_id"
     t.index ["channel_web_widget_id"], name: "index_portals_on_channel_web_widget_id"