Merge release/22.4 into trunk (#15666)

Author: jaclync

WooCommerce/Classes/Extensions/SitePlugin+Woo.swift

@@ -4,8 +4,6 @@ import Yosemite
 ///
 extension SitePlugin {
     enum SupportedPlugin {
-        public static let LegacyWCShip = "WooCommerce Shipping & Tax"
-        public static let WooShipping = ["Woo Shipping", "WooCommerce Shipping"]
         public static let WCTracking = "WooCommerce Shipment Tracking"
         public static let WCSubscriptions = ["WooCommerce Subscriptions", "Woo Subscriptions"]
         public static let WCProductBundles = ["WooCommerce Product Bundles", "Woo Product Bundles"]
@@ -14,4 +12,9 @@ extension SitePlugin {
         public static let WCGiftCards = ["WooCommerce Gift Cards", "Woo Gift Cards"]
         public static let GoogleForWooCommerce = ["Google Listings and Ads", "Google for WooCommerce"]
     }
+
+    enum SupportedPluginPath {
+        public static let LegacyWCShip = "woocommerce-services/woocommerce-services.php"
+        public static let WooShipping = "woocommerce-shipping/woocommerce-shipping.php"
+    }
 }

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

@@ -90,7 +90,7 @@ final class OrderDetailsDataSource: NSObject {
     ///
     var shouldAllowWCShipInstallation: Bool {
         let isFeatureFlagEnabled = featureFlags.isFeatureFlagEnabled(.shippingLabelsOnboardingM1)
-        let plugin = resultsControllers.sitePlugins.first { $0.name == SitePlugin.SupportedPlugin.LegacyWCShip }
+        let plugin = resultsControllers.sitePlugins.first { $0.plugin == SitePlugin.SupportedPluginPath.LegacyWCShip }
         let isPluginInstalled = plugin != nil && resultsControllers.sitePlugins.count > 0
         let isPluginActive = plugin?.status.isActive ?? false
         let isCountryCodeUS = SiteAddress(siteSettings: siteSettings).countryCode == CountryCode.US

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift

@@ -795,19 +795,19 @@ extension OrderDetailsViewModel {
             return false
         }
 
-        guard await !isPluginActive(SitePlugin.SupportedPlugin.LegacyWCShip) else {
+        guard await !isPluginActive(pluginPath: SitePlugin.SupportedPluginPath.LegacyWCShip) else {
             return true
         }
 
-        return await isPluginActive(SitePlugin.SupportedPlugin.WooShipping)
+        return await isPluginActive(pluginPath: SitePlugin.SupportedPluginPath.WooShipping)
     }
 
     /// Checks if the Woo Shipping extension is active, with the minimum version required for its shipping label flow.
     ///
     @MainActor
     func isWooShippingSupported() async -> Bool {
         guard featureFlagService.isFeatureFlagEnabled(.revampedShippingLabelCreation),
-              let plugin = await fetchPlugin(SitePlugin.SupportedPlugin.WooShipping) else {
+              let plugin = await fetchPluginByPath(SitePlugin.SupportedPluginPath.WooShipping) else {
             return false
         }
 
@@ -884,7 +884,7 @@ extension OrderDetailsViewModel {
     ///
     private func isPluginActive(_ pluginNames: [String], completion: @escaping (Bool) -> (Void)) {
         Task { @MainActor in
-            let plugin = await fetchPlugin(pluginNames)
+            let plugin = await fetchPluginByNames(pluginNames)
             completion(plugin?.active == true)
         }
     }
@@ -893,7 +893,7 @@ extension OrderDetailsViewModel {
     /// Additionally it logs to tracks if the plugin store is accessed without it being in sync so we can handle that edge-case if it happens recurrently.
     ///
     @MainActor
-    private func fetchPlugin(_ pluginNames: [String]) async -> SystemPlugin? {
+    private func fetchPluginByNames(_ pluginNames: [String]) async -> SystemPlugin? {
         guard arePluginsSynced() else {
             DDLogError("⚠️ SystemPlugins accessed without being in sync.")
             ServiceLocator.analytics.track(event: WooAnalyticsEvent.Orders.pluginsNotSyncedYet())
@@ -907,6 +907,24 @@ extension OrderDetailsViewModel {
         }
     }
 
+    /// Fetches a plugin from storage, based on the provided plugin path.
+    /// Additionally it logs to tracks if the plugin store is accessed without it being in sync so we can handle that edge-case if it happens recurrently.
+    ///
+    @MainActor
+    private func fetchPluginByPath(_ path: String) async -> SystemPlugin? {
+        guard arePluginsSynced() else {
+            DDLogError("⚠️ SystemPlugins accessed without being in sync.")
+            ServiceLocator.analytics.track(event: WooAnalyticsEvent.Orders.pluginsNotSyncedYet())
+            return nil
+        }
+
+        return await withCheckedContinuation { continuation in
+            stores.dispatch(SystemStatusAction.fetchSystemPluginWithPath(siteID: order.siteID, pluginPath: path, onCompletion: { plugin in
+                continuation.resume(returning: plugin)
+            }))
+        }
+    }
+
     /// Function that checks for any existing system plugin in the order's store.
     /// If there is none, we assume plugins are not synced because at least the`WooCommerce` plugin should be present.
     ///
@@ -944,6 +962,12 @@ private extension OrderDetailsViewModel {
             }
         }
     }
+
+    @MainActor
+    func isPluginActive(pluginPath: String) async -> Bool {
+        let plugin = await fetchPluginByPath(pluginPath)
+        return plugin?.active == true
+    }
 }
 
 extension OrderDetailsViewModel {