@nuskin/ns-util 4.7.0-td-341.2 → 4.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-util",
-  "version": "4.7.0-td-341.2",
+  "version": "4.7.0",
   "baseURL": "/",
   "main": "src/util.js",
   "scripts": {
@@ -23,7 +23,6 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/nu-skin-aem/wm/ns-util/blob/master/README.md",
   "dependencies": {
-    "@ns/ns-contentstack-lib": "2.2.1",
     "@nuskin/events": "1.0.4",
     "@nuskin/ns-common-lib": "1.4.6",
     "@nuskin/nuskinjquery": "2.3.1",

package/src/storage.js

@@ -47,7 +47,8 @@ if (!nuskin.storage) {
             ROUTER_CALLBACK_URL: "callbackUrl",
             SHOPPING_CONTEXT: "shoppingContext",
             SPONSOR_ID: "nuskin.account.sponsorId",
-            TICKET_COOKIE:"ticketCookie"
+            TICKET_COOKIE:"ticketCookie",
+            UTM_INFO: "utmInfo"
         };
 
         const LOCAL_STORAGE = "localStorage",
@@ -472,6 +473,11 @@ if (!nuskin.storage) {
                 key: 'skin-consultation-vuex-state',
                 type: REQUIRED,
                 storageType: LOCAL_STORAGE
+            },
+            UTM_INFO: {
+                key: 'utmInfo',
+                type: REQUIRED,
+                storageType: COOKIE
             }
         };
 

package/src/util.js

@@ -22,7 +22,6 @@ export * from './stickyHeader.js';
 export { default as StickyHeaderStack } from './stickyHeader.js';
 export { default as storage } from './storage.js';
 export { default as StringService } from './stringService.js';
-export {default as csStringService} from './csStringsService.js';
 export { default as TdcStrings } from './tdcStrings.js';
 export { default as AgelocService } from './agelocService.js';
 export { default as PreferencesCookieService } from './preferencesCookieService.js';

package/src/csStringsService.js

@@ -1,157 +0,0 @@
-import { getStack } from '@ns/ns-contentstack-lib';
-import * as lodash from "lodash";
-import storage from "./storage.js";
-import RunConfigService from './runConfigService.js';
-
-const CONTENT_TYPE_UID = "shared_strings";
-const ENTRY_IDS = [
-    "bltaff9c4bbcf2dfc3f",
-    "blt715f143c0df06571",
-    "blt4fc16a923dd994ac",
-    "blt3cca085912f0ec8d",
-    "bltaf7f8ce73702b4fe",
-    "bltd049fc6b4153f131"
-];
-
-
-let currentLocale = "";
-let currentStrings = {};
-let STRINGS_STORAGE_KEY = "cs-strings-";
-let EXPIRE_TIME = 1000 * 60 * 20; // 20 minutes
-
-/**
- * Gets string values for a list of requested strings
- *
- * @param stringInfos - [{key: value, dflt:value},{key:value, dflt:value}...]
- * @param locale - locale of the string
- */
-async function getStrings (stringsInfo,locale = getLocale().locale)  {
-    await refreshStrings(locale);
-    return getRequestedStrings(stringsInfo);
-}
-
-
-function getLocale() {;
-    let runConfig = RunConfigService.getRunConfig();
-    let locale =  `${runConfig.language}_${runConfig.country}`;
-    return {
-        locale,
-        country: runConfig.country || 'US',
-        language: runConfig.language || 'en'
-    };
-};
-
-function getRequestedStrings(stringInfos) {
-    let returnVal = {};    
-    stringInfos.forEach((stringInfo) => {
-        const key = stringInfo.key;
-        returnVal[key] = (currentStrings && currentStrings[key]) || stringInfo.dflt;
-    });
-    return returnVal;
-}
-
-function aemToCsLocale(aemLocale) {
-    const [language, country] = aemLocale.split("_");
-    return `${country.toUpperCase()}-${language}`;
-}
-
-async function refreshStrings(locale) {
-    if (locale !== currentLocale || lodash.isEmpty(currentStrings)) {
-        currentLocale = locale;
-        currentStrings = await getStoredStrings(locale);
-        if (!currentStrings) {
-            await getServerStrings(locale);
-        }
-    }
-}
-
-/**
- * Loads the common strings from the cs
- *
- * @param locale
- * @returns {Promise<void>}
- */
-async function getServerStrings(locale) {
-    try {
-        let csLocale = aemToCsLocale(locale);
-        switch (csLocale) {
-            case 'ID-in':
-                csLocale = 'ID-id'
-                break
-            default:
-        }
-    
-        const Stack = await getStack();
-        const allstrings = [];
-        for(let entryId of ENTRY_IDS) {
-            const response = await Stack.ContentType(CONTENT_TYPE_UID)
-                .Entry(entryId)
-                .only(['strings'])
-                .language(csLocale)
-                .includeFallback()
-                .toJSON()
-                .fetch()
-            
-            if(response && response.strings && Array.isArray(response.strings)){
-                allstrings.push(...response.strings);
-            }            
-        }
-        parseAndSaveCSstrings(allstrings,locale);
-    } catch (error) {
-        console.log('Error in fetchStringsFromContentstack', error);
-    }
-}
-
-function parseAndSaveCSstrings(allstrings,locale) {
-    try{ 
-        currentStrings = allstrings.reduce((acc, string) => {
-            acc[string.key] = string.value;
-            return acc;
-        }, {});
-        saveServerStrings(currentStrings,locale);
-    }
-    catch (error) {
-        console.log('Error in parseAndSaveCSstrings', error);
-    }
-}
-
-/**
- * Loads the common strings previously stored in sessionStorage
- * @param locale
- * @returns {*}
- */
-function getStoredStrings(locale) {
-    let strings = null;
-    if (storage) {
-        strings = storage.getItem({
-            storageType: "sessionStorage",
-            key: `${STRINGS_STORAGE_KEY}${locale}`
-        });
-    }
-    return strings;
-}
-
-/**
- * Saves the common strings to sessionStorage for the specified ttl
- *
- * @param strings
- * @param locale
- */
-function saveServerStrings(strings,locale) {
-    storage.setItem(
-        { storageType: "sessionStorage", key: `${STRINGS_STORAGE_KEY}${locale}` },
-        strings,
-        { ttl: EXPIRE_TIME }
-    );
-}
-
-/**
- *
- * csStringService
- * Service to get common strings from contentstack
- *
- * @namespace csStringService
- */
-export default { 
-    getStrings
-}