Skip to content

Commit

Permalink
Merge pull request #13675 from woocommerce/issue/add-store-id-and-url…
Browse files Browse the repository at this point in the history
…-to-surveys

Issue/add store id and url to surveys
  • Loading branch information
JorgeMucientes authored Mar 7, 2025
2 parents 5624230 + 580e369 commit 0cafb95
Showing 1 changed file with 25 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.google.android.material.appbar.MaterialToolbar
import com.woocommerce.android.AppPrefsWrapper
import com.woocommerce.android.R
import com.woocommerce.android.analytics.AnalyticsEvent.SURVEY_SCREEN
import com.woocommerce.android.analytics.AnalyticsTracker
Expand All @@ -26,17 +27,27 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_ORDER_
import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_PRODUCT_ADDONS_FEEDBACK
import com.woocommerce.android.databinding.FragmentFeedbackSurveyBinding
import com.woocommerce.android.extensions.navigateSafely
import com.woocommerce.android.tools.SelectedSite
import com.woocommerce.android.ui.base.BaseFragment
import com.woocommerce.android.ui.main.AppBarStatus
import com.woocommerce.android.widgets.CustomProgressDialog
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject

@AndroidEntryPoint
class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
companion object {
const val TAG = "feedback_survey"
private const val QUERY_PARAMETER_MESSAGE = "msg"
private const val SURVEY_DONE_QUERY_MESSAGE = "done"
}

@Inject
lateinit var selectedSite: SelectedSite

@Inject
lateinit var appPrefsWrapper: AppPrefsWrapper

override val activityAppBarStatus: AppBarStatus
get() = AppBarStatus.Hidden

Expand Down Expand Up @@ -66,7 +77,7 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {
configureWebView()
savedInstanceState?.let {
binding.webView.restoreState(it)
} ?: binding.webView.loadUrl(getSurveyUrlFromArguments())
} ?: binding.webView.loadUrl(addCrowdSignalTagsTo(getSurveyUrlFromArguments()))
}

private fun setupToolbar(toolbar: MaterialToolbar) {
Expand All @@ -82,6 +93,19 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) {

private fun getSurveyUrlFromArguments(): String = arguments.customUrl ?: arguments.surveyType.url

private fun addCrowdSignalTagsTo(url: String): String {
val siteId = selectedSite.getOrNull()?.siteId
val storeId = appPrefsWrapper.getWCStoreID(siteId ?: 0L)
val storeUrl = selectedSite.getOrNull()?.url

return buildString {
append(url)
if (siteId != null) append("&site-id=$siteId")
if (!storeId.isNullOrBlank()) append("&store-id=$storeId")
if (!storeUrl.isNullOrBlank()) append("&store-url=$storeUrl")
}
}

override fun onDestroyView() {
super.onDestroyView()
_binding = null
Expand Down

0 comments on commit 0cafb95

Please sign in to comment.