From dcd08ac1b69973a19f3da4d4ee31b36cd9e20e66 Mon Sep 17 00:00:00 2001 From: Dan Q Date: Tue, 19 Sep 2023 11:39:01 +0100 Subject: [PATCH 1/3] Apply empty string to URL in event that vendorUrl is absent --- .../product-list-content.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx b/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx index 45d948fef45..84b6e0801ab 100644 --- a/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx +++ b/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx @@ -22,12 +22,16 @@ export default function ProductListContent( props: { title: product.title, icon: product.icon, vendorName: product.vendorName, - vendorUrl: appendURLParams( product.vendorUrl, [ - [ 'utm_source', 'extensionsscreen' ], - [ 'utm_medium', 'product' ], - [ 'utm_campaign', 'wcaddons' ], - [ 'utm_content', 'devpartner' ], - ] ), + vendorUrl: ( + product.vendorUrl ? + appendURLParams( product.vendorUrl, [ + [ 'utm_source', 'extensionsscreen' ], + [ 'utm_medium', 'product' ], + [ 'utm_campaign', 'wcaddons' ], + [ 'utm_content', 'devpartner' ], + ] ) : + '' + ), price: product.price, url: appendURLParams( product.url, From de8535ae7cb464cd17ba79ca03b99223bc206a54 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 19 Sep 2023 10:49:33 +0000 Subject: [PATCH 2/3] Add changefile(s) from automation for the following project(s): woocommerce --- .../fix-wccom-marketplace-products-with-no-vendorurl | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 plugins/woocommerce/changelog/fix-wccom-marketplace-products-with-no-vendorurl diff --git a/plugins/woocommerce/changelog/fix-wccom-marketplace-products-with-no-vendorurl b/plugins/woocommerce/changelog/fix-wccom-marketplace-products-with-no-vendorurl new file mode 100644 index 00000000000..393032bc56d --- /dev/null +++ b/plugins/woocommerce/changelog/fix-wccom-marketplace-products-with-no-vendorurl @@ -0,0 +1,5 @@ +Significance: patch +Type: fix +Comment: More-resilient handling of absent product vendor URLs when browsing WooCommerce > Extensions. + + From 59cb9fad48083148b4a0057f6d2f01881d20e8b8 Mon Sep 17 00:00:00 2001 From: Dan Q Date: Tue, 19 Sep 2023 14:46:59 +0100 Subject: [PATCH 3/3] Appease linter --- .../product-list-content.tsx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx b/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx index 84b6e0801ab..ac4189291e4 100644 --- a/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx +++ b/plugins/woocommerce-admin/client/marketplace/components/product-list-content/product-list-content.tsx @@ -22,16 +22,14 @@ export default function ProductListContent( props: { title: product.title, icon: product.icon, vendorName: product.vendorName, - vendorUrl: ( - product.vendorUrl ? - appendURLParams( product.vendorUrl, [ - [ 'utm_source', 'extensionsscreen' ], - [ 'utm_medium', 'product' ], - [ 'utm_campaign', 'wcaddons' ], - [ 'utm_content', 'devpartner' ], - ] ) : - '' - ), + vendorUrl: product.vendorUrl + ? appendURLParams( product.vendorUrl, [ + [ 'utm_source', 'extensionsscreen' ], + [ 'utm_medium', 'product' ], + [ 'utm_campaign', 'wcaddons' ], + [ 'utm_content', 'devpartner' ], + ] ) + : '', price: product.price, url: appendURLParams( product.url,