align with latest wprs

Author: jkmassel

Modules/Sources/WordPressCore/Users/DisplayUser.swift

@@ -69,3 +69,15 @@ extension DisplayUser {
             .joined(separator: " ")
     }
 }
+
+extension UserRole: @retroactive Codable {
+    public init(from decoder: any Decoder) throws {
+        let role = try decoder.singleValueContainer().decode(String.self)
+        self.init(role)
+    }
+
+    public func encode(to encoder: any Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(self.rawValue)
+    }
+}

WordPress/Classes/Users/ViewModel/UserListViewModel.swift

@@ -126,7 +126,7 @@ class UserListViewModel: ObservableObject {
     }
 
     private func sortUsers(_ users: [DisplayUser]) -> [Section] {
-        Dictionary(grouping: users) { $0.id == currentUserId ? RoleSection.me : RoleSection.role($0.role) }
+        Dictionary(grouping: users) { $0.id == currentUserId ? RoleSection.me : RoleSection.role($0.role.rawValue) }
             .map { Section(id: $0.key, users: $0.value.sorted(by: { $0.username < $1.username })) }
             .sorted { $0.id < $1.id }
     }

WordPress/Classes/Users/Views/UserDetailsView.swift

@@ -55,7 +55,7 @@ struct UserDetailsView: View {
             .listRowInsets(.zero)
 
             Section {
-                makeRow(title: Strings.roleFieldTitle, content: user.role.displayString)
+                makeRow(title: Strings.roleFieldTitle, content: user.role.rawValue)
                 makeRow(title: Strings.emailAddressFieldTitle, content: user.emailAddress, link: user.emailAddress.asEmail())
                 if let website = user.websiteUrl, !website.isEmpty {
                     makeRow(title: Strings.websiteFieldTitle, content: website, link: URL(string: website))