fix(admin-ui): Trigger navigation confirm if assets have been changed

vendure-ecommerce · Sep 16, 2019 · 6e751b0 · 6e751b0
1 parent 528eb3c
commit 6e751b0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/...ages/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts b/...ages/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts
@@ -202,6 +202,10 @@ export class CollectionDetailComponent extends BaseDetailComponent<Collection.Fr
             );
     }
 
+    canDeactivate(): boolean {
+        return super.canDeactivate() && !this.assetChanges.assetIds && !this.assetChanges.featuredAssetId;
+    }
+
     /**
      * Sets the values of the form on changes to the category or current language.
      */

diff --git a/packages/admin-ui/src/app/catalog/components/product-detail/product-detail.component.ts b/packages/admin-ui/src/app/catalog/components/product-detail/product-detail.component.ts
@@ -382,6 +382,10 @@ export class ProductDetailComponent extends BaseDetailComponent<ProductWithVaria
             );
     }
 
+    canDeactivate(): boolean {
+        return super.canDeactivate() && !this.assetChanges.assetIds && !this.assetChanges.featuredAssetId;
+    }
+
     /**
      * Sets the values of the form on changes to the product or current language.
      */

diff --git a/packages/admin-ui/src/app/common/base-detail.component.ts b/packages/admin-ui/src/app/common/base-detail.component.ts
@@ -59,6 +59,10 @@ export abstract class BaseDetailComponent<Entity extends { id: string; updatedAt
         this.setQueryParam('lang', code);
     }
 
+    canDeactivate(): boolean {
+        return this.detailForm && this.detailForm.pristine;
+    }
+
     protected abstract setFormValues(entity: Entity, languageCode: LanguageCode): void;
 
     protected getCustomFieldConfig(key: Exclude<keyof CustomFields, '__typename'>): CustomFieldConfig[] {

diff --git a/packages/admin-ui/src/app/shared/providers/routing/can-deactivate-detail-guard.ts b/packages/admin-ui/src/app/shared/providers/routing/can-deactivate-detail-guard.ts
@@ -29,7 +29,7 @@ export class CanDeactivateDetailGuard implements CanDeactivate<BaseDetailCompone
                 return true;
             }
         }
-        if (component.detailForm && component.detailForm.dirty) {
+        if (!component.canDeactivate()) {
             return this.modalService
                 .dialog({
                     title: _('common.confirm-navigation'),
-Original file line number
+Diff line change
@@ Expand Up @@
                 );
         }
+        canDeactivate(): boolean {
+            return super.canDeactivate() && !this.assetChanges.assetIds && !this.assetChanges.featuredAssetId;
+        }
         /**
          * Sets the values of the form on changes to the category or current language.
          */
@@ Expand Down @@