@sumaris-net/ngx-components 1.11.4 → 1.11.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "1.11.4",
+  "version": "1.11.7",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/public_api.d.ts

@@ -83,6 +83,7 @@ export * from './src/app/shared/observables';
 export * from './src/app/shared/events';
 export * from './src/app/shared/alerts';
 export * from './src/app/shared/platforms';
+export * from './src/app/shared/files';
 export * from './src/app/shared/hotkeys/shared-hotkeys.module';
 export * from './src/app/shared/hotkeys/hotkeys.service';
 export * from './src/app/shared/hotkeys/dialog/hotkeys-dialog.component';

package/src/app/shared/files.d.ts

@@ -0,0 +1,9 @@
+import { FileEvent, UploadFile } from './upload-file/upload-file.model';
+import { UploadFilePopoverOptions } from './upload-file/upload-file-popover.component';
+import { PopoverController } from '@ionic/angular';
+import { Observable } from 'rxjs';
+import { OverlayEventDetail } from '@ionic/core/dist/types/utils/overlays-interface';
+export declare class FilesUtils {
+    static showUploadPopover<T>(popoverController: PopoverController, event: UIEvent, opts: UploadFilePopoverOptions<T>): Promise<OverlayEventDetail<UploadFile<T>[]>>;
+    static readAsText(file: File, encoding?: string): Observable<FileEvent<string>>;
+}

package/src/app/shared/upload-file/testing/upload-file.testing.d.ts

@@ -5,7 +5,7 @@ import { FileEvent } from '../upload-file.model';
 export declare class UploadFileTestingPage {
     private popoverController;
     constructor(popoverController: PopoverController);
-    showPopover(event: UIEvent, opts?: Partial<UploadFilePopoverOptions>): Promise<void>;
+    showPopover(event: UIEvent, opts?: Partial<UploadFilePopoverOptions<any>>): Promise<void>;
     /**
      * Simulate a upload function, with progression
      * @param file

package/src/app/shared/upload-file/upload-file-popover.component.d.ts

@@ -3,16 +3,16 @@ import { PopoverController } from '@ionic/angular';
 import { UploadFileComponent } from './upload-file.component';
 import { FileDeleteFn, FileUploadFn, UploadFile } from './upload-file.model';
 import { TranslateService } from '@ngx-translate/core';
-export interface UploadFilePopoverOptions {
+export interface UploadFilePopoverOptions<T> {
     title?: string;
-    uploadFn: FileUploadFn;
-    deleteFn?: FileDeleteFn;
+    uploadFn: FileUploadFn<T>;
+    deleteFn?: FileDeleteFn<any>;
     instantUpload?: boolean;
     uniqueFile?: boolean;
     fileExtension?: string;
     maxParallelUpload?: number;
 }
-export declare class UploadFilePopover implements UploadFilePopoverOptions {
+export declare class UploadFilePopover implements UploadFilePopoverOptions<any> {
     protected popoverController: PopoverController;
     protected translate: TranslateService;
     protected cd: ChangeDetectorRef;
@@ -21,12 +21,12 @@ export declare class UploadFilePopover implements UploadFilePopoverOptions {
     title: string;
     uniqueFile: boolean;
     instantUpload: boolean;
-    uploadFn: FileUploadFn;
-    deleteFn: FileDeleteFn;
+    uploadFn: FileUploadFn<any>;
+    deleteFn: FileDeleteFn<any>;
     maxParallelUpload: number;
     importing: boolean;
     error: string;
-    get files(): UploadFile[];
+    get files(): UploadFile<any>[];
     get disabled(): boolean;
     get valid(): boolean;
     constructor(popoverController: PopoverController, translate: TranslateService, cd: ChangeDetectorRef);

package/src/app/shared/upload-file/upload-file.component.d.ts

@@ -9,12 +9,12 @@ export declare class UploadFileComponent {
     fileExtension: string;
     uniqueFile: boolean;
     instantUpload: boolean;
-    uploadFn: FileUploadFn;
-    deleteFn: FileDeleteFn;
+    uploadFn: FileUploadFn<any>;
+    deleteFn: FileDeleteFn<any>;
     maxParallelUpload: number;
-    files: UploadFile[];
-    get processingFiles(): UploadFile[];
-    get processedFiles(): UploadFile[];
+    files: UploadFile<any>[];
+    get processingFiles(): UploadFile<any>[];
+    get processedFiles(): UploadFile<any>[];
     get processingFilesCount(): number;
     constructor(cd: ChangeDetectorRef, translate: TranslateService);
     /**
@@ -40,6 +40,6 @@ export declare class UploadFileComponent {
     /**
      * Execute upload
      */
-    uploadFiles(files?: File[]): Promise<UploadFile[]>;
+    uploadFiles(files?: File[]): Promise<UploadFile<any>[]>;
     waitIdle(opts?: WaitForOptions): Promise<void>;
 }

package/src/app/shared/upload-file/upload-file.model.d.ts

@@ -1,13 +1,13 @@
 import { Observable } from 'rxjs';
 import { HttpEventType, HttpProgressEvent, HttpResponse } from '@angular/common/http';
-export declare class UploadFile extends File {
+export declare class UploadFile<T> extends File {
     progress?: number;
     deleting?: boolean;
-    finalName?: string;
     error?: string;
+    result?: T;
 }
-export declare type FileUploadFn = (file: File) => Observable<FileEvent<any>>;
-export declare type FileDeleteFn = (file: UploadFile) => Promise<boolean>;
+export declare type FileUploadFn<T> = (file: File) => Observable<FileEvent<T>>;
+export declare type FileDeleteFn<T> = (file: UploadFile<T>) => Promise<boolean>;
 export interface FileProgressEvent {
     type: HttpEventType;
     loaded: number;