Merge pull request #20287 from wordpress-mobile/issue/19885-hide-page…

…s-for-insufficient-roles Fix: Hide Pages menu for users with insufficient roles
wordpress-mobile · Mar 13, 2023 · cf7dfb0 · cf7dfb0
2 parents 28ebe98 + 6c170b3
commit cf7dfb0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/WordPress/Classes/Models/Blog+Capabilities.swift b/WordPress/Classes/Models/Blog+Capabilities.swift
@@ -61,6 +61,12 @@ extension Blog {
         return !hasBusinessPlan && isUserCapableOf("scan")
     }
 
+    /// Returns true if the current user is allowed to list and edit the blog's Pages
+    ///
+    @objc public func isListingPagesAllowed() -> Bool {
+        return isAdmin || isUserCapableOf(.EditPages)
+    }
+
     private func isUserCapableOf(_ capability: String) -> Bool {
         return capabilities?[capability] as? Bool ?? false
     }

diff --git a/WordPress/Classes/Models/Blog.h b/WordPress/Classes/Models/Blog.h
@@ -104,7 +104,9 @@ typedef NS_ENUM(NSUInteger, BlogFeature) {
     BlogFeatureFileDownloadsStats,
     /// Does the blog support Blaze?
     BlogFeatureBlaze,
-
+    /// Does the blog support listing and editing Pages?
+    BlogFeaturePages,
+
 };
 
 typedef NS_ENUM(NSInteger, SiteVisibility) {

diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m
@@ -612,6 +612,8 @@ - (BOOL)supports:(BlogFeature)feature
             return [self isHostedAtWPcom];
         case BlogFeatureBlaze:
             return [self isBlazeApproved];
+        case BlogFeaturePages:
+            return [self isListingPagesAllowed];
     }
 }
 

diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
@@ -991,14 +991,16 @@ - (BlogDetailsSection *)publishTypeSectionViewModel
     mediaRow.quickStartIdentifier = QuickStartTourElementMediaScreen;
     [rows addObject:mediaRow];
 
-    BlogDetailsRow *pagesRow = [[BlogDetailsRow alloc] initWithTitle:NSLocalizedString(@"Pages", @"Noun. Title. Links to the blog's Pages screen.")
-                                             accessibilityIdentifier:@"Site Pages Row"
-                                                    image:[UIImage gridiconOfType:GridiconTypePages]
-                                                 callback:^{
-        [weakSelf showPageListFromSource:BlogDetailsNavigationSourceRow];
-                                                 }];
-    pagesRow.quickStartIdentifier = QuickStartTourElementPages;
-    [rows addObject:pagesRow];
+    if ([self.blog supports:BlogFeaturePages]) {
+        BlogDetailsRow *pagesRow = [[BlogDetailsRow alloc] initWithTitle:NSLocalizedString(@"Pages", @"Noun. Title. Links to the blog's Pages screen.")
+                                                 accessibilityIdentifier:@"Site Pages Row"
+                                                        image:[UIImage gridiconOfType:GridiconTypePages]
+                                                     callback:^{
+            [weakSelf showPageListFromSource:BlogDetailsNavigationSourceRow];
+                                                     }];
+        pagesRow.quickStartIdentifier = QuickStartTourElementPages;
+        [rows addObject:pagesRow];
+    }
 
     BlogDetailsRow *commentsRow = [[BlogDetailsRow alloc] initWithTitle:NSLocalizedString(@"Comments", @"Noun. Title. Links to the blog's Comments screen.")
                                                           image:[[UIImage gridiconOfType:GridiconTypeComment] imageFlippedForRightToLeftLayoutDirection]