@nuskin/product-components 3.3.4 → 3.3.5-cx16-8616.2

package/.releaserc

@@ -1,6 +1,6 @@
 {
     "branches": [
-      "master"
+      "master", {"name":"CX16-8616", "channel":"prerelease", "prerelease":"cx16-8616"}
     ],
     "plugins": [
         "@semantic-release/npm",

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [3.3.5-cx16-8616.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx16-8616.1...v3.3.5-cx16-8616.2) (2023-03-25)
+
+
+### Fix
+
+* added comment for new prerelease #CX16-8616 ([eede258](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/eede258b1c40b5ad357ac6a0fc8fb756d2180f4e)), closes [#CX16-8616](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8616)
+
+## [3.3.5-cx16-8616.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.4...v3.3.5-cx16-8616.1) (2023-03-25)
+
+
+### Fix
+
+* comment #CX16-8616 ([166d464](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/166d464f24c4d121e1e2e39fe23d7bd44a22cfaf)), closes [#CX16-8616](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8616)
+* wait for config. #CX16-8616 ([c6c4147](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/c6c4147612aa54a5815b6614c06f2bffdd77d448)), closes [#CX16-8616](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8616)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([2355bd7](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/2355bd73c1cf7c2a8110f85d72bebdb66a286cfc))
+
+## [3.3.5-cx16-8616.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.4...v3.3.5-cx16-8616.1) (2023-03-25)
+
+
+### Fix
+
+* wait for config. #CX16-8616 ([c6c4147](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/c6c4147612aa54a5815b6614c06f2bffdd77d448)), closes [#CX16-8616](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8616)
+
 ## [3.3.4](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.3...v3.3.4) (2023-03-24)
 
 

package/mixins/NsProductMixin.js

@@ -25,24 +25,12 @@ import webLoyalty from "@nuskin/ns-loyalty-web";
 import { getProp, getFullUrl } from "@nuskin/ns-common-lib";
 import { PriceType } from "@nuskin/ns-product-lib";
 import { ProductDataService } from "@nuskin/ns-product";
+import { waitForConfig } from "../services/configHelper";
 
 //const PRODUCT_SMALL_VARIANT = "product-card.selected-variant";
 const PENDING_FAVORITE = "pendingFavorite";
 const KEY_BREADCRUMB_BACK = "breadcrumbBack";
 
-const configMapsToLoad = [
-  "Url",
-  "Basic",
-  "Shopping",
-  "ADP",
-  "Cart",
-  "Loyalty",
-  "Checkout"
-];
-getConfiguration(configMapsToLoad).then(() =>
-  console.log("ns-shop config loaded")
-);
-
 /**
  * NsProductMixin
  *
@@ -337,14 +325,7 @@ const NsProductMixin = {
     }
   },
   async mounted() {
-    await getConfiguration([
-      "Cart",
-      "Basic",
-      "Url",
-      "Shopping",
-      "ADP",
-      "Equinox_Markets"
-    ]);
+    await waitForConfig();
     await this.init();
     this.addListeners();
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/product-components",
-  "version": "3.3.4",
+  "version": "3.3.5-cx16-8616.2",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {

package/services/NsProductAppService.js

@@ -1,5 +1,6 @@
 import Vue from "vue";
 
+import { waitForConfig } from "./configHelper";
 import {
   RunConfigService,
   ConfigService,
@@ -44,6 +45,7 @@ if (!NsProductAppService) {
     },
     async mounted() {
       await this.setConfig();
+      await waitForConfig();
 
       this.runConfigInterval = setInterval(async () => {
         if (this.runConfigTries <= 0) {

package/services/NsProductDataService.js

@@ -9,6 +9,7 @@ import { isNullOrEmpty } from "@nuskin/ns-common-lib";
 import { ProductDataService } from "@nuskin/ns-product";
 import { Product, PriceType } from "@nuskin/ns-product-lib";
 import { equinoxLocalStorage } from "@nuskin/ns-util";
+import { waitForConfig } from "./configHelper";
 
 class ProductDataBatch {
   constructor(id, skus) {
@@ -116,6 +117,7 @@ if (!NsProductDataService) {
       }
     },
     async mounted() {
+      await waitForConfig();
       this.addListeners();
       this.setProductDataFromSession();
     },

package/services/configHelper.js

@@ -0,0 +1,31 @@
+import { events } from "@nuskin/ns-util";
+
+/**
+ * Helper to wait for certain config maps to be loaded that are used
+ * in dependent nuskin packages.
+ *
+ * @returns {Promise}
+ */
+const waitForConfig = async () => {
+  const promise = new Promise(resolve => {
+    // Wait for this maps to be loaded.
+    const neededMaps = ["Url", "Basic", "Shopping", "ADP", "Cart", "Loyalty", "Checkout"]; // eslint-disable-line
+
+    const isSubset = (array1, array2) => {
+      return array2.every(element => array1.includes(element));
+    };
+
+    const configCallback = configs => {
+      if (configs && isSubset(configs, neededMaps)) {
+        events.unsubscribe(events.global.CS_CONFIG_SET, configCallback);
+        resolve();
+      }
+    };
+
+    events.getValue(events.global.CS_CONFIG_SET, configCallback, true);
+  });
+
+  return promise;
+};
+
+export { waitForConfig };