Show taxonomies and manage terms (#24955)

* Decouple `TagsService.getTags` from WordPressKit API

* Decouple from WordPressKit.RemotePostTag

* Add managing terms and taxonomies

* Update release notes

* Extract duplicated code

* Rephrase a user-facing message

Author: crazytonyli

RELEASE-NOTES.txt

@@ -8,6 +8,7 @@
 * [*] Add "File Size" to Site Media Details [#24947]
 * [*] Add "Email to Subscribers" row to "Publishing" sheet [#24946]
 * [*] Add permalink preview in the slug editor and make other improvements [#24949]
+* [*] Add "Taxonomies" to Site Settings [#24955]
 * [*] Update "Categories" picker to indicate multiple selection [#24952]
 
 26.4
@@ -237,7 +238,7 @@
 * [*] [internal] Incorporate a parser to handle Gutenberg blocks more efficiently for improved performance [#22886]
 * [**] Improve performance of Image and Gallery block processors to avoid long delay when saving a post [#22896]
 * [*] Improve performance of File block processor [#22897]
-* [*] [internal] Prompt users to keep the app up to date on their devices, so they can try new features, as well as benefit from performance improvements and bug fixes [#23195, #23216, #23218, #23211] 
+* [*] [internal] Prompt users to keep the app up to date on their devices, so they can try new features, as well as benefit from performance improvements and bug fixes [#23195, #23216, #23218, #23211]
 * [**] [Jetpack-only] Reader: Add a new feed dedicated to tags [#23242]
 
 24.9.1

WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController+Swift.swift

@@ -3,6 +3,9 @@ import SwiftUI
 import WordPressData
 import WordPressFlux
 import WordPressShared
+import WordPressAPI
+import WordPressAPIInternal
+import WordPressCore
 
 extension SiteSettingsViewController {
     // MARK: - General
@@ -52,6 +55,26 @@ extension SiteSettingsViewController {
         navigationController?.pushViewController(tagsVC, animated: true)
     }
 
+    @objc public func showCustomTaxonomies() {
+        let viewController: UIViewController
+        if let client = try? WordPressClient(site: .init(blog: blog)) {
+            let rootView = SiteCustomTaxonomiesView(blog: self.blog, api: client.api)
+            viewController = UIHostingController(rootView: rootView)
+        } else {
+            let feature = NSLocalizedString(
+                "applicationPasswordRequired.feature.customTaxonomies",
+                value: "Taxonomies Management",
+                comment: "Feature name for managing terms and taxonomies in the app"
+            )
+            let rootView = ApplicationPasswordRequiredView(blog: self.blog, localizedFeatureName: feature, presentingViewController: self) { client in
+                SiteCustomTaxonomiesView(blog: self.blog, api: client.api)
+            }
+            viewController = UIHostingController(rootView: rootView)
+        }
+
+        self.navigationController?.pushViewController(viewController, animated: true)
+    }
+
     // MARK: - Timezone
 
     func formattedTimezoneValue() -> String? {

WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m

@@ -33,6 +33,7 @@
 NS_ENUM(NSInteger, SiteSettingsWriting) {
     SiteSettingsWritingDefaultCategory = 0,
     SiteSettingsWritingTags,
+    SiteSettingsWritingCustomTaxonomies,
     SiteSettingsWritingDefaultPostFormat,
     SiteSettingsWritingRelatedPosts,
     SiteSettingsWritingDateAndTimeFormat,
@@ -62,6 +63,7 @@ @interface SiteSettingsViewController () <UITableViewDelegate, UITextFieldDelega
 @property (nonatomic, strong) SwitchTableViewCell  *editorSelectorCell;
 @property (nonatomic, strong) SettingTableViewCell *defaultCategoryCell;
 @property (nonatomic, strong) SettingTableViewCell *tagsCell;
+@property (nonatomic, strong) SettingTableViewCell *customTaxonomiesCell;
 @property (nonatomic, strong) SettingTableViewCell *defaultPostFormatCell;
 @property (nonatomic, strong) SettingTableViewCell *relatedPostsCell;
 @property (nonatomic, strong) SettingTableViewCell *dateAndTimeFormatCell;
@@ -204,6 +206,7 @@ - (NSArray *)writingSectionRows
     NSMutableArray *rows = [NSMutableArray arrayWithObjects:
                             @(SiteSettingsWritingDefaultCategory),
                             @(SiteSettingsWritingTags),
+                            @(SiteSettingsWritingCustomTaxonomies),
                             @(SiteSettingsWritingDefaultPostFormat), nil];
 
     BOOL jetpackFeaturesEnabled = [JetpackFeaturesRemovalCoordinator jetpackFeaturesEnabled];
@@ -366,6 +369,17 @@ - (SettingTableViewCell *)tagsCell
     return _tagsCell;
 }
 
+- (SettingTableViewCell *)customTaxonomiesCell
+{
+    if (_customTaxonomiesCell){
+        return _customTaxonomiesCell;
+    }
+    _customTaxonomiesCell = [[SettingTableViewCell alloc] initWithLabel:NSLocalizedString(@"Taxonomies", @"Label for viewing the custom taxonomies")
+                                                               editable:self.blog.isAdmin
+                                                        reuseIdentifier:nil];
+    return _customTaxonomiesCell;
+}
+
 - (SettingTableViewCell *)defaultPostFormatCell
 {
     if (_defaultPostFormatCell){
@@ -533,6 +547,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForWritingSettingsAt
         case (SiteSettingsWritingTags):
             return self.tagsCell;
 
+        case (SiteSettingsWritingCustomTaxonomies):
+            return self.customTaxonomiesCell;
+
         case (SiteSettingsWritingDefaultPostFormat):
             [self configureDefaultPostFormatCell];
             return self.defaultPostFormatCell;
@@ -858,6 +875,10 @@ - (void)tableView:(UITableView *)tableView didSelectInWritingSectionRow:(NSInteg
             [self showTagList];
             break;
 
+        case SiteSettingsWritingCustomTaxonomies:
+            [self showCustomTaxonomies];
+            break;
+
         case SiteSettingsWritingDefaultPostFormat:
             [self showPostFormatSelector];
             break;

WordPress/Classes/ViewRelated/Tags/EditTagView.swift

@@ -2,21 +2,22 @@ import SwiftUI
 import WordPressUI
 import WordPressKit
 import WordPressData
+import WordPressAPI
 import SVProgressHUD
 
 struct EditTagView: View {
     @Environment(\.dismiss) private var dismiss
     @StateObject private var viewModel: EditTagViewModel
 
-    init(tag: RemotePostTag?, tagsService: TagsService) {
-        self._viewModel = StateObject(wrappedValue: EditTagViewModel(tag: tag, tagsService: tagsService))
+    init(term: AnyTermWithViewContext?, taxonomy: SiteTaxonomy?, tagsService: TaxonomyServiceProtocol) {
+        self._viewModel = StateObject(wrappedValue: EditTagViewModel(term: term, taxonomy: taxonomy, tagsService: tagsService))
     }
 
     var body: some View {
         Form {
-            Section(Strings.tagSectionHeader) {
+            Section {
                 HStack {
-                    TextField(Strings.tagNamePlaceholder, text: $viewModel.tagName)
+                    TextField(viewModel.localizedLabels.newPlaceholder, text: $viewModel.tagName)
                         .textFieldStyle(.plain)
                         .autocorrectionDisabled()
                         .textInputAutocapitalization(.never)
@@ -31,12 +32,24 @@ struct EditTagView: View {
                         }
                     }
                 }
+            } header: {
+                Text(Strings.tagSectionHeader)
+            } footer: {
+                if let text = viewModel.localizedLabels.nameFieldDescription {
+                    Text(verbatim: text)
+                }
             }
 
-            Section(Strings.descriptionSectionHeader) {
+            Section {
                 TextField(Strings.descriptionPlaceholder, text: $viewModel.tagDescription, axis: .vertical)
                     .textFieldStyle(.plain)
                     .lineLimit(5...15)
+            } header: {
+                Text(Strings.descriptionSectionHeader)
+            } footer: {
+                if let text = viewModel.localizedLabels.descriptionFieldDescription {
+                    Text(verbatim: text)
+                }
             }
 
             if viewModel.isExistingTag {
@@ -98,38 +111,39 @@ class EditTagViewModel: ObservableObject {
     @Published var showError = false
     @Published var errorMessage = ""
 
-    private let originalTag: RemotePostTag?
-    private let tagsService: TagsService
+    private let originalTerm: AnyTermWithViewContext?
+    private let tagsService: TaxonomyServiceProtocol
+    fileprivate let localizedLabels: LocalizedLabels
 
     var isExistingTag: Bool {
-        originalTag != nil
+        originalTerm != nil
     }
 
     var navigationTitle: String {
-        originalTag?.name ?? Strings.newTagTitle
+        originalTerm?.name ?? localizedLabels.newItemTitle
     }
 
-    init(tag: RemotePostTag?, tagsService: TagsService) {
-        self.originalTag = tag
+    init(term: AnyTermWithViewContext?, taxonomy: SiteTaxonomy?, tagsService: TaxonomyServiceProtocol) {
+        self.originalTerm = term
+        self.localizedLabels = taxonomy.flatMap(LocalizedLabels.from) ?? .tag
         self.tagsService = tagsService
-        self.tagName = tag?.name ?? ""
-        self.tagDescription = tag?.tagDescription ?? ""
+        self.tagName = term?.name ?? ""
+        self.tagDescription = term?.description ?? ""
     }
 
     func deleteTag() async -> Bool {
-        guard let tag = originalTag else { return false }
+        guard let term = originalTerm else { return false }
 
         SVProgressHUD.show()
         defer { SVProgressHUD.dismiss() }
 
         do {
-            try await tagsService.deleteTag(tag)
+            try await tagsService.deleteTag(term)
 
-            // Post notification to update the UI
             NotificationCenter.default.post(
                 name: .tagDeleted,
                 object: nil,
-                userInfo: [TagNotificationUserInfoKeys.tagID: tag.tagID ?? 0]
+                userInfo: [TagNotificationUserInfoKeys.tagID: NSNumber(value: term.id)]
             )
             return true
         } catch {
@@ -143,23 +157,21 @@ class EditTagViewModel: ObservableObject {
         SVProgressHUD.show()
         defer { SVProgressHUD.dismiss() }
 
-        let tagToSave: RemotePostTag
-        if let existingTag = originalTag {
-            tagToSave = existingTag
-        } else {
-            tagToSave = RemotePostTag()
-        }
-
-        tagToSave.name = tagName.trimmingCharacters(in: .whitespacesAndNewlines)
-        tagToSave.tagDescription = tagDescription.trimmingCharacters(in: .whitespacesAndNewlines)
-
         do {
-            let savedTag = try await tagsService.saveTag(tagToSave)
+            let savedTerm: AnyTermWithViewContext
+
+            let tagName = tagName.trimmingCharacters(in: .whitespacesAndNewlines)
+            let tagDescription = tagDescription.trimmingCharacters(in: .whitespacesAndNewlines)
+            if let existingTerm = originalTerm {
+                savedTerm = try await tagsService.updateTag(existingTerm, name: tagName, description: tagDescription)
+            } else {
+                savedTerm = try await tagsService.createTag(name: tagName, description: tagDescription)
+            }
 
             NotificationCenter.default.post(
-                name: originalTag == nil ? .tagCreated : .tagUpdated,
+                name: originalTerm == nil ? .tagCreated : .tagUpdated,
                 object: nil,
-                userInfo: [TagNotificationUserInfoKeys.tag: savedTag]
+                userInfo: [TagNotificationUserInfoKeys.tag: savedTerm]
             )
             return true
         } catch {
@@ -170,10 +182,43 @@ class EditTagViewModel: ObservableObject {
     }
 }
 
+private struct LocalizedLabels {
+    var newPlaceholder: String
+    var newItemTitle: String
+    var nameFieldDescription: String?
+    var descriptionFieldDescription: String?
+
+    static func from(taxonomy: SiteTaxonomy) -> Self {
+        Self(
+            newPlaceholder: (taxonomy.details.labels[.newItemName] ?? nil) ?? "",
+            newItemTitle: (taxonomy.details.labels[.addNewItem] ?? nil) ?? "",
+            nameFieldDescription: taxonomy.details.labels[.nameFieldDescription] ?? nil,
+            descriptionFieldDescription: taxonomy.details.labels[.descFieldDescription] ?? nil
+        )
+    }
+
+    static var tag: Self {
+        Self(
+            newPlaceholder: NSLocalizedString(
+                "edit.tag.name.placeholder",
+                value: "Tag name",
+                comment: "Placeholder text for tag name field"
+            ),
+             newItemTitle: NSLocalizedString(
+                "edit.tag.new.title",
+                value: "New Tag",
+                comment: "Navigation title for new tag creation"
+            ),
+            nameFieldDescription: nil,
+            descriptionFieldDescription: nil
+        )
+    }
+}
+
 private enum Strings {
     static let tagSectionHeader = NSLocalizedString(
         "edit.tag.section.tag",
-        value: "Tag",
+        value: "Name",
         comment: "Section header for tag name in edit tag view"
     )
 
@@ -183,33 +228,21 @@ private enum Strings {
         comment: "Section header for tag description in edit tag view"
     )
 
-    static let tagNamePlaceholder = NSLocalizedString(
-        "edit.tag.name.placeholder",
-        value: "Tag name",
-        comment: "Placeholder text for tag name field"
-    )
-
     static let descriptionPlaceholder = NSLocalizedString(
         "edit.tag.description.placeholder",
         value: "Add a description...",
         comment: "Placeholder text for tag description field"
     )
 
-    static let newTagTitle = NSLocalizedString(
-        "edit.tag.new.title",
-        value: "New Tag",
-        comment: "Navigation title for new tag creation"
-    )
-
     static let deleteConfirmationTitle = NSLocalizedString(
         "edit.tag.delete.confirmation.title",
-        value: "Delete Tag",
-        comment: "Title for delete tag confirmation dialog"
+        value: "Delete",
+        comment: "Title for delete a term confirmation dialog"
     )
 
     static let deleteConfirmationMessage = NSLocalizedString(
         "edit.tag.delete.confirmation.message",
-        value: "Are you sure you want to delete this tag?",
+        value: "Are you sure you want to delete this?",
         comment: "Message for delete tag confirmation dialog"
     )
 }