Merge pull request #7697 from woocommerce/issue/7566-rander-no-connected

Widgets: Show Not logged in view

Author: Ecarrion

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

@@ -175,6 +175,8 @@ class DefaultStoresManager: StoresManager {
         ServiceLocator.storageManager.reset()
         ServiceLocator.productImageUploader.reset()
 
+        updateAndReloadWidgetInformation(with: nil)
+
         NotificationCenter.default.post(name: .logOutEventReceived, object: nil)
 
         return self
@@ -501,7 +503,7 @@ private extension DefaultStoresManager {
     /// Updates the necesary dependencies for the widget to function correctly.
     /// Reloads widgets timelines.
     ///
-    func updateAndReloadWidgetInformation(with siteID: Int64) {
+    func updateAndReloadWidgetInformation(with siteID: Int64?) {
         // Token to fire network requests
         keychain.currentAuthToken = sessionManager.defaultCredentials?.authToken
 

WooCommerce/StoreWidgets/StoreInfoProvider.swift

@@ -1,13 +1,25 @@
 import WidgetKit
 import KeychainAccess
 
-/// Type that represents the Widget information
+/// Type that represents the all the possible Widget states.
 ///
-struct StoreInfoEntry: TimelineEntry {
-    /// Date to request new info
-    ///
-    var date: Date
+enum StoreInfoEntry: TimelineEntry {
+    // Represents a not logged-in state
+    case notConnected
+
+    // Represents a fetching error state
+    case error
+
+    // Represents a fetched data state
+    case data(StoreInfoData)
 
+    // Current date, needed by the `TimelineEntry` protocol.
+    var date: Date { Date() }
+}
+
+/// Type that represents the the widget state data.
+///
+struct StoreInfoData {
     /// Eg: Today, Weekly, Monthly, Yearly
     ///
     var range: String
@@ -45,13 +57,12 @@ final class StoreInfoProvider: TimelineProvider {
     ///
     func placeholder(in context: Context) -> StoreInfoEntry {
         let dependencies = Self.fetchDependencies()
-        return StoreInfoEntry(date: Date(),
-                              range: "Today",
-                              name: dependencies?.storeName ?? Localization.myShop,
-                              revenue: "$132.234",
-                              visitors: "67",
-                              orders: "23",
-                              conversion: "34%")
+        return StoreInfoEntry.data(.init(range: Localization.today,
+                                         name: dependencies?.storeName ?? Localization.myShop,
+                                         revenue: "$132.234",
+                                         visitors: "67",
+                                         orders: "23",
+                                         conversion: "34%"))
     }
 
     /// Quick Snapshot. Required when previewing the widget.
@@ -65,7 +76,7 @@ final class StoreInfoProvider: TimelineProvider {
     ///
     func getTimeline(in context: Context, completion: @escaping (Timeline<StoreInfoEntry>) -> Void) {
         guard let dependencies = Self.fetchDependencies() else {
-            return // TODO: Dispatch non auth error entry
+            return completion(Timeline<StoreInfoEntry>(entries: [StoreInfoEntry.notConnected], policy: .never))
         }
 
         let strongService = StoreInfoDataService(authToken: dependencies.authToken)
@@ -75,13 +86,12 @@ final class StoreInfoProvider: TimelineProvider {
                 let todayStats = try await strongService.fetchTodayStats(for: dependencies.storeID)
 
                 // TODO: Use proper store formatting.
-                let entry = StoreInfoEntry(date: Date(),
-                                           range: Localization.today,
-                                           name: dependencies.storeName,
-                                           revenue: "$\(todayStats.revenue)",
-                                           visitors: "\(todayStats.totalVisitors)",
-                                           orders: "\(todayStats.totalOrders)",
-                                           conversion: "\(todayStats.conversion)%")
+                let entry = StoreInfoEntry.data(.init(range: Localization.today,
+                                                      name: dependencies.storeName,
+                                                      revenue: "$\(todayStats.revenue)",
+                                                      visitors: "\(todayStats.totalVisitors)",
+                                                      orders: "\(todayStats.totalOrders)",
+                                                      conversion: "\(todayStats.conversion)%"))
 
                 let reloadDate = Date(timeIntervalSinceNow: 30 * 60) // Ask for a 15 minutes reload.
                 let timeline = Timeline<StoreInfoEntry>(entries: [entry], policy: .after(reloadDate))

WooCommerce/StoreWidgets/StoreInfoWidget.swift

@@ -11,7 +11,16 @@ struct StoreInfoWidget: Widget {
 
     var body: some WidgetConfiguration {
         StaticConfiguration(kind: "StoreInfoWidget", provider: StoreInfoProvider()) { entry in
-            StoreInfoView(entry: entry)
+            Group {
+                switch entry {
+                case .notConnected:
+                    NotLoggedInView()
+                case .error:
+                    EmptyView() // TODO:
+                case .data(let data):
+                    StoreInfoView(entry: data)
+                }
+            }
         }
         .configurationDisplayName("Store Info")
         .supportedFamilies(enableWidgets ? [.systemMedium] : [])
@@ -23,7 +32,7 @@ struct StoreInfoWidget: Widget {
 private struct StoreInfoView: View {
 
     // Entry to render
-    let entry: StoreInfoEntry
+    let entry: StoreInfoData
 
     var body: some View {
         ZStack {
@@ -156,13 +165,12 @@ private extension NotLoggedInView {
 struct StoreWidgets_Previews: PreviewProvider {
     static var previews: some View {
         StoreInfoView(
-            entry: StoreInfoEntry(date: Date(),
-                                  range: "Today",
-                                  name: "Ernest Shop",
-                                  revenue: "$132.234",
-                                  visitors: "67",
-                                  orders: "23",
-                                  conversion: "37%")
+            entry: StoreInfoData(range: "Today",
+                                 name: "Ernest Shop",
+                                 revenue: "$132.234",
+                                 visitors: "67",
+                                 orders: "23",
+                                 conversion: "37%")
         )
         .previewContext(WidgetPreviewContext(family: .systemMedium))