Skip to content

[CIAB] Hide POS #14634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2025
+28 −1
Merged

[CIAB] Hide POS #14634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2723c19
Hide POS feature for CIAB sites
hichamboushaba Sep 18, 2025
153cd09
Add a test case
hichamboushaba Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion WooCommerce/src/main/kotlin/com/woocommerce/android/ciab/CIABAffectedFeature.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ enum class CIABAffectedFeature {
GroupedProducts,
VariableProducts,
GiftCardEditing,
ProductsStockDashboardCard
ProductsStockDashboardCard,
POS
}
9 changes: 9 additions & 0 deletions ...ommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/tab/WooPosTabShouldBeVisible.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.woocommerce.android.ui.woopos.tab

import com.woocommerce.android.ciab.CIABAffectedFeature
import com.woocommerce.android.ciab.CIABSiteGateKeeper
import com.woocommerce.android.tools.SelectedSite
import com.woocommerce.android.ui.woopos.WooPosIsScreenSizeAllowed
import com.woocommerce.android.ui.woopos.common.util.WooPosCouldNotDetermineValueException
Expand All @@ -16,12 +18,19 @@ class WooPosTabShouldBeVisible @Inject constructor(
private val isScreenSizeAllowed: WooPosIsScreenSizeAllowed,
private val wooCommerceStore: WooCommerceStore,
private val isRemoteFeatureFlagEnabled: IsRemoteFeatureFlagEnabled,
private val ciabSiteGateKeeper: CIABSiteGateKeeper,
private val wooPosLog: WooPosLogWrapper,
) {
suspend operator fun invoke(): Result<Boolean> = withContext(Dispatchers.IO) {
val selectedSite = selectedSite.getOrNull()
?: return@withContext Result.failure(WooPosCouldNotDetermineValueException())

if (ciabSiteGateKeeper.isFeatureUnsupported(CIABAffectedFeature.POS)) {
return@withContext Result.success(false).also {
wooPosLog.i("POS Tab Not visible reason: Site is CIAB")
}
}

if (!isRemoteFeatureFlagEnabled(WOO_POS)) {
return@withContext Result.success(false).also {
wooPosLog.i("POS Tab Not visible reason: Remote feature flag is disabled")
Expand Down
17 changes: 17 additions & 0 deletions ...rce/src/test/kotlin/com/woocommerce/android/ui/woopos/tab/WooPosTabShouldBeVisibleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.woocommerce.android.ui.woopos.tab

import com.woocommerce.android.ciab.CIABAffectedFeature
import com.woocommerce.android.ciab.CIABSiteGateKeeper
import com.woocommerce.android.tools.SelectedSite
import com.woocommerce.android.ui.woopos.WooPosIsScreenSizeAllowed
import com.woocommerce.android.ui.woopos.common.util.WooPosCouldNotDetermineValueException
Expand All @@ -9,6 +11,7 @@ import com.woocommerce.android.viewmodel.BaseUnitTest
import kotlinx.coroutines.ExperimentalCoroutinesApi
import org.junit.Before
import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
Expand All @@ -28,6 +31,9 @@ class WooPosTabShouldBeVisibleTest : BaseUnitTest() {
private val wooCommerceStore: WooCommerceStore = mock()
private val isScreenSizeAllowed: WooPosIsScreenSizeAllowed = mock()
private val isRemoteFeatureFlagEnabled: IsRemoteFeatureFlagEnabled = mock()
private val ciabSiteGateKeeper: CIABSiteGateKeeper = mock {
on { isFeatureUnsupported(CIABAffectedFeature.POS) } doReturn false
}

private lateinit var sut: WooPosTabShouldBeVisible
private lateinit var siteModel: SiteModel
Expand All @@ -46,6 +52,7 @@ class WooPosTabShouldBeVisibleTest : BaseUnitTest() {
isScreenSizeAllowed = isScreenSizeAllowed,
wooCommerceStore = wooCommerceStore,
isRemoteFeatureFlagEnabled = isRemoteFeatureFlagEnabled,
ciabSiteGateKeeper = ciabSiteGateKeeper,
wooPosLog = mock()
)
}
Expand Down Expand Up @@ -120,6 +127,16 @@ class WooPosTabShouldBeVisibleTest : BaseUnitTest() {
assertFalse(r.getOrThrow())
}

@Test
fun `given feature unsupported for CIAB site, when invoked, then return success false`() = testBlocking {
whenever(ciabSiteGateKeeper.isFeatureUnsupported(CIABAffectedFeature.POS)).thenReturn(true)

val r = sut()

assertTrue(r.isSuccess)
assertFalse(r.getOrThrow())
}

private fun buildSiteSettings(countryCode: String = "us") =
WCSettingsTestUtils.generateSettings(
siteId = LocalOrRemoteId.LocalId(1)
Expand Down