Skip to content

Commit 39c7c34

Browse files
committed
Pass garden values to site initializers
1 parent 3de9358 commit 39c7c34

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2747,7 +2747,10 @@ extension Networking.Site {
27472747
isAdmin: CopiableProp<Bool> = .copy,
27482748
wasEcommerceTrial: CopiableProp<Bool> = .copy,
27492749
hasSSOEnabled: CopiableProp<Bool> = .copy,
2750-
applicationPasswordAvailable: CopiableProp<Bool> = .copy
2750+
applicationPasswordAvailable: CopiableProp<Bool> = .copy,
2751+
isGarden: CopiableProp<Bool> = .copy,
2752+
gardenName: CopiableProp<String?> = .copy,
2753+
gardenPartner: CopiableProp<String?> = .copy
27512754
) -> Networking.Site {
27522755
let siteID = siteID ?? self.siteID
27532756
let name = name ?? self.name
@@ -2772,6 +2775,9 @@ extension Networking.Site {
27722775
let wasEcommerceTrial = wasEcommerceTrial ?? self.wasEcommerceTrial
27732776
let hasSSOEnabled = hasSSOEnabled ?? self.hasSSOEnabled
27742777
let applicationPasswordAvailable = applicationPasswordAvailable ?? self.applicationPasswordAvailable
2778+
let isGarden = isGarden ?? self.isGarden
2779+
let gardenName = gardenName ?? self.gardenName
2780+
let gardenPartner = gardenPartner ?? self.gardenPartner
27752781

27762782
return Networking.Site(
27772783
siteID: siteID,
@@ -2796,7 +2802,10 @@ extension Networking.Site {
27962802
isAdmin: isAdmin,
27972803
wasEcommerceTrial: wasEcommerceTrial,
27982804
hasSSOEnabled: hasSSOEnabled,
2799-
applicationPasswordAvailable: applicationPasswordAvailable
2805+
applicationPasswordAvailable: applicationPasswordAvailable,
2806+
isGarden: isGarden,
2807+
gardenName: gardenName,
2808+
gardenPartner: gardenPartner
28002809
)
28012810
}
28022811
}

Modules/Sources/Networking/Model/Site.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
104104
/// The site Garden name is present
105105
///
106106
public let gardenName: String?
107-
107+
108108
/// The site Garden partner if present
109109
///
110110
public let gardenPartner: String?

Modules/Sources/Networking/Model/WordPressSite.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ public extension WordPressSite {
110110
isAdmin: false,
111111
wasEcommerceTrial: false,
112112
hasSSOEnabled: false,
113-
applicationPasswordAvailable: false)
113+
applicationPasswordAvailable: false,
114+
isGarden: false,
115+
gardenName: nil,
116+
gardenPartner: nil)
114117
}
115118

116119
struct Authentication: Decodable {

Modules/Sources/Yosemite/Model/Mocks/Graphs/ScreenshotsObjectGraph.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ struct ScreenshotObjectGraph: MockObjectGraph {
5656
isAdmin: false,
5757
wasEcommerceTrial: false,
5858
hasSSOEnabled: false,
59-
applicationPasswordAvailable: false
59+
applicationPasswordAvailable: false,
60+
isGarden: false,
61+
gardenName: nil,
62+
gardenPartner: nil
6063
)
6164

6265
/// May not be needed anymore if we're not mocking the API

Modules/Sources/Yosemite/Model/Storage/Site+ReadOnlyConvertible.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ extension Storage.Site: ReadOnlyConvertible {
3131
isAdmin = site.isAdmin
3232
wasEcommerceTrial = site.wasEcommerceTrial
3333
hasSSOEnabled = site.hasSSOEnabled
34+
isGarden = site.isGarden
35+
gardenName = site.gardenName
36+
gardenPartner = site.gardenPartner
3437
}
3538

3639
/// Returns a ReadOnly version of the receiver.
@@ -58,6 +61,9 @@ extension Storage.Site: ReadOnlyConvertible {
5861
isAdmin: isAdmin,
5962
wasEcommerceTrial: wasEcommerceTrial,
6063
hasSSOEnabled: hasSSOEnabled,
61-
applicationPasswordAvailable: false) // to be updated separately
64+
applicationPasswordAvailable: false, // to be updated separately
65+
isGarden: isGarden,
66+
gardenName: gardenName,
67+
gardenPartner: gardenPartner)
6268
}
6369
}

0 commit comments

Comments
 (0)