@ecodev/natural 38.0.0 → 38.0.1

package/bundles/ecodev-natural.umd.js

@@ -3443,11 +3443,14 @@
         /**
          * Persist search and then launch whatever is required to refresh the list
          */
-        NaturalAbstractList.prototype.search = function (naturalSearchSelections, navigationExtras) {
+        NaturalAbstractList.prototype.search = function (naturalSearchSelections, navigationExtras, resetPagination) {
+            if (resetPagination === void 0) { resetPagination = true; }
             // Reset page index to restart the pagination (preserve pageSize)
-            this.variablesManager.merge('pagination', {
-                pagination: lodashEs.pick(this.defaultPagination, ['offset', 'pageIndex']),
-            });
+            if (resetPagination) {
+                this.variablesManager.merge('pagination', {
+                    pagination: lodashEs.pick(this.defaultPagination, ['offset', 'pageIndex']),
+                });
+            }
             // Persist if activated
             // Two parallel navigations conflict. We first persist the search, then the pagination
             if (this.persistSearch && !this.isPanel) {
@@ -3771,6 +3774,7 @@
              * Name of filter for child items to access ancestor item
              */
             _this.ancestorRelationName = 'parent';
+            _this.oldAncertorId = null;
             _this.breadcrumbs = [];
             return _this;
         }
@@ -3781,27 +3785,30 @@
             // "na" is a trailing param, and should be considered only when there is no search
             this.route.params.subscribe(function (params) {
                 // "ns" stands for natural-search to be shorter in url
-                if (!params['ns']) {
-                    var navigationConditionValue = null;
-                    // "na" stands for "navigation" (relation) in url
-                    if (params['na']) {
-                        navigationConditionValue = { have: { values: [params['na']] } };
-                        _this.service.getOne(params['na']).subscribe(
-                        // TODO casting should disappear and instead this class should enforce
-                        // the service to support Tone with a new generic
-                        function (ancestor) { return (_this.breadcrumbs = _this.getBreadcrumb(ancestor)); });
-                        _this.clearSearch();
-                    }
-                    else {
-                        navigationConditionValue = { empty: {} };
-                        _this.breadcrumbs = [];
-                    }
-                    var condition = {};
-                    condition[_this.ancestorRelationName] = navigationConditionValue;
-                    var variables = { filter: { groups: [{ conditions: [condition] }] } };
-                    // todo : check why without "as Vall" it errors. Vall is supposed to be QueryVariables, and filter too.
-                    _this.variablesManager.set('navigation', variables);
+                if (params['ns']) {
+                    return;
+                }
+                var navigationConditionValue = null;
+                // "na" stands for "navigation" (relation) in url
+                if (params['na']) {
+                    navigationConditionValue = { have: { values: [params['na']] } };
+                    _this.service.getOne(params['na']).subscribe(
+                    // TODO casting should disappear and instead this class should enforce
+                    // the service to support Tone with a new generic
+                    function (ancestor) { return (_this.breadcrumbs = _this.getBreadcrumb(ancestor)); });
+                    var hasAncestorChanged = params['na'] !== _this.oldAncertorId;
+                    _this.oldAncertorId = params['na'];
+                    _this.clearSearch(hasAncestorChanged);
                 }
+                else {
+                    navigationConditionValue = { empty: {} };
+                    _this.breadcrumbs = [];
+                }
+                var condition = {};
+                condition[_this.ancestorRelationName] = navigationConditionValue;
+                var variables = { filter: { groups: [{ conditions: [condition] }] } };
+                // todo : check why without "as Vall" it errors. Vall is supposed to be QueryVariables, and filter too.
+                _this.variablesManager.set('navigation', variables);
             });
             _super.prototype.ngOnInit.call(this);
         };
@@ -3834,11 +3841,19 @@
             }
             _super.prototype.translateSearchAndRefreshList.call(this, naturalSearchSelections);
         };
-        NaturalAbstractNavigableList.prototype.clearSearch = function () {
+        NaturalAbstractNavigableList.prototype.clearSearch = function (resetPagination) {
+            if (resetPagination === void 0) { resetPagination = true; }
             this.naturalSearchSelections = [[]];
-            this.search([[]]);
+            _super.prototype.search.call(this, [[]], undefined, resetPagination);
             this.persistenceService.persistInStorage('ns', null, this.getStorageKey());
         };
+        NaturalAbstractNavigableList.prototype.search = function (naturalSearchSelections, navigationExtras, resetPagination) {
+            var _this = this;
+            if (resetPagination === void 0) { resetPagination = true; }
+            this.persistenceService.persistInUrl('na', null, this.route).then(function () {
+                _super.prototype.search.call(_this, naturalSearchSelections, navigationExtras, resetPagination);
+            });
+        };
         /**
          * Return an array for router link usage
          */