@financial-times/qanda-ui 0.0.1-beta.46 → 0.0.1-beta.48

package/dist/cjs/index.js

@@ -21,9 +21,8 @@ class QandaUI {
             throw new Error('Required properties are missing');
         }
         const storyId = options?.storyId ?? containerElement.dataset.qandaStoryid;
-        const useStaging = options?.useStaging ??
-            containerElement.dataset.qandaUsestaging === 'true' ??
-            false;
+        const stagingData = containerElement.dataset.qandaUsestaging === 'true' ? true : false;
+        const useStaging = options?.useStaging ?? stagingData;
         const title = options?.title ?? containerElement.dataset.qandaTitle;
         const commentsAPIHost = options?.commentsAPIHost ?? containerElement.dataset.qandaCommentsapihost;
         const commentsAPIVersion = options?.commentsAPIVersion ??

package/dist/cjs/store/updateComments.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateComments = void 0;
 const comments_api_1 = require("../services/comments-api");
-const stream_1 = require("../store/stream");
+const stream_1 = require("./stream");
 const qandas_1 = require("../utils/qandas");
 const updateComments = (dispatch, updatedComments, storyId, useStaging, commentsAPIUrl) => {
     if (!updatedComments.length) {
@@ -15,12 +15,15 @@ const updateComments = (dispatch, updatedComments, storyId, useStaging, comments
         dispatch(comments_api_1.nextCommentsApi.util.updateQueryData('getQandAStream', 
         // Updates happen only for the live stream, so we pass the status as 'live' hardcoded
         { storyId, useStaging, commentsAPIUrl, status: 'live' }, (draft) => {
-            // NB - if the same comment is updated more than once, the most recent thing added to the array will be the one that is shown
+            // NB - if the same comment is updated more than once, the most recent thing added to the array will be the one that is shown, as each update is the full question and answer block
+            // this will check if a question already exists in the store, and if so, it will update the object and move to the top of the array so that we don't have duplicates and it is in the right order
             for (let c = 0; c < updatedComments.length; c++) {
                 const commentId = updatedComments[c].id;
                 const commentIndex = draft.qandas.findIndex((d) => d.id === commentId);
                 if (commentIndex > -1) {
                     draft.qandas[commentIndex] = updatedComments[c];
+                    const commentToMove = draft.qandas.splice(commentIndex, 1);
+                    draft.qandas.unshift(commentToMove[0]);
                 }
                 else {
                     draft.qandas.unshift(updatedComments[c]);

package/dist/cjs/utils/auth.js

@@ -8,7 +8,9 @@ exports.default = async ({ useStaging = true, displayName = '', commentsAPIUrl =
         useStagingEnvironment: useStaging,
         onlySubscribers: true,
         displayName,
-        commentsAPIUrl: commentsAPIUrl === PROD_AUTH_URL ? PROD_AUTH_URL : TEST_AUTH_URL,
+        commentsAPIUrl: commentsAPIUrl.startsWith(PROD_AUTH_URL)
+            ? PROD_AUTH_URL
+            : TEST_AUTH_URL,
     });
     // if the JWT creation has failed, a `userHasValidSession` value will be returned
     // our application assumes the values of a JWT are saved to state, so we set the

package/dist/esm/index.js

@@ -14,9 +14,8 @@ class QandaUI {
             throw new Error('Required properties are missing');
         }
         const storyId = options?.storyId ?? containerElement.dataset.qandaStoryid;
-        const useStaging = options?.useStaging ??
-            containerElement.dataset.qandaUsestaging === 'true' ??
-            false;
+        const stagingData = containerElement.dataset.qandaUsestaging === 'true' ? true : false;
+        const useStaging = options?.useStaging ?? stagingData;
         const title = options?.title ?? containerElement.dataset.qandaTitle;
         const commentsAPIHost = options?.commentsAPIHost ?? containerElement.dataset.qandaCommentsapihost;
         const commentsAPIVersion = options?.commentsAPIVersion ??

package/dist/esm/store/updateComments.js

@@ -1,6 +1,6 @@
 // PURPOSE: move the comments saved in updatedComments into the main comments array for the stream and then clear out the updatedComments array, and update the lastAnsweredQuestionId in the store
 import { nextCommentsApi } from '../services/comments-api';
-import { setLatestAnsweredQuestionId } from '../store/stream';
+import { setLatestAnsweredQuestionId } from './stream';
 import { getLatestAnsweredQuestion } from '../utils/qandas';
 export const updateComments = (dispatch, updatedComments, storyId, useStaging, commentsAPIUrl) => {
     if (!updatedComments.length) {
@@ -12,12 +12,15 @@ export const updateComments = (dispatch, updatedComments, storyId, useStaging, c
         dispatch(nextCommentsApi.util.updateQueryData('getQandAStream', 
         // Updates happen only for the live stream, so we pass the status as 'live' hardcoded
         { storyId, useStaging, commentsAPIUrl, status: 'live' }, (draft) => {
-            // NB - if the same comment is updated more than once, the most recent thing added to the array will be the one that is shown
+            // NB - if the same comment is updated more than once, the most recent thing added to the array will be the one that is shown, as each update is the full question and answer block
+            // this will check if a question already exists in the store, and if so, it will update the object and move to the top of the array so that we don't have duplicates and it is in the right order
             for (let c = 0; c < updatedComments.length; c++) {
                 const commentId = updatedComments[c].id;
                 const commentIndex = draft.qandas.findIndex((d) => d.id === commentId);
                 if (commentIndex > -1) {
                     draft.qandas[commentIndex] = updatedComments[c];
+                    const commentToMove = draft.qandas.splice(commentIndex, 1);
+                    draft.qandas.unshift(commentToMove[0]);
                 }
                 else {
                     draft.qandas.unshift(updatedComments[c]);

package/dist/esm/utils/auth.js

@@ -6,7 +6,9 @@ export default async ({ useStaging = true, displayName = '', commentsAPIUrl = PR
         useStagingEnvironment: useStaging,
         onlySubscribers: true,
         displayName,
-        commentsAPIUrl: commentsAPIUrl === PROD_AUTH_URL ? PROD_AUTH_URL : TEST_AUTH_URL,
+        commentsAPIUrl: commentsAPIUrl.startsWith(PROD_AUTH_URL)
+            ? PROD_AUTH_URL
+            : TEST_AUTH_URL,
     });
     // if the JWT creation has failed, a `userHasValidSession` value will be returned
     // our application assumes the values of a JWT are saved to state, so we set the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/qanda-ui",
-  "version": "0.0.1-beta.46",
+  "version": "0.0.1-beta.48",
   "description": "Components for the Live Q&A (AKA Ask an Expert) UI",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",