@sumaris-net/ngx-components 1.0.9 → 1.2.0

package/bundles/sumaris-net.ngx-components.umd.js

@@ -2489,6 +2489,14 @@
         DateUtils.max = function (date1, date2) {
             return !date1 ? date2 : (!date2 || date1.isSameOrAfter(date2) ? date1 : date2);
         };
+        DateUtils.equals = function (date1, date2) {
+            return DateUtils.isSame(date1, date2);
+        };
+        DateUtils.isSame = function (date1, date2, granularity) {
+            var d1 = fromDateISOString(date1);
+            var d2 = fromDateISOString(date2);
+            return (!d1 && !d2) || d1.isSame(d2, granularity);
+        };
         return DateUtils;
     }());
     function toDateISOString(value) {
@@ -3714,7 +3722,7 @@
                 source = source.split('|');
             }
             // Skip if value is not an array
-            if (!(source instanceof Array) || control.length === 0) {
+            if (!Array.isArray(source) || control.length === 0) {
                 if (isNotEmptyArray(source))
                     console.warn("WARN: please resize the FormArray '" + path + "' to the same length of the input array");
                 return [];
@@ -4236,8 +4244,8 @@
                 this.value = this.adapter.translateErrors(form, opts);
                 this._ref.markForCheck();
             }
-            else if (isNotNilOrBlank(this.value)) {
-                this.value = '';
+            else if (this.value !== undefined) {
+                this.value = undefined;
                 this._ref.markForCheck();
             }
         };
@@ -8656,7 +8664,7 @@
         };
         AppFormField.prototype.computeValuesFromToken = function (token) {
             var values = this.injector.get(token);
-            return values instanceof Array ? values : [];
+            return Array.isArray(values) ? values : [];
         };
         AppFormField.prototype.checkAndResolveFormControl = function () {
             var _this = this;
@@ -9874,7 +9882,7 @@
             }, {});
         };
         EntityUtils.getMapAsArray = function (source) {
-            if (source instanceof Array)
+            if (Array.isArray(source))
                 return source;
             return Object.getOwnPropertyNames(source || {})
                 .map(function (key) { return ({
@@ -12380,8 +12388,8 @@
                             ])];
                         case 1:
                             res = _a.sent();
-                            values = res[0] && res[0] instanceof Array ? res[0] : null;
-                            ids = res[1] && res[1] instanceof Array ? res[1] : null;
+                            values = res[0] && Array.isArray(res[0]) ? res[0] : null;
+                            ids = res[1] && Array.isArray(res[1]) ? res[1] : null;
                             migration = false;
                             if (!this.isByIdMode) return [3 /*break*/, 5];
                             if (!isNotNil(ids)) return [3 /*break*/, 3];
@@ -13979,7 +13987,7 @@
                                 .pipe(operators.catchError(function (error) { return _this.onApolloError(error, opts.error); }), operators.first()).toPromise()];
                         case 5:
                             res = _b.sent();
-                            if (res.errors instanceof Array) {
+                            if (Array.isArray(res.errors)) {
                                 throw res.errors[0];
                             }
                             return [2 /*return*/, res.data];
@@ -14653,7 +14661,7 @@
             if (!queries.length)
                 return;
             queries.forEach(function (query) {
-                if (opts.data instanceof Array) {
+                if (Array.isArray(opts.data)) {
                     // Filter values, if a filter function exists
                     var data = query.insertFilterFn ? opts.data.filter(function (i) { return query.insertFilterFn(i); }) : opts.data;
                     if (isNotEmptyArray(data)) {
@@ -14691,7 +14699,7 @@
                 return;
             console.debug("[base-data-service] Removing data from watching queries: ", queries);
             return queries.map(function (query) {
-                if (opts.ids instanceof Array) {
+                if (Array.isArray(opts.ids)) {
                     return _this.graphql.removeFromCachedQueryByIds(cache, {
                         query: query.query,
                         variables: query.variables,
@@ -16089,7 +16097,7 @@
             this.comments = source.comments;
             this.creationDate = fromDateISOString(source.creationDate);
             this.statusId = source.statusId;
-            if (source.properties && source.properties instanceof Array) {
+            if (source.properties && Array.isArray(source.properties)) {
                 this.properties = EntityUtils.getPropertyArrayAsObject(source.properties);
             }
             else {
@@ -17703,20 +17711,30 @@
         function CustomReuseStrategy() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        /**
+         * Force to reuse the route when:
+         *  - path change from [/new] -> [/:id]
+         *  - or path change from [/new] -> [/new?id=:id]
+         * @param future
+         * @param curr
+         */
         CustomReuseStrategy.prototype.shouldReuseRoute = function (future, curr) {
             var result = _super.prototype.shouldReuseRoute.call(this, future, curr);
-            // Force to reuse the route when:
-            // - path change from [/new] -> [/:id]
-            // - or path change from [/new] -> [/new?id=:id]
+            // Is sam route config
             if (!result && future.routeConfig && future.routeConfig === curr.routeConfig) {
+                // Read the parameter name, where id is stored
                 var pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
-                var futureId = future.params[pathIdParam] === 'new' ?
-                    (future.queryParams[pathIdParam] || future.queryParams['id']) : future.params[pathIdParam];
-                var currId = curr.params[pathIdParam] === 'new' ?
-                    (curr.queryParams[pathIdParam] || curr.queryParams['id']) : curr.params[pathIdParam];
-                return futureId === currId &&
-                    // Always reload 'new' page
-                    currId !== 'new';
+                // Read the current route id
+                var currId = curr.params[pathIdParam] === 'new'
+                    ? (curr.queryParams[pathIdParam] || curr.queryParams['id'] || 'new') // e.g. path like '/new/?id=<ID>'
+                    : curr.params[pathIdParam]; // e.g. path like '/<ID>'
+                // Read the future route id
+                var futureId = future.params[pathIdParam] === 'new'
+                    ? (future.queryParams[pathIdParam] || future.queryParams['id'] || 'new') // e.g. path like '/new/?id=<ID>'
+                    : future.params[pathIdParam]; // e.g. path like '/<ID>'
+                // Reuse if same ID, but never when 'new' expected
+                return futureId !== 'new' && currId !== 'new'
+                    && futureId === currId;
             }
             return result;
         };
@@ -21456,7 +21474,7 @@
     AppPropertiesForm.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-properties-form',
-                    template: "\n<!-- Properties -->\n<form [formGroup]=\"form\" class=\"form-container\">\n  <ion-grid *ngIf=\"!loading; else propertiesSkeleton\"\n            formArrayName=\"properties\" class=\"ion-no-padding\" >\n    <ion-row class=\"ion-no-padding\">\n      <ion-col class=\"ion-no-padding ion-align-self-end\" size=\"12\">\n        <span class=\"toolbar-spacer\"></span>\n\n        <!-- Show more options -->\n        <ion-button color=\"light\" *ngIf=\"formArray?.length === 0\"\n                    [title]=\"'SETTINGS.BTN_SHOW_MORE_HELP'|translate\"\n                    (click)=\"helper.add()\">\n          <ion-label translate>COMMON.BTN_SHOW_MORE</ion-label>\n          <mat-icon slot=\"end\">arrow_drop_down</mat-icon>\n        </ion-button>\n      </ion-col>\n    </ion-row>\n\n    <ng-container *ngFor=\"let fieldForm of fieldForms; let i=index\">\n      <ion-row class=\"ion-no-padding\" [formGroupName]=\"i\">\n\n        <!-- property key -->\n        <ion-col size=\"6\" class=\"ion-no-padding\">\n          <mat-form-field floatLabel=\"never\">\n            <mat-select [formControl]=\"fieldForm.controls.key\"\n                        [placeholder]=\"'SETTINGS.PROPERTY_KEY'|translate\"\n                        (selectionChange)=\"updateDefinitionAt(i)\"\n                        [tabindex]=\"20+i*2\"\n                        required>\n\n              <!-- When option's key not a well known option, add it as first select option -->\n              <mat-option *ngIf=\"isUnknownField(fieldForm)\" [value]=\"fieldForm.controls.key.value\">\n                {{fieldForm.controls.key.value}}\n              </mat-option>\n\n              <mat-option *ngFor=\"let item of definitions\" [value]=\"item.key\">{{ item.label | translate }}\n              </mat-option>\n\n            </mat-select>\n\n            <mat-error *ngIf=\"fieldForm.controls.key.hasError('required') && !helper.isLast(i)\"\n                       translate>ERROR.FIELD_REQUIRED\n            </mat-error>\n          </mat-form-field>\n        </ion-col>\n\n        <!-- property value -->\n        <ion-col class=\"ion-no-padding\" padding-left >\n          <app-form-field *ngIf=\"getDefinitionAt(i) else unknownValue; let definition; \"\n                          floatLabel=\"never\"\n                          [definition]=\"definition\"\n                          [formControl]=\"fieldForm.controls.value\"\n                          [placeholder]=\"'SETTINGS.PROPERTY_VALUE' | translate\"\n                          [required]=\"true\"\n                          [tabindex]=\"20+i*2 + 1\">\n          </app-form-field>\n          <ng-template #unknownValue>\n            <mat-form-field floatLabel=\"never\">\n              <input type=\"text\" matInput\n                     [placeholder]=\"'SETTINGS.PROPERTY_VALUE' | translate\"\n                     [formControl]=\"fieldForm.controls.value\"\n                     [required]=\"true\"\n                     [tabindex]=\"20+i*2 + 1\">\n            </mat-form-field>\n          </ng-template>\n        </ion-col>\n\n        <ion-col size=\"auto\" class=\"ion-no-padding\">\n          <button type=\"button\" mat-icon-button color=\"light\"\n                  [disabled]=\"disabled\"\n                  [title]=\"'COMMON.BTN_DELETE'|translate\"\n                  (click)=\"removeAt(i)\">\n            <mat-icon>close</mat-icon>\n          </button>\n          <button [hidden]=\"!helper.isLast(i)\"\n                  type=\"button\"\n                  mat-icon-button\n                  color=\"light\"\n                  [disabled]=\"disabled\"\n                  [title]=\"'CONFIGURATION.BTN_ADD_PROPERTY'|translate\"\n                  (click)=\"helper.add()\">\n            <mat-icon>add</mat-icon>\n          </button>\n        </ion-col>\n      </ion-row>\n    </ng-container>\n  </ion-grid>\n</form>\n\n<ng-template #propertiesSkeleton>\n\n  <ion-grid class=\"ion-no-padding\">\n    <ng-container *ngTemplateOutlet=\"propertyRowSkeleton\"></ng-container>\n    <ng-container *ngTemplateOutlet=\"propertyRowSkeleton\"></ng-container>\n    <ng-container *ngTemplateOutlet=\"propertyRowSkeleton\"></ng-container>\n  </ion-grid>\n\n</ng-template>\n\n<ng-template #propertyRowSkeleton>\n\n  <ion-row>\n    <!-- property key -->\n    <ion-col>\n      <mat-form-field>\n        <input matInput hidden>\n        <ion-skeleton-text animated style=\"width: 60%\"></ion-skeleton-text>\n        <ion-icon name=\"arrow-dropdown\" matSuffix></ion-icon>\n      </mat-form-field>\n    </ion-col>\n    <!-- value -->\n    <ion-col>\n      <mat-form-field>\n        <input matInput hidden>\n        <ion-skeleton-text animated style=\"width: 60%\"></ion-skeleton-text>\n      </mat-form-field>\n    </ion-col>\n    <!-- buttons -->\n    <ion-col size=\"2\">\n      <button type=\"button\" mat-icon-button color=\"light\"\n              [disabled]=\"true\">\n        <mat-icon>close</mat-icon>\n      </button>\n    </ion-col>\n  </ion-row>\n\n</ng-template>\n",
+                    template: "\n<!-- Properties -->\n<form [formGroup]=\"form\" class=\"form-container\">\n  <ion-grid *ngIf=\"!loading; else propertiesSkeleton\"\n            formArrayName=\"properties\" class=\"ion-no-padding\" >\n    <ion-row class=\"ion-no-padding\">\n      <ion-col class=\"ion-no-padding ion-align-self-end\" size=\"12\">\n        <span class=\"toolbar-spacer\"></span>\n\n        <!-- Show more options -->\n        <ion-button color=\"light\" *ngIf=\"formArray?.length === 0\"\n                    [title]=\"'SETTINGS.BTN_SHOW_MORE_HELP'|translate\"\n                    (click)=\"helper.add()\">\n          <ion-label translate>COMMON.BTN_SHOW_MORE</ion-label>\n          <mat-icon slot=\"end\">arrow_drop_down</mat-icon>\n        </ion-button>\n      </ion-col>\n    </ion-row>\n\n    <ng-container *ngFor=\"let fieldForm of fieldForms; let i=index\">\n      <ion-row class=\"ion-no-padding\" [formGroupName]=\"i\">\n\n        <!-- property key -->\n        <ion-col size=\"6\" class=\"ion-no-padding\">\n          <mat-form-field floatLabel=\"never\">\n            <mat-select [formControl]=\"fieldForm.controls.key\"\n                        [placeholder]=\"'SETTINGS.PROPERTY_KEY'|translate\"\n                        (selectionChange)=\"updateDefinitionAt(i)\"\n                        [tabindex]=\"20+i*2\"\n                        required>\n\n              <!-- When option's key not a well known option, add it as first select option -->\n              <mat-option *ngIf=\"isUnknownField(fieldForm)\" [value]=\"fieldForm.controls.key.value\">\n                {{fieldForm.controls.key.value}}\n              </mat-option>\n\n              <mat-option *ngFor=\"let item of definitions\" [value]=\"item.key\">{{ item.label | translate }}\n              </mat-option>\n\n            </mat-select>\n\n            <mat-error *ngIf=\"fieldForm.controls.key.hasError('required') && !helper.isLast(i)\"\n                       translate>ERROR.FIELD_REQUIRED\n            </mat-error>\n          </mat-form-field>\n        </ion-col>\n\n        <!-- property value -->\n        <ion-col class=\"ion-no-padding\" padding-left >\n          <app-form-field *ngIf=\"getDefinitionAt(i) else unknownValue; let definition; \"\n                          floatLabel=\"never\"\n                          [definition]=\"definition\"\n                          [formControl]=\"fieldForm.controls.value\"\n                          [placeholder]=\"'SETTINGS.PROPERTY_VALUE' | translate\"\n                          [required]=\"true\"\n                          [tabindex]=\"20+i*2 + 1\">\n          </app-form-field>\n          <ng-template #unknownValue>\n            <mat-form-field floatLabel=\"never\">\n              <input type=\"text\" matInput\n                     [placeholder]=\"'SETTINGS.PROPERTY_VALUE' | translate\"\n                     [formControl]=\"fieldForm.controls.value\"\n                     [required]=\"true\"\n                     [tabindex]=\"20+i*2 + 1\">\n            </mat-form-field>\n          </ng-template>\n        </ion-col>\n\n        <ion-col size=\"auto\" class=\"ion-no-padding\">\n          <button type=\"button\" mat-icon-button color=\"light\"\n                  [disabled]=\"disabled\"\n                  [title]=\"'COMMON.BTN_DELETE'|translate\"\n                  (click)=\"removeAt(i)\">\n            <mat-icon>close</mat-icon>\n          </button>\n          <button [hidden]=\"!helper.isLast(i)\"\n                  type=\"button\"\n                  mat-icon-button\n                  color=\"light\"\n                  [disabled]=\"disabled\"\n                  [title]=\"'SETTINGS.BTN_ADD_PROPERTY'|translate\"\n                  (click)=\"helper.add()\">\n            <mat-icon>add</mat-icon>\n          </button>\n        </ion-col>\n      </ion-row>\n    </ng-container>\n  </ion-grid>\n</form>\n\n<ng-template #propertiesSkeleton>\n\n  <ion-grid class=\"ion-no-padding\">\n    <ng-container *ngTemplateOutlet=\"propertyRowSkeleton\"></ng-container>\n    <ng-container *ngTemplateOutlet=\"propertyRowSkeleton\"></ng-container>\n    <ng-container *ngTemplateOutlet=\"propertyRowSkeleton\"></ng-container>\n  </ion-grid>\n\n</ng-template>\n\n<ng-template #propertyRowSkeleton>\n\n  <ion-row>\n    <!-- property key -->\n    <ion-col>\n      <mat-form-field>\n        <input matInput hidden>\n        <ion-skeleton-text animated style=\"width: 60%\"></ion-skeleton-text>\n        <ion-icon name=\"arrow-dropdown\" matSuffix></ion-icon>\n      </mat-form-field>\n    </ion-col>\n    <!-- value -->\n    <ion-col>\n      <mat-form-field>\n        <input matInput hidden>\n        <ion-skeleton-text animated style=\"width: 60%\"></ion-skeleton-text>\n      </mat-form-field>\n    </ion-col>\n    <!-- buttons -->\n    <ion-col size=\"2\">\n      <button type=\"button\" mat-icon-button color=\"light\"\n              [disabled]=\"true\">\n        <mat-icon>close</mat-icon>\n      </button>\n    </ion-col>\n  </ion-row>\n\n</ng-template>\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush
                 },] }
     ];
@@ -22224,7 +22242,7 @@
         function DepartmentToStringPipe() {
         }
         DepartmentToStringPipe.prototype.transform = function (value, separator) {
-            if (value instanceof Array)
+            if (Array.isArray(value))
                 return departmentsToString(value, separator);
             return departmentToString(value);
         };
@@ -25816,10 +25834,12 @@
             var _a;
             if (this._loading) {
                 this._loading = false;
-                if (!opts || opts.emitEvent !== false) {
+                if (!opts || opts.onlySelf !== true) {
                     // Emit to children forms
                     // Tables should be changed by parent
                     (_a = this.forms) === null || _a === void 0 ? void 0 : _a.forEach(function (c) { return c.markAsLoaded(opts); });
+                }
+                if (!opts || opts.emitEvent !== false) {
                     this.markForCheck();
                 }
             }