@financial-times/n-myft-ui 32.0.2 → 33.1.0

package/components/jsx/preferences-modal/index.js

@@ -11,10 +11,10 @@ const renderError = ({ message, preferencesModal }) => {
 
 const removeError = ({ preferencesModal }) => {
 	renderError({
-		message: "",
+		message: '',
 		preferencesModal,
 	});
-}
+};
 
 /**
  * This preference modal is part of a test
@@ -60,7 +60,7 @@ const toggleCheckboxStatus = ({ instantAlertsCheckbox, isChecked }) => {
 		instantAlertsCheckbox.dataset.trackable = 'pop-up-box|set-instant-alert-on';
 		instantAlertsCheckbox.checked = false;
 	}
-}
+};
 
 const tracking = (conceptId) => {
 	const trackingData = {
@@ -72,7 +72,7 @@ const tracking = (conceptId) => {
 			name: 'pop-up-box',
 			id: '72de123e-5082-11ee-be56-0242ac120002',
 		}
-	}
+	};
 
 	const trackingEvent = new CustomEvent('oTracking.event', {
 		detail: trackingData,
@@ -218,7 +218,7 @@ const toggleInstantAlertsPreference = async ({ event, conceptId, preferencesModa
 	instantAlertsCheckbox.removeAttribute('disabled');
 };
 
-const setCheckboxForAlertConceptToOff =  ({ event, preferencesModal }) => {
+const setCheckboxForAlertConceptToOff = ({ event, preferencesModal }) => {
 	const conceptId = preferencesModal.dataset.conceptId;
 	const instantAlertsCheckbox = preferencesModal.querySelector('[data-component-id="myft-preferences-modal-checkbox"]');
 
@@ -231,7 +231,7 @@ const setCheckboxForAlertConceptToOff =  ({ event, preferencesModal }) => {
 		instantAlertsCheckbox,
 		isChecked: false,
 	});
-}
+};
 
 export default () => {
 	/**

package/karma.conf.js

@@ -155,7 +155,7 @@ module.exports = function (karma) {
 			safari: {
 				base: 'BrowserStack',
 				os: 'OS X',
-				os_version : 'High Sierra',
+				os_version : 'Monterey',
 				browser: 'Safari',
 				browser_version: 'latest'
 			}

package/myft/ui/lists.js

@@ -500,6 +500,12 @@ function openCreateListAndAddArticleOverlay (contentId, config) {
 function initialEventListeners () {
 
 	document.body.addEventListener('myft.user.saved.content.add', event => {
+		//Only show the create list overlay if the saved article is the main article, this is useful if there are other article listed in the article page
+		//For example having a related articles that can also be saved
+		const currentContentId = document.querySelector('[data-content-id]').dataset.contentId;
+		if (event && event.detail && currentContentId !== event.detail.subject) {
+			return;
+		}
 		event.stopPropagation();
 		const contentId = event.detail.subject;
 		const configSet = event.currentTarget.querySelector('[data-myft-ui-save-config]');
@@ -512,6 +518,12 @@ function initialEventListeners () {
 	});
 
 	document.body.addEventListener('myft.user.saved.content.remove', event => {
+		//Only show unsave notification if the saved article is the main article, this is useful if there are other article listed in the article page
+		//For example having a related articles that can also be saved
+		const currentContentId = document.querySelector('[data-content-id]').dataset.contentId;
+		if (event && event.detail && currentContentId !== event.detail.subject) {
+			return;
+		}
 		event.stopPropagation();
 		const contentId = event.detail.subject;
 		return showUnsavedNotification(contentId);

package/myft/ui/myft-buttons/init.js

@@ -26,7 +26,7 @@ function getInteractionHandler (relationshipName) {
 	};
 }
 
-function anonEventListeners (flags = {}) {
+function anonEventListeners () {
 	const currentPath = window.location.pathname;
 	const subscribeUrl = '/products?segID=400863&segmentID=190b4443-dc03-bd53-e79b-b4b6fbd04e64';
 	const signInLink = `/login${currentPath.length ? `?location=${currentPath}` : ''}`;
@@ -35,12 +35,6 @@ function anonEventListeners (flags = {}) {
 		saved: `Please <a href="${subscribeUrl}" class="myft-ui-subscribe" data-trackable="Subscribe">subscribe</a> or <a href="${signInLink}" data-trackable="Sign In">sign in</a> to save this article.`
 	};
 
-	// 11/5/23 - US Growth test for Free Article Demand, see https://financialtimes.atlassian.net/browse/UG-1191
-	// This will be cleaned up after the test as part of https://financialtimes.atlassian.net/browse/UG-1221
-	if (flags.get && flags.get('podcastReferral')) {
-		messages.saved = `<a href="/register/access?multistepRegForm=multistep?segmentID=ce23dd51-4421-32fc-23df-30099f38f1a4" data-trackable="Register">Register</a> for free or  <a href="${signInLink}" data-trackable="Sign In">sign in</a> to save this article`;
-	};
-
 	['followed', 'saved'].forEach(action => {
 		createDelegate('submit', relationshipConfig[action].uiSelector, event => {
 			event.preventDefault();
@@ -105,7 +99,7 @@ export default function (opts) {
 		enhanceActionUrls();
 
 		if (opts && opts.anonymous) {
-			anonEventListeners(opts.flags);
+			anonEventListeners();
 		} else {
 			signedInEventListeners();
 			personaliseLinks();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-myft-ui",
-  "version": "32.0.2",
+  "version": "33.1.0",
   "description": "Client side component for interaction with myft",
   "main": "server.js",
   "scripts": {
@@ -63,7 +63,7 @@
     "karma-chrome-launcher": "3.2.0",
     "karma-firefox-launcher": "^1.0.0",
     "karma-html-reporter": "^0.2.6",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^2.0.1",
     "karma-sinon": "^1.0.5",
     "karma-sinon-chai": "2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
@@ -71,7 +71,7 @@
     "karma-webpack": "^4.0.2",
     "lintspaces-cli": "^0.7.0",
     "lolex": "5.1.2",
-    "mocha": "6.2.2",
+    "mocha": "^10.2.0",
     "mockery": "2.1.0",
     "node-fetch": "2.6.0",
     "nodemon": "^1.9.2",

package/secrets.js

@@ -4,7 +4,6 @@ module.exports = {
 		'38d9c080-3301-11ea-9616-d1b31132c269', // components/unread-articles-indicator/README.md:3
 		'11df4800-391a-11ea-973b-4a52933561ab', // components/unread-articles-indicator/README.md:67
 		'190b4443-dc03-bd53-e79b-b4b6fbd04e64', // segment ID for subscribe URL
-		'ce23dd51-4421-32fc-23df-30099f38f1a4', // segment ID for USG test https://financialtimes.atlassian.net/browse/UG-1191
 		'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx', // regex for uuid generator
 		'a5676e20-5c92-47f3-a76c-11f9761121f5', // test/navigationAlphaTest.spec.js
 		'72de123e-5082-11ee-be56-0242ac120002' // components/jsx/preferences-modal/index.js