@ikas/storefront-api 4.0.0-alpha.38 → 4.0.0-alpha.4

package/src/api/file-upload/index.ts

@@ -1,44 +1,38 @@
 import { IkasProductOption } from "@ikas/storefront-models";
-import { QueryParams as GetProductOptionFileUrlQueryParams } from "../../__api/queries/getProductOptionFileUrl";
-import { IkasProductOptionFileUrl } from "@ikas/storefront-models";
-import { APIResponse } from "@ikas/fe-api-client";
-import axios from "axios";
+import { IkasStorefrontConfig } from "@ikas/storefront-config";
 
-export type { GetProductOptionFileUrlQueryParams };
-
-export async function getProductOptionFileUrl(
-  params: GetProductOptionFileUrlQueryParams,
-  file: File
+export async function uploadProductOptionFile(
+  file: File,
+  option: IkasProductOption
 ) {
-  const _getProductOptionFileUrl = (
-    await import("../../__api/queries/getProductOptionFileUrl")
-  ).default;
-  const response = await _getProductOptionFileUrl(params);
-  return new APIResponse(
-    response.data
-      ? {
-          ...(response.data as unknown as IkasProductOptionFileUrl),
-          file: file,
-        }
-      : null,
-    response.graphQLErrors
-  );
-}
-
-export async function uploadFile(params: IkasProductOptionFileUrl, file: File) {
-  const config = {
+  const URL = `${IkasStorefrontConfig.getAdminApiUrl()}/upload-product-option-file`;
+  const response = await fetch(URL, {
+    method: "POST",
     headers: {
-      "Content-Type": "multipart/form-data",
+      "x-api-key": IkasStorefrontConfig.getApiKey() || "",
+      "x-sfid": IkasStorefrontConfig.getStorefrontId() || "",
+      "x-sfrid": IkasStorefrontConfig.getStorefrontRoutingId() || "",
+      "Content-Type": "application/json",
+      Accept: "application/json",
     },
-  };
-  const data = new FormData();
-  Object.entries(params.fields).forEach(([key, value]) => {
-    //@ts-ignore
-    data.append(key, value);
+    body: JSON.stringify({
+      base64: await getBase64(file),
+      fileName: file.name,
+      productOptionSetId: option.productOptionSetId,
+      productOptionId: option.id,
+    }),
   });
 
-  data.append("file", file);
+  if (!response.ok) {
+    return null;
+  }
+  return await response.text();
+}
 
-  const res = await axios.post(params.url, data, config);
-  return res.status === 200 || res.status === 204;
+export function getBase64(file: File): Promise<string | null> {
+  return new Promise((resolve) => {
+    const reader = new FileReader();
+    reader.addEventListener("load", () => resolve(reader.result as string));
+    reader.readAsDataURL(file);
+  });
 }

package/src/api/masterpass/index.ts

@@ -1,12 +1,12 @@
-import { QueryParams as GetMasterPassRequestTokenQueryParams } from "../../__api/queries/getMasterPassRequestToken";
+import { QueryParams as GetMasterpassRequestTokenQueryParams } from "../../__api/queries/getMasterpassRequestToken";
 
-export type { GetMasterPassRequestTokenQueryParams };
+export type { GetMasterpassRequestTokenQueryParams };
 
-export async function getMasterPassRequestToken(
-  data: GetMasterPassRequestTokenQueryParams
+export async function getMasterpassRequestToken(
+  data: GetMasterpassRequestTokenQueryParams
 ) {
-  const _getMasterPassRequestToken = (
-    await import("../../__api/queries/getMasterPassRequestToken")
+  const _getMasterpassRequestToken = (
+    await import("../../__api/queries/getMasterpassRequestToken")
   ).default;
-  return await _getMasterPassRequestToken(data);
+  return await _getMasterpassRequestToken(data);
 }

package/src/api/product/index.ts

@@ -266,7 +266,6 @@ function simpleToProduct(simple: SearchProduct): IkasProduct {
     shortDescription: simple.shortDescription || "",
     productOptionSetId: simple.productOptionSetId,
     variantTypes: simple.productVariantTypes.map((pvt) => ({
-      order: pvt.order,
       variantType: {
         id: pvt.variantType.id,
         name: pvt.variantType.name,

package/src/api/raffle/index.ts

@@ -7,21 +7,21 @@ import {
 } from "@ikas/storefront-models";
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
 
-import { QueryParams as ListStorefrontRaffleParams } from "../../__api/queries/listStorefrontRaffle";
+import { QueryParams as ListRaffleQueryParams } from "../../__api/queries/listRaffle";
 import { QueryParams as SaveRaffleParticipantQueryParams } from "../../__api/mutations/saveRaffleParticipant";
 import { QueryParams as ListRaffleMetadataQueryParams } from "../../__api/queries/listRaffleMetadata";
+import { QueryParams as GetRafflesByCustomerIdQueryParams } from "../../__api/queries/getRafflesByCustomerId";
 
 export type {
-  ListStorefrontRaffleParams,
+  ListRaffleQueryParams,
   SaveRaffleParticipantQueryParams,
   ListRaffleMetadataQueryParams,
+  GetRafflesByCustomerIdQueryParams,
 };
 
-export async function listStorefrontRaffle(params: ListStorefrontRaffleParams) {
-  const _listStorefrontRaffle = (
-    await import("../../__api/queries/listStorefrontRaffle")
-  ).default;
-  const response = await _listStorefrontRaffle(params);
+export async function listRaffle(params: ListRaffleQueryParams) {
+  const _listRaffle = (await import("../../__api/queries/listRaffle")).default;
+  const response = await _listRaffle(params);
   const data: IkasRaffle[] | undefined = response.data as any;
 
   data?.forEach((r) =>
@@ -45,7 +45,7 @@ export async function saveRaffleParticipant(
   ).default;
   const response = await _saveRaffleParticipant(params);
   return new APIResponse(
-    response.data ? (response.data as unknown as IkasRaffleParticipant) : null,
+    response.data ? (response.data as IkasRaffleParticipant) : null,
     response.graphQLErrors
   );
 }
@@ -63,11 +63,13 @@ export async function listRaffleMetaData(
   );
 }
 
-export async function listRaffleParticipants() {
-  const _listRaffleParticipants = (
-    await import("../../__api/queries/listRaffleParticipants")
+export async function getRafflesByCustomerId(
+  params: GetRafflesByCustomerIdQueryParams
+) {
+  const _getRafflesByCustomerId = (
+    await import("../../__api/queries/getRafflesByCustomerId")
   ).default;
-  const response = await _listRaffleParticipants();
+  const response = await _getRafflesByCustomerId(params);
   const data: IkasRaffle[] | undefined = response.data as any;
 
   data?.forEach((r) =>

package/src/index.ts

@@ -1,19 +1,12 @@
 import { APIErrorCode, Config } from "@ikas/fe-api-client";
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
 
-IkasStorefrontConfig.addObserver({
-  id: "ikas-storefront-api",
-  callback: setAPIClientConfig,
-});
-
-export function setAPIClientConfig() {
+const onConfigChange = () => {
   Config.URL = IkasStorefrontConfig.getApiUrl() || "";
   Config.HEADERS = {
     "x-api-key": IkasStorefrontConfig.getApiKey() || "",
     "x-sfid": IkasStorefrontConfig.getStorefrontId() || "",
     "x-sfrid": IkasStorefrontConfig.getStorefrontRoutingId() || "",
-    "x-sid": IkasStorefrontConfig.getSessionId() || "",
-    "x-vid": IkasStorefrontConfig.getVisitorId() || "",
   };
 
   if (IkasStorefrontConfig.getCustomerToken()) {
@@ -30,7 +23,12 @@ export function setAPIClientConfig() {
       ],
     };
   }
-}
+};
+
+IkasStorefrontConfig.addObserver({
+  id: "ikas-storefront-api",
+  callback: onConfigChange,
+});
 
 export * from "./api/blog";
 export * from "./api/brand";

package/src/__api/queries/listRaffleParticipants.ts

@@ -1,81 +0,0 @@
-import {
-  fetchQuery,
-  ConfigType,
-  APIResponse,
-  handleAPIError,
-} from "@ikas/fe-api-client";
-import { RaffleParticipants } from "../types";
-
-const listRaffleParticipants = async (
-  fields?: string[],
-  config?: ConfigType
-) => {
-  try {
-    const { data, errors } = await fetchQuery({
-      operationName: "listRaffleParticipants",
-      config,
-      allReturnFields,
-      fields,
-      query: (returnFields: string) => `
-				query listRaffleParticipants {
-					listRaffleParticipants ${returnFields}
-				}
-			`,
-    });
-
-    return new APIResponse<RaffleParticipants[]>(
-      data?.listRaffleParticipants,
-      errors
-    );
-  } catch (err) {
-    return handleAPIError(err);
-  }
-};
-
-export default listRaffleParticipants;
-
-const allReturnFields =
-  "{applicationDate appliedProduct {productId variantId } createdAt customerId deleted email extraData firstName fullName id isDeliveredCargo lastName phone raffle {createdAt dateRange {end start } deleted id metadata {canonicals createdAt deleted description disableIndex id pageTitle slug targetId targetType updatedAt } name requiredCustomerAccount status updatedAt variants {productId variantId } verificationType } raffleId status updatedAt }";
-
-export enum ResponseField {
-  APPLICATION_DATE = "applicationDate",
-  APPLIED_PRODUCT__PRODUCT_ID = "appliedProduct.productId",
-  APPLIED_PRODUCT__VARIANT_ID = "appliedProduct.variantId",
-  CREATED_AT = "createdAt",
-  CUSTOMER_ID = "customerId",
-  DELETED = "deleted",
-  EMAIL = "email",
-  EXTRA_DATA = "extraData",
-  FIRST_NAME = "firstName",
-  FULL_NAME = "fullName",
-  ID = "id",
-  IS_DELIVERED_CARGO = "isDeliveredCargo",
-  LAST_NAME = "lastName",
-  PHONE = "phone",
-  RAFFLE__CREATED_AT = "raffle.createdAt",
-  RAFFLE__DATE_RANGE__END = "raffle.dateRange.end",
-  RAFFLE__DATE_RANGE__START = "raffle.dateRange.start",
-  RAFFLE__DELETED = "raffle.deleted",
-  RAFFLE__ID = "raffle.id",
-  RAFFLE__METADATA__CANONICALS = "raffle.metadata.canonicals",
-  RAFFLE__METADATA__CREATED_AT = "raffle.metadata.createdAt",
-  RAFFLE__METADATA__DELETED = "raffle.metadata.deleted",
-  RAFFLE__METADATA__DESCRIPTION = "raffle.metadata.description",
-  RAFFLE__METADATA__DISABLE_INDEX = "raffle.metadata.disableIndex",
-  RAFFLE__METADATA__ID = "raffle.metadata.id",
-  RAFFLE__METADATA__PAGE_TITLE = "raffle.metadata.pageTitle",
-  RAFFLE__METADATA__SLUG = "raffle.metadata.slug",
-  RAFFLE__METADATA__TARGET_ID = "raffle.metadata.targetId",
-  RAFFLE__METADATA__TARGET_TYPE = "raffle.metadata.targetType",
-  RAFFLE__METADATA__UPDATED_AT = "raffle.metadata.updatedAt",
-  RAFFLE__NAME = "raffle.name",
-  RAFFLE__REQUIRED_CUSTOMER_ACCOUNT = "raffle.requiredCustomerAccount",
-  RAFFLE__STATUS = "raffle.status",
-  RAFFLE__UPDATED_AT = "raffle.updatedAt",
-  RAFFLE__VARIANTS__PRODUCT_ID = "raffle.variants.productId",
-  RAFFLE__VARIANTS__VARIANT_ID = "raffle.variants.variantId",
-  RAFFLE__VERIFICATION_TYPE = "raffle.verificationType",
-  RAFFLE_ID = "raffleId",
-  STATUS = "status",
-  UPDATED_AT = "updatedAt",
-}