Merge branch 'trunk' into issue-3885/variation-delete-confirmation

Author: Joel Dean

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 17.2
+This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.
+
 ## 17.1
 This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.
 

RELEASE-NOTES.txt

@@ -1,13 +1,19 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+17.3
+-----
+
+
 17.3
 -----
 - [*] [Internal] Enhanced user experience in shipping label creation with automatic scrolling to the first invalid field upon form submission failure [https://github.com/woocommerce/woocommerce-android/pull/10657]
 - [*] [Internal] Enhanced product variation delete confirmation dialog visibility and functionality across device rotations [https://github.com/woocommerce/woocommerce-android/pull/10664]
+- [*] [Internal] Added a text along with the receipts file when it is shared [https://github.com/woocommerce/woocommerce-android/pull/10681]
 
 17.2
 -----
 - [**] [Available for users with WooCommerce version of 8.7+, which is not released yet] Every order have a receipt now. The receipts can be shared via many apps installed on the phone [https://github.com/woocommerce/woocommerce-android/pull/10650]
+- [*] Fix login for sites with Jetpack Connection Package [https://github.com/woocommerce/woocommerce-android/pull/10688]
 
 17.1
 -----

WooCommerce/metadata/PlayStoreStrings.pot

@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_171"
+msgctxt "release_note_172"
 msgid ""
-"17.1:\n"
-"This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.\n"
+"17.2:\n"
+"This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.\n"
 msgstr ""
 
-msgctxt "release_note_170"
+msgctxt "release_note_171"
 msgid ""
-"17.0:\n"
-"Get ready for a smoother experience with our latest update! We've ironed out the pesky bug that kept gift cards from showing up in the 'totals' section during order creation and editing. Managing your sales with our WooCommerce app is now more seamless than ever. Update now and enjoy the hassle-free enhancements!\n"
+"17.1:\n"
+"This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

WooCommerce/metadata/release_notes.txt

@@ -1 +1 @@
-This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.
+This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/helpers/util/Screen.kt

@@ -23,6 +23,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -96,6 +97,16 @@ open class Screen {
             }
         }
 
+        private fun isElementEnabled(element: Int): Boolean {
+            return try {
+                onView(withId(element))
+                    .check(matches(isEnabled()))
+                true
+            } catch (e: Throwable) {
+                false
+            }
+        }
+
         private fun isElementNotDisplayed(element: Int): Boolean {
             return try {
                 onView(withId(element))
@@ -307,6 +318,14 @@ open class Screen {
         idleFor(1000) // allow for transitions
     }
 
+    fun waitForElementToBeEnabled(elementID: Int) {
+        waitForConditionToBeTrue(
+            Supplier<Boolean> {
+                isElementEnabled(elementID)
+            }
+        )
+    }
+
     fun waitForElementToBeDisplayed(elementID: Int) {
         waitForConditionToBeTrue(
             Supplier<Boolean> {

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/UnifiedOrderScreen.kt

@@ -14,12 +14,12 @@ import com.woocommerce.android.R
 import com.woocommerce.android.e2e.helpers.util.NestedScrollViewExtension
 import com.woocommerce.android.e2e.helpers.util.Screen
 import org.hamcrest.CoreMatchers.endsWith
-import org.hamcrest.Matchers
 import org.hamcrest.core.AllOf.allOf
 
 class UnifiedOrderScreen : Screen(R.id.order_creation_root) {
     fun createOrder(): SingleOrderScreen {
-        clickOn(R.id.menu_create)
+        waitForElementToBeEnabled(R.id.menu_create)
+        Espresso.onView(withId(R.id.menu_create)).perform(click())
         return SingleOrderScreen()
     }
 
@@ -60,18 +60,9 @@ class UnifiedOrderScreen : Screen(R.id.order_creation_root) {
         return this
     }
 
-    fun editCustomerNote(note: String): UnifiedOrderScreen {
-        waitForElementToBeDisplayedWithoutFailure(R.id.notes_section)
-        scrollTo(R.id.notes_section)
+    fun addCustomerNote(note: String): UnifiedOrderScreen {
+        Espresso.onView(withText(R.string.order_creation_add_customer_note)).perform(click())
 
-        val editNoteButton = Espresso.onView(
-            Matchers.allOf(
-                isDescendantOfA(withId(R.id.notes_section)),
-                withId(R.id.edit_button)
-            )
-        )
-
-        clickOn(editNoteButton)
         typeTextInto(R.id.customerOrderNote_editor, note)
         clickOn(R.id.menu_done)
         return this

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/ui/OrdersUITest.kt

@@ -18,7 +18,6 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.json.JSONObject
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
@@ -48,11 +47,9 @@ class OrdersUITest : TestBase() {
         TabNavComponent().gotoOrdersScreen()
     }
 
-    @Ignore
     @Test
     fun e2eCreateOrderTest() {
         val note = "Just a placeholder text"
-        val status = "Processing"
         val ordersJSONArray = MocksReader().readOrderToArray()
 
         for (orderJSON in ordersJSONArray.iterator()) {
@@ -63,12 +60,10 @@ class OrdersUITest : TestBase() {
             OrderListScreen()
                 .createFABTap()
                 .assertNewOrderScreen()
-                .updateOrderStatus(status)
+                .addCustomerNote(note)
                 .addProductTap()
                 .assertProductsSelectorScreen(composeTestRule)
                 .selectProduct(composeTestRule, orderData.productName)
-                .editCustomerNote(note)
-                .addShipping()
                 .createOrder()
                 .assertSingleOrderScreenWithProduct(orderData)
                 .goBackToOrdersScreen()

WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/FlowExtensions.kt

@@ -3,43 +3,47 @@ package com.woocommerce.android.extensions
 import kotlinx.coroutines.flow.Flow
 
 @Suppress("LongParameterList")
-inline fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
+inline fun <T1, T2, T3, T4, T5, T6, R> combine(
     flow: Flow<T1>,
     flow2: Flow<T2>,
     flow3: Flow<T3>,
     flow4: Flow<T4>,
     flow5: Flow<T5>,
     flow6: Flow<T6>,
-    flow7: Flow<T7>,
-    crossinline transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R
+    crossinline transform: suspend (T1, T2, T3, T4, T5, T6) -> R
 ): Flow<R> {
-    return kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7) { args: Array<*> ->
+    return kotlinx.coroutines.flow.combine(
+        flow,
+        flow2,
+        flow3,
+        flow4,
+        flow5,
+        flow6,
+    ) { args: Array<*> ->
         @Suppress("UNCHECKED_CAST", "MagicNumber")
         transform(
             args[0] as T1,
             args[1] as T2,
             args[2] as T3,
             args[3] as T4,
             args[4] as T5,
-            args[5] as T6,
-            args[6] as T7,
+            args[5] as T6
         )
     }
 }
 
 @Suppress("LongParameterList")
-inline fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
+inline fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
     flow: Flow<T1>,
     flow2: Flow<T2>,
     flow3: Flow<T3>,
     flow4: Flow<T4>,
     flow5: Flow<T5>,
     flow6: Flow<T6>,
     flow7: Flow<T7>,
-    flow8: Flow<T8>,
-    crossinline transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R
+    crossinline transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R
 ): Flow<R> {
-    return kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7, flow8) { args: Array<*> ->
+    return kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7) { args: Array<*> ->
         @Suppress("UNCHECKED_CAST", "MagicNumber")
         transform(
             args[0] as T1,
@@ -49,7 +53,6 @@ inline fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
             args[4] as T5,
             args[5] as T6,
             args[6] as T7,
-            args[7] as T8,
         )
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/hub/AnalyticsHubFragment.kt

@@ -29,8 +29,7 @@ import kotlinx.coroutines.launch
 import java.util.Date
 
 @AndroidEntryPoint
-class AnalyticsHubFragment :
-    BaseFragment(R.layout.fragment_analytics) {
+class AnalyticsHubFragment : BaseFragment(R.layout.fragment_analytics) {
     companion object {
         const val KEY_DATE_RANGE_SELECTOR_RESULT = "key_order_status_result"
         const val DATE_PICKER_FRAGMENT_TAG = "DateRangePicker"
@@ -110,6 +109,9 @@ class AnalyticsHubFragment :
     private fun bind(view: View) {
         _binding = FragmentAnalyticsBinding.bind(view)
         binding.analyticsDateSelectorCard.setOnClickListener { viewModel.onDateRangeSelectorClick() }
+        binding.analyticsOrdersCard.onSeeReportClickListener = { url -> viewModel.onSeeReport(url) }
+        binding.analyticsRevenueCard.onSeeReportClickListener = { url -> viewModel.onSeeReport(url) }
+        binding.analyticsProductsCard.onSeeReportClickListener = { url -> viewModel.onSeeReport(url) }
     }
 
     private fun handleStateChange(viewState: AnalyticsViewState) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/hub/AnalyticsHubViewModel.kt

@@ -13,6 +13,7 @@ import com.woocommerce.android.model.OrdersStat
 import com.woocommerce.android.model.ProductsStat
 import com.woocommerce.android.model.RevenueStat
 import com.woocommerce.android.model.SessionStat
+import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.ui.analytics.hub.RefreshIndicator.NotShowIndicator
 import com.woocommerce.android.ui.analytics.hub.RefreshIndicator.ShowIndicator
 import com.woocommerce.android.ui.analytics.hub.daterangeselector.AnalyticsHubDateRangeSelectorViewState
@@ -70,6 +71,8 @@ class AnalyticsHubViewModel @Inject constructor(
     private val feedbackRepository: FeedbackRepository,
     private val tracker: AnalyticsTrackerWrapper,
     private val dateUtils: DateUtils,
+    private val selectedSite: SelectedSite,
+    private val getReportUrl: GetReportUrl,
     savedState: SavedStateHandle
 ) : ScopedViewModel(savedState) {
 
@@ -132,6 +135,17 @@ class AnalyticsHubViewModel @Inject constructor(
         rangeSelectionState.value = selectionType.generateLocalizedSelectionData()
     }
 
+    fun onSeeReport(url: String) {
+        selectedSite.getOrNull()?.let { site ->
+            val event = if (site.isWpComStore) {
+                AnalyticsViewEvent.OpenWPComWebView(url)
+            } else {
+                AnalyticsViewEvent.OpenUrl(url)
+            }
+            triggerEvent(event)
+        } ?: triggerEvent(AnalyticsViewEvent.OpenUrl(url))
+    }
+
     fun onCustomRangeSelected(startDate: Date, endDate: Date) {
         rangeSelectionState.value = SelectionType.CUSTOM.generateLocalizedSelectionData(
             startDate = startDate,
@@ -310,7 +324,8 @@ class AnalyticsHubViewModel @Inject constructor(
             stats.conversionRate,
             null,
             listOf()
-        )
+        ),
+        reportUrl = null
     )
 
     private fun buildRevenueDataViewState(revenueStat: RevenueStat) =
@@ -328,6 +343,10 @@ class AnalyticsHubViewModel @Inject constructor(
                 if (revenueStat.netDelta is DeltaPercentage.Value) revenueStat.netDelta.value else null,
                 revenueStat.netRevenueByInterval.map { it.toFloat() }
             ),
+            reportUrl = getReportUrl(
+                selection = ranges,
+                card = ReportCard.Revenue
+            )
         )
 
     private fun buildOrdersDataViewState(ordersStats: OrdersStat) =
@@ -352,6 +371,10 @@ class AnalyticsHubViewModel @Inject constructor(
                     null
                 },
                 ordersStats.avgOrderValueByInterval.map { it.toFloat() }
+            ),
+            reportUrl = getReportUrl(
+                selection = ranges,
+                card = ReportCard.Orders
             )
         )
 
@@ -379,7 +402,11 @@ class AnalyticsHubViewModel @Inject constructor(
                         ),
                         index != products.size - 1
                     )
-                }
+                },
+            reportUrl = getReportUrl(
+                selection = ranges,
+                card = ReportCard.Products
+            )
         )
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/hub/GetReportUrl.kt

@@ -0,0 +1,51 @@
+package com.woocommerce.android.ui.analytics.hub
+
+import com.woocommerce.android.extensions.adminUrlOrDefault
+import com.woocommerce.android.extensions.formatToYYYYmmDD
+import com.woocommerce.android.tools.SelectedSite
+import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection
+import javax.inject.Inject
+
+class GetReportUrl @Inject constructor(
+    private val selectedSite: SelectedSite
+) {
+    operator fun invoke(
+        selection: StatsTimeRangeSelection,
+        card: ReportCard
+    ): String? {
+        return selectedSite.getOrNull()?.let { siteModel ->
+            val adminURL = siteModel.adminUrlOrDefault
+            val page = "page=wc-admin"
+            val path = when (card) {
+                ReportCard.Revenue -> "path=%2Fanalytics%2Frevenue"
+                ReportCard.Orders -> "path=%2Fanalytics%2Forders"
+                ReportCard.Products -> "path=%2Fanalytics%2Fproducts"
+            }
+            val period = getPeriod(selection)
+            val compare = "compare=previous_period"
+            "${adminURL}admin.php?$page&$path&$period&$compare"
+        }
+    }
+
+    private fun getPeriod(selection: StatsTimeRangeSelection): String {
+        return when (selection.selectionType) {
+            StatsTimeRangeSelection.SelectionType.TODAY -> "period=today"
+            StatsTimeRangeSelection.SelectionType.YESTERDAY -> "period=yesterday"
+            StatsTimeRangeSelection.SelectionType.LAST_WEEK -> "period=last_week"
+            StatsTimeRangeSelection.SelectionType.LAST_MONTH -> "period=last_month"
+            StatsTimeRangeSelection.SelectionType.LAST_QUARTER -> "period=last_quarter"
+            StatsTimeRangeSelection.SelectionType.LAST_YEAR -> "period=last_year"
+            StatsTimeRangeSelection.SelectionType.WEEK_TO_DATE -> "period=week"
+            StatsTimeRangeSelection.SelectionType.MONTH_TO_DATE -> "period=month"
+            StatsTimeRangeSelection.SelectionType.QUARTER_TO_DATE -> "period=quarter"
+            StatsTimeRangeSelection.SelectionType.YEAR_TO_DATE -> "period=year"
+            StatsTimeRangeSelection.SelectionType.CUSTOM -> {
+                val startDate = selection.currentRange.start.formatToYYYYmmDD()
+                val endDate = selection.currentRange.end.formatToYYYYmmDD()
+                "period=custom&after=$startDate&before=$endDate"
+            }
+        }
+    }
+}
+
+enum class ReportCard { Revenue, Orders, Products }