@sumaris-net/ngx-components 18.3.21 → 18.3.23
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/doc/changelog.md +7 -1
- package/esm2022/src/app/core/table/async-table.class.mjs +31 -5
- package/esm2022/src/app/core/table/table.class.mjs +14 -13
- package/esm2022/src/app/shared/geolocation/geolocation.utils.mjs +11 -12
- package/fesm2022/sumaris-net.ngx-components.mjs +52 -26
- package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +1 -1
- package/src/app/core/table/async-table.class.d.ts +4 -1
- package/src/assets/manifest.json +1 -1
|
@@ -41,17 +41,16 @@ export class GeolocationUtils {
|
|
|
41
41
|
*/
|
|
42
42
|
static async getCurrentPosition(platform, options) {
|
|
43
43
|
// Use Capacitor plugin
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (platform.is('capacitor')) {
|
|
44
|
+
if (platform.is('capacitor')) {
|
|
45
|
+
try {
|
|
46
|
+
console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options?.timeout})`);
|
|
47
|
+
const pos = await Geolocation.getCurrentPosition(options);
|
|
48
|
+
return {
|
|
49
|
+
latitude: pos.coords.latitude,
|
|
50
|
+
longitude: pos.coords.longitude,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
catch (err) {
|
|
55
54
|
console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${err?.message || ''}`);
|
|
56
55
|
// Detect a permission error, to add code
|
|
57
56
|
// FIXME - Capacitor use hardcoded strings! (see https://github.com/ionic-team/capacitor-plugins)
|
|
@@ -79,4 +78,4 @@ export class GeolocationUtils {
|
|
|
79
78
|
});
|
|
80
79
|
}
|
|
81
80
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"geolocation.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/geolocation/geolocation.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Geolocation, Position } from '@capacitor/geolocation';\nimport { PlatformService } from '../../core/services/platform.service';\nimport { Platform } from '@ionic/angular';\nimport { isNil } from '../functions';\n\nexport class IPosition {\n  latitude: number;\n  longitude: number;\n}\n\nexport abstract class GeolocationUtils {\n  static isNotNilAndValid(position: IPosition, opts?: { debug?: boolean }) {\n    if (!position || isNil(position.latitude) || isNil(position.longitude)) return false;\n\n    // Invalid lat/lon\n    if (position.latitude < -90 || position.latitude > 90 || position.longitude < -180 || position.longitude > 180) {\n      // /!\\ Log in console, because should never occur\n      if (opts?.debug) console.warn('Invalid lat/long position:  ', position);\n      return false;\n    }\n\n    // OK: valid\n    return true;\n  }\n\n  static isNilOrInvalid(position: IPosition, opts?: { debug?: boolean }) {\n    return !GeolocationUtils.isNotNilAndValid(position, opts);\n  }\n\n  static computeDistanceInMiles(position1: IPosition, position2: IPosition): number {\n    // Invalid position(s): skip\n    if (GeolocationUtils.isNilOrInvalid(position1, { debug: true }) || GeolocationUtils.isNilOrInvalid(position2, { debug: true })) return;\n\n    const latitude1Rad = (Math.PI * position1.latitude) / 180;\n    const longitude1Rad = (Math.PI * position1.longitude) / 180;\n    const latitude2Rad = (Math.PI * position2.latitude) / 180;\n    const longitude2Rad = (Math.PI * position2.longitude) / 180;\n\n    let distance =\n      2 *\n      6371 *\n      Math.asin(\n        Math.sqrt(\n          Math.pow(Math.sin((latitude1Rad - latitude2Rad) / 2), 2) +\n            Math.cos(latitude1Rad) * Math.cos(latitude2Rad) * Math.pow(Math.sin((longitude2Rad - longitude1Rad) / 2), 2)\n        )\n      );\n    distance = Math.round((distance / 1.852 + Number.EPSILON) * 100) / 100;\n    return distance;\n  }\n\n  /**\n   * Get the position by geo loc sensor\n   */\n  static async getCurrentPosition(platform: PlatformService | Platform, options?: PositionOptions): Promise<IPosition> {\n    // Use Capacitor plugin\n    if (platform.is('capacitor')) {\n      try {\n        console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options?.timeout})`);\n        const pos: Position = await Geolocation.getCurrentPosition(options);\n        return <IPosition>{\n          latitude: pos.coords.latitude,\n          longitude: pos.coords.longitude,\n        };\n      } catch (err) {\n        console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${err?.message || ''}`);\n\n        // Detect a permission error, to add code\n        // FIXME - Capacitor use hardcoded strings! (see https://github.com/ionic-team/capacitor-plugins)\n        const message = ((err?.message || '') as string).toLowerCase();\n        if (message.includes('location permission was denied') || message.includes('location disabled')) {\n          throw { ...err, code: GeolocationPositionError.PERMISSION_DENIED };\n        }\n        throw err;\n      }\n    }\n\n    // Or fallback to navigator\n    console.info('[geolocation-utils] Get current geo location, using browser...');\n    return new Promise<IPosition>((resolve, reject) => {\n      navigator.geolocation.getCurrentPosition(\n        (res) => {\n          resolve(<IPosition>{\n            latitude: res.coords.latitude,\n            longitude: res.coords.longitude,\n          });\n        },\n        (err) => {\n          let message = err?.message || err;\n          message = typeof message === 'string' ? message : JSON.stringify(message);\n          console.error('[geolocation-utils] Cannot get current geo location, using browser:' + message);\n          reject(err);\n        },\n        options\n      );\n    });\n  }\n}\n"]}
|
|
@@ -26627,17 +26627,16 @@ class GeolocationUtils {
|
|
|
26627
26627
|
*/
|
|
26628
26628
|
static async getCurrentPosition(platform, options) {
|
|
26629
26629
|
// Use Capacitor plugin
|
|
26630
|
-
|
|
26631
|
-
|
|
26632
|
-
|
|
26633
|
-
|
|
26634
|
-
|
|
26635
|
-
|
|
26636
|
-
|
|
26637
|
-
|
|
26638
|
-
|
|
26639
|
-
|
|
26640
|
-
if (platform.is('capacitor')) {
|
|
26630
|
+
if (platform.is('capacitor')) {
|
|
26631
|
+
try {
|
|
26632
|
+
console.info(`[geolocation-utils] Get current geo location, using Capacitor...(timeout: ${options?.timeout})`);
|
|
26633
|
+
const pos = await Geolocation.getCurrentPosition(options);
|
|
26634
|
+
return {
|
|
26635
|
+
latitude: pos.coords.latitude,
|
|
26636
|
+
longitude: pos.coords.longitude,
|
|
26637
|
+
};
|
|
26638
|
+
}
|
|
26639
|
+
catch (err) {
|
|
26641
26640
|
console.error(`[geolocation-utils] Cannot get current geo location, using Capacitor: ${err?.message || ''}`);
|
|
26642
26641
|
// Detect a permission error, to add code
|
|
26643
26642
|
// FIXME - Capacitor use hardcoded strings! (see https://github.com/ionic-team/capacitor-plugins)
|
|
@@ -31565,7 +31564,7 @@ class AppTable {
|
|
|
31565
31564
|
saveBeforeFilter;
|
|
31566
31565
|
propagateRowError = false;
|
|
31567
31566
|
permanentSelectionAllowed = false; // Allow keep selected rows over page change or sort change
|
|
31568
|
-
openRowThrottleTime = 800;
|
|
31567
|
+
openRowThrottleTime = 800; // Prevent double click - see issue sumaris-app#864
|
|
31569
31568
|
defaultSortBy;
|
|
31570
31569
|
defaultSortDirection;
|
|
31571
31570
|
defaultPageSize = DEFAULT_PAGE_SIZE;
|
|
@@ -32421,11 +32420,17 @@ class AppTable {
|
|
|
32421
32420
|
this.selection.clear();
|
|
32422
32421
|
this.openRow(row.currentData.id, row)
|
|
32423
32422
|
.catch((err) => console.error('Failed to open row', err)) // Continue
|
|
32424
|
-
.then(
|
|
32423
|
+
.then(() => {
|
|
32425
32424
|
this.markAsLoaded();
|
|
32426
|
-
//
|
|
32427
|
-
|
|
32428
|
-
|
|
32425
|
+
// Prevent double click (use an open throttle time)
|
|
32426
|
+
if (this.openRowThrottleTime > 0) {
|
|
32427
|
+
setTimeout(() => {
|
|
32428
|
+
this._openingRow = false;
|
|
32429
|
+
}, this.openRowThrottleTime);
|
|
32430
|
+
}
|
|
32431
|
+
else {
|
|
32432
|
+
this._openingRow = false;
|
|
32433
|
+
}
|
|
32429
32434
|
});
|
|
32430
32435
|
return true;
|
|
32431
32436
|
}
|
|
@@ -32551,8 +32556,6 @@ class AppTable {
|
|
|
32551
32556
|
}
|
|
32552
32557
|
this.editedRow = row;
|
|
32553
32558
|
this.onStartEditingRow.emit(row);
|
|
32554
|
-
// FIXME
|
|
32555
|
-
//this.detectChanges(); // Workaround need by SUMARiS (e.g. for samples tables) otherwise the row will not be editable
|
|
32556
32559
|
return true;
|
|
32557
32560
|
}
|
|
32558
32561
|
/**
|
|
@@ -32831,11 +32834,8 @@ class AppTable {
|
|
|
32831
32834
|
this.visibleRowCount++;
|
|
32832
32835
|
this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
|
|
32833
32836
|
// Emit event
|
|
32834
|
-
if (!opts || opts.emitEvent !== false)
|
|
32837
|
+
if (!opts || opts.emitEvent !== false)
|
|
32835
32838
|
this.markForCheck();
|
|
32836
|
-
// FIXME
|
|
32837
|
-
//this.detectChanges(); // Workaround need by SUMARiS (e.g. samples tables) otherwise new row is not visible
|
|
32838
|
-
}
|
|
32839
32839
|
return row;
|
|
32840
32840
|
}
|
|
32841
32841
|
registerCellValueChanges(name, formPath, emitInitialValue) {
|
|
@@ -34250,6 +34250,7 @@ class AppAsyncTable {
|
|
|
34250
34250
|
_dataSource;
|
|
34251
34251
|
_filter;
|
|
34252
34252
|
_initialized = false;
|
|
34253
|
+
_openingRow = false;
|
|
34253
34254
|
_subscription = new Subscription();
|
|
34254
34255
|
_dataSourceLoadingSubscription;
|
|
34255
34256
|
_cellValueChangesDefs = {};
|
|
@@ -34309,6 +34310,7 @@ class AppAsyncTable {
|
|
|
34309
34310
|
saveBeforeFilter;
|
|
34310
34311
|
propagateRowError = false;
|
|
34311
34312
|
permanentSelectionAllowed = false; // Allow keep selected rows over page change or sort change
|
|
34313
|
+
openRowThrottleTime = 800; // Prevent double click - see issue sumaris-app#864
|
|
34312
34314
|
defaultSortBy;
|
|
34313
34315
|
defaultSortDirection;
|
|
34314
34316
|
defaultPageSize = DEFAULT_PAGE_SIZE;
|
|
@@ -34524,6 +34526,14 @@ class AppAsyncTable {
|
|
|
34524
34526
|
get sortDirection() {
|
|
34525
34527
|
return (this.sort && this.sort.direction && (this.sort.direction === 'desc' ? 'desc' : 'asc')) || undefined;
|
|
34526
34528
|
}
|
|
34529
|
+
set sortDirection(value) {
|
|
34530
|
+
if (this.sort) {
|
|
34531
|
+
this.sort.direction = value;
|
|
34532
|
+
}
|
|
34533
|
+
else {
|
|
34534
|
+
this.defaultSortDirection = value;
|
|
34535
|
+
}
|
|
34536
|
+
}
|
|
34527
34537
|
_paginator = null;
|
|
34528
34538
|
set paginator(value) {
|
|
34529
34539
|
this._paginator = value;
|
|
@@ -35103,15 +35113,29 @@ class AppAsyncTable {
|
|
|
35103
35113
|
}
|
|
35104
35114
|
// Open the detail page (if not inline editing)
|
|
35105
35115
|
if (!this.inlineEdition) {
|
|
35116
|
+
if (this._openingRow)
|
|
35117
|
+
return; // Prevent double click
|
|
35106
35118
|
if (event) {
|
|
35107
35119
|
event.stopPropagation();
|
|
35108
35120
|
event.preventDefault();
|
|
35109
35121
|
}
|
|
35122
|
+
this._openingRow = true; // Prevent double click
|
|
35110
35123
|
this.markAsLoading();
|
|
35111
35124
|
this.selection.clear();
|
|
35112
35125
|
this.openRow(row.currentData.id, row)
|
|
35113
|
-
.
|
|
35114
|
-
.
|
|
35126
|
+
.catch((err) => console.error('Failed to open row', err)) // Continue
|
|
35127
|
+
.then(() => {
|
|
35128
|
+
this.markAsLoaded();
|
|
35129
|
+
// Prevent double click (use an open throttle time)
|
|
35130
|
+
if (this.openRowThrottleTime > 0) {
|
|
35131
|
+
setTimeout(() => {
|
|
35132
|
+
this._openingRow = false;
|
|
35133
|
+
}, this.openRowThrottleTime);
|
|
35134
|
+
}
|
|
35135
|
+
else {
|
|
35136
|
+
this._openingRow = false;
|
|
35137
|
+
}
|
|
35138
|
+
});
|
|
35115
35139
|
return true;
|
|
35116
35140
|
}
|
|
35117
35141
|
// Start editing row
|
|
@@ -35727,7 +35751,7 @@ class AppAsyncTable {
|
|
|
35727
35751
|
}
|
|
35728
35752
|
}
|
|
35729
35753
|
setLoading(value, opts) {
|
|
35730
|
-
if (this.loadingSubject.value !== value) {
|
|
35754
|
+
if (!this.loadingSubject.closed && this.loadingSubject.value !== value) {
|
|
35731
35755
|
this.loadingSubject.next(value);
|
|
35732
35756
|
if (!opts || opts.emitEvent !== false) {
|
|
35733
35757
|
this.markForCheck();
|
|
@@ -35875,7 +35899,7 @@ class AppAsyncTable {
|
|
|
35875
35899
|
}
|
|
35876
35900
|
}
|
|
35877
35901
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: AppAsyncTable, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
|
|
35878
|
-
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.11", type: AppAsyncTable, inputs: { settingsId: "settingsId", debug: "debug", i18nColumnPrefix: "i18nColumnPrefix", i18nColumnSuffix: "i18nColumnSuffix", autoLoad: "autoLoad", readOnly: "readOnly", inlineEdition: "inlineEdition", focusFirstColumn: "focusFirstColumn", confirmBeforeDelete: "confirmBeforeDelete", confirmBeforeCancel: "confirmBeforeCancel", undoableDeletion: "undoableDeletion", saveBeforeDelete: "saveBeforeDelete", keepEditedRowOnSave: "keepEditedRowOnSave", saveBeforeSort: "saveBeforeSort", saveBeforeFilter: "saveBeforeFilter", propagateRowError: "propagateRowError", permanentSelectionAllowed: "permanentSelectionAllowed", defaultSortBy: "defaultSortBy", defaultSortDirection: "defaultSortDirection", defaultPageSize: "defaultPageSize", defaultPageSizeOptions: "defaultPageSizeOptions", focusColumn: "focusColumn", dataSource: "dataSource", filter: "filter", disabled: "disabled", paginator: "paginator" }, outputs: { onRefresh: "onRefresh", onOpenRow: "onOpenRow", onNewRow: "onNewRow", onStartEditingRow: "onStartEditingRow", onConfirmEditCreateRow: "onConfirmEditCreateRow", onCancelOrDeleteRow: "onCancelOrDeleteRow", onBeforeDeleteRows: "onBeforeDeleteRows", onBeforeCancelRows: "onBeforeCancelRows", onBeforeSave: "onBeforeSave", onAfterDeletedRows: "onAfterDeletedRows", onSort: "onSort", onDirty: "onDirty", onError: "onError" }, viewQueries: [{ propertyName: "table", first: true, predicate: MatTable, descendants: true }, { propertyName: "childPaginator", first: true, predicate: MatPaginator, descendants: true }, { propertyName: "sort", first: true, predicate: MatSort, descendants: true }], ngImport: i0 });
|
|
35902
|
+
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.11", type: AppAsyncTable, inputs: { settingsId: "settingsId", debug: "debug", i18nColumnPrefix: "i18nColumnPrefix", i18nColumnSuffix: "i18nColumnSuffix", autoLoad: "autoLoad", readOnly: "readOnly", inlineEdition: "inlineEdition", focusFirstColumn: "focusFirstColumn", confirmBeforeDelete: "confirmBeforeDelete", confirmBeforeCancel: "confirmBeforeCancel", undoableDeletion: "undoableDeletion", saveBeforeDelete: "saveBeforeDelete", keepEditedRowOnSave: "keepEditedRowOnSave", saveBeforeSort: "saveBeforeSort", saveBeforeFilter: "saveBeforeFilter", propagateRowError: "propagateRowError", permanentSelectionAllowed: "permanentSelectionAllowed", openRowThrottleTime: "openRowThrottleTime", defaultSortBy: "defaultSortBy", defaultSortDirection: "defaultSortDirection", defaultPageSize: "defaultPageSize", defaultPageSizeOptions: "defaultPageSizeOptions", focusColumn: "focusColumn", dataSource: "dataSource", filter: "filter", disabled: "disabled", paginator: "paginator" }, outputs: { onRefresh: "onRefresh", onOpenRow: "onOpenRow", onNewRow: "onNewRow", onStartEditingRow: "onStartEditingRow", onConfirmEditCreateRow: "onConfirmEditCreateRow", onCancelOrDeleteRow: "onCancelOrDeleteRow", onBeforeDeleteRows: "onBeforeDeleteRows", onBeforeCancelRows: "onBeforeCancelRows", onBeforeSave: "onBeforeSave", onAfterDeletedRows: "onAfterDeletedRows", onSort: "onSort", onDirty: "onDirty", onError: "onError" }, viewQueries: [{ propertyName: "table", first: true, predicate: MatTable, descendants: true }, { propertyName: "childPaginator", first: true, predicate: MatPaginator, descendants: true }, { propertyName: "sort", first: true, predicate: MatSort, descendants: true }], ngImport: i0 });
|
|
35879
35903
|
}
|
|
35880
35904
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: AppAsyncTable, decorators: [{
|
|
35881
35905
|
type: Directive
|
|
@@ -35913,6 +35937,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.11", ngImpo
|
|
|
35913
35937
|
type: Input
|
|
35914
35938
|
}], permanentSelectionAllowed: [{
|
|
35915
35939
|
type: Input
|
|
35940
|
+
}], openRowThrottleTime: [{
|
|
35941
|
+
type: Input
|
|
35916
35942
|
}], defaultSortBy: [{
|
|
35917
35943
|
type: Input
|
|
35918
35944
|
}], defaultSortDirection: [{
|