Conform UserFeedback to WIdgetProviding. Clean up code

joshdubey · joshdubey · commit 08358ef91d2e · 2025-02-06T16:59:16.000Z
diff --git a/Production/govuk_ios/Builders/ViewControllerBuilder.swift b/Production/govuk_ios/Builders/ViewControllerBuilder.swift
@@ -32,8 +32,6 @@ class ViewControllerBuilder {
             configService: configService,
             topicWidgetViewModel: topicWidgetViewModel,
             feedbackAction: feedbackAction,
-            searchAction: searchAction,
-            recentActivityAction: recentActivityAction,
             widgetBuilder: widgetBuilder
         )
         return HomeViewController(
diff --git a/Production/govuk_ios/Resources/Widgets.json b/Production/govuk_ios/Resources/Widgets.json
@@ -2,22 +2,27 @@
     "widgets" : [
         {
             "name" : "TestWidget.TestWidgetProvider",
-            "rank" : 3,
+            "rank" : 4,
             "enabled" : true
         },
         {
             "name" : "TestWidget.TestWebWidgetProvider",
-            "rank" : 2,
+            "rank" : 3,
             "enabled" : true
         },
         {
             "name" : "govuk_ios.SearchWidgetProvider",
-            "rank" : 0,
+            "rank" : 1,
             "enabled" : true
         },
         {
             "name" : "govuk_ios.RecentActivityWidgetProvider",
-            "rank" : 1,
+            "rank" : 2,
+            "enabled" : true
+        },
+        {
+            "name" : "govuk_ios.UserFeedbackWidgetProvider",
+            "rank" : 0,
             "enabled" : true
         }
     ]
diff --git a/Production/govuk_ios/Services/WidgetBuilder.swift b/Production/govuk_ios/Services/WidgetBuilder.swift
@@ -82,6 +82,8 @@ class WidgetBuilder: NSObject {
                 return searchAction
             case "recentActivity":
                 return recentActivityAction
+            case "userFeedback":
+                return feedbackAction
             default:
                 return { }
             }
diff --git a/Production/govuk_ios/ViewModels/HomeViewModel.swift b/Production/govuk_ios/ViewModels/HomeViewModel.swift
@@ -7,32 +7,16 @@ struct HomeViewModel {
     let configService: AppConfigServiceInterface
     let topicWidgetViewModel: TopicsWidgetViewModel
     let feedbackAction: () -> Void
-    let searchAction: () -> Void
-    let recentActivityAction: () -> Void
 
     let widgetBuilder: WidgetBuilder
 
     var widgets: [WidgetView] {
         widgetBuilder.getAll() +
         [
-            feedbackWidget,
             topicsWidget
         ].compactMap { $0 }
     }
 
-    private var feedbackWidget: WidgetView {
-        let title = String.home.localized("feedbackWidgetTitle")
-        let viewModel = WidgetViewModel(
-            title: title,
-            action: feedbackAction
-        )
-        let content = UserFeedbackView(viewModel: viewModel)
-        let widget = WidgetView(useContentAccessibilityInfo: true)
-        widget.backgroundColor = UIColor.govUK.fills.surfaceCardSelected
-        widget.addContent(content)
-        return widget
-    }
-
     private var topicsWidget: WidgetView? {
         guard widgetEnabled(feature: .topics)
         else { return nil }
diff --git a/Production/govuk_ios/Views/Home/UserFeedbackWidgetProvider.swift b/Production/govuk_ios/Views/Home/UserFeedbackWidgetProvider.swift
@@ -3,14 +3,16 @@ import GOVKit
 
 class UserFeedbackWidgetProvider: NSObject,
                                   WidgetProviding {
-    var title: String = "Google"
-    var urlString: String? = "https://www.gooogle.com"
-    var actionType: WidgetAction = .url
+    var title: String = String.home.localized("feedbackWidgetTitle")
+    var urlString: String?
+    var actionType: WidgetAction = .custom("userFeedback")
     var widget: WidgetView
     var startViewController: UIViewController.Type?
 
     override init() {
-        self.widget = WidgetView(useContentAccessibilityInfo: true)
+        let localWidget = WidgetView(useContentAccessibilityInfo: true)
+        localWidget.backgroundColor = UIColor.govUK.fills.surfaceCardSelected
+        self.widget = localWidget
         super.init()
     }
 
diff --git a/Tests/govuk_ios/govuk_ios_snapshot_tests/Specs/ViewControllers/HomeViewControllerSnapshotTests.swift b/Tests/govuk_ios/govuk_ios_snapshot_tests/Specs/ViewControllers/HomeViewControllerSnapshotTests.swift
@@ -126,8 +126,6 @@ class HomeViewControllerSnapshotTests: SnapshotTestCase {
             configService: MockAppConfigService(),
             topicWidgetViewModel: topicsViewModel,
             feedbackAction: { },
-            searchAction: { },
-            recentActivityAction: { },
             widgetBuilder: WidgetBuilder(analytics: MockAnalyticsService(),
                                          configService: MockAppConfigService(),
                                          topicWidgetViewModel: topicsViewModel,
diff --git a/Tests/govuk_ios/govuk_ios_unit_tests/Specs/ViewControllers/HomeViewControllerTests.swift b/Tests/govuk_ios/govuk_ios_unit_tests/Specs/ViewControllers/HomeViewControllerTests.swift
@@ -21,13 +21,11 @@ struct HomeViewControllerTests {
             configService: MockAppConfigService(),
             topicWidgetViewModel: topicsViewModel,
             feedbackAction: { },
-            searchAction: { () -> Void in _ = true },
-            recentActivityAction: { },
             widgetBuilder: WidgetBuilder(analytics: MockAnalyticsService(),
                                          configService: MockAppConfigService(),
                                          topicWidgetViewModel: topicsViewModel,
                                          feedbackAction: { },
-                                         searchAction: { },
+                                         searchAction: { () -> Void in _ = true },
                                          recentActivityAction: { })
         )
         let subject = HomeViewController(viewModel: viewModel)
@@ -49,13 +47,11 @@ struct HomeViewControllerTests {
             configService: MockAppConfigService(),
             topicWidgetViewModel: topicsViewModel,
             feedbackAction: { },
-            searchAction: { () -> Void in _ = true },
-            recentActivityAction: { },
             widgetBuilder: WidgetBuilder(analytics: MockAnalyticsService(),
                                          configService: MockAppConfigService(),
                                          topicWidgetViewModel: topicsViewModel,
                                          feedbackAction: { },
-                                         searchAction: { },
+                                         searchAction: { () -> Void in _ = true },
                                          recentActivityAction: { })
         )
         let subject = HomeViewController(viewModel: viewModel)
@@ -81,13 +77,11 @@ struct HomeViewControllerTests {
             configService: MockAppConfigService(),
             topicWidgetViewModel: topicsViewModel,
             feedbackAction: { },
-            searchAction: { () -> Void in _ = true },
-            recentActivityAction: { },
             widgetBuilder: WidgetBuilder(analytics: MockAnalyticsService(),
                                          configService: MockAppConfigService(),
                                          topicWidgetViewModel: topicsViewModel,
                                          feedbackAction: { },
-                                         searchAction: { },
+                                         searchAction: { () -> Void in _ = true },
                                          recentActivityAction: { })
         )
         let subject = HomeViewController(viewModel: viewModel)
diff --git a/Tests/govuk_ios/govuk_ios_unit_tests/Specs/ViewModels/HomeViewModelTests.swift b/Tests/govuk_ios/govuk_ios_unit_tests/Specs/ViewModels/HomeViewModelTests.swift
@@ -21,13 +21,11 @@ struct HomeViewModelTests {
             configService: MockAppConfigService(),
             topicWidgetViewModel: topicsViewModel,
             feedbackAction: { },
-            searchAction: { () -> Void in _ = true },
-            recentActivityAction: { },
             widgetBuilder: WidgetBuilder(analytics: MockAnalyticsService(),
                                          configService: MockAppConfigService(),
                                          topicWidgetViewModel: topicsViewModel,
                                          feedbackAction: { },
-                                         searchAction: { },
+                                         searchAction: { () -> Void in _ = true },
                                          recentActivityAction: { })
         )
         let widgets = subject.widgets
@@ -52,8 +50,6 @@ struct HomeViewModelTests {
             configService: configService,
             topicWidgetViewModel: topicsViewModel,
             feedbackAction: { },
-            searchAction: { },
-            recentActivityAction: { },
             widgetBuilder: WidgetBuilder(analytics: MockAnalyticsService(),
                                          configService: MockAppConfigService(),
                                          topicWidgetViewModel: topicsViewModel,

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ class ViewControllerBuilder {`
`32`	`32`	`configService: configService,`
`33`	`33`	`topicWidgetViewModel: topicWidgetViewModel,`
`34`	`34`	`feedbackAction: feedbackAction,`
`35`		`- searchAction: searchAction,`
`36`		`- recentActivityAction: recentActivityAction,`
`37`	`35`	`widgetBuilder: widgetBuilder`
`38`	`36`	`)`
`39`	`37`	`return HomeViewController(`
Original file line number	Diff line number	Diff line change
`@@ -2,22 +2,27 @@`
`2`	`2`	`"widgets" : [`
`3`	`3`	`{`
`4`	`4`	`"name" : "TestWidget.TestWidgetProvider",`
`5`		`- "rank" : 3,`
	`5`	`+ "rank" : 4,`
`6`	`6`	`"enabled" : true`
`7`	`7`	`},`
`8`	`8`	`{`
`9`	`9`	`"name" : "TestWidget.TestWebWidgetProvider",`
`10`		`- "rank" : 2,`
	`10`	`+ "rank" : 3,`
`11`	`11`	`"enabled" : true`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"name" : "govuk_ios.SearchWidgetProvider",`
`15`		`- "rank" : 0,`
	`15`	`+ "rank" : 1,`
`16`	`16`	`"enabled" : true`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"name" : "govuk_ios.RecentActivityWidgetProvider",`
`20`		`- "rank" : 1,`
	`20`	`+ "rank" : 2,`
	`21`	`+ "enabled" : true`
	`22`	`+ },`
	`23`	`+ {`
	`24`	`+ "name" : "govuk_ios.UserFeedbackWidgetProvider",`
	`25`	`+ "rank" : 0,`
`21`	`26`	`"enabled" : true`
`22`	`27`	`}`
`23`	`28`	`]`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ class WidgetBuilder: NSObject {`
`82`	`82`	`return searchAction`
`83`	`83`	`case "recentActivity":`
`84`	`84`	`return recentActivityAction`
	`85`	`+ case "userFeedback":`
	`86`	`+ return feedbackAction`
`85`	`87`	`default:`
`86`	`88`	`return { }`
`87`	`89`	`}`