fix: Add back validation method

fylein · Oct 13, 2023 · b893674 · b893674
1 parent 41f9661
commit b893674
Showing 1 changed file with 31 additions and 15 deletions.
diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.ts b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.ts
@@ -187,32 +187,48 @@ export class AddEditAdvanceRequestPage implements OnInit {
       return this.saveDraftAdvanceRequest(advanceRequest);
     }
   }
+  showFormValidationErrors(): void {
+    this.fg.markAllAsTouched();
+    const formContainer = this.formContainer.nativeElement as HTMLElement;
+    if (formContainer) {
+      const invalidElement = formContainer.querySelector('.ng-invalid');
+      if (invalidElement) {
+        invalidElement.scrollIntoView({
+          behavior: 'smooth',
+        });
+      }
+    }
+  }
 
-  async showAdvanceSummaryPopover() {
+  async showAdvanceSummaryPopover(): Promise<void> {
     if (this.fg.valid) {
       const advanceSummaryPopover = await this.popoverController.create({
-        component: DraftAdvanceSummaryComponent,
-        cssClass: 'dialog-popover',
+        component: PopupAlertComponent,
+        componentProps: {
+          title: 'Review',
+          message:
+            'This action will save a draft advance request and will not be submitted to your approvers directly. You need to explicitly submit a draft advance request.',
+          primaryCta: {
+            text: 'Finish',
+            action: 'continue',
+          },
+          secondaryCta: {
+            text: 'Cancel',
+            action: 'cancel',
+          },
+        },
+        cssClass: 'pop-up-in-center',
       });
 
       await advanceSummaryPopover.present();
 
-      const { data } = await advanceSummaryPopover.onWillDismiss();
+      const { data } = await advanceSummaryPopover.onWillDismiss<{ action: string }>();
 
-      if (data && data.saveAdvanceRequest) {
+      if (data && data.action === 'continue') {
         this.save('Draft');
       }
     } else {
-      this.fg.markAllAsTouched();
-      const formContainer = this.formContainer.nativeElement as HTMLElement;
-      if (formContainer) {
-        const invalidElement = formContainer.querySelector('.ng-invalid');
-        if (invalidElement) {
-          invalidElement.scrollIntoView({
-            behavior: 'smooth',
-          });
-        }
-      }
+      this.showFormValidationErrors();
     }
   }