Properly placed pages tests #8303
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ import android.arch.lifecycle.LiveData | |
| import android.arch.lifecycle.MutableLiveData | ||
| import android.arch.lifecycle.ViewModel | ||
| import android.support.annotation.StringRes | ||
| import kotlinx.coroutines.experimental.CoroutineDispatcher | ||
| import kotlinx.coroutines.experimental.Job | ||
| import kotlinx.coroutines.experimental.delay | ||
|
|
@@ -19,6 +18,7 @@ import org.wordpress.android.fluxc.model.page.PageModel | |
| import org.wordpress.android.fluxc.model.page.PageStatus | ||
| import org.wordpress.android.fluxc.store.PageStore | ||
| import org.wordpress.android.fluxc.store.PostStore.OnPostUploaded | ||
| import org.wordpress.android.modules.COMMON_POOL_CONTEXT | ||
| import org.wordpress.android.modules.UI_CONTEXT | ||
| import org.wordpress.android.ui.pages.PageItem.Action | ||
| import org.wordpress.android.ui.pages.PageItem.Action.DELETE_PERMANENTLY | ||
|
|
@@ -47,12 +47,17 @@ import javax.inject.Inject | |
| import javax.inject.Named | ||
| import kotlin.coroutines.experimental.Continuation | ||
|
|
||
| private const val ACTION_DELAY = 100 | ||
| private const val SEARCH_DELAY = 200 | ||
| private const val SEARCH_COLLAPSE_DELAY = 500 | ||
|
|
||
| class PagesViewModel | ||
| @Inject constructor( | ||
| private val pageStore: PageStore, | ||
| private val dispatcher: Dispatcher, | ||
| private val actionPerfomer: ActionPerformer, | ||
| @Named(UI_CONTEXT) private val uiContext: CoroutineDispatcher, | ||
| @Named(COMMON_POOL_CONTEXT) private val commonPoolContext: CoroutineDispatcher | ||
| ) : ViewModel() { | ||
| private val _isSearchExpanded = MutableLiveData<Boolean>() | ||
| val isSearchExpanded: LiveData<Boolean> = _isSearchExpanded | ||
|
|
@@ -84,14 +89,10 @@ class PagesViewModel | |
| private val _setPageParent = SingleLiveEvent<PageModel?>() | ||
| val setPageParent: LiveData<PageModel?> = _setPageParent | ||
|
|
||
| private var pageMap: Map<Long, PageModel> = mapOf() | ||
| set(value) { | ||
| field = value | ||
| _pages.postValue(field.values.toList()) | ||
|
|
||
| if (isSearchExpanded.value == true) { | ||
| onSearch(lastSearchQuery) | ||
|
|
@@ -137,8 +138,7 @@ class PagesViewModel | |
| actionPerfomer.onCleanup() | ||
| } | ||
|
|
||
| private fun reloadPagesAsync() = launch(commonPoolContext) { | ||
| refreshPages() | ||
|
|
||
| val loadState = if (pageMap.isEmpty()) FETCHING else REFRESHING | ||
|
|
@@ -160,11 +160,11 @@ class PagesViewModel | |
| } | ||
|
|
||
| private suspend fun refreshPages() { | ||
| pageMap = pageStore.getPagesFromDb(site).associateBy { it.remoteId } | ||
| } | ||
|
|
||
| fun onPageEditFinished(pageId: Long) { | ||
| launch(uiContext) { | ||
| refreshPages() // show local changes immediately | ||
| waitForPageUpdate(pageId) | ||
| reloadPages() | ||
|
|
@@ -179,7 +179,7 @@ class PagesViewModel | |
| } | ||
|
|
||
| fun onPageParentSet(pageId: Long, parentId: Long) { | ||
| launch(uiContext) { | ||
| pageMap[pageId]?.let { page -> | ||
| setParent(page, parentId) | ||
| } | ||
|
|
@@ -198,11 +198,11 @@ class PagesViewModel | |
| _isNewPageButtonVisible.postOnUi(isNotEmpty && hasNoExceptions) | ||
| } | ||
|
|
||
| fun onSearch(searchQuery: String, delay: Int = SEARCH_DELAY) { | ||
| searchJob?.cancel() | ||
| if (searchQuery.isNotEmpty()) { | ||
| searchJob = launch(uiContext) { | ||
| delay(delay) | ||
| searchJob = null | ||
| if (isActive) { | ||
| _lastSearchQuery = searchQuery | ||
|
|
@@ -218,7 +218,7 @@ class PagesViewModel | |
| private suspend fun groupedSearch( | ||
| site: SiteModel, | ||
| searchQuery: String | ||
| ): SortedMap<PageListType, List<PageModel>> = withContext(commonPoolContext) { | ||
| val list = pageStore.search(site, searchQuery).groupBy { PageListType.fromPageStatus(it.status) } | ||
| return@withContext list.toSortedMap( | ||
| Comparator { previous, next -> | ||
|
|
@@ -250,8 +250,8 @@ class PagesViewModel | |
| _isSearchExpanded.value = false | ||
| clearSearch() | ||
|
|
||
| launch(uiContext) { | ||
| delay(SEARCH_COLLAPSE_DELAY) | ||
| checkIfNewPageButtonShouldBeVisible() | ||
| } | ||
| return true | ||
|
|
@@ -275,7 +275,7 @@ class PagesViewModel | |
| } | ||
|
|
||
| fun onDeleteConfirmed(remoteId: Long) { | ||
| launch(commonPoolContext) { | ||
| pageMap[remoteId]?.let { deletePage(it) } | ||
| } | ||
| } | ||
|
|
@@ -289,7 +289,7 @@ class PagesViewModel | |
| } | ||
|
|
||
| fun onPullToRefresh() { | ||
| launch(uiContext) { | ||
| reloadPages(FETCHING) | ||
| } | ||
| } | ||
|
|
@@ -298,70 +298,75 @@ class PagesViewModel | |
| val oldParent = page.parent?.remoteId ?: 0 | ||
|
|
||
| val action = PageAction(UPLOAD) { | ||
| launch(commonPoolContext) { | ||
| if (page.parent?.remoteId != parentId) { | ||
|
There was a problem hiding this comment. By removing this line, the logic in the setter is not called and we lost the instant updates. We could just extract that code and call it from here explicitly. There was a problem hiding this comment. you're right! I missed that. I'll call the setter explicitly 👍 |
||
| val updatedPage = updateParent(page, parentId) | ||
|
|
||
| pageStore.uploadPageToServer(updatedPage) | ||
| } | ||
| } | ||
| } | ||
| action.undo = { | ||
| launch(commonPoolContext) { | ||
| pageMap[page.remoteId]?.let { changed -> | ||
|
There was a problem hiding this comment. Same here, lost instant updates. |
||
| val updatedPage = updateParent(changed, oldParent) | ||
|
|
||
| pageStore.uploadPageToServer(updatedPage) | ||
| } | ||
| } | ||
| } | ||
| action.onSuccess = { | ||
| launch(commonPoolContext) { | ||
| reloadPages() | ||
|
|
||
| delay(ACTION_DELAY) | ||
| _showSnackbarMessage.postValue( | ||
| SnackbarMessageHolder(string.page_parent_changed, string.undo, action.undo)) | ||
| } | ||
| } | ||
| action.onError = { | ||
| launch(commonPoolContext) { | ||
| refreshPages() | ||
|
|
||
| _showSnackbarMessage.postValue(SnackbarMessageHolder(string.page_parent_change_error)) | ||
| } | ||
| } | ||
|
|
||
| launch(uiContext) { | ||
| _arePageActionsEnabled = false | ||
| actionPerfomer.performAction(action) | ||
| _arePageActionsEnabled = true | ||
| } | ||
| } | ||
|
|
||
| private fun updateParent(page: PageModel, parentId: Long): PageModel { | ||
| val updatedPage = page.copy(parent = pageMap[parentId]) | ||
| val updatedMap = pageMap.toMutableMap() | ||
| updatedMap[page.remoteId] = updatedPage | ||
| pageMap = updatedMap | ||
| return updatedPage | ||
| } | ||
|
|
||
| private fun deletePage(page: PageModel) { | ||
| val action = PageAction(REMOVE) { | ||
| launch(commonPoolContext) { | ||
| pageMap = pageMap.filter { it.key != page.remoteId } | ||
|
|
||
| checkIfNewPageButtonShouldBeVisible() | ||
|
|
||
| pageStore.deletePageFromServer(page) | ||
| } | ||
| } | ||
| action.onSuccess = { | ||
| launch(commonPoolContext) { | ||
| delay(ACTION_DELAY) | ||
| reloadPages() | ||
|
|
||
| _showSnackbarMessage.postValue(SnackbarMessageHolder(string.page_permanently_deleted)) | ||
| } | ||
| } | ||
| action.onError = { | ||
| launch(commonPoolContext) { | ||
| refreshPages() | ||
|
|
||
| _showSnackbarMessage.postValue(SnackbarMessageHolder(string.page_delete_error)) | ||
|
|
@@ -377,48 +382,56 @@ class PagesViewModel | |
| pageMap[remoteId]?.let { page -> | ||
| val oldStatus = page.status | ||
| val action = PageAction(UPLOAD) { | ||
| val updatedPage = updatePageStatus(page, status) | ||
| launch(commonPoolContext) { | ||
| pageStore.updatePageInDb(updatedPage) | ||
| refreshPages() | ||
|
|
||
| pageStore.uploadPageToServer(updatedPage) | ||
| } | ||
| } | ||
| action.undo = { | ||
| val updatedPage = updatePageStatus(page, oldStatus) | ||
| launch(commonPoolContext) { | ||
| pageStore.updatePageInDb(updatedPage) | ||
| refreshPages() | ||
|
|
||
| pageStore.uploadPageToServer(updatedPage) | ||
| } | ||
| } | ||
| action.onSuccess = { | ||
| launch(commonPoolContext) { | ||
| delay(ACTION_DELAY) | ||
| reloadPages() | ||
|
|
||
| val message = prepareStatusChangeSnackbar(status, action.undo) | ||
| _showSnackbarMessage.postValue(message) | ||
| } | ||
| } | ||
| action.onError = { | ||
| launch(commonPoolContext) { | ||
| action.undo() | ||
|
|
||
| _showSnackbarMessage.postValue(SnackbarMessageHolder(string.page_status_change_error)) | ||
| } | ||
| } | ||
|
|
||
| launch(uiContext) { | ||
| _arePageActionsEnabled = false | ||
| actionPerfomer.performAction(action) | ||
| _arePageActionsEnabled = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun updatePageStatus(page: PageModel, oldStatus: PageStatus): PageModel { | ||
| val updatedPage = page.copy(status = oldStatus) | ||
| val updatedMap = pageMap.toMutableMap() | ||
| updatedMap[page.remoteId] = updatedPage | ||
| pageMap = updatedMap | ||
| return updatedPage | ||
| } | ||
|
|
||
| private fun prepareStatusChangeSnackbar(newStatus: PageStatus, undo: (() -> Unit)? = null): SnackbarMessageHolder { | ||
| val message = when (newStatus) { | ||
| PageStatus.DRAFT -> string.page_moved_to_draft | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package org.wordpress.android | ||
|
|
||
| import kotlinx.coroutines.experimental.CoroutineScope | ||
| import kotlinx.coroutines.experimental.runBlocking | ||
| import kotlin.coroutines.experimental.CoroutineContext | ||
| import kotlin.coroutines.experimental.EmptyCoroutineContext | ||
|
|
||
| fun <T> test(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T) { | ||
| runBlocking(context, block) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!