Merge pull request #17329 from thomashorta/issue/11002-page-settings-parent

Add Parent Page setting to Page Settings in editor

Author: ovitrif

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 21.1
 -----
+* [**] Added functionality to set the parent of a page from page settings in the editor. [https://github.com/wordpress-mobile/WordPress-Android/pull/17329]
 * [***] [Jetpack-only] Redesigned the landing screen. [https://github.com/wordpress-mobile/WordPress-Android/pull/17351]
 
 21.0

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -29,7 +29,6 @@
 import org.wordpress.android.fluxc.model.PostModel;
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.model.bloggingprompts.BloggingPromptModel;
-import org.wordpress.android.fluxc.model.page.PageModel;
 import org.wordpress.android.fluxc.network.utils.StatsGranularity;
 import org.wordpress.android.imageeditor.EditImageActivity;
 import org.wordpress.android.imageeditor.preview.PreviewImageFragment.Companion.EditImageData;
@@ -663,13 +662,14 @@ public static void viewCurrentBlogPages(@NonNull Context context, @NonNull SiteM
         AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_PAGES, site);
     }
 
-    public static void viewPageParentForResult(@NonNull Fragment fragment, @NonNull PageModel page) {
+    public static void viewPageParentForResult(@NonNull Fragment fragment, @NonNull SiteModel site,
+                                               @NonNull Long pageRemoteId) {
         Intent intent = new Intent(fragment.getContext(), PageParentActivity.class);
-        intent.putExtra(WordPress.SITE, page.getSite());
-        intent.putExtra(EXTRA_PAGE_REMOTE_ID_KEY, page.getRemoteId());
+        intent.putExtra(WordPress.SITE, site);
+        intent.putExtra(EXTRA_PAGE_REMOTE_ID_KEY, pageRemoteId);
         fragment.startActivityForResult(intent, RequestCodes.PAGE_PARENT);
 
-        AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_PAGE_PARENT, page.getSite());
+        AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_PAGE_PARENT, site);
     }
 
     public static void viewUnifiedComments(Context context, SiteModel site) {

WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt

@@ -393,7 +393,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ
         })
 
         viewModel.setPageParent.observe(viewLifecycleOwner, { page ->
-            page?.let { ActivityLauncher.viewPageParentForResult(this@PagesFragment, page) }
+            page?.let { ActivityLauncher.viewPageParentForResult(this@PagesFragment, it.site, it.remoteId) }
         })
 
         viewModel.isNewPageButtonVisible.observe(viewLifecycleOwner, { isVisible ->

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -609,8 +609,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
             } else {
                 mEditPostRepository.loadPostByLocalPostId(extras.getInt(EXTRA_POST_LOCAL_ID));
-                // Load post from extra)s
-
+                // Load post from extra's
                 if (mEditPostRepository.hasPost()) {
                     if (extras.getBoolean(EXTRA_LOAD_AUTO_SAVE_REVISION)) {
                         mEditPostRepository.update(postModel -> {

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.wordpress.android.fluxc.model.MediaModel
 import org.wordpress.android.fluxc.model.PostImmutableModel
@@ -32,6 +33,8 @@ import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
+private const val EMPTY_STRING = ""
+
 class EditPostRepository
 @Inject constructor(
     private val localeManagerWrapper: LocaleManagerWrapper,
@@ -95,6 +98,7 @@ class EditPostRepository
         get() = post!!.tagNameList
     val dateLocallyChanged: String
         get() = post!!.dateLocallyChanged
+    private var parent: PostModel? = null
 
     private var locked = false
 
@@ -144,9 +148,11 @@ class EditPostRepository
     @Synchronized
     private fun reportTransactionState(lock: Boolean) {
         if (lock && locked) {
-            val message = "EditPostRepository: Transaction is writing on a locked thread ${Arrays.toString(
-                    Thread.currentThread().stackTrace
-            )}"
+            val message = "EditPostRepository: Transaction is writing on a locked thread ${
+                Arrays.toString(
+                        Thread.currentThread().stackTrace
+                )
+            }"
             AppLog.e(T.EDITOR, message)
         }
         locked = lock
@@ -210,7 +216,8 @@ class EditPostRepository
         reportTransactionState(false)
     }
 
-    fun postWasChangedInCurrentSession() = postUtils.postHasEdits(postSnapshotWhenEditorOpened,
+    fun postWasChangedInCurrentSession() = postUtils.postHasEdits(
+            postSnapshotWhenEditorOpened,
             requireNotNull(post)
     )
 
@@ -228,6 +235,19 @@ class EditPostRepository
         reportTransactionState(false)
     }
 
+    fun getParentTitle(site: SiteModel): String {
+        // update parent local field if parent ID of current post has changed
+        if (parent?.remotePostId != post?.parentId) {
+            runBlocking {
+                parent = post?.parentId
+                        ?.takeUnless { it == 0L }
+                        ?.let { postStore.getPostByRemotePostId(it, site) }
+            }
+        }
+
+        return parent?.title ?: EMPTY_STRING
+    }
+
     sealed class UpdatePostResult {
         object Updated : UpdatePostResult()
         object NoChanges : UpdatePostResult()