@sumaris-net/ngx-components 2.4.23-rc4 → 2.4.23-rc5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/src/app/shared/shared-routing.module.mjs +14 -9
- package/fesm2015/sumaris-net.ngx-components.mjs +13 -8
- package/fesm2015/sumaris-net.ngx-components.mjs.map +1 -1
- package/fesm2020/sumaris-net.ngx-components.mjs +13 -8
- package/fesm2020/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -13,9 +13,9 @@ export class CustomReuseStrategy extends IonicRouteStrategy {
|
|
|
13
13
|
* @param curr
|
|
14
14
|
*/
|
|
15
15
|
shouldReuseRoute(future, curr) {
|
|
16
|
-
const
|
|
16
|
+
const reuse = super.shouldReuseRoute(future, curr);
|
|
17
17
|
// Is sam route config
|
|
18
|
-
if (
|
|
18
|
+
if (future.routeConfig && future.routeConfig === curr.routeConfig) {
|
|
19
19
|
// Read the parameter name, where id is stored
|
|
20
20
|
const pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
|
|
21
21
|
// Read the current route id
|
|
@@ -28,15 +28,20 @@ export class CustomReuseStrategy extends IonicRouteStrategy {
|
|
|
28
28
|
: future.params[pathIdParam]; // e.g. path like '/<ID>'
|
|
29
29
|
// Reuse if same ID, using a futureId, if exists
|
|
30
30
|
if (isNotNil(futureId)) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
if (!reuse) {
|
|
32
|
+
// Allow reuse when changing from /new to /new?id=:id
|
|
33
|
+
if (currId === 'new' && isNil(curr.queryParams[pathIdParam]) && future.params[pathIdParam] === 'new' && isNotNil(future.queryParams[pathIdParam])) {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
// Allow reuse same id, expect when expected '/new'
|
|
37
|
+
return futureId !== 'new' && futureId === currId;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
console.log(`Router reuse={reuse} from /${curr.params[pathIdParam]} to /${future.params[pathIdParam]}`);
|
|
34
41
|
}
|
|
35
|
-
// Allow reuse same id, expect when expected '/new'
|
|
36
|
-
return futureId !== 'new' && futureId === currId;
|
|
37
42
|
}
|
|
38
43
|
}
|
|
39
|
-
return
|
|
44
|
+
return reuse;
|
|
40
45
|
}
|
|
41
46
|
}
|
|
42
47
|
CustomReuseStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CustomReuseStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -67,4 +72,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
|
|
|
67
72
|
]
|
|
68
73
|
}]
|
|
69
74
|
}], ctorParameters: function () { return []; } });
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLXJvdXRpbmcubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2FwcC9zaGFyZWQvc2hhcmVkLXJvdXRpbmcubW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxVQUFVLEVBQUUsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBeUIsa0JBQWtCLEVBQUUsWUFBWSxFQUFDLE1BQU0saUJBQWlCLENBQUM7QUFDekYsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sZ0JBQWdCLENBQUM7QUFDbEQsT0FBTyxFQUFDLG1CQUFtQixFQUFDLE1BQU0sK0JBQStCLENBQUM7QUFDbEUsT0FBTyxFQUFDLEtBQUssRUFBRSxRQUFRLEVBQUMsTUFBTSxhQUFhLENBQUM7O0FBSTVDLE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxrQkFBa0I7SUFFekQ7Ozs7OztPQU1HO0lBQ0gsZ0JBQWdCLENBQUMsTUFBOEIsRUFBRSxJQUE0QjtRQUMzRSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRW5ELHNCQUFzQjtRQUN0QixJQUFJLE1BQU0sQ0FBQyxXQUFXLElBQUksTUFBTSxDQUFDLFdBQVcsS0FBSyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2pFLDhDQUE4QztZQUM5QyxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksSUFBSSxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxXQUFXLElBQUksSUFBSSxDQUFDO1lBRTNGLDRCQUE0QjtZQUM1QixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEtBQUs7Z0JBQy9DLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxpQ0FBaUM7Z0JBQ3RHLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMseUJBQXlCO1lBRXZELDJCQUEyQjtZQUMzQixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEtBQUs7Z0JBQ25ELENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLElBQUksTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxpQ0FBaUM7Z0JBQzFHLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMseUJBQXlCO1lBRXZELGdEQUFnRDtZQUNoRCxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRTtnQkFDdEIsSUFBSSxDQUFDLEtBQUssRUFBRTtvQkFDVixxREFBcUQ7b0JBQ3JELElBQUksTUFBTSxLQUFLLEtBQUssSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssS0FBSyxJQUFJLFFBQVEsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUU7d0JBQ2pKLE9BQU8sSUFBSSxDQUFDO3FCQUNiO29CQUVELG1EQUFtRDtvQkFDbkQsT0FBTyxRQUFRLEtBQUssS0FBSyxJQUFJLFFBQVEsS0FBSyxNQUFNLENBQUM7aUJBQ2xEO3FCQUNJO29CQUNILE9BQU8sQ0FBQyxHQUFHLENBQUMsOEJBQThCLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFFBQVEsTUFBTSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7aUJBQ3pHO2FBQ0Y7U0FDSjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzs7aUhBN0NVLG1CQUFtQjtxSEFBbkIsbUJBQW1COzRGQUFuQixtQkFBbUI7a0JBRC9CLFVBQVU7O0FBMERYLE1BQU0sT0FBTyxtQkFBbUI7SUFFOUI7UUFDRSxPQUFPLENBQUMsS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7SUFDdkQsQ0FBQzs7aUhBSlUsbUJBQW1CO2tIQUFuQixtQkFBbUIsWUFQNUIsWUFBWTtrSEFPSCxtQkFBbUIsYUFMbkI7UUFDVCxFQUFFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsbUJBQW1CLEVBQUU7UUFDOUQsRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLG1CQUFtQixFQUFFO0tBQ2hFLFlBTEMsWUFBWTs0RkFPSCxtQkFBbUI7a0JBVC9CLFFBQVE7bUJBQUM7b0JBQ1IsT0FBTyxFQUFFO3dCQUNQLFlBQVk7cUJBQ2I7b0JBQ0QsU0FBUyxFQUFFO3dCQUNULEVBQUUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFFBQVEsRUFBRSxtQkFBbUIsRUFBRTt3QkFDOUQsRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLG1CQUFtQixFQUFFO3FCQUNoRTtpQkFDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SW5qZWN0YWJsZSwgTmdNb2R1bGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBSb3V0ZVJldXNlU3RyYXRlZ3ksIFJvdXRlck1vZHVsZX0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7SW9uaWNSb3V0ZVN0cmF0ZWd5fSBmcm9tICdAaW9uaWMvYW5ndWxhcic7XG5pbXBvcnQge0NvbXBvbmVudERpcnR5R3VhcmR9IGZyb20gJy4vZ3VhcmQvY29tcG9uZW50LWRpcnR5Lmd1YXJkJztcbmltcG9ydCB7aXNOaWwsIGlzTm90TmlsfSBmcm9tICcuL2Z1bmN0aW9ucyc7XG5cblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEN1c3RvbVJldXNlU3RyYXRlZ3kgZXh0ZW5kcyBJb25pY1JvdXRlU3RyYXRlZ3kge1xuXG4gIC8qKlxuICAgKiBGb3JjZSB0byByZXVzZSB0aGUgcm91dGUgd2hlbjpcbiAgICogIC0gcGF0aCBjaGFuZ2UgZnJvbSBbL25ld10gLT4gWy86aWRdXG4gICAqICAtIG9yIHBhdGggY2hhbmdlIGZyb20gWy9uZXddIC0+IFsvbmV3P2lkPTppZF1cbiAgICogQHBhcmFtIGZ1dHVyZVxuICAgKiBAcGFyYW0gY3VyclxuICAgKi9cbiAgc2hvdWxkUmV1c2VSb3V0ZShmdXR1cmU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIGN1cnI6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QpOiBib29sZWFuIHtcbiAgICBjb25zdCByZXVzZSA9IHN1cGVyLnNob3VsZFJldXNlUm91dGUoZnV0dXJlLCBjdXJyKTtcblxuICAgIC8vIElzIHNhbSByb3V0ZSBjb25maWdcbiAgICBpZiAoZnV0dXJlLnJvdXRlQ29uZmlnICYmIGZ1dHVyZS5yb3V0ZUNvbmZpZyA9PT0gY3Vyci5yb3V0ZUNvbmZpZykge1xuICAgICAgLy8gUmVhZCB0aGUgcGFyYW1ldGVyIG5hbWUsIHdoZXJlIGlkIGlzIHN0b3JlZFxuICAgICAgY29uc3QgcGF0aElkUGFyYW0gPSBmdXR1cmUucm91dGVDb25maWcuZGF0YSAmJiBmdXR1cmUucm91dGVDb25maWcuZGF0YS5wYXRoSWRQYXJhbSB8fCAnaWQnO1xuXG4gICAgICAvLyBSZWFkIHRoZSBjdXJyZW50IHJvdXRlIGlkXG4gICAgICBjb25zdCBjdXJySWQgPSBjdXJyLnBhcmFtc1twYXRoSWRQYXJhbV0gPT09ICduZXcnXG4gICAgICAgID8gKGN1cnIucXVlcnlQYXJhbXNbcGF0aElkUGFyYW1dIHx8IGN1cnIucXVlcnlQYXJhbXNbJ2lkJ10gfHwgJ25ldycpIC8vIGUuZy4gcGF0aCBsaWtlICcvbmV3Lz9pZD08SUQ+J1xuICAgICAgICA6IGN1cnIucGFyYW1zW3BhdGhJZFBhcmFtXTsgLy8gZS5nLiBwYXRoIGxpa2UgJy88SUQ+J1xuXG4gICAgICAvLyBSZWFkIHRoZSBmdXR1cmUgcm91dGUgaWRcbiAgICAgIGNvbnN0IGZ1dHVyZUlkID0gZnV0dXJlLnBhcmFtc1twYXRoSWRQYXJhbV0gPT09ICduZXcnXG4gICAgICAgID8gKGZ1dHVyZS5xdWVyeVBhcmFtc1twYXRoSWRQYXJhbV0gfHwgZnV0dXJlLnF1ZXJ5UGFyYW1zWydpZCddIHx8ICduZXcnKSAvLyBlLmcuIHBhdGggbGlrZSAnL25ldy8/aWQ9PElEPidcbiAgICAgICAgOiBmdXR1cmUucGFyYW1zW3BhdGhJZFBhcmFtXTsgLy8gZS5nLiBwYXRoIGxpa2UgJy88SUQ+J1xuXG4gICAgICAgIC8vIFJldXNlIGlmIHNhbWUgSUQsIHVzaW5nIGEgZnV0dXJlSWQsIGlmIGV4aXN0c1xuICAgICAgICBpZiAoaXNOb3ROaWwoZnV0dXJlSWQpKSB7XG4gICAgICAgICAgaWYgKCFyZXVzZSkge1xuICAgICAgICAgICAgLy8gQWxsb3cgcmV1c2Ugd2hlbiBjaGFuZ2luZyBmcm9tIC9uZXcgdG8gL25ldz9pZD06aWRcbiAgICAgICAgICAgIGlmIChjdXJySWQgPT09ICduZXcnICYmIGlzTmlsKGN1cnIucXVlcnlQYXJhbXNbcGF0aElkUGFyYW1dKSAmJiBmdXR1cmUucGFyYW1zW3BhdGhJZFBhcmFtXSA9PT0gJ25ldycgJiYgaXNOb3ROaWwoZnV0dXJlLnF1ZXJ5UGFyYW1zW3BhdGhJZFBhcmFtXSkpIHtcbiAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIC8vIEFsbG93IHJldXNlIHNhbWUgaWQsIGV4cGVjdCB3aGVuIGV4cGVjdGVkICcvbmV3J1xuICAgICAgICAgICAgcmV0dXJuIGZ1dHVyZUlkICE9PSAnbmV3JyAmJiBmdXR1cmVJZCA9PT0gY3VycklkO1xuICAgICAgICAgIH1cbiAgICAgICAgICBlbHNlIHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKGBSb3V0ZXIgcmV1c2U9e3JldXNlfSBmcm9tIC8ke2N1cnIucGFyYW1zW3BhdGhJZFBhcmFtXX0gdG8gLyR7ZnV0dXJlLnBhcmFtc1twYXRoSWRQYXJhbV19YCk7XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgfVxuXG4gICAgcmV0dXJuIHJldXNlO1xuICB9XG59XG5cbkBOZ01vZHVsZSh7XG4gIGltcG9ydHM6IFtcbiAgICBSb3V0ZXJNb2R1bGVcbiAgXSxcbiAgcHJvdmlkZXJzOiBbXG4gICAgeyBwcm92aWRlOiBSb3V0ZVJldXNlU3RyYXRlZ3ksIHVzZUNsYXNzOiBDdXN0b21SZXVzZVN0cmF0ZWd5IH0sXG4gICAgeyBwcm92aWRlOiBDb21wb25lbnREaXJ0eUd1YXJkLCB1c2VDbGFzczogQ29tcG9uZW50RGlydHlHdWFyZCB9XG4gIF1cbn0pXG5leHBvcnQgY2xhc3MgU2hhcmVkUm91dGluZ01vZHVsZSB7XG5cbiAgY29uc3RydWN0b3IoKSB7XG4gICAgY29uc29sZS5kZWJ1ZygnW3NoYXJlZC1yb3V0aW5nXSBDcmVhdGluZyBtb2R1bGUuLi4nKTtcbiAgfVxufVxuIl19
|
|
@@ -19994,9 +19994,9 @@ class CustomReuseStrategy extends IonicRouteStrategy {
|
|
|
19994
19994
|
* @param curr
|
|
19995
19995
|
*/
|
|
19996
19996
|
shouldReuseRoute(future, curr) {
|
|
19997
|
-
const
|
|
19997
|
+
const reuse = super.shouldReuseRoute(future, curr);
|
|
19998
19998
|
// Is sam route config
|
|
19999
|
-
if (
|
|
19999
|
+
if (future.routeConfig && future.routeConfig === curr.routeConfig) {
|
|
20000
20000
|
// Read the parameter name, where id is stored
|
|
20001
20001
|
const pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
|
|
20002
20002
|
// Read the current route id
|
|
@@ -20009,15 +20009,20 @@ class CustomReuseStrategy extends IonicRouteStrategy {
|
|
|
20009
20009
|
: future.params[pathIdParam]; // e.g. path like '/<ID>'
|
|
20010
20010
|
// Reuse if same ID, using a futureId, if exists
|
|
20011
20011
|
if (isNotNil(futureId)) {
|
|
20012
|
-
|
|
20013
|
-
|
|
20014
|
-
|
|
20012
|
+
if (!reuse) {
|
|
20013
|
+
// Allow reuse when changing from /new to /new?id=:id
|
|
20014
|
+
if (currId === 'new' && isNil(curr.queryParams[pathIdParam]) && future.params[pathIdParam] === 'new' && isNotNil(future.queryParams[pathIdParam])) {
|
|
20015
|
+
return true;
|
|
20016
|
+
}
|
|
20017
|
+
// Allow reuse same id, expect when expected '/new'
|
|
20018
|
+
return futureId !== 'new' && futureId === currId;
|
|
20019
|
+
}
|
|
20020
|
+
else {
|
|
20021
|
+
console.log(`Router reuse={reuse} from /${curr.params[pathIdParam]} to /${future.params[pathIdParam]}`);
|
|
20015
20022
|
}
|
|
20016
|
-
// Allow reuse same id, expect when expected '/new'
|
|
20017
|
-
return futureId !== 'new' && futureId === currId;
|
|
20018
20023
|
}
|
|
20019
20024
|
}
|
|
20020
|
-
return
|
|
20025
|
+
return reuse;
|
|
20021
20026
|
}
|
|
20022
20027
|
}
|
|
20023
20028
|
CustomReuseStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CustomReuseStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
|