Merge pull request #724 from Financial-Times/ENTST-547-fix-highlights…

…-checkbox-issue fix: highlights checkbox displaying when highlights are not selected
Financial-Times · Jul 7, 2023 · 93a50ef · 93a50ef
2 parents ff277bc + ff39525
commit 93a50ef
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/components/x-gift-article/__tests__/x-gift-article.test.jsx b/components/x-gift-article/__tests__/x-gift-article.test.jsx
@@ -19,7 +19,8 @@ const baseArgs = {
 		title: 'Equinor and Daimler Truck cut Russia ties as Volvo and JLR halt car deliveries'
 	},
 	id: 'base-gift-article-static-id',
-	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`
+	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`,
+	hasHighlights: true
 }
 
 describe('x-gift-article', () => {

diff --git a/components/x-gift-article/src/v2/AdvancedSharingOptions.jsx b/components/x-gift-article/src/v2/AdvancedSharingOptions.jsx
@@ -11,7 +11,8 @@ export const AdvancedSharingOptions = (props) => {
 		includeHighlights,
 		enterpriseHasCredits,
 		giftCredits,
-		showHighlightsRecipientMessage
+		showHighlightsRecipientMessage,
+		hasHighlights
 	} = props
 	const onValueChange = (event) => {
 		if (event.target.value === ShareType.enterprise) {
@@ -69,7 +70,7 @@ export const AdvancedSharingOptions = (props) => {
 				</NoCreditAlert>
 			)}
 			{showHighlightsRecipientMessage && <ReceivedHighlightsAlert {...props} />}
-			{showHighlightsCheckbox && (
+			{showHighlightsCheckbox && hasHighlights && (
 				<div className="o-forms-input o-forms-input--checkbox o-forms-field share-article-dialog__include-highlights">
 					<label htmlFor="includeHighlights">
 						<input

diff --git a/...nents/x-gift-article/storybook/share-article-modal-with-advanced-sharing-free-article.jsx b/...nents/x-gift-article/storybook/share-article-modal-with-advanced-sharing-free-article.jsx
@@ -12,7 +12,8 @@ exports.args = {
 		title: 'Equinor and Daimler Truck cut Russia ties as Volvo and JLR halt car deliveries'
 	},
 	id: 'base-gift-article-static-id',
-	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`
+	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`,
+	hasHighlights: true
 }
 
 exports.fetchMock = (fetchMock) => {

diff --git a/...ift-article/storybook/share-article-modal-with-advanced-sharing-no-enterprise-credits.jsx b/...ift-article/storybook/share-article-modal-with-advanced-sharing-no-enterprise-credits.jsx
@@ -12,7 +12,8 @@ exports.args = {
 		title: 'Equinor and Daimler Truck cut Russia ties as Volvo and JLR halt car deliveries'
 	},
 	id: 'base-gift-article-static-id',
-	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`
+	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`,
+	hasHighlights: true
 }
 
 exports.fetchMock = (fetchMock) => {

diff --git a/...ts/x-gift-article/storybook/share-article-modal-with-advanced-sharing-no-gift-credits.jsx b/...ts/x-gift-article/storybook/share-article-modal-with-advanced-sharing-no-gift-credits.jsx
@@ -12,7 +12,8 @@ exports.args = {
 		title: 'Equinor and Daimler Truck cut Russia ties as Volvo and JLR halt car deliveries'
 	},
 	id: 'base-gift-article-static-id',
-	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`
+	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`,
+	hasHighlights: true
 }
 
 exports.fetchMock = (fetchMock) => {

diff --git a/...t-article/storybook/share-article-modal-with-advanced-sharing-save-highlights-message.jsx b/...t-article/storybook/share-article-modal-with-advanced-sharing-save-highlights-message.jsx
@@ -13,6 +13,7 @@ exports.args = {
 	},
 	id: 'base-gift-article-static-id',
 	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`,
+	hasHighlights: false,
 	showHighlightsCheckbox: false,
 	showHighlightsRecipientMessage: true
 }

diff --git a/components/x-gift-article/storybook/share-article-modal-with-advanced-sharing.jsx b/components/x-gift-article/storybook/share-article-modal-with-advanced-sharing.jsx
@@ -12,7 +12,8 @@ exports.args = {
 		title: 'Equinor and Daimler Truck cut Russia ties as Volvo and JLR halt car deliveries'
 	},
 	id: 'base-gift-article-static-id',
-	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`
+	enterpriseApiBaseUrl: `https://enterprise-sharing-api.ft.com`,
+	hasHighlights: true
 }
 
 exports.fetchMock = (fetchMock) => {