Show a toast message (notice) when moving posts to trash

RELEASE-NOTES.txt

@@ -1,7 +1,7 @@
 23.6
 -----
-
 * [***] [internal][Jetpack-only] [***] Added paid domain selection, plan selection, and checkout screens in site creation flow [#21688]
+* [**] When moving a post to trash, show a toast message with undo action instead of an inline undo row. [#21724]
 * [*] Site Domains: Fixed an issue where the message shared while adding a domain was inaccurate. [#21827]
 * [*] Fix an issue where login with site address is blocked after failing the first attempt. [#21848]
 * [*] Fix an issue with an issue [#16999] with HTML not being stripped from post titles [#21846]

WordPress/Classes/Models/AbstractPost.h

@@ -36,10 +36,6 @@ typedef NS_ENUM(NSUInteger, AbstractPostRemoteStatus) {
 // These are primarily used as helpers sorting fetchRequests.
 @property (nonatomic, assign) BOOL metaIsLocal;
 @property (nonatomic, assign) BOOL metaPublishImmediately;
-/**
- Used to store the post's status before its sent to the trash.
- */
-@property (nonatomic, strong) NSString *restorableStatus;
 /**
  This array will contain a list of revision IDs.
  */

WordPress/Classes/Models/AbstractPost.m

@@ -39,8 +39,6 @@ @implementation AbstractPost
 @dynamic autosaveModifiedDate;
 @dynamic autosaveIdentifier;
 
-@synthesize restorableStatus;
-
 + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key
 {
     NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];

WordPress/Classes/Services/PostRepository.swift

@@ -81,6 +81,9 @@ final class PostRepository {
             return
         }
 
+        let status = try await coreDataStack.performQuery { try $0.existingObject(with: postID).status }
+        assert(status == .trash, "This function can only be used to delete trashed posts/pages.")
+
         // First delete the post from local database.
         let (remote, remotePost) = try await coreDataStack.performAndSave { [remoteFactory] context in
             let post = try context.existingObject(with: postID)

WordPress/Classes/Services/PostService.h

@@ -125,41 +125,6 @@ forceDraftIfCreating:(BOOL)forceDraftIfCreating
          success:(nullable void (^)(AbstractPost *post, NSString *previewURL))success
          failure:(void (^)(NSError * _Nullable error))failure;
 
-/**
- Attempts to delete the specified post outright vs moving it to the 
- trash folder.
-
- @param post The post or page to delete
- @param success A success block
- @param failure A failure block
- */
-- (void)deletePost:(AbstractPost *)post
-           success:(nullable void (^)(void))success
-           failure:(void (^)(NSError * _Nullable error))failure;
-
-/**
- Moves the specified post into the trash bin. Does not delete
- the post unless it was deleted on the server.
-
- @param post The post or page to trash
- @param success A success block
- @param failure A failure block
- */
-- (void)trashPost:(AbstractPost *)post
-          success:(nullable nullable void (^)(void))success
-          failure:(void (^)(NSError * _Nullable error))failure;
-
-/**
- Moves the specified post out of the trash bin.
-
- @param post The post or page to restore
- @param success A success block
- @param failure A failure block
- */
-- (void)restorePost:(AbstractPost *)post
-           success:(nullable void (^)(void))success
-           failure:(void (^)(NSError * _Nullable error))failure;
-
 @end
 
 NS_ASSUME_NONNULL_END

WordPress/Classes/Services/PostService.m

@@ -449,195 +449,6 @@ - (void)handleAutoSaveWithRestRemote:(PostServiceRemoteREST *)restRemote
 
 }
 
-#pragma mark - Delete, Trashing, Restoring
-
-- (void)deletePost:(AbstractPost *)post
-           success:(void (^)(void))success
-           failure:(void (^)(NSError *error))failure
-{
-    void (^privateBlock)(void) = ^void() {
-        NSNumber *postID = post.postID;
-        if ([postID longLongValue] > 0) {
-            RemotePost *remotePost = [PostHelper remotePostWithPost:post];
-            id<PostServiceRemote> remote = [self.postServiceRemoteFactory forBlog:post.blog];
-            [remote deletePost:remotePost success:success failure:failure];
-        }
-        [self.managedObjectContext deleteObject:post];
-        [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
-    };
-
-    if ([post isRevision]) {
-        [self deletePost:post.original success:privateBlock failure:failure];
-    } else {
-        privateBlock();
-    }
-}
-
-- (void)trashPost:(AbstractPost *)post
-          success:(void (^)(void))success
-          failure:(void (^)(NSError *error))failure
-{
-    if ([post.status isEqualToString:PostStatusTrash]) {
-        [self deletePost:post success:success failure:failure];
-        return;
-    }
-
-    void(^privateBodyBlock)(void) = ^void() {
-        post.restorableStatus = post.status;
-
-        NSNumber *postID = post.postID;
-
-        if ([post isRevision] || [postID longLongValue] <= 0) {
-            post.status = PostStatusTrash;
-
-            if (success) {
-                success();
-            }
-
-            return;
-        }
-
-        [self trashRemotePostWithPost:post
-                              success:success
-                              failure:failure];
-    };
-
-    if ([post isRevision]) {
-        [self trashPost:post.original
-                success:privateBodyBlock
-                failure:failure];
-    } else {
-        privateBodyBlock();
-    }
-}
-
-- (void)trashRemotePostWithPost:(AbstractPost*)post
-                        success:(void (^)(void))success
-                        failure:(void (^)(NSError *error))failure
-{
-    NSManagedObjectID *postObjectID = post.objectID;
-
-    void (^successBlock)(RemotePost *post) = ^(RemotePost *remotePost) {
-        NSError *err;
-        Post *postInContext = (Post *)[self.managedObjectContext existingObjectWithID:postObjectID error:&err];
-        if (err) {
-            DDLogError(@"%@", err);
-        }
-        if (postInContext) {
-            if (!remotePost || [remotePost.status isEqualToString:PostStatusDeleted]) {
-                [self.managedObjectContext deleteObject:post];
-            } else {
-                [PostHelper updatePost:postInContext withRemotePost:remotePost inContext:self.managedObjectContext];
-                postInContext.latest.statusAfterSync = postInContext.statusAfterSync;
-                postInContext.latest.status = postInContext.status;
-            }
-            [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
-        }
-        if (success) {
-            success();
-        }
-    };
-
-    void (^failureBlock)(NSError *error) = ^(NSError *error) {
-        NSError *err;
-        Post *postInContext = (Post *)[self.managedObjectContext existingObjectWithID:postObjectID error:&err];
-        if (err) {
-            DDLogError(@"%@", err);
-        }
-        if (postInContext) {
-            postInContext.restorableStatus = nil;
-        }
-        if (failure){
-            failure(error);
-        }
-    };
-
-    RemotePost *remotePost = [PostHelper remotePostWithPost:post];
-    id<PostServiceRemote> remote = [self.postServiceRemoteFactory forBlog:post.blog];
-    [remote trashPost:remotePost success:successBlock failure:failureBlock];
-}
-
-- (void)restorePost:(AbstractPost *)post
-            success:(void (^)(void))success
-            failure:(void (^)(NSError *error))failure
-{
-    void (^privateBodyBlock)(void) = ^void() {
-        post.status = post.restorableStatus;
-        [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
-
-        if (![post isRevision] && [post.postID longLongValue] > 0) {
-            [self restoreRemotePostWithPost:post success:success failure:failure];
-        } else {
-            if (success) {
-                success();
-            }
-        }
-    };
-
-    if (post.isRevision) {
-        [self restorePost:post.original
-                  success:privateBodyBlock
-                  failure:failure];
-
-        return;
-    } else {
-        privateBodyBlock();
-    }
-}
-
-- (void)restoreRemotePostWithPost:(AbstractPost*)post
-                          success:(void (^)(void))success
-                          failure:(void (^)(NSError *error))failure
-{
-    NSManagedObjectID *postObjectID = post.objectID;
-
-    void (^successBlock)(RemotePost *post) = ^(RemotePost *remotePost) {
-        NSError *err;
-        Post *postInContext = (Post *)[self.managedObjectContext existingObjectWithID:postObjectID error:&err];
-        postInContext.restorableStatus = nil;
-        if (err) {
-            DDLogError(@"%@", err);
-        }
-        if (postInContext) {
-            [PostHelper updatePost:postInContext withRemotePost:remotePost inContext:self.managedObjectContext];
-            [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
-        }
-        if (success) {
-            success();
-        }
-    };
-
-    void (^failureBlock)(NSError *error) = ^(NSError *error) {
-        NSError *err;
-        Post *postInContext = (Post *)[self.managedObjectContext existingObjectWithID:postObjectID error:&err];
-        if (err) {
-            DDLogError(@"%@", err);
-        }
-        if (postInContext) {
-            // Put the post back in the trash bin.
-            postInContext.status = PostStatusTrash;
-            [[ContextManager sharedInstance] saveContext:self.managedObjectContext];
-        }
-        if (failure){
-            failure(error);
-        }
-    };
-
-    RemotePost *remotePost = [PostHelper remotePostWithPost:post];
-    if (post.restorableStatus) {
-        remotePost.status = post.restorableStatus;
-    } else {
-        // Assign a status of draft to the remote post. The WordPress.com REST API will
-        // ignore this and should restore the post's previous status. The XML-RPC API
-        // needs a status assigned to move a post out of the trash folder. Draft is the
-        // safest option when we don't know what the status was previously.
-        remotePost.status = PostStatusDraft;
-    }
-
-    id<PostServiceRemote> remote = [self.postServiceRemoteFactory forBlog:post.blog];
-    [remote restorePost:remotePost success:successBlock failure:failureBlock];
-}
-
 #pragma mark - Helpers
 
 - (NSDictionary *)remoteSyncParametersDictionaryForRemote:(nonnull id <PostServiceRemote>)remote