Merge branch 'trunk' into core-data-test-case

Conflicts:
	WordPress/WordPressTest/ContextManagerTests.swift

Author: crazytonyli

RELEASE-NOTES.txt

@@ -13,6 +13,7 @@
 * [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
 * [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
 * [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
+* [*] Stats: we fixed a crash that occurred sometimes in Stats [#18613]
 * [*] Posts list: we fixed an issue where the create button was not shown on iPad in split screen [#18609]
 
 19.8

WordPress/Classes/Extensions/Post+BloggingPrompts.swift

@@ -4,7 +4,7 @@ extension Post {
         guard let prompt = prompt else {
             return
         }
-        postTitle = prompt.title
+
         content = prompt.content
     }
 

WordPress/Classes/Utility/ContextManager.h

@@ -3,6 +3,13 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ A constant representing the current version of the data model.
+
+ @see -[ContextManager initWithModelName:storeURL:]
+ */
+FOUNDATION_EXTERN NSString * const ContextManagerModelNameCurrent;
+
 @protocol CoreDataStack
 @property (nonatomic, readonly, strong) NSManagedObjectContext *mainContext;
 - (NSManagedObjectContext *const)newDerivedContext;
@@ -34,6 +41,18 @@ NS_ASSUME_NONNULL_BEGIN
 */
 + (instancetype)internalSharedInstance;
 
+/**
+ Create a ContextManager instance with given model name and database location.
+
+ Note: This initialiser is only used for testing purpose at the moment.
+
+ @param modelName Model name in Core Data data model file.
+                  Use ContextManagerModelNameCurrent for current version, or
+                  "WordPress <version>" for specific version.
+ @param storeURL Database location.
+ */
+- (instancetype)initWithModelName:(NSString *)modelName storeURL:(NSURL *)storeURL NS_DESIGNATED_INITIALIZER;
+
 
 ///--------------------------
 ///@name Contexts

WordPress/Classes/Utility/ContextManager.m

@@ -5,6 +5,8 @@
 
 #define SentryStartupEventAddError(event, error) [event addError:error file:__FILE__ function:__FUNCTION__ line:__LINE__]
 
+NSString * const ContextManagerModelNameCurrent = @"$CURRENT";
+
 // MARK: - Static Variables
 //
 static ContextManager *_instance;
@@ -22,6 +24,8 @@ @interface ContextManager ()
 @property (nonatomic, strong) NSManagedObjectContext *mainContext;
 @property (nonatomic, strong) NSManagedObjectContext *writerContext;
 @property (nonatomic, assign) BOOL migrationFailed;
+@property (nonatomic, strong) NSString *modelName;
+@property (nonatomic, strong) NSURL *storeURL;
 
 @end
 
@@ -31,9 +35,25 @@ @interface ContextManager ()
 @implementation ContextManager
 
 - (instancetype)init
+{
+    NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
+                                                                        NSUserDomainMask,
+                                                                        YES) lastObject];
+    NSURL *storeURL = [NSURL fileURLWithPath:[documentsDirectory stringByAppendingPathComponent:@"WordPress.sqlite"]];
+
+    return [self initWithModelName:ContextManagerModelNameCurrent storeURL:storeURL];
+}
+
+- (instancetype)initWithModelName:(NSString *)modelName storeURL:(NSURL *)storeURL
 {
     self = [super init];
     if (self) {
+        NSParameterAssert([modelName isEqualToString:ContextManagerModelNameCurrent] || [modelName hasPrefix:@"WordPress "]);
+        NSParameterAssert([storeURL isFileURL]);
+
+        self.modelName = modelName;
+        self.storeURL = storeURL;
+
         [NSValueTransformer registerCustomTransformers];
         // Create `mainContext` and `writerContext` during initialisation to
         // ensure they are only created once.
@@ -236,7 +256,16 @@ - (NSManagedObjectModel *)managedObjectModel
     }
     NSString *modelPath = [self modelPath];
     NSURL *modelURL = [NSURL fileURLWithPath:modelPath];
-    _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+    if ([self.modelName isEqualToString:ContextManagerModelNameCurrent]) {
+        // Use the current version defined in data model.
+        _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+    } else {
+        // Find the specific version defined in data model.
+        NSURL *versionedModelURL = [[modelURL URLByAppendingPathComponent:self.modelName] URLByAppendingPathExtension:@"mom"];
+        NSAssert([NSFileManager.defaultManager fileExistsAtPath:versionedModelURL.path],
+                 @"Can't find model '%@' at %@", self.modelName, modelPath);
+        _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:versionedModelURL];
+    }
     return _managedObjectModel;
 }
 
@@ -324,15 +353,6 @@ - (NSArray *)sortedModelNames
     return modelNames;
 }
 
-- (NSURL *)storeURL
-{
-    NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
-                                                                        NSUserDomainMask,
-                                                                        YES) lastObject];
-    
-    return [NSURL fileURLWithPath:[documentsDirectory stringByAppendingPathComponent:@"WordPress.sqlite"]];
-}
-
 - (NSString *)modelPath
 {
     return [[NSBundle mainBundle] pathForResource:@"WordPress" ofType:@"momd"];

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardPromptsCardCell.swift

@@ -73,6 +73,10 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
         }
     }
 
+    // This provides a quick way to toggle the `Remove from dashboard` menu item.
+    // Since it (probably) will not be included in Blogging Prompts V1, it is disabled by default.
+    private let removeFromDashboardEnabled = false
+
     // Used to present:
     // - The menu sheet for contextual menu in iOS13.
     // - The Blogging Prompts list when selected from the contextual menu.
@@ -273,15 +277,16 @@ class DashboardPromptsCardCell: UICollectionViewCell, Reusable {
 
     // Defines the structure of the contextual menu items.
     private var contextMenuItems: [[MenuItem]] {
-        return [
-            [
-                .viewMore(viewMoreMenuTapped),
-                .skip(skipMenuTapped)
-            ],
-            [
-                .remove(removeMenuTapped)
-            ]
+        let defaultItems: [MenuItem] = [
+            .viewMore(viewMoreMenuTapped),
+            .skip(skipMenuTapped)
         ]
+
+        if removeFromDashboardEnabled {
+            return [defaultItems, [.remove(removeMenuTapped)]]
+        }
+
+        return [defaultItems]
     }
 
     private var contextMenu: UIMenu {

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

@@ -525,7 +525,7 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {
     // This should be removed once the experiment is done
     //
     private func assignMySiteExperimentIfNeeded(event: WPAnalyticsStat) {
-        if event == .signedIn {
+        if event == .signedIn || event == .createdAccount {
             if FeatureFlag.mySiteDashboard.enabled {
                 let isTreatment = BlogDashboardAB.shared.variant == .treatment
                 MySiteSettings().setDefaultSection(isTreatment ? .dashboard : .siteMenu)