From 51247a206426b986994abcea513ec56d064ea68a Mon Sep 17 00:00:00 2001 From: Aman S Date: Wed, 2 Apr 2025 20:34:49 +0530 Subject: [PATCH] NTP-52482 || Added datasource in CRM INTENT (#15620) --- .../src/main/java/com/navi/chat/models/WebViewIntent.kt | 1 + .../java/com/navi/chat/ui/activities/CRMWebViewActivity.kt | 2 ++ .../navi-chat/src/main/java/com/navi/chat/utils/Constants.kt | 1 + .../java/com/navi/chat/viewmodels/CRMWebSharedViewModel.kt | 5 +++++ 4 files changed, 9 insertions(+) diff --git a/android/navi-chat/src/main/java/com/navi/chat/models/WebViewIntent.kt b/android/navi-chat/src/main/java/com/navi/chat/models/WebViewIntent.kt index c5631fcd63..a1f776d755 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/models/WebViewIntent.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/models/WebViewIntent.kt @@ -14,4 +14,5 @@ data class WebViewIntent( val productType: String?, val fromActiveChat: Boolean? = false, val conversationId: String? = null, + val dataSource: String? = null, ) diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/CRMWebViewActivity.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/CRMWebViewActivity.kt index 1a4f591701..4d0fb651b5 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/CRMWebViewActivity.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/CRMWebViewActivity.kt @@ -35,6 +35,7 @@ import com.navi.chat.utils.ACTIVE_CHAT_CONV import com.navi.chat.utils.CHAT_BOT_SCREEN_NAME import com.navi.chat.utils.CONVERSATION_ID_PARAM import com.navi.chat.utils.CRM_WEB_VIEW_ACTIVITY +import com.navi.chat.utils.DATA_SOURCE import com.navi.chat.utils.EXTERNAL_DEEPLINK_BASE_URL import com.navi.chat.utils.NAVI_CLICK_ACTION_URL import com.navi.chat.utils.NAVI_JAVA_SCRIPT @@ -96,6 +97,7 @@ class CRMWebViewActivity : BaseActivity() { productType = intent.getStringExtra(PRODUCT_TYPE), fromActiveChat = fromActiveChat.toBoolean(), conversationId = conversationId, + dataSource = intent.getStringExtra(DATA_SOURCE), ) pathUrl = viewModel.buildPathUrl(webViewIntent) diff --git a/android/navi-chat/src/main/java/com/navi/chat/utils/Constants.kt b/android/navi-chat/src/main/java/com/navi/chat/utils/Constants.kt index c398af32f2..11beca76b1 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/utils/Constants.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/utils/Constants.kt @@ -151,6 +151,7 @@ const val SCREEN_NAME_CAPITAL = "SCREEN_NAME" const val PL_WEB_URL_HOST_NAME = "PL_WEB_URL_HOST_NAME" const val NAVI_JAVA_SCRIPT = "NaviJavaScript" const val ORDER_ID = "orderId" +const val DATA_SOURCE = "dataSource" const val PRODUCT_TYPE = "productType" const val PRODUCT = "product" const val IS_LANDING_ROUTE_TRUE = "isLandingRoute=true" diff --git a/android/navi-chat/src/main/java/com/navi/chat/viewmodels/CRMWebSharedViewModel.kt b/android/navi-chat/src/main/java/com/navi/chat/viewmodels/CRMWebSharedViewModel.kt index 7521d11455..9de3728ac9 100644 --- a/android/navi-chat/src/main/java/com/navi/chat/viewmodels/CRMWebSharedViewModel.kt +++ b/android/navi-chat/src/main/java/com/navi/chat/viewmodels/CRMWebSharedViewModel.kt @@ -35,6 +35,7 @@ import com.navi.chat.utils.CRM_WEB_VIEW_BASE_URL import com.navi.chat.utils.CRM_WEB_VIEW_URL_PARAM_CONTINUE import com.navi.chat.utils.CUSTOMER import com.navi.chat.utils.CUSTOMER_SUPPORT_PATH +import com.navi.chat.utils.DATA_SOURCE import com.navi.chat.utils.EQUALS import com.navi.chat.utils.FORWARD_SLASH import com.navi.chat.utils.HELP_PATH @@ -206,6 +207,10 @@ constructor( pathUrl.append(AMPERSAND).append(ORDER_ID).append(EQUALS).append(it) } + webViewIntent.dataSource?.let { + pathUrl.append(AMPERSAND).append(DATA_SOURCE).append(EQUALS).append(it) + } + webViewIntent.productType?.let { pathUrl.append(AMPERSAND).append(PRODUCT).append(EQUALS).append(it) }