@sumaris-net/ngx-components 18.8.3 → 18.8.5
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/esm2022/src/app/shared/image/image.model.mjs +1 -1
- package/esm2022/src/app/shared/image/image.service.mjs +10 -9
- package/fesm2022/sumaris-net.ngx-components.mjs +9 -8
- package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +1 -1
- package/src/app/shared/image/image.model.d.ts +1 -0
- package/src/app/shared/image/image.service.d.ts +6 -5
- package/src/app/shared/inputs.d.ts +1 -1
- package/src/assets/manifest.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC9pbWFnZS9pbWFnZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGludGVyZmFjZSBJbWFnZSB7XG4gIGRhdGFVcmw6IHN0cmluZztcbiAgdXJsOiBzdHJpbmc7XG4gIHRpdGxlPzogc3RyaW5nO1xuICBleGlmPzogYW55O1xufVxuXG5leHBvcnQgdHlwZSBJbWFnZVNpemUgPSAnc21hbGwnIHwgJ21lZGl1bScgfCAnbGFyZ2UnO1xuIl19
|
|
@@ -17,19 +17,15 @@ export class ImageService extends StartableService {
|
|
|
17
17
|
settings;
|
|
18
18
|
translate;
|
|
19
19
|
popoverController;
|
|
20
|
-
actionSheetController;
|
|
21
20
|
environment;
|
|
22
21
|
defaultMaxHeight = 1024;
|
|
23
22
|
defaultMaxWidth = 1024;
|
|
24
|
-
constructor(platform, settings, translate, popoverController,
|
|
25
|
-
// protected camera: Camera,
|
|
26
|
-
actionSheetController, environment) {
|
|
23
|
+
constructor(platform, settings, translate, popoverController, environment) {
|
|
27
24
|
super(platform);
|
|
28
25
|
this.platform = platform;
|
|
29
26
|
this.settings = settings;
|
|
30
27
|
this.translate = translate;
|
|
31
28
|
this.popoverController = popoverController;
|
|
32
|
-
this.actionSheetController = actionSheetController;
|
|
33
29
|
this.environment = environment;
|
|
34
30
|
this._debug = !environment.production;
|
|
35
31
|
if (this._debug)
|
|
@@ -63,9 +59,14 @@ export class ImageService extends StartableService {
|
|
|
63
59
|
});
|
|
64
60
|
if (!data)
|
|
65
61
|
return undefined;
|
|
62
|
+
// DEBUG
|
|
63
|
+
if (this._debug && data.exif) {
|
|
64
|
+
console.debug(`[image-service] Image added, with exif:`, data.exif);
|
|
65
|
+
}
|
|
66
66
|
return [
|
|
67
67
|
{
|
|
68
68
|
dataUrl: data.dataUrl,
|
|
69
|
+
exif: data.exif,
|
|
69
70
|
},
|
|
70
71
|
];
|
|
71
72
|
}
|
|
@@ -77,7 +78,7 @@ export class ImageService extends StartableService {
|
|
|
77
78
|
/* -- protected functions -- */
|
|
78
79
|
async addUploadedImages(event, opts) {
|
|
79
80
|
const { data } = await FilesUtils.showUploadPopover(this.popoverController, event, {
|
|
80
|
-
uniqueFile: true,
|
|
81
|
+
uniqueFile: opts?.multiple !== true,
|
|
81
82
|
fileExtension: '.png, .jpg',
|
|
82
83
|
instantUpload: true,
|
|
83
84
|
uploadFn: (file) => ImagesUtils.readAsDataURL(file, {
|
|
@@ -92,16 +93,16 @@ export class ImageService extends StartableService {
|
|
|
92
93
|
.map((file) => file.response.body) // Get response body = data as base64
|
|
93
94
|
.map((dataUrl) => ({ dataUrl }));
|
|
94
95
|
}
|
|
95
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, deps: [{ token: i1.PlatformService }, { token: i2.LocalSettingsService }, { token: i3.TranslateService }, { token: i4.PopoverController }, { token:
|
|
96
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, deps: [{ token: i1.PlatformService }, { token: i2.LocalSettingsService }, { token: i3.TranslateService }, { token: i4.PopoverController }, { token: ENVIRONMENT, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
96
97
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, providedIn: 'root' });
|
|
97
98
|
}
|
|
98
99
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, decorators: [{
|
|
99
100
|
type: Injectable,
|
|
100
101
|
args: [{ providedIn: 'root' }]
|
|
101
|
-
}], ctorParameters: () => [{ type: i1.PlatformService }, { type: i2.LocalSettingsService }, { type: i3.TranslateService }, { type: i4.PopoverController }, { type:
|
|
102
|
+
}], ctorParameters: () => [{ type: i1.PlatformService }, { type: i2.LocalSettingsService }, { type: i3.TranslateService }, { type: i4.PopoverController }, { type: i5.Environment, decorators: [{
|
|
102
103
|
type: Inject,
|
|
103
104
|
args: [ENVIRONMENT]
|
|
104
105
|
}, {
|
|
105
106
|
type: Optional
|
|
106
107
|
}] }] });
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"image.service.js","sourceRoot":"","sources":["../../../../../../src/app/shared/image/image.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, Optional } from '@angular/core';\nimport { PopoverController } from '@ionic/angular';\n\nimport { TranslateService } from '@ngx-translate/core';\nimport { StartableService } from '../services/startable-service.class';\nimport { ENVIRONMENT, Environment } from '../../../environments/environment.class';\nimport { PlatformService } from '../../core/services/platform.service';\nimport { LocalSettingsService } from '../../core/services/local-settings.service';\nimport { FilesUtils } from '../file/file.utils';\nimport { ImagesUtils } from '../file/images.utils';\nimport { isEmptyArray } from '../functions';\n\nimport { Image } from './image.model';\nimport { Capacitor } from '@capacitor/core';\nimport { Camera, CameraResultType, ImageOptions } from '@capacitor/camera';\n\n@Injectable({ providedIn: 'root' })\nexport class ImageService extends StartableService {\n  private defaultMaxHeight = 1024;\n  private defaultMaxWidth = 1024;\n\n  constructor(\n    protected platform: PlatformService,\n    protected settings: LocalSettingsService,\n    protected translate: TranslateService,\n    protected popoverController: PopoverController,\n    @Inject(ENVIRONMENT) @Optional() protected environment?: Environment\n  ) {\n    super(platform);\n    this._debug = !environment.production;\n    if (this._debug) console.debug(`[image] Creating service`);\n  }\n\n  protected async ngOnStart(): Promise<any> {\n    try {\n      const camera = Capacitor.isPluginAvailable('Camera');\n      console.info(`[image] Starting... {camera: ${camera}}`);\n    } catch (err) {\n      console.error('Cannot check Camera plugin: ' + (err?.message || err));\n    }\n  }\n\n  async add(\n    event?: Event,\n    opts?: { maxHeight?: number; mawWidth?: number; quality?: number; multiple?: boolean } & ImageOptions\n  ): Promise<Image[] | undefined> {\n    if (!this.started) await this.ready();\n\n    // If desktop: open upload popover\n    if (!this.platform.isCordova()) {\n      return this.addUploadedImages(event, opts);\n    }\n\n    console.info(`[image-service] Adding image...`);\n\n    try {\n      const data = await Camera.getPhoto({\n        height: this.defaultMaxHeight,\n        width: this.defaultMaxWidth,\n        promptLabelCancel: this.translate.instant('COMMON.BTN_CANCEL'),\n        promptLabelPicture: this.translate.instant('IMAGE.BTN_CAMERA_SOURCE'),\n        resultType: CameraResultType.DataUrl,\n        ...opts,\n      });\n      if (!data) return undefined;\n\n      // DEBUG\n      if (this._debug && data.exif) {\n        console.debug(`[image-service] Image added, with exif:`, data.exif);\n      }\n\n      return [\n        <Image>{\n          dataUrl: data.dataUrl,\n          exif: data.exif,\n        },\n      ];\n    } catch (err) {\n      console.info(`[image-service] Error while adding image: ${err?.message || err} -> ${err?.originalStack || ''}`);\n      return undefined;\n    }\n  }\n\n  /* -- protected functions -- */\n\n  protected async addUploadedImages(\n    event?: Event,\n    opts?: { maxHeight?: number; mawWidth?: number; quality?: number; multiple?: boolean }\n  ): Promise<Image[] | undefined> {\n    const { data } = await FilesUtils.showUploadPopover(this.popoverController, event, {\n      uniqueFile: opts?.multiple !== true,\n      fileExtension: '.png, .jpg',\n      instantUpload: true,\n      uploadFn: (file) =>\n        ImagesUtils.readAsDataURL(file, {\n          maxWidth: this.defaultMaxWidth,\n          maxHeight: this.defaultMaxHeight,\n          ...opts,\n        }),\n    });\n\n    if (isEmptyArray(data)) return; // No files uploaded: skip\n    return (data || [])\n      .map((file) => file.response.body) // Get response body = data as base64\n      .map((dataUrl) => <Image>{ dataUrl });\n  }\n}\n"]}
|
|
@@ -25830,19 +25830,15 @@ class ImageService extends StartableService {
|
|
|
25830
25830
|
settings;
|
|
25831
25831
|
translate;
|
|
25832
25832
|
popoverController;
|
|
25833
|
-
actionSheetController;
|
|
25834
25833
|
environment;
|
|
25835
25834
|
defaultMaxHeight = 1024;
|
|
25836
25835
|
defaultMaxWidth = 1024;
|
|
25837
|
-
constructor(platform, settings, translate, popoverController,
|
|
25838
|
-
// protected camera: Camera,
|
|
25839
|
-
actionSheetController, environment) {
|
|
25836
|
+
constructor(platform, settings, translate, popoverController, environment) {
|
|
25840
25837
|
super(platform);
|
|
25841
25838
|
this.platform = platform;
|
|
25842
25839
|
this.settings = settings;
|
|
25843
25840
|
this.translate = translate;
|
|
25844
25841
|
this.popoverController = popoverController;
|
|
25845
|
-
this.actionSheetController = actionSheetController;
|
|
25846
25842
|
this.environment = environment;
|
|
25847
25843
|
this._debug = !environment.production;
|
|
25848
25844
|
if (this._debug)
|
|
@@ -25876,9 +25872,14 @@ class ImageService extends StartableService {
|
|
|
25876
25872
|
});
|
|
25877
25873
|
if (!data)
|
|
25878
25874
|
return undefined;
|
|
25875
|
+
// DEBUG
|
|
25876
|
+
if (this._debug && data.exif) {
|
|
25877
|
+
console.debug(`[image-service] Image added, with exif:`, data.exif);
|
|
25878
|
+
}
|
|
25879
25879
|
return [
|
|
25880
25880
|
{
|
|
25881
25881
|
dataUrl: data.dataUrl,
|
|
25882
|
+
exif: data.exif,
|
|
25882
25883
|
},
|
|
25883
25884
|
];
|
|
25884
25885
|
}
|
|
@@ -25890,7 +25891,7 @@ class ImageService extends StartableService {
|
|
|
25890
25891
|
/* -- protected functions -- */
|
|
25891
25892
|
async addUploadedImages(event, opts) {
|
|
25892
25893
|
const { data } = await FilesUtils.showUploadPopover(this.popoverController, event, {
|
|
25893
|
-
uniqueFile: true,
|
|
25894
|
+
uniqueFile: opts?.multiple !== true,
|
|
25894
25895
|
fileExtension: '.png, .jpg',
|
|
25895
25896
|
instantUpload: true,
|
|
25896
25897
|
uploadFn: (file) => ImagesUtils.readAsDataURL(file, {
|
|
@@ -25905,13 +25906,13 @@ class ImageService extends StartableService {
|
|
|
25905
25906
|
.map((file) => file.response.body) // Get response body = data as base64
|
|
25906
25907
|
.map((dataUrl) => ({ dataUrl }));
|
|
25907
25908
|
}
|
|
25908
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, deps: [{ token: PlatformService }, { token: LocalSettingsService }, { token: i1$1.TranslateService }, { token: i2$1.PopoverController }, { token:
|
|
25909
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, deps: [{ token: PlatformService }, { token: LocalSettingsService }, { token: i1$1.TranslateService }, { token: i2$1.PopoverController }, { token: ENVIRONMENT, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
25909
25910
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, providedIn: 'root' });
|
|
25910
25911
|
}
|
|
25911
25912
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: ImageService, decorators: [{
|
|
25912
25913
|
type: Injectable,
|
|
25913
25914
|
args: [{ providedIn: 'root' }]
|
|
25914
|
-
}], ctorParameters: () => [{ type: PlatformService }, { type: LocalSettingsService }, { type: i1$1.TranslateService }, { type: i2$1.PopoverController }, { type:
|
|
25915
|
+
}], ctorParameters: () => [{ type: PlatformService }, { type: LocalSettingsService }, { type: i1$1.TranslateService }, { type: i2$1.PopoverController }, { type: Environment, decorators: [{
|
|
25915
25916
|
type: Inject,
|
|
25916
25917
|
args: [ENVIRONMENT]
|
|
25917
25918
|
}, {
|