@sumaris-net/ngx-components 1.11.2 → 1.11.3
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/bundles/sumaris-net.ngx-components.umd.js +9 -5
- package/bundles/sumaris-net.ngx-components.umd.js.map +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js.map +1 -1
- package/esm2015/src/app/shared/upload-file/upload-file.component.js +10 -6
- package/fesm2015/sumaris-net.ngx-components.js +9 -5
- package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
- package/package.json +1 -1
|
@@ -135,20 +135,24 @@ export class UploadFileComponent {
|
|
|
135
135
|
return of(file);
|
|
136
136
|
})
|
|
137
137
|
.map(file$ => file$.pipe(tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)), switchMap(file => this.uploadFn(file).pipe(map((event) => {
|
|
138
|
+
// Progress event
|
|
138
139
|
if ((event === null || event === void 0 ? void 0 : event.type) === HttpEventType.UploadProgress || event.type === HttpEventType.User) {
|
|
139
140
|
const total = event.total || 1;
|
|
140
141
|
const loaded = event.loaded || 0;
|
|
141
142
|
file.progress = Math.min(1, loaded / total);
|
|
142
143
|
}
|
|
144
|
+
// Response event
|
|
143
145
|
else if (event instanceof HttpResponse || event instanceof FileResponse) {
|
|
144
|
-
const
|
|
145
|
-
file.finalName =
|
|
146
|
+
const body = event.body;
|
|
147
|
+
file.finalName = body === null || body === void 0 ? void 0 : body.finalName;
|
|
146
148
|
file.progress = 1;
|
|
147
|
-
const message =
|
|
148
|
-
console.
|
|
149
|
+
const message = (body === null || body === void 0 ? void 0 : body.message) || event.statusText || 'OK';
|
|
150
|
+
console.debug(`[upload-file] ${file.name}: ${message}`
|
|
151
|
+
+ (file.finalName ? ` (finalName: ${file.finalName})` : ''));
|
|
149
152
|
}
|
|
150
153
|
else {
|
|
151
|
-
|
|
154
|
+
// Other events
|
|
155
|
+
console.warn('[upload-file] Unknown event, returned by uploadFn\'s observable:', event);
|
|
152
156
|
}
|
|
153
157
|
return file;
|
|
154
158
|
}), catchError((err) => {
|
|
@@ -193,4 +197,4 @@ UploadFileComponent.propDecorators = {
|
|
|
193
197
|
deleteFn: [{ type: Input }],
|
|
194
198
|
maxParallelUpload: [{ type: Input }]
|
|
195
199
|
};
|
|
196
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload-file.component.js","sourceRoot":"","sources":["../../../../../../src/app/shared/upload-file/upload-file.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {ChangeDetectorRef, Component, ElementRef, Input, ViewChild} from '@angular/core';\nimport {HttpEventType, HttpResponse} from '@angular/common/http';\nimport {catchError, debounceTime, filter, first, map, switchMap, tap} from 'rxjs/operators';\nimport {BehaviorSubject, forkJoin, Observable, of, Subject} from 'rxjs';\nimport {TranslateService} from '@ngx-translate/core';\nimport {FileDeleteFn, FileResponse, FileUploadFn, UploadFile} from './upload-file.model';\nimport {isNil, isNotNil} from '../functions';\nimport {waitFor, WaitForOptions} from '../observables';\n\n@Component({\n  selector: 'app-upload-file',\n  templateUrl: './upload-file.component.html',\n  styleUrls: ['./upload-file.component.scss'],\n})\nexport class UploadFileComponent {\n\n  @ViewChild('fileDropRef', { static: false }) fileDropEl: ElementRef;\n\n  @Input() fileExtension: string;\n  @Input() uniqueFile = false;\n  @Input() instantUpload = false;\n  @Input() uploadFn: FileUploadFn;\n  @Input() deleteFn: FileDeleteFn;\n  @Input() maxParallelUpload: number;\n\n  files: UploadFile[] = [];\n\n  get processingFiles(): UploadFile[] {\n    return this.files.filter(f => !f.deleting && isNotNil(f.progress) && f.progress < 1)\n  }\n\n  get processedFiles(): UploadFile[] {\n    return this.files.filter(f => !f.deleting && f.progress === 1);\n  }\n\n  get processingFilesCount(): number {\n    return this.processingFiles.length;\n  }\n\n  constructor(protected cd: ChangeDetectorRef, protected translate: TranslateService) {}\n\n  /**\n   * on file drop handler\n   */\n  onFileDropped(event) {\n    this.prepareFilesList(event);\n  }\n\n  /**\n   * handle file from browsing\n   */\n  fileBrowseHandler(files) {\n    this.prepareFilesList(files);\n  }\n\n  /**\n   * Delete file from files list\n   *\n   * @param index (File index)\n   */\n  async deleteFile(index: number) {\n    const file = this.files[index];\n\n    if (file.progress === 1 && this.deleteFn) {\n      if (file.deleting) {\n        console.warn(`[upload-file] This file already deleting`);\n        return;\n      }\n      try {\n        file.deleting = true\n        const deleted = await this.deleteFn(file);\n        if (!deleted) return;\n      }\n      catch(err) {\n        console.error(err && err.message || err);\n        return;\n      }\n      finally {\n        file.deleting = false;\n      }\n\n      // Make sure index not changed\n      index = this.files.indexOf(file);\n      if (index === -1) return; // Not found (already removed ?)\n    }\n    else if (file.progress > 0) {\n      console.warn(`[upload-file] Cannot remove this file while uploading`);\n      return;\n    }\n\n    this.files.splice(index, 1);\n    this.cd.markForCheck();\n  }\n\n  /**\n   * Convert Files list to normal array list\n   *\n   * @param files (Files List)\n   */\n  prepareFilesList(files: FileList | File[]) {\n    let items: File[];\n    if (files instanceof FileList) {\n      items = [];\n      for (let i = 0; i < files.length; i++) {\n        const item = files.item(i);\n        items.push(item);\n      }\n    }\n    else {\n      items = files;\n    }\n    this.files.push(...items);\n\n    this.fileDropEl.nativeElement.value = '';\n\n    // Start upload\n    if (this.instantUpload) {\n      this.uploadFiles(items);\n    }\n  }\n\n  /**\n   * Execute upload\n   */\n  async uploadFiles(files?: File[]): Promise<UploadFile[]> {\n\n    if (!files) {\n      console.info('[upload-file] Uploading all files...');\n      files = this.files;\n    }\n\n    const $processingFileCountChange = new BehaviorSubject(this.processingFilesCount);\n    const $changes = new Subject();\n    $changes.subscribe(_ => {\n      this.cd.markForCheck();\n      $processingFileCountChange.next(this.processingFilesCount);\n    });\n\n    const jobs: Observable<UploadFile>[] = files\n      .map(f => f as UploadFile)\n      .filter(file => isNil(file.progress) && !file.error) // Skip if already started or in error\n      .map((file, i) => {\n          // Wait if need\n          if (isNotNil(this.maxParallelUpload)) {\n            return $processingFileCountChange.pipe(\n              debounceTime(i), // call of filter() must be different for waiting job\n              filter(count => count < this.maxParallelUpload),\n              map(_ => {\n                // Start uploading\n                if (isNil(file.progress)) file.progress = 0;\n                $changes.next();\n                return file;\n              }),\n              first()\n            );\n          }\n          // Start uploading\n          if (isNil(file.progress)) file.progress = 0;\n          return of(file);\n        })\n      .map(file$ => file$.pipe(\n          tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)),\n          switchMap(file => this.uploadFn(file).pipe(\n            map((event) => {\n              if (event?.type === HttpEventType.UploadProgress || event.type === HttpEventType.User) {\n                const total = event.total || 1;\n                const loaded = event.loaded || 0;\n                file.progress = Math.min(1, loaded / total);\n              } else if (event instanceof HttpResponse || event instanceof FileResponse) {\n                const content = event.body;\n                file.finalName = content?.finalName;\n                file.progress = 1;\n                const message = content.message || event.statusText || 'succeed';\n                console.info(`[upload-file] ${file.name}: ${message} (finalName: ${file.finalName})`);\n              }\n              else {\n                console.warn(`[upload-file] ${file.name}: Unknown event received by uploadFn : `, event);\n              }\n              return file;\n            }),\n            catchError((err) => {\n              console.error(err);\n              file.error = err.error?.message || 'FILE.UPLOAD.ERROR';\n              return of(file);\n            }),\n            tap(() => {\n              $changes.next();\n              this.cd.markForCheck();\n            })\n          )\n        )\n    ));\n\n    // Wait jobs to finish\n    return await forkJoin(jobs).toPromise()\n      .then(files => {\n        $changes.complete();\n        $changes.unsubscribe();\n        return files;\n      });\n  }\n\n  waitIdle(opts?: WaitForOptions): Promise<void> {\n    return waitFor(() => this.processingFilesCount === 0, opts);\n  }\n}\n"]}
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload-file.component.js","sourceRoot":"","sources":["../../../../../../src/app/shared/upload-file/upload-file.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {ChangeDetectorRef, Component, ElementRef, Input, ViewChild} from '@angular/core';\nimport {HttpEventType, HttpResponse} from '@angular/common/http';\nimport {catchError, debounceTime, filter, first, map, switchMap, tap} from 'rxjs/operators';\nimport {BehaviorSubject, forkJoin, Observable, of, Subject} from 'rxjs';\nimport {TranslateService} from '@ngx-translate/core';\nimport {FileDeleteFn, FileResponse, FileUploadFn, UploadFile} from './upload-file.model';\nimport {isNil, isNotNil} from '../functions';\nimport {waitFor, WaitForOptions} from '../observables';\n\n@Component({\n  selector: 'app-upload-file',\n  templateUrl: './upload-file.component.html',\n  styleUrls: ['./upload-file.component.scss'],\n})\nexport class UploadFileComponent {\n\n  @ViewChild('fileDropRef', { static: false }) fileDropEl: ElementRef;\n\n  @Input() fileExtension: string;\n  @Input() uniqueFile = false;\n  @Input() instantUpload = false;\n  @Input() uploadFn: FileUploadFn;\n  @Input() deleteFn: FileDeleteFn;\n  @Input() maxParallelUpload: number;\n\n  files: UploadFile[] = [];\n\n  get processingFiles(): UploadFile[] {\n    return this.files.filter(f => !f.deleting && isNotNil(f.progress) && f.progress < 1)\n  }\n\n  get processedFiles(): UploadFile[] {\n    return this.files.filter(f => !f.deleting && f.progress === 1);\n  }\n\n  get processingFilesCount(): number {\n    return this.processingFiles.length;\n  }\n\n  constructor(protected cd: ChangeDetectorRef, protected translate: TranslateService) {}\n\n  /**\n   * on file drop handler\n   */\n  onFileDropped(event) {\n    this.prepareFilesList(event);\n  }\n\n  /**\n   * handle file from browsing\n   */\n  fileBrowseHandler(files) {\n    this.prepareFilesList(files);\n  }\n\n  /**\n   * Delete file from files list\n   *\n   * @param index (File index)\n   */\n  async deleteFile(index: number) {\n    const file = this.files[index];\n\n    if (file.progress === 1 && this.deleteFn) {\n      if (file.deleting) {\n        console.warn(`[upload-file] This file already deleting`);\n        return;\n      }\n      try {\n        file.deleting = true\n        const deleted = await this.deleteFn(file);\n        if (!deleted) return;\n      }\n      catch(err) {\n        console.error(err && err.message || err);\n        return;\n      }\n      finally {\n        file.deleting = false;\n      }\n\n      // Make sure index not changed\n      index = this.files.indexOf(file);\n      if (index === -1) return; // Not found (already removed ?)\n    }\n    else if (file.progress > 0) {\n      console.warn(`[upload-file] Cannot remove this file while uploading`);\n      return;\n    }\n\n    this.files.splice(index, 1);\n    this.cd.markForCheck();\n  }\n\n  /**\n   * Convert Files list to normal array list\n   *\n   * @param files (Files List)\n   */\n  prepareFilesList(files: FileList | File[]) {\n    let items: File[];\n    if (files instanceof FileList) {\n      items = [];\n      for (let i = 0; i < files.length; i++) {\n        const item = files.item(i);\n        items.push(item);\n      }\n    }\n    else {\n      items = files;\n    }\n    this.files.push(...items);\n\n    this.fileDropEl.nativeElement.value = '';\n\n    // Start upload\n    if (this.instantUpload) {\n      this.uploadFiles(items);\n    }\n  }\n\n  /**\n   * Execute upload\n   */\n  async uploadFiles(files?: File[]): Promise<UploadFile[]> {\n\n    if (!files) {\n      console.info('[upload-file] Uploading all files...');\n      files = this.files;\n    }\n\n    const $processingFileCountChange = new BehaviorSubject(this.processingFilesCount);\n    const $changes = new Subject();\n    $changes.subscribe(_ => {\n      this.cd.markForCheck();\n      $processingFileCountChange.next(this.processingFilesCount);\n    });\n\n    const jobs: Observable<UploadFile>[] = files\n      .map(f => f as UploadFile)\n      .filter(file => isNil(file.progress) && !file.error) // Skip if already started or in error\n      .map((file, i) => {\n          // Wait if need\n          if (isNotNil(this.maxParallelUpload)) {\n            return $processingFileCountChange.pipe(\n              debounceTime(i), // call of filter() must be different for waiting job\n              filter(count => count < this.maxParallelUpload),\n              map(_ => {\n                // Start uploading\n                if (isNil(file.progress)) file.progress = 0;\n                $changes.next();\n                return file;\n              }),\n              first()\n            );\n          }\n          // Start uploading\n          if (isNil(file.progress)) file.progress = 0;\n          return of(file);\n        })\n      .map(file$ => file$.pipe(\n          tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)),\n          switchMap(file => this.uploadFn(file).pipe(\n            map((event) => {\n              // Progress event\n              if (event?.type === HttpEventType.UploadProgress || event.type === HttpEventType.User) {\n                const total = event.total || 1;\n                const loaded = event.loaded || 0;\n                file.progress = Math.min(1, loaded / total);\n              }\n              // Response event\n              else if (event instanceof HttpResponse || event instanceof FileResponse) {\n                const body = event.body;\n                file.finalName = body?.finalName;\n                file.progress = 1;\n                const message = body?.message || event.statusText || 'OK';\n                console.debug(`[upload-file] ${file.name}: ${message}`\n                  + (file.finalName ? ` (finalName: ${file.finalName})` : '')\n                );\n              }\n              else {\n                // Other events\n                console.warn('[upload-file] Unknown event, returned by uploadFn\\'s observable:', event);\n              }\n              return file;\n            }),\n            catchError((err) => {\n              console.error(err);\n              file.error = err.error?.message || 'FILE.UPLOAD.ERROR';\n              return of(file);\n            }),\n            tap(() => {\n              $changes.next();\n              this.cd.markForCheck();\n            })\n          )\n        )\n    ));\n\n    // Wait jobs to finish\n    return await forkJoin(jobs).toPromise()\n      .then(files => {\n        $changes.complete();\n        $changes.unsubscribe();\n        return files;\n      });\n  }\n\n  waitIdle(opts?: WaitForOptions): Promise<void> {\n    return waitFor(() => this.processingFilesCount === 0, opts);\n  }\n}\n"]}
|
|
@@ -15826,20 +15826,24 @@ class UploadFileComponent {
|
|
|
15826
15826
|
return of(file);
|
|
15827
15827
|
})
|
|
15828
15828
|
.map(file$ => file$.pipe(tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)), switchMap(file => this.uploadFn(file).pipe(map((event) => {
|
|
15829
|
+
// Progress event
|
|
15829
15830
|
if ((event === null || event === void 0 ? void 0 : event.type) === HttpEventType.UploadProgress || event.type === HttpEventType.User) {
|
|
15830
15831
|
const total = event.total || 1;
|
|
15831
15832
|
const loaded = event.loaded || 0;
|
|
15832
15833
|
file.progress = Math.min(1, loaded / total);
|
|
15833
15834
|
}
|
|
15835
|
+
// Response event
|
|
15834
15836
|
else if (event instanceof HttpResponse || event instanceof FileResponse) {
|
|
15835
|
-
const
|
|
15836
|
-
file.finalName =
|
|
15837
|
+
const body = event.body;
|
|
15838
|
+
file.finalName = body === null || body === void 0 ? void 0 : body.finalName;
|
|
15837
15839
|
file.progress = 1;
|
|
15838
|
-
const message =
|
|
15839
|
-
console.
|
|
15840
|
+
const message = (body === null || body === void 0 ? void 0 : body.message) || event.statusText || 'OK';
|
|
15841
|
+
console.debug(`[upload-file] ${file.name}: ${message}`
|
|
15842
|
+
+ (file.finalName ? ` (finalName: ${file.finalName})` : ''));
|
|
15840
15843
|
}
|
|
15841
15844
|
else {
|
|
15842
|
-
|
|
15845
|
+
// Other events
|
|
15846
|
+
console.warn('[upload-file] Unknown event, returned by uploadFn\'s observable:', event);
|
|
15843
15847
|
}
|
|
15844
15848
|
return file;
|
|
15845
15849
|
}), catchError((err) => {
|