From bbdd5be8e6997f4053aeb19431c4ffe92fb42e46 Mon Sep 17 00:00:00 2001
From: Lukas Chladek <lukaschladek@gmail.com>
Date: Wed, 6 Jan 2021 00:11:48 +0700
Subject: [PATCH] fix(admin-ui): Shipping method validators fix

---
 .../shipping-method-detail.component.ts              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/admin-ui/src/lib/settings/src/components/shipping-method-detail/shipping-method-detail.component.ts b/packages/admin-ui/src/lib/settings/src/components/shipping-method-detail/shipping-method-detail.component.ts
index 416b7f7283..df589ed827 100644
--- a/packages/admin-ui/src/lib/settings/src/components/shipping-method-detail/shipping-method-detail.component.ts
+++ b/packages/admin-ui/src/lib/settings/src/components/shipping-method-detail/shipping-method-detail.component.ts
@@ -80,10 +80,10 @@ export class ShippingMethodDetailComponent
 
     ngOnInit() {
         this.init();
-        combineLatest(
+        combineLatest([
             this.dataService.shippingMethod.getShippingMethodOperations().single$,
             this.entity$.pipe(take(1)),
-        ).subscribe(([data, entity]) => {
+        ]).subscribe(([data, entity]) => {
             this.checkers = data.shippingEligibilityCheckers;
             this.calculators = data.shippingCalculators;
             this.fulfillmentHandlers = data.fulfillmentHandlers;
@@ -150,6 +150,8 @@ export class ShippingMethodDetailComponent
         this.selectedChecker = configurableDefinitionToInstance(checker);
         const formControl = this.detailForm.get('checker');
         if (formControl) {
+            formControl.clearValidators();
+            formControl.updateValueAndValidity({ onlySelf: true });
             formControl.patchValue(this.selectedChecker);
         }
         this.detailForm.markAsDirty();
@@ -160,6 +162,8 @@ export class ShippingMethodDetailComponent
         this.selectedCalculator = configurableDefinitionToInstance(calculator);
         const formControl = this.detailForm.get('calculator');
         if (formControl) {
+            formControl.clearValidators();
+            formControl.updateValueAndValidity({ onlySelf: true });
             formControl.patchValue(this.selectedCalculator);
         }
         this.detailForm.markAsDirty();
@@ -171,7 +175,7 @@ export class ShippingMethodDetailComponent
         if (!selectedChecker || !selectedCalculator) {
             return;
         }
-        combineLatest(this.entity$, this.languageCode$)
+        combineLatest([this.entity$, this.languageCode$])
             .pipe(
                 take(1),
                 mergeMap(([shippingMethod, languageCode]) => {
@@ -211,7 +215,7 @@ export class ShippingMethodDetailComponent
         if (!selectedChecker || !selectedCalculator) {
             return;
         }
-        combineLatest(this.entity$, this.languageCode$)
+        combineLatest([this.entity$, this.languageCode$])
             .pipe(
                 take(1),
                 mergeMap(([shippingMethod, languageCode]) => {