feat: handle cancel state for form modals

restorecommerce · Sep 5, 2024 · 573a1f7 · 573a1f7
1 parent 1386916
commit 573a1f7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/packages/modules/order/src/lib/components/order-view.component.ts b/packages/modules/order/src/lib/components/order-view.component.ts
@@ -44,6 +44,7 @@ import { transformOrderToInput } from '../utils';
           onOpenEditOrderItem(vm.order, vm.products, $event)
         "
         (openDeleteOrderItemModal)="onDeleteOrderItem(vm.order, $event)"
+        (openEditShopModal)="onOpenEditShopModal()"
       />
     </ng-container>
   `,
@@ -228,4 +229,8 @@ export class OrderViewComponent implements OnInit, OnDestroy {
         });
       });
   }
+
+  onOpenEditShopModal() {
+    // console.log("On open edit shop modal!");
+  }
 }
diff --git a/packages/modules/order/src/lib/jss-forms/order-address-jss-form.ts b/packages/modules/order/src/lib/jss-forms/order-address-jss-form.ts
@@ -245,7 +245,7 @@ export const buildOrderAddressSchema = (
           {
             type: 'button',
             label: 'Cancel',
-            action: 'reset',
+            action: 'cancel',
             class: 'transparent',
           },
           {

diff --git a/packages/modules/order/src/lib/jss-forms/order.jss-form.ts b/packages/modules/order/src/lib/jss-forms/order.jss-form.ts
@@ -156,7 +156,7 @@ export const buildOrderSchema = (
           {
             type: 'button',
             label: 'Cancel',
-            action: 'reset',
+            action: 'cancel',
             class: 'transparent',
           },
           {

diff --git a/packages/modules/order/src/lib/modals/jss-form-modal.component.ts b/packages/modules/order/src/lib/modals/jss-form-modal.component.ts
@@ -71,8 +71,10 @@ export class JSSFormModalComponent {
     }
   }
 
-  onAction(_: string): void {
-    // TODO
+  onAction(actionType: string): void {
+    if (actionType === 'cancel') {
+      this.close();
+    }
   }
 
   close(value?: string) {

diff --git a/packages/modules/order/src/lib/modals/order-item/order-item-form.component.html b/packages/modules/order/src/lib/modals/order-item/order-item-form.component.html
@@ -106,8 +106,9 @@
       <button
         vcl-button
         type="button"
+        (click)="close()"
       >
-        Reset
+        Cancel
       </button>
     </div>
   </form>

diff --git a/packages/modules/ui/src/lib/components/organisms/order/order-view.component.html b/packages/modules/ui/src/lib/components/organisms/order/order-view.component.html
@@ -1,6 +1,9 @@
 <div class="order-details">
   <div class="order-shop">
-    <rc-shop-info [shop]="order.shop || {}" />
+    <rc-shop-info
+      [shop]="order.shop || {}"
+      (openEditShopModal)="openEditShopModal.emit()"
+    />
   </div>
 
   <div class="order-info">

diff --git a/packages/modules/ui/src/lib/components/organisms/order/order-view.component.ts b/packages/modules/ui/src/lib/components/organisms/order/order-view.component.ts
@@ -32,6 +32,7 @@ export class RcOrderViewComponent implements OnInit {
     new EventEmitter<IoRestorecommerceOrderItem>();
 
   @Output() openEditOrderInfoModal = new EventEmitter<void>();
+  @Output() openEditShopModal = new EventEmitter<void>();
 
   product?: IoRestorecommerceProductPhysicalVariant | null;
   customer?: IoRestorecommerceUserUser | null;