Skip to content
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

Site Monitor: Adjust position in menu item #20098

Merged
merged 2 commits into from
Feb 2, 2024
Merged

Site Monitor: Adjust position in menu item #20098

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
4d423df
Refactor: move the site monitoring row after the manage rows
zwarm Feb 1, 2024
f612aac
Update tests to align with the site monitor row position change
zwarm Feb 1, 2024
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
4 changes: 2 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteItemsBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ class SiteItemsBuilder @Inject constructor(
private fun getManageSiteItems(
params: SiteItemsBuilderParams
): List<MySiteCardAndItem> {
val siteMonitoring = buildSiteMonitoringOptionsIfNeeded(params)
val manageSiteItems = buildManageSiteItems(params)
val siteMonitoring = buildSiteMonitoringOptionsIfNeeded(params)

val emptyHeaderItem1 = CategoryEmptyHeaderItem(UiString.UiStringText(""))
val jetpackConfiguration = buildJetpackDependantConfigurationItemsIfNeeded(params)
Expand All @@ -102,8 +102,8 @@ class SiteItemsBuilder @Inject constructor(
val emptyHeaderItem2 = CategoryEmptyHeaderItem(UiString.UiStringText(""))
val admin = siteListItemBuilder.buildAdminItemIfAvailable(params.site, params.onClick)
return listOf(manageHeader) +
siteMonitoring +
manageSiteItems +
siteMonitoring +
emptyHeaderItem1 +
jetpackConfiguration +
lookAndFeel +
Expand Down
16 changes: 8 additions & 8 deletions WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsBuilderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ class SiteItemsBuilderTest {
@Test
fun `adds all the items in the correct order`() {
setupHeaders(
addSiteMonitoringItem = true,
addActivityLogItem = true,
addSiteMonitoringItem = true,
addPlanItem = false,
addPagesItem = true,
addAdminItem = true,
Expand Down Expand Up @@ -107,10 +107,10 @@ class SiteItemsBuilderTest {
TRAFFIC_HEADER,
STATS_ITEM,
MANAGE_HEADER,
SITE_MONITORING_ITEM,
ACTIVITY_ITEM,
BACKUP_ITEM,
SCAN_ITEM,
SITE_MONITORING_ITEM,
EMPTY_HEADER,
PEOPLE_ITEM,
PLUGINS_ITEM,
Expand Down Expand Up @@ -231,8 +231,8 @@ class SiteItemsBuilderTest {

@Suppress("ComplexMethod", "LongMethod")
private fun setupHeaders(
addSiteMonitoringItem: Boolean = false,
addActivityLogItem: Boolean = false,
addSiteMonitoringItem: Boolean = false,
addPlanItem: Boolean = false,
addPagesItem: Boolean = false,
addAdminItem: Boolean = false,
Expand All @@ -258,11 +258,6 @@ class SiteItemsBuilderTest {
PLAN_ITEM.copy(showFocusPoint = showPlansFocusPoint)
)
}
if (addSiteMonitoringItem) {
whenever(siteListItemBuilder.buildSiteMonitoringItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
SITE_MONITORING_ITEM
)
}
if (addActivityLogItem) {
whenever(siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
ACTIVITY_ITEM
Expand All @@ -278,6 +273,11 @@ class SiteItemsBuilderTest {
SCAN_ITEM
)
}
if (addSiteMonitoringItem) {
whenever(siteListItemBuilder.buildSiteMonitoringItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
SITE_MONITORING_ITEM
)
}
if (addPagesItem) {
whenever(
siteListItemBuilder.buildPagesItemIfAvailable(
Expand Down
Loading