feat: edit product variant for physical goods

restorecommerce · Aug 21, 2024 · 1f4a89f · 1f4a89f
1 parent 90735d1
commit 1f4a89f
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 32 deletions.
diff --git a/packages/core/graphql/src/lib/documents/fragments/product.gql b/packages/core/graphql/src/lib/documents/fragments/product.gql
@@ -1,6 +1,6 @@
 fragment ProductFragment on IoRestorecommerceProductProduct {
   id
-  tags
+  # tags
   product {
     name
     description
@@ -28,7 +28,7 @@ fragment ProductFragment on IoRestorecommerceProductProduct {
         # }
         stockLevel
         stockKeepingUnit
-        parentVariantId
+        # parentVariantId
         taxIds
         price {
           currencyId

diff --git a/packages/core/graphql/src/lib/generated/generated.ts b/packages/core/graphql/src/lib/generated/generated.ts
@@ -5411,7 +5411,6 @@ export type CatalogProductMutateMutation = {
             payload?: {
               __typename?: 'IoRestorecommerceProductProduct';
               id?: string | null;
-              tags?: Array<string> | null;
               product?: {
                 __typename?: 'IoRestorecommerceProductIndividualProduct';
                 name?: string | null;
@@ -5432,7 +5431,6 @@ export type CatalogProductMutateMutation = {
                     description?: string | null;
                     stockLevel?: number | null;
                     stockKeepingUnit?: string | null;
-                    parentVariantId?: string | null;
                     taxIds?: Array<string> | null;
                     price?: {
                       __typename?: 'IoRestorecommercePricePrice';
@@ -5508,7 +5506,6 @@ export type CatalogProductReadQuery = {
             payload?: {
               __typename?: 'IoRestorecommerceProductProduct';
               id?: string | null;
-              tags?: Array<string> | null;
               product?: {
                 __typename?: 'IoRestorecommerceProductIndividualProduct';
                 name?: string | null;
@@ -5529,7 +5526,6 @@ export type CatalogProductReadQuery = {
                     description?: string | null;
                     stockLevel?: number | null;
                     stockKeepingUnit?: string | null;
-                    parentVariantId?: string | null;
                     taxIds?: Array<string> | null;
                     price?: {
                       __typename?: 'IoRestorecommercePricePrice';
@@ -5981,7 +5977,6 @@ export type OrderFragmentFragment = {
     product?: {
       __typename?: 'IoRestorecommerceProductProduct';
       id?: string | null;
-      tags?: Array<string> | null;
       product?: {
         __typename?: 'IoRestorecommerceProductIndividualProduct';
         name?: string | null;
@@ -6002,7 +5997,6 @@ export type OrderFragmentFragment = {
             description?: string | null;
             stockLevel?: number | null;
             stockKeepingUnit?: string | null;
-            parentVariantId?: string | null;
             taxIds?: Array<string> | null;
             price?: {
               __typename?: 'IoRestorecommercePricePrice';
@@ -6519,7 +6513,6 @@ export type OrganizationFragmentFragment = {
 export type ProductFragmentFragment = {
   __typename?: 'IoRestorecommerceProductProduct';
   id?: string | null;
-  tags?: Array<string> | null;
   product?: {
     __typename?: 'IoRestorecommerceProductIndividualProduct';
     name?: string | null;
@@ -6540,7 +6533,6 @@ export type ProductFragmentFragment = {
         description?: string | null;
         stockLevel?: number | null;
         stockKeepingUnit?: string | null;
-        parentVariantId?: string | null;
         taxIds?: Array<string> | null;
         price?: {
           __typename?: 'IoRestorecommercePricePrice';
@@ -8244,7 +8236,6 @@ export type OrderingOrderMutateMutation = {
                 product?: {
                   __typename?: 'IoRestorecommerceProductProduct';
                   id?: string | null;
-                  tags?: Array<string> | null;
                   product?: {
                     __typename?: 'IoRestorecommerceProductIndividualProduct';
                     name?: string | null;
@@ -8265,7 +8256,6 @@ export type OrderingOrderMutateMutation = {
                         description?: string | null;
                         stockLevel?: number | null;
                         stockKeepingUnit?: string | null;
-                        parentVariantId?: string | null;
                         taxIds?: Array<string> | null;
                         price?: {
                           __typename?: 'IoRestorecommercePricePrice';
@@ -8782,7 +8772,6 @@ export type OrderingOrderReadQuery = {
                 product?: {
                   __typename?: 'IoRestorecommerceProductProduct';
                   id?: string | null;
-                  tags?: Array<string> | null;
                   product?: {
                     __typename?: 'IoRestorecommerceProductIndividualProduct';
                     name?: string | null;
@@ -8803,7 +8792,6 @@ export type OrderingOrderReadQuery = {
                         description?: string | null;
                         stockLevel?: number | null;
                         stockKeepingUnit?: string | null;
-                        parentVariantId?: string | null;
                         taxIds?: Array<string> | null;
                         price?: {
                           __typename?: 'IoRestorecommercePricePrice';
@@ -9393,7 +9381,6 @@ export const LocationFragmentFragmentDoc = gql`
 export const ProductFragmentFragmentDoc = gql`
   fragment ProductFragment on IoRestorecommerceProductProduct {
     id
-    tags
     product {
       name
       description
@@ -9411,7 +9398,6 @@ export const ProductFragmentFragmentDoc = gql`
           description
           stockLevel
           stockKeepingUnit
-          parentVariantId
           taxIds
           price {
             currencyId

diff --git a/packages/modules/product/src/lib/components/product-variant-modal.component.ts b/packages/modules/product/src/lib/components/product-variant-modal.component.ts
@@ -69,13 +69,57 @@ export class ProductVariantEditComponent {
   }
 
   onSubmit() {
+    // ASSUME A PRODUCT IS PHYSICAL!
     const value = this.variantModalForm.form.value as IProductVariantFormValue;
-    value.id = uuidv4();
 
-    if (value.offerings === 'physical') {
-      // REMOVE the field 'offerings'
-      delete value.offerings;
+    // Fix the backend price issues!
+    const regularPrice = +(value.price?.regularPrice || 0);
+    const salePrice = +(value.price?.salePrice || 0);
+
+    // TODO Convert price!
+    value.stockLevel = +(value.stockLevel || 0);
+    value.price = {
+      ...value.price,
+      regularPrice,
+      salePrice,
+    };
+
+    // REMOVE the field 'offerings'
+    delete value.offerings;
+
+    if (this.variant.id) {
+      // EDIT MODE
+      const updatedVariant: IIoRestorecommerceProductPhysicalVariant = {
+        ...this.variant,
+        ...value,
+      };
+
+      const productWithUpdatedVariant =
+        this.product.product.physical?.variants?.map((variant) => {
+          if (variant.id === updatedVariant.id) {
+            return updatedVariant;
+          } else {
+            return variant;
+          }
+        });
+
+      const product: IProduct = {
+        ...this.product,
+        product: {
+          ...this.product.product,
+          physical: {
+            variants: productWithUpdatedVariant,
+          },
+        },
+      };
 
+      this.productFacade.update({
+        items: [product],
+        mode: ModeType.Update,
+      });
+    } else {
+      // CREATE MODE
+      value.id = uuidv4();
       let product: IProduct;
 
       if (this.product.product.physical?.variants) {
@@ -116,10 +160,9 @@ export class ProductVariantEditComponent {
     }
 
     this.close();
-    // Massage the value to the parent product
   }
 
   onAction(_: string) {
-    // TODO
+    this.close();
   }
 }
diff --git a/packages/modules/product/src/lib/components/product-view.component.ts b/packages/modules/product/src/lib/components/product-view.component.ts
@@ -28,7 +28,7 @@ import { ProductVariantEditComponent } from './product-variant-modal.component';
     <ng-container *ngIf="vm$ | async as vm">
       <rc-product-view
         (addVariant)="onAddVariant(vm.product)"
-        (editVariant)="onEditVariant($event)"
+        (editVariant)="onEditVariant($event, vm.product)"
         [product]="vm.product"
       />
     </ng-container>
@@ -93,12 +93,15 @@ export class ProductViewComponent implements OnInit, OnDestroy {
       .subscribe();
   }
 
-  onEditVariant(variant: IIoRestorecommerceProductPhysicalVariant) {
-    console.log('variant:', variant);
+  onEditVariant(
+    variant: IIoRestorecommerceProductPhysicalVariant,
+    product: IProduct
+  ) {
     this.subscriptions.sink = this.addVariantLayer
       .open({
         data: {
           title: `Edit product variant`,
+          product,
           variant,
         },
       })

diff --git a/packages/modules/product/src/lib/jss-forms/product-variant.jss-form.ts b/packages/modules/product/src/lib/jss-forms/product-variant.jss-form.ts
@@ -15,13 +15,6 @@ export const buildProductVariantSchema = (
   return {
     type: 'form',
     fields: [
-      // {
-      //   name: 'price',
-      //   type: 'object',
-      //   fields: [
-
-      //   ],
-      // },
       {
         name: 'offerings',
         label: 'Offerings',