@ikas/storefront-providers 4.0.0-alpha.58 → 4.0.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront-providers",
-  "version": "4.0.0-alpha.58",
+  "version": "4.0.0-alpha.6",
   "description": "Data providers for ikas storefront theme components.",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
@@ -17,12 +17,11 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.0",
-    "@ikas/storefront-api": "^4.0.0-alpha.58",
-    "@ikas/storefront-config": "^4.0.0-alpha.58",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.58",
-    "@ikas/storefront-models": "^4.0.0-alpha.58",
+    "@ikas/storefront-api": "^4.0.0-alpha.6",
+    "@ikas/storefront-config": "^4.0.0-alpha.6",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.6",
+    "@ikas/storefront-models": "^4.0.0-alpha.6",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "rollup-plugin-rename-node-modules": "^1.2.0",
     "@types/lodash": "^4.14.168",
     "@types/react": "^16.9.55",
     "mobx": "^6.1.3",
@@ -38,10 +37,10 @@
   },
   "peerDependencies": {
     "mobx": "^6.1.3",
-    "@ikas/storefront-api": "^4.0.0-alpha.58",
-    "@ikas/storefront-config": "^4.0.0-alpha.58",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.58",
-    "@ikas/storefront-models": "^4.0.0-alpha.58",
+    "@ikas/storefront-api": "^4.0.0-alpha.6",
+    "@ikas/storefront-config": "^4.0.0-alpha.6",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.6",
+    "@ikas/storefront-models": "^4.0.0-alpha.6",
     "lodash": "^4.17.20"
   }
 }

package/src/models/ui/raffle-list/init.ts

@@ -1,4 +1,4 @@
-import { listStorefrontRaffle } from "@ikas/storefront-api";
+import { listRaffle } from "@ikas/storefront-api";
 import { IkasRaffleList } from ".";
 import { populateRaffleProducts } from "../../../providers/helpers/raffle";
 
@@ -25,7 +25,7 @@ async function getRaffleList(
   page: number,
   limit: number
 ) {
-  const response = await listStorefrontRaffle({
+  const response = await listRaffle({
     start: list.start ? { eq: list.start } : undefined,
     end: list.end ? { eq: list.end } : undefined,
     includeDeleted: list.includeDeleted || false,

package/src/providers/page-data-get.ts

@@ -62,7 +62,7 @@ import {
   listHTMLMetaData,
   listMerchantSettings,
   listProductOptionSet,
-  listStorefrontRaffle,
+  listRaffle,
   listRaffleMetaData,
   searchProducts,
 } from "@ikas/storefront-api";
@@ -80,7 +80,7 @@ export class IkasPageDataProvider {
   theme: IkasThemeJson;
   pageType?: IkasThemeJsonPageType | null = null;
   pageParams: Record<string, any> = {};
-  private pageComponentPropValues: IkasPageComponentPropValue[] = [];
+  pageComponentPropValues: IkasPageComponentPropValue[] = [];
   pageSpecificData?: any | null = null;
   merchantSettings?: IkasMerchantSettings | null = null;
   possiblePageTypes?: IkasThemeJsonPageType[] = []; // Used for distinguishing blog slug page from main slug page
@@ -154,10 +154,6 @@ export class IkasPageDataProvider {
     return this.page?.components || [];
   }
 
-  get $pageComponentPropValues() {
-    return this.pageComponentPropValues;
-  }
-
   async getMerchantSettings() {
     const merchantSettingsResponse = await listMerchantSettings({});
 
@@ -349,12 +345,11 @@ export class IkasPageDataProvider {
     };
 
     const handleBlogPage = async () => {
-      const blogsResponse = await listBlog({
+      const blog = await listBlog({
         id: { eq: metaData.targetId },
       });
-      if (!blogsResponse.isSuccess || !blogsResponse.data?.data?.length) return;
+      if (!blog) return;
 
-      const blog = blogsResponse.data.data[0];
       this.pageSpecificData = blog;
       this.pageType = IkasThemeJsonPageType.BLOG;
       this.setPageMetaData(metaData);
@@ -376,13 +371,14 @@ export class IkasPageDataProvider {
         return;
 
       const blogCategory = blogCategoriesResponse.data.data[0];
+
       this.pageSpecificData = blogCategory;
       this.pageType = IkasThemeJsonPageType.BLOG_CATEGORY;
       this.setPageMetaData(metaData);
     };
 
     const handleRafflePage = async () => {
-      const response = await listStorefrontRaffle({
+      const response = await listRaffle({
         id: { eq: metaData.targetId },
       });
 
@@ -674,21 +670,21 @@ export class IkasPageDataProvider {
       switch (type) {
         case "DEFAULT":
           const htmlMetaDataResponse = await listHTMLMetaData({
-            targetId: { in: idList },
+            id: { in: idList },
           });
           results = htmlMetaDataResponse.data || [];
           break;
 
         case "BLOG":
           const blogMetaDataResponse = await listBlogMetaData({
-            targetId: { in: idList },
+            id: { in: idList },
           });
           results = blogMetaDataResponse.data?.data || [];
           break;
 
         case "RAFFLE":
           const raffleMetaDataResponse = await listRaffleMetaData({
-            targetId: { in: idList },
+            id: { in: idList },
           });
           results = raffleMetaDataResponse.data || [];
           break;

package/src/providers/placeholders.ts

@@ -25,7 +25,6 @@ export function getPlaceholderProduct() {
     attributes: [],
     variantTypes: [],
     productOptionSetId: null,
-    baseUnit: null,
   };
   return product;
 }
@@ -113,11 +112,13 @@ export function getPlaceholderRaffle(): IkasRaffle {
     dateRange: null,
     metadata: null,
     name: "",
+    participantCount: null,
     requiredCustomerAccount: false,
     status: false,
     variants: [],
     products: [],
     verificationType: IkasRaffleVerificationType.EMAIL,
+    isCustomerWinner: false,
   };
 }
 

package/src/providers/prop-value/link.ts

@@ -7,11 +7,11 @@ export type IkasLinkMetaDataType = "DEFAULT" | "BLOG" | "RAFFLE";
 export type IkasLinkMetaDataTargetId = {
   type: IkasLinkMetaDataType;
   id: string;
-  navigationLink: NavigationLink;
+  navigationLink: IkasNavigationLink;
 };
 
 export class IkasLinkPropValueProvider
-  implements IkasPropValueProvider<NavigationLink | NavigationLink[]>
+  implements IkasPropValueProvider<IkasNavigationLink | IkasNavigationLink[]>
 {
   private linkPropValue: IkasLinkPropValue | IkasLinkPropValue[];
   private theme: IkasThemeJson;
@@ -29,89 +29,89 @@ export class IkasLinkPropValueProvider
 
   private async getNavigationLink(
     linkPropValue: IkasLinkPropValue
-  ): Promise<NavigationLink> {
-    let navigationLink: NavigationLink | undefined;
+  ): Promise<IkasNavigationLink> {
+    let navigationLink: IkasNavigationLink | undefined;
 
     if (linkPropValue.linkType === IkasLinkType.PAGE) {
       // INDEX PAGE
       if (linkPropValue.pageType === IkasThemeJsonPageType.INDEX) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.ACCOUNT) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.ADDRESSES) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/addresses",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.ORDERS) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/orders",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (
         linkPropValue.pageType === IkasThemeJsonPageType.FAVORITE_PRODUCTS
       ) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/favorite-products",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.LOGIN) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/login",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.REGISTER) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/register",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (
         linkPropValue.pageType === IkasThemeJsonPageType.FORGOT_PASSWORD
       ) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/forgot-password",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (
         linkPropValue.pageType === IkasThemeJsonPageType.RECOVER_PASSWORD
       ) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/account/recover-password",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.BLOG_INDEX) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/blog",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.CART) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/cart",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       } else if (linkPropValue.pageType === IkasThemeJsonPageType.SEARCH) {
-        navigationLink = new NavigationLink({
+        navigationLink = {
           href: "/search",
           label: linkPropValue.label || "",
           subLinks: [],
-        });
+        };
       }
       // CUSTOM PAGE
       else if (linkPropValue.pageType === IkasThemeJsonPageType.CUSTOM) {
@@ -119,11 +119,11 @@ export class IkasLinkPropValueProvider
           (p) => p.id === linkPropValue.pageId
         );
         if (themePage) {
-          navigationLink = new NavigationLink({
+          navigationLink = {
             href: "/pages/" + themePage.slug,
             label: linkPropValue.label || "",
             subLinks: [],
-          });
+          };
         }
       }
       // ITEM PAGES
@@ -135,11 +135,11 @@ export class IkasLinkPropValueProvider
         ].includes(linkPropValue.pageType!)
       ) {
         if (linkPropValue.itemId) {
-          navigationLink = new NavigationLink({
+          navigationLink = {
             href: "/",
             label: linkPropValue.label || "",
             subLinks: [],
-          });
+          };
           this.linkMetaDataTargetIds.push({
             type: "DEFAULT",
             id: linkPropValue.itemId,
@@ -155,11 +155,11 @@ export class IkasLinkPropValueProvider
         ].includes(linkPropValue.pageType!)
       ) {
         if (linkPropValue.itemId) {
-          navigationLink = new NavigationLink({
+          navigationLink = {
             href: "/blog/",
             label: linkPropValue.label || "",
             subLinks: [],
-          });
+          };
           this.linkMetaDataTargetIds.push({
             type: "BLOG",
             id: linkPropValue.itemId,
@@ -170,11 +170,11 @@ export class IkasLinkPropValueProvider
       // RAFFLE ITEM PAGE
       else if (linkPropValue.pageType === IkasThemeJsonPageType.RAFFLE_DETAIL) {
         if (linkPropValue.itemId) {
-          navigationLink = new NavigationLink({
+          navigationLink = {
             href: "/raffle/",
             label: linkPropValue.label || "",
             subLinks: [],
-          });
+          };
           this.linkMetaDataTargetIds.push({
             type: "RAFFLE",
             id: linkPropValue.itemId,
@@ -200,12 +200,12 @@ export class IkasLinkPropValueProvider
     }
     // EXTERNAL LINK
     else if (linkPropValue.linkType === IkasLinkType.EXTERNAL) {
-      navigationLink = new NavigationLink({
+      navigationLink = {
         href: linkPropValue.externalLink || "",
         label: linkPropValue.label || "",
         subLinks: [],
         isExternal: true,
-      });
+      };
     }
 
     if (navigationLink) {
@@ -244,7 +244,7 @@ export class IkasLinkPropValueProvider
       return navigationLink;
     }
 
-    return new NavigationLink({ href: "", label: "", subLinks: [] });
+    return { href: "", label: "", subLinks: [] } as IkasNavigationLink;
   }
 
   async getValue(): Promise<IkasNavigationLink | IkasNavigationLink[]> {
@@ -257,20 +257,3 @@ export class IkasLinkPropValueProvider
     }
   }
 }
-
-// This is a class by choice, mobx creates clones of plain JSON objects, but not class instances
-export class NavigationLink implements IkasNavigationLink {
-  href: string;
-  label: string;
-  subLinks: IkasNavigationLink[];
-  isExternal?: boolean | null;
-  itemId?: string;
-
-  constructor(data: IkasNavigationLink) {
-    this.href = data.href;
-    this.label = data.label;
-    this.subLinks = data.subLinks;
-    this.isExternal = data.isExternal;
-    this.itemId = data.itemId;
-  }
-}

package/src/providers/prop-value/product-list.ts

@@ -81,13 +81,15 @@ export class IkasProductListPropValueProvider
         IkasRelatedProductsType.CATEGORY
       ) {
         this.relatedProductData.categoryIds =
-          this.pageSpecificData.categories.map(
+          this.pageSpecificData.product.categories.map(
             (category: IkasCategory) => category.id
           );
       } else {
-        this.relatedProductData.brandIds = [this.pageSpecificData?.brand?.id];
+        this.relatedProductData.brandIds = [
+          this.pageSpecificData.product?.brand?.id,
+        ];
       }
-      this.relatedProductData.productId = this.pageSpecificData.id;
+      this.relatedProductData.productId = this.pageSpecificData.product.id;
     }
 
     const productList: IkasProductList = {

package/src/providers/prop-value/raffle.ts

@@ -1,4 +1,4 @@
-import { listStorefrontRaffle } from "@ikas/storefront-api";
+import { listRaffle } from "@ikas/storefront-api";
 import IkasPropValueProvider from ".";
 import { IkasRafflePropValue } from "../../models/prop-value/raffle";
 import { populateRaffleProducts } from "../helpers/raffle";
@@ -23,7 +23,7 @@ export class IkasRafflePropValueProvider
     }
     if (!this.rafflePropValue.raffleId) return null;
 
-    const rafflesResponse = await listStorefrontRaffle({
+    const rafflesResponse = await listRaffle({
       id: { eq: this.rafflePropValue.raffleId },
     });
 

package/src/providers/types.ts

@@ -19,7 +19,6 @@ import { IkasBrandPropValue } from "../models/prop-value/brand";
 import { IkasCategoryPropValue } from "../models/prop-value/category";
 import { IkasProductPropValue } from "../models/prop-value/product";
 import { IkasRafflePropValue } from "../models/prop-value/raffle";
-import { makeAutoObservable } from "mobx";
 
 export class IkasPageComponentPropValue {
   pageComponent: IkasThemeJsonPageComponent;
@@ -30,8 +29,6 @@ export class IkasPageComponentPropValue {
     this.pageComponent = data.pageComponent;
     this.component = data.component;
     this.propValues = data.propValues || {};
-
-    makeAutoObservable(this);
   }
 }