@ikas/storefront 4.0.0-alpha.21 → 4.0.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "4.0.0-alpha.21",
+  "version": "4.0.0-alpha.23",
   "description": "Storefront functionality for ikas storefront themes.",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
@@ -24,11 +24,11 @@
     "libphonenumber-js": "^1.10.6"
   },
   "devDependencies": {
-    "@ikas/storefront-api": "^4.0.0-alpha.21",
-    "@ikas/storefront-config": "^4.0.0-alpha.21",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.21",
-    "@ikas/storefront-models": "^4.0.0-alpha.21",
-    "@ikas/storefront-providers": "^4.0.0-alpha.21",
+    "@ikas/storefront-api": "^4.0.0-alpha.23",
+    "@ikas/storefront-config": "^4.0.0-alpha.23",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.23",
+    "@ikas/storefront-models": "^4.0.0-alpha.23",
+    "@ikas/storefront-providers": "^4.0.0-alpha.23",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
@@ -52,11 +52,11 @@
     "html-react-parser": "^1.4.0"
   },
   "peerDependencies": {
-    "@ikas/storefront-api": "^4.0.0-alpha.21",
-    "@ikas/storefront-config": "^4.0.0-alpha.21",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.21",
-    "@ikas/storefront-models": "^4.0.0-alpha.21",
-    "@ikas/storefront-providers": "^4.0.0-alpha.21",
+    "@ikas/storefront-api": "^4.0.0-alpha.23",
+    "@ikas/storefront-config": "^4.0.0-alpha.23",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.23",
+    "@ikas/storefront-models": "^4.0.0-alpha.23",
+    "@ikas/storefront-providers": "^4.0.0-alpha.23",
     "mobx": "^6.1.3",
     "mobx-react-lite": "^3.1.5",
     "next": "12.0.7",

package/src/components/page/index.tsx

@@ -19,6 +19,7 @@ import { ThemeComponent } from "./ThemeComponent";
 import { IkasBaseStore } from "../../store";
 import { initIkasEvents } from "../../analytics/events";
 import { IkasPageDataInit } from "../../page-data-init";
+import { setAPIClientConfig } from "@ikas/storefront-api";
 
 export type IkasPageProps = {
   propValues: IkasPageComponentPropValue[];
@@ -55,15 +56,16 @@ export const IkasPage: React.FC<IkasPageProps> = observer(
     productReviewSummary,
   }) => {
     const router = useRouter();
-    const store = IkasBaseStore.getInstance();
-    store.router = router;
 
     IkasStorefrontConfig.init({
       ...configJson,
       currentPageComponents: components,
     });
     IkasBaseStore.getInstance().router = router;
+    setAPIClientConfig();
 
+    const store = IkasBaseStore.getInstance();
+    store.router = router;
     store.currentPageType = pageType;
 
     const [isBrowser, setIsBrowser] = React.useState(false);

package/src/components/page-editor/model.ts

@@ -23,7 +23,7 @@ import HtmlMetaDataStore from "../../store/html-meta-data";
 import BlogStore from "../../store/blog";
 import RaffleStore from "../../store/raffle";
 import ProductStore from "../../store/product";
-import { IkasAPIClientConfig } from "@ikas/storefront-api";
+import { setAPIClientConfig } from "@ikas/storefront-api";
 
 const PACKAGE_VERSION = "2.0.20";
 // import { version as PACKAGE_VERSION } from "../../../package.json";
@@ -536,8 +536,6 @@ export default class IkasPageEditorViewModel {
 
   // Message Handlers
 
-  static setAPIClientConfig() {}
-
   handleUpdateFrameData = async (data: any) => {
     this.theme = new IkasThemeJson(data.theme);
     this.page = this.theme?.pages.find((p) => p.id === data.selectedPage.id);
@@ -573,17 +571,7 @@ export default class IkasPageEditorViewModel {
         cdnUrl: data.cdnUrl,
       });
 
-      IkasAPIClientConfig.URL = IkasStorefrontConfig.getApiUrl() || "";
-      IkasAPIClientConfig.HEADERS = {
-        "x-api-key": IkasStorefrontConfig.getApiKey() || "",
-        "x-sfid": IkasStorefrontConfig.getStorefrontId() || "",
-        "x-sfrid": IkasStorefrontConfig.getStorefrontRoutingId() || "",
-      };
-
-      if (IkasStorefrontConfig.getCustomerToken()) {
-        IkasAPIClientConfig.TOKEN =
-          IkasStorefrontConfig.getCustomerToken() || "";
-      }
+      setAPIClientConfig();
     }
 
     // (window as any).editorApiKey = data.apiKey;
@@ -636,8 +624,6 @@ export default class IkasPageEditorViewModel {
     await this.pageDataProvider.setLinkSlugs();
 
     if (pageComponentPropValues) {
-      pageComponentPropValues.propValues[propName] = propValue;
-
       if (prop.type === IkasThemeJsonComponentPropType.CUSTOM) {
         IkasPageDataInit.initCustomDataPropValue(
           prop,
@@ -668,6 +654,12 @@ export default class IkasPageEditorViewModel {
           propValue,
           pageComponentPropValues
         );
+      } else if (prop.type === IkasThemeJsonComponentPropType.PRODUCT_LIST) {
+        IkasPageDataInit.initProductListPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
       } else if (prop.type === IkasThemeJsonComponentPropType.CATEGORY) {
         IkasPageDataInit.initCategoryPropValue(
           prop,
@@ -707,6 +699,8 @@ export default class IkasPageEditorViewModel {
           propValue,
           pageComponentPropValues
         );
+      } else {
+        pageComponentPropValues.propValues[propName] = propValue;
       }
     }
   };

package/src/pages/checkout.tsx

@@ -9,7 +9,7 @@ import IkasCheckoutPage, {
 import { useRouter } from "next/router.js";
 import { FullscreenLoading } from "../components/checkout/components/fullscreen-loading";
 import { CheckoutStep } from "../components/checkout/model";
-import { getCartById } from "@ikas/storefront-api";
+import { getCartById, setAPIClientConfig } from "@ikas/storefront-api";
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import { IkasBaseStore } from "..";
 import { IkasCheckout, IkasCheckoutSettings } from "../models/data";
@@ -35,6 +35,7 @@ const CheckoutPage: React.FC<Props> = ({
   const [checkout, setCheckout] = React.useState<IkasCheckout | undefined>();
 
   IkasStorefrontConfig.init(configJson);
+  setAPIClientConfig();
 
   React.useEffect(() => {
     setCustomizationProps(customizationProps);