Skip to content

Analytics Hub: Product Card error state #8304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 5, 2022
Merged

Analytics Hub: Product Card error state #8304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eee75f7
Add support for the "Error label" on Items Sold list
Ecarrion Dec 2, 2022
a0cc10b
Update items sold header to accentuate it with a bold font
Ecarrion Dec 2, 2022
300b0f2
Update tests
Ecarrion Dec 2, 2022
2a51b29
Update tests
Ecarrion Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ private extension AnalyticsHubViewModel {
static func productCard(currentPeriodStats: OrderStatsV4?,
previousPeriodStats: OrderStatsV4?,
itemsSoldStats: TopEarnerStats?) -> AnalyticsProductCardViewModel {
let showSyncError = currentPeriodStats == nil || previousPeriodStats == nil
let showStatsError = currentPeriodStats == nil || previousPeriodStats == nil
let showItemsSoldError = itemsSoldStats == nil
let itemsSold = StatsDataTextFormatter.createItemsSoldText(orderStats: currentPeriodStats)
let itemsSoldDelta = StatsDataTextFormatter.createOrderItemsSoldDelta(from: previousPeriodStats, to: currentPeriodStats)

Expand All @@ -243,7 +244,8 @@ private extension AnalyticsHubViewModel {
deltaBackgroundColor: Constants.deltaColor(for: itemsSoldDelta.direction),
itemsSoldData: itemSoldRows(from: itemsSoldStats),
isRedacted: false,
showSyncError: showSyncError)
showStatsError: showStatsError,
showItemsSoldError: showItemsSoldError)
}

/// Helper functions to create `TopPerformersRow.Data` items rom the provided `TopEarnerStats`.
Expand Down
26 changes: 21 additions & 5 deletions WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsProductCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ struct AnalyticsProductCard: View {
///
let isRedacted: Bool

/// Indicates if there was an error loading the data for the card
/// Indicates if there was an error loading stats part of the card.
///
let showSyncError: Bool
let showStatsError: Bool

/// Indicates if there was an error loading items sold part of the card.
///
let showItemsSoldError: Bool

var body: some View {
VStack(alignment: .leading) {
Expand All @@ -50,7 +54,7 @@ struct AnalyticsProductCard: View {
.shimmering(active: isRedacted)
}

if showSyncError {
if showStatsError {
Text(Localization.noProducts)
.foregroundColor(Color(.text))
.subheadlineStyle()
Expand All @@ -62,6 +66,14 @@ struct AnalyticsProductCard: View {
.padding(.top, Layout.columnSpacing)
.redacted(reason: isRedacted ? .placeholder : [])
.shimmering(active: isRedacted)

if showItemsSoldError {
Text(Localization.noItemsSold)
.foregroundColor(Color(.text))
.subheadlineStyle()
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.top, Layout.columnSpacing)
}
}
.padding(Layout.cardPadding)
}
Expand All @@ -74,6 +86,8 @@ private extension AnalyticsProductCard {
static let itemsSold = NSLocalizedString("Items Sold", comment: "Title for the items sold column on the products card on the analytics hub screen.")
static let noProducts = NSLocalizedString("Unable to load product analytics",
comment: "Text displayed when there is an error loading product stats data.")
static let noItemsSold = NSLocalizedString("Unable to load product items sold analytics",
comment: "Text displayed when there is an error loading items sold stats data.")
}

enum Layout {
Expand All @@ -98,15 +112,17 @@ struct AnalyticsProductCardPreviews: PreviewProvider {
.init(imageURL: imageURL, name: "Bird Of Paradise", details: "Net Sales: $23.50", value: "2"),
],
isRedacted: false,
showSyncError: false)
showStatsError: false,
showItemsSoldError: false)
.previewLayout(.sizeThatFits)

AnalyticsProductCard(itemsSold: "-",
delta: "0%",
deltaBackgroundColor: .withColorStudio(.gray, shade: .shade0),
itemsSoldData: [],
isRedacted: false,
showSyncError: true)
showStatsError: true,
showItemsSoldError: true)
.previewLayout(.sizeThatFits)
.previewDisplayName("No data")
}
Expand Down
15 changes: 11 additions & 4 deletions WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsProductCardViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ struct AnalyticsProductCardViewModel {
///
let isRedacted: Bool

/// Indicates if there was an error loading the data for the card
/// Indicates if there was an error loading stats part of the card.
///
let showSyncError: Bool
let showStatsError: Bool

/// Indicates if there was an error loading items sold part of the card.
///
let showItemsSoldError: Bool
}

extension AnalyticsProductCardViewModel {
Expand All @@ -41,7 +45,8 @@ extension AnalyticsProductCardViewModel {
deltaBackgroundColor: .lightGray,
itemsSoldData: [.init(imageURL: nil, name: "Product Name", details: "Net Sales", value: "$5678")],
isRedacted: true,
showSyncError: false)
showStatsError: false,
showItemsSoldError: false)
}

}
Expand All @@ -55,6 +60,8 @@ extension AnalyticsProductCard {
self.deltaBackgroundColor = viewModel.deltaBackgroundColor
self.itemsSoldData = viewModel.itemsSoldData
self.isRedacted = viewModel.isRedacted
self.showSyncError = viewModel.showSyncError
self.showStatsError = viewModel.showStatsError
self.showItemsSoldError = viewModel.showItemsSoldError

}
}
2 changes: 1 addition & 1 deletion WooCommerce/Classes/ViewRelated/Dashboard/MyStore/TopPerformersView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ struct TopPerformersView: View {
Spacer()
Text(valueTitle)
}
.font(.subheadline.bold())
.foregroundColor(Color(.text))
.subheadlineStyle()
.padding(.bottom, Layout.tableSpacing)

// Rows
Expand Down
3 changes: 2 additions & 1 deletion ...rce/WooCommerceTests/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ final class AnalyticsHubViewModelTests: XCTestCase {
// Then
XCTAssertTrue(vm.revenueCard.showSyncError)
XCTAssertTrue(vm.ordersCard.showSyncError)
XCTAssertTrue(vm.productCard.showSyncError)
XCTAssertTrue(vm.productCard.showStatsError)
XCTAssertTrue(vm.productCard.showItemsSoldError)
}

func test_cards_viewmodels_redacted_while_updating_from_network() async {
Expand Down