chore: refactor order edit component

restorecommerce · Sep 17, 2024 · 7f2d183 · 7f2d183
1 parent f2ddb65
commit 7f2d183
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 53 deletions.
diff --git a/packages/modules/order/src/lib/components/order-edit.component.ts b/packages/modules/order/src/lib/components/order-edit.component.ts
@@ -2,6 +2,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   ElementRef,
+  HostBinding,
   ViewChild,
 } from '@angular/core';
 import { Router } from '@angular/router';
@@ -18,6 +19,7 @@ import {
   filterEmptyAndNullishAndUndefined,
 } from '@console-core/state';
 import { IOrder } from '@console-core/types';
+import { JSONEditorComponent } from '@console-modules/ui';
 
 import { buildOrderSchema } from '../jss-forms';
 import { transformOrderToInput } from '../utils';
@@ -26,21 +28,18 @@ import { transformOrderToInput } from '../utils';
   selector: 'app-module-order-edit',
   template: `
     <ng-container *ngIf="vm$ | async as vm">
-      <div class="mt-2 h-100p">
+      <div class="mt-2 flex col">
         <!-- <rc-crud-edit
           [id]="vm.id"
           [schema]="schema"
           [update]="update"
         /> -->
-        <form>
-          <!-- <textarea
-            #rawTextarea
-            name="json"
-            (input)="onInput()"
-            [value]="orderJSON || getOrderSource(vm.order)"
-          ></textarea> -->
-
-          <rc-json-editor class="flex" />
+        <form class="col flex">
+          <rc-json-editor
+            #jsonEditor
+            [value]="getOrderSource(vm.order)"
+            class="flex"
+          />
 
           <div class="py-2 row justify-content-end">
             <div class="loose-button-group">
@@ -63,28 +62,11 @@ import { transformOrderToInput } from '../utils';
       </div>
     </ng-container>
   `,
-  styles: [
-    `
-      :host {
-        display: block;
-        height: 100%;
-      }
-
-      form {
-        display: flex;
-        height: 100%;
-        flex-direction: column;
-      }
-
-      textarea {
-        width: 100%;
-        flex: 1;
-      }
-    `,
-  ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class OrderEditComponent {
+  @HostBinding('class') classNames = 'col w-100p h-100p';
+
   schema!: VCLFormFieldSchemaRoot;
   update = this.orderFacade.update;
 
@@ -95,6 +77,9 @@ export class OrderEditComponent {
   @ViewChild('rawTextarea')
   rawTextarea!: ElementRef;
 
+  @ViewChild('jsonEditor')
+  jsonEditor!: JSONEditorComponent;
+
   readonly vm$ = combineLatest({
     id: this.routerFacade.params$.pipe(
       map(({ id }) => id),
@@ -118,9 +103,12 @@ export class OrderEditComponent {
     ),
   });
 
-  getOrderSource(order: IOrder) {
+  getOrderSource(order: IOrder): string {
     const orderInput = transformOrderToInput(order);
-    console.log(order);
+    // console.log(order);
+    // The above log always shows up whenever we hover on the cancel and save button.
+    // Investigate this by first removing the vcl-button directive to see if this is the
+    // issue.
     return JSON.stringify(orderInput, null, 4);
   }
 
@@ -130,32 +118,11 @@ export class OrderEditComponent {
     private readonly orderFacade: OrderFacade
   ) {}
 
-  onInput() {
-    const textarea = this.rawTextarea.nativeElement as HTMLTextAreaElement;
-    this.orderJSON = textarea.value;
-
-    this.modified = true;
-
-    let error = '';
-
-    try {
-      JSON.stringify(JSON.parse(this.orderJSON));
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (e: any) {
-      error = e.message;
-    }
-
-    textarea.setCustomValidity(error ? 'Invalid JSON: ' + error : '');
-    textarea.reportValidity();
-
-    this.jsonError = !!error;
-  }
-
   onSave() {
     this.update({
       items: [
         {
-          ...JSON.parse(this.orderJSON),
+          ...JSON.parse(this.jsonEditor.editor.getValue()),
         },
       ],
       mode: ModeType.Update,

diff --git a/packages/modules/ui/src/lib/components/organisms/json-editor/json-editor.component.ts b/packages/modules/ui/src/lib/components/organisms/json-editor/json-editor.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   ElementRef,
   HostBinding,
+  Input,
   OnDestroy,
 } from '@angular/core';
 import ace from 'ace-builds';
@@ -16,6 +17,8 @@ export class JSONEditorComponent implements AfterViewInit, OnDestroy {
 
   editor!: ace.Ace.Editor;
 
+  @Input() value = '';
+
   constructor(private elRef: ElementRef) {}
 
   ngAfterViewInit(): void {
@@ -24,6 +27,7 @@ export class JSONEditorComponent implements AfterViewInit, OnDestroy {
     this.editor = ace.edit(containerElement, {
       useWorker: false,
       printMargin: false,
+      value: this.value,
     });
 
     // Seems we have to import it manually in both cases...