feat: Add variant SKU field to SaleorProviderFieldsMapping

saleor · Jul 24, 2024 · 8d6d7bd · 8d6d7bd
1 parent 57f7aa0
commit 8d6d7bd
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 6 deletions.
diff --git a/apps/cms-v2/src/modules/configuration/app-config.test.ts b/apps/cms-v2/src/modules/configuration/app-config.test.ts
@@ -17,6 +17,7 @@ const getMockContentfulInput = (): ContentfulProviderConfig.InputShape => {
       productSlug: "productSlug",
       variantId: "variantId",
       variantName: "variantName",
+      variantSku: "variantSku",
     },
     spaceId: "test",
   };
@@ -34,6 +35,7 @@ const getMockDatocmsInput = (): DatocmsProviderConfig.InputShape => {
       productSlug: "productSlug",
       variantId: "variantId",
       variantName: "variantName",
+      variantSku: "variantSku",
     },
   };
 };

diff --git a/apps/cms-v2/src/modules/configuration/print-saleor-product-fields.ts b/apps/cms-v2/src/modules/configuration/print-saleor-product-fields.ts
@@ -20,5 +20,8 @@ export const printSaleorProductFields = (fieldName: SaleorProviderFieldsMappingK
     case "variantId": {
       return "Variant ID";
     }
+    case "variantSku": {
+      return "Variant SKU";
+    }
   }
 };
diff --git a/apps/cms-v2/src/modules/configuration/schemas/saleor-provider-fields-mapping.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/saleor-provider-fields-mapping.schema.ts
@@ -6,6 +6,7 @@ import { z } from "zod";
 export const SaleorProviderFieldsMappingSchema = z.object({
   variantId: z.string().min(1),
   variantName: z.string().min(1),
+  variantSku: z.string().min(1),
   productId: z.string().min(1),
   productName: z.string().min(1),
   productSlug: z.string().min(1),
@@ -22,4 +23,5 @@ export const SaleorProviderFieldsMappingKeys: Array<SaleorProviderFieldsMappingK
   "productName",
   "productSlug",
   "channels",
+  "variantSku",
 ];
diff --git a/apps/cms-v2/src/modules/providers/builder.io/builder-io-config-form.tsx b/apps/cms-v2/src/modules/providers/builder.io/builder-io-config-form.tsx
@@ -172,6 +172,7 @@ const AddFormVariant = () => {
           productName: "",
           productSlug: "",
           variantId: "",
+          variantSku: "",
         },
       }}
     />

diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-client.test.ts b/apps/cms-v2/src/modules/providers/contentful/contentful-client.test.ts
@@ -18,13 +18,15 @@ const getMockContenfulConfiguration = (): ContentfulProviderConfig.FullShape =>
     productSlug: "product-slug",
     variantId: "variant-id",
     variantName: "variant-name",
+    variantSku: "variant-sku",
   },
 });
 
 const getMockWebhookProductVariant = (): WebhookProductVariantFragment => {
   return {
     id: "test-id",
     name: "test-name",
+    sku: "test-sku",
     product: {
       id: "test-product-id",
       name: "test-product-name",

diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-config-form.tsx b/apps/cms-v2/src/modules/providers/contentful/contentful-config-form.tsx
@@ -339,6 +339,7 @@ const AddVariant = () => {
           productName: "",
           productSlug: "",
           variantId: "",
+          variantSku: "",
         },
         spaceId: "",
       }}

diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.test.ts b/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.test.ts
@@ -21,13 +21,15 @@ const getMockContenfulConfiguration = (): ContentfulProviderConfig.FullShape =>
     productSlug: "product-slug",
     variantId: "variant-id",
     variantName: "variant-name",
+    variantSku: "variant-sku",
   },
 });
 
 const getMockWebhookProductVariant = (): WebhookProductVariantFragment => {
   return {
     id: "test-id",
     name: "test-name",
+    sku: "test-sku",
     product: {
       id: "test-product-id",
       name: "test-product-name",
@@ -61,7 +63,7 @@ describe("ContentfulWebhooksProcessor", () => {
 
     processor = new ContentfulWebhooksProcessor(
       getMockContenfulConfiguration(),
-      () => mockContentfulClient
+      () => mockContentfulClient,
     );
   });
 
@@ -74,7 +76,7 @@ describe("ContentfulWebhooksProcessor", () => {
       expect.objectContaining({
         configuration: getMockContenfulConfiguration(),
         variant: mockProductVariant,
-      })
+      }),
     );
   });
 
@@ -87,7 +89,7 @@ describe("ContentfulWebhooksProcessor", () => {
       expect.objectContaining({
         configuration: getMockContenfulConfiguration(),
         variant: mockProductVariant,
-      })
+      }),
     );
   });
 
@@ -100,7 +102,7 @@ describe("ContentfulWebhooksProcessor", () => {
       expect.objectContaining({
         configuration: getMockContenfulConfiguration(),
         variant: mockProductVariant,
-      })
+      }),
     );
   });
 

diff --git a/apps/cms-v2/src/modules/providers/datocms/datocms-config-form.tsx b/apps/cms-v2/src/modules/providers/datocms/datocms-config-form.tsx
@@ -255,6 +255,7 @@ const AddFormVariant = () => {
           productName: "",
           productSlug: "",
           variantId: "",
+          variantSku: "",
         },
       }}
     />

diff --git a/apps/cms-v2/src/modules/providers/fields-mapper.test.ts b/apps/cms-v2/src/modules/providers/fields-mapper.test.ts
@@ -11,10 +11,12 @@ describe("FieldsMapper", () => {
         productSlug: "product-slug",
         variantId: "variant-id",
         variantName: "variant-name",
+        variantSku: "variant-sku",
       },
       variant: {
         id: "aaa-bbb-ccc",
         name: "43",
+        sku: "sku",
         channelListings: [
           {
             channel: {
@@ -37,6 +39,7 @@ describe("FieldsMapper", () => {
       "product-name": "Shoes",
       "product-slug": "shoes",
       "variant-id": "aaa-bbb-ccc",
+      "variant-sku": "sku",
       channels: [
         {
           channel: {

diff --git a/apps/cms-v2/src/modules/providers/fields-mapper.ts b/apps/cms-v2/src/modules/providers/fields-mapper.ts
@@ -9,7 +9,8 @@ export class FieldsMapper {
     variant: WebhookProductVariantFragment;
     configMapping: ProvidersConfig.AnyFullShape["productVariantFieldsMapping"];
   }) {
-    const { channels, variantName, productId, productName, productSlug, variantId } = configMapping;
+    const { channels, variantName, productId, productName, productSlug, variantId, variantSku } =
+      configMapping;
 
     return {
       [variantName]: variant.name,
@@ -18,6 +19,7 @@ export class FieldsMapper {
       [productSlug]: variant.product.slug,
       [variantId]: variant.id,
       [channels]: variant.channelListings,
+      [variantSku]: variant.sku,
     };
   }
 }
diff --git a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-config-form.tsx b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-config-form.tsx
@@ -197,6 +197,7 @@ const AddFormVariant = () => {
           productName: "",
           productSlug: "",
           variantId: "",
+          variantSku: "",
         },
       }}
     />

diff --git a/apps/cms-v2/src/modules/providers/strapi/strapi-config-form.tsx b/apps/cms-v2/src/modules/providers/strapi/strapi-config-form.tsx
@@ -155,6 +155,7 @@ const AddFormVariant = () => {
           productName: "",
           productSlug: "",
           variantId: "",
+          variantSku: "",
         },
       }}
     />

diff --git a/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.test.ts b/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.test.ts
@@ -18,6 +18,7 @@ const getMockContentfulInput = (): ContentfulProviderConfig.InputShape => {
       productSlug: "productSlug",
       variantId: "variantId",
       variantName: "variantName",
+      variantSku: "variantSku",
     },
     spaceId: "test",
   };
@@ -36,6 +37,7 @@ const getMockDatocmsInput = (): DatocmsProviderConfig.InputShape => {
       productSlug: "productSlug",
       variantId: "variantId",
       variantName: "variantName",
+      variantSku: "variantSku",
     },
   };
 };
@@ -81,6 +83,7 @@ const getMockProductVariantWebhookFragment = (): WebhookProductVariantFragment =
   return {
     id: "variant-id",
     name: "variant-name",
+    sku: "variant-sku",
     product: {
       id: "product-id",
       name: "product-name",

diff --git a/apps/cms-v2/src/pages/api/manifest.ts b/apps/cms-v2/src/pages/api/manifest.ts
@@ -33,7 +33,7 @@ const handler = createManifestHandler({
          */
       ],
       homepageUrl: "https://github.com/saleor/apps",
-      id: "saleor.app.cms2",
+      id: "saleor.app.cms4",
       name: "CMS",
       permissions: ["MANAGE_PRODUCTS"],
       requiredSaleorVersion: ">=3.10 <4",