@sumaris-net/ngx-components 1.15.14 → 1.16.0

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.
Files changed (13) hide show
  1. package/bundles/sumaris-net.ngx-components.umd.js +35 -32
  2. package/bundles/sumaris-net.ngx-components.umd.js.map +1 -1
  3. package/bundles/sumaris-net.ngx-components.umd.min.js +2 -2
  4. package/bundles/sumaris-net.ngx-components.umd.min.js.map +1 -1
  5. package/doc/changelog.md +3 -0
  6. package/esm2015/src/app/admin/services/person.service.js +5 -9
  7. package/esm2015/src/app/shared/services/job.utils.js +28 -21
  8. package/fesm2015/sumaris-net.ngx-components.js +30 -26
  9. package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
  10. package/package.json +1 -1
  11. package/src/app/admin/services/person.service.d.ts +2 -1
  12. package/src/app/shared/services/job.utils.d.ts +4 -2
  13. package/sumaris-net.ngx-components.metadata.json +1 -1
package/doc/changelog.md CHANGED
@@ -263,3 +263,6 @@
263
263
  # 1.15.13
264
264
  [fix] File upload component: fix file/event management
265
265
  [enh] Add new pipe 'formGetGroup:<name>'
266
+
267
+ # 1.16.0
268
+ [enh] Refactor JobUtils functions: 'progression' is now optional, and hold by options
package/esm2015/src/app/admin/services/person.service.js CHANGED
@@ -10,7 +10,6 @@ import { StatusIds } from '../../core/services/model/model.enum';
10
10
  import { JobUtils } from '../../shared/services/job.utils';
11
11
  import { PlatformService } from '../../core/services/platform.service';
12
12
  import { PersonFilter } from './filter/person.filter';
13
- import { isInstanceOf } from '../../core/services/model/entity.model';
14
13
  import { BaseEntityService } from '../../core/services/base-entity-service.class';
15
14
  import { environment } from '../../../environments/environment';
16
15
  import * as i0 from "@angular/core";
@@ -129,23 +128,20 @@ export class PersonService extends BaseEntityService {
129
128
  return this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection, Object.assign(Object.assign({}, filter), { searchText: value, statusIds: filter && filter.statusIds || [StatusIds.ENABLE], userProfiles: filter && filter.userProfiles }), { withTotal: true /* need by autocomplete */ });
130
129
  });
131
130
  }
132
- executeImport(progression, opts) {
131
+ executeImport(filter, opts) {
133
132
  const _super = Object.create(null, {
134
133
  loadAll: { get: () => super.loadAll }
135
134
  });
136
135
  return __awaiter(this, void 0, void 0, function* () {
137
136
  const maxProgression = opts && opts.maxProgression || 100;
138
- const filter = {
139
- statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY],
140
- userProfiles: ['SUPERVISOR', 'USER', 'GUEST']
141
- };
137
+ filter = Object.assign(Object.assign({}, filter), { statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY], userProfiles: ['SUPERVISOR', 'USER', 'GUEST'] });
142
138
  console.info('[person-service] Importing persons...');
143
139
  const res = yield JobUtils.fetchAllPages((offset, size) => _super.loadAll.call(this, offset, size, 'id', null, filter, {
144
140
  debug: false,
145
141
  fetchPolicy: 'network-only',
146
142
  withTotal: (offset === 0),
147
143
  toEntity: false
148
- }), progression, { maxProgression: maxProgression * 0.9 });
144
+ }), Object.assign(Object.assign({}, opts), { maxProgression: maxProgression * 0.9 }));
149
145
  // Save result locally
150
146
  yield this.entities.saveAll(res.data, { entityName: 'PersonVO', reset: true });
151
147
  });
@@ -155,7 +151,7 @@ export class PersonService extends BaseEntityService {
155
151
  if (!source)
156
152
  return undefined;
157
153
  console.debug('TODO check isInstanceOf');
158
- if (!isInstanceOf(source, Person)) {
154
+ if (!(source instanceof Person)) {
159
155
  source = Person.fromObject(source);
160
156
  }
161
157
  const target = source.asObject();
@@ -176,4 +172,4 @@ PersonService.ctorParameters = () => [
176
172
  { type: NetworkService },
177
173
  { type: EntitiesStorage }
178
174
  ];
179
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"person.service.js","sourceRoot":"","sources":["../../../../../../src/app/admin/services/person.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable} from '@angular/core';\nimport {FetchPolicy, gql} from '@apollo/client/core';\nimport {BehaviorSubject} from 'rxjs';\nimport {GraphqlService} from '../../core/graphql/graphql.service';\nimport {NetworkService} from '../../core/services/network.service';\nimport {EntitiesStorage} from '../../core/services/storage/entities-storage.service';\nimport {Person, UserProfileLabel} from '../../core/services/model/person.model';\nimport {ReferentialUtils} from '../../core/services/model/referential.model';\nimport {StatusIds} from '../../core/services/model/model.enum';\nimport {SortDirection} from '@angular/material/sort';\nimport {JobUtils} from '../../shared/services/job.utils';\nimport {LoadResult, SuggestService} from '../../shared/services/entity-service.class';\nimport {PlatformService} from '../../core/services/platform.service';\nimport {PersonFilter} from './filter/person.filter';\nimport {isInstanceOf} from '../../core/services/model/entity.model';\nimport {BaseEntityGraphqlMutations, BaseEntityService} from '../../core/services/base-entity-service.class';\nimport {environment} from '../../../environments/environment';\n\nexport const PersonFragments = {\n  person: gql`fragment PersonFragment on PersonVO {\n    id\n    firstName\n    lastName\n    email\n    pubkey\n    avatar\n    statusId\n    updateDate\n    creationDate\n    profiles\n    username\n    usernameExtranet\n    department {\n      id\n      label\n      name\n      logo\n      __typename\n    }\n    __typename\n  }`\n};\n\n// Load persons query\nconst PersonQueries = {\n  loadAll: gql`\n    query Persons($offset: Int, $size: Int, $sortBy: String, $sortDirection: String, $filter: PersonFilterVOInput){\n      data: persons(filter: $filter, offset: $offset, size: $size, sortBy: $sortBy, sortDirection: $sortDirection){\n        ...PersonFragment\n      }\n    }\n    ${PersonFragments.person}`,\n\n  loadAllWithTotal: gql`\n    query PersonsWithTotal($offset: Int, $size: Int, $sortBy: String, $sortDirection: String, $filter: PersonFilterVOInput){\n      data: persons(filter: $filter, offset: $offset, size: $size, sortBy: $sortBy, sortDirection: $sortDirection){\n        ...PersonFragment\n      }\n      total: personsCount(filter: $filter)\n    }\n    ${PersonFragments.person}`\n};\n\n\nconst PersonMutations: BaseEntityGraphqlMutations = {\n  saveAll: gql`\n    mutation savePersons($data:[PersonVOInput]){\n      data: savePersons(persons: $data){\n        ...PersonFragment\n      }\n    }\n    ${PersonFragments.person}`,\n  deleteAll: gql`\n    mutation deletePersons($ids:[Int]){\n      deletePersons(ids: $ids)\n    }`\n};\n\n@Injectable({providedIn: 'root'})\nexport class PersonService extends BaseEntityService<Person, PersonFilter>\n  implements SuggestService<Person, PersonFilter> {\n\n  constructor(\n    protected graphql: GraphqlService,\n    protected platform: PlatformService,\n    protected network: NetworkService,\n    protected entities: EntitiesStorage\n  ) {\n    super(graphql, platform, Person, PersonFilter, {\n      queries: PersonQueries,\n      mutations: PersonMutations,\n      defaultSortBy: 'lastName',\n      defaultSortDirection: 'asc'\n    });\n\n    // for DEV only -----\n    this._debug = !environment.production;\n  }\n\n  async loadAll(offset: number, size: number, sortBy?: string,\n                sortDirection?: SortDirection,\n                filter?: Partial<PersonFilter>, opts?: {\n        [key: string]: any;\n        fetchPolicy?: FetchPolicy;\n        debug?: boolean;\n        withTotal?: boolean;\n        toEntity?: boolean;\n      }): Promise<LoadResult<Person>> {\n\n    const offline = this.network.offline && (!opts || opts.fetchPolicy !== 'network-only');\n    if (offline) {\n      return this.loadAllLocally(offset, size, sortBy, sortDirection, filter, opts);\n    }\n\n    return super.loadAll(offset, size, sortBy, sortDirection, filter, opts);\n  }\n\n  async loadAllLocally(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection,\n                       filter?: Partial<PersonFilter>,\n                       opts?: {\n                         [key: string]: any;\n                         fetchPolicy?: FetchPolicy;\n                         debug?: boolean;\n                         withTotal?: boolean;\n                         toEntity?: boolean;\n                       }): Promise<LoadResult<Person>> {\n\n    filter = this.asFilter(filter);\n\n    const variables = {\n      offset: offset || 0,\n      size: size || 100,\n      sortBy: sortBy || this.defaultSortBy,\n      sortDirection: sortDirection || this.defaultSortDirection,\n      filter: filter && filter.asFilterFn()\n    };\n\n    const {data, total} = await this.entities.loadAll<Person>('PersonVO', variables);\n\n    const entities = (!opts || opts.toEntity !== false) ?\n      (data || []).map(Person.fromObject) :\n      (data || []) as Person[];\n    return {\n      data: entities,\n      total\n    };\n  }\n\n  async suggest(value: any, filter?: PersonFilter, sortBy?: string, sortDirection?: SortDirection): Promise<LoadResult<Person>> {\n    if (ReferentialUtils.isNotEmpty(value)) return {data: [value]};\n    value = (typeof value === 'string' && value !== '*') && value || undefined;\n    sortBy = sortBy || filter.searchAttribute || (filter.searchAttributes && filter.searchAttributes[0]);\n    return this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection,\n      {\n        ...filter,\n        searchText: value as string,\n        statusIds: filter && filter.statusIds || [StatusIds.ENABLE],\n        userProfiles: filter && filter.userProfiles\n      },\n      { withTotal: true /* need by autocomplete */ }\n      );\n  }\n\n  async executeImport(progression: BehaviorSubject<number>,\n                opts?: {\n                  maxProgression?: number;\n                }): Promise<void> {\n\n    const maxProgression = opts && opts.maxProgression || 100;\n    const filter = {\n      statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY],\n      userProfiles: <UserProfileLabel[]>['SUPERVISOR', 'USER', 'GUEST']\n    };\n\n    console.info('[person-service] Importing persons...');\n\n    const res = await JobUtils.fetchAllPages((offset, size) =>\n        super.loadAll(offset, size, 'id', null, filter, {\n          debug: false,\n          fetchPolicy: 'network-only',\n          withTotal: (offset === 0), // Compute total only once\n          toEntity: false\n        }),\n      progression,\n      {maxProgression: maxProgression * 0.9}\n    );\n\n    // Save result locally\n    await this.entities.saveAll(res.data, {entityName: 'PersonVO', reset: true});\n  }\n\n  /* -- protected methods -- */\n\n  protected asObject(source: Person | any): any {\n    if (!source) return undefined;\n\n    console.debug('TODO check isInstanceOf');\n    if (!isInstanceOf(source, Person)) {\n      source = Person.fromObject(source);\n    }\n    const target = source.asObject();\n\n    // Not known in server GraphQL schema\n    delete target.mainProfile;\n\n    // Minify the department object\n    target.department = source.department && source.department.asObject(true);\n\n    return target;\n  }\n\n}\n"]}
175
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"person.service.js","sourceRoot":"","sources":["../../../../../../src/app/admin/services/person.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable} from '@angular/core';\nimport {FetchPolicy, gql} from '@apollo/client/core';\nimport {BehaviorSubject} from 'rxjs';\nimport {GraphqlService} from '../../core/graphql/graphql.service';\nimport {NetworkService} from '../../core/services/network.service';\nimport {EntitiesStorage} from '../../core/services/storage/entities-storage.service';\nimport {Person, UserProfileLabel} from '../../core/services/model/person.model';\nimport {ReferentialUtils} from '../../core/services/model/referential.model';\nimport {StatusIds} from '../../core/services/model/model.enum';\nimport {SortDirection} from '@angular/material/sort';\nimport {JobUtils} from '../../shared/services/job.utils';\nimport {LoadResult, SuggestService} from '../../shared/services/entity-service.class';\nimport {PlatformService} from '../../core/services/platform.service';\nimport {PersonFilter} from './filter/person.filter';\nimport {isInstanceOf} from '../../core/services/model/entity.model';\nimport {BaseEntityGraphqlMutations, BaseEntityService} from '../../core/services/base-entity-service.class';\nimport {environment} from '../../../environments/environment';\n\nexport const PersonFragments = {\n  person: gql`fragment PersonFragment on PersonVO {\n    id\n    firstName\n    lastName\n    email\n    pubkey\n    avatar\n    statusId\n    updateDate\n    creationDate\n    profiles\n    username\n    usernameExtranet\n    department {\n      id\n      label\n      name\n      logo\n      __typename\n    }\n    __typename\n  }`\n};\n\n// Load persons query\nconst PersonQueries = {\n  loadAll: gql`\n    query Persons($offset: Int, $size: Int, $sortBy: String, $sortDirection: String, $filter: PersonFilterVOInput){\n      data: persons(filter: $filter, offset: $offset, size: $size, sortBy: $sortBy, sortDirection: $sortDirection){\n        ...PersonFragment\n      }\n    }\n    ${PersonFragments.person}`,\n\n  loadAllWithTotal: gql`\n    query PersonsWithTotal($offset: Int, $size: Int, $sortBy: String, $sortDirection: String, $filter: PersonFilterVOInput){\n      data: persons(filter: $filter, offset: $offset, size: $size, sortBy: $sortBy, sortDirection: $sortDirection){\n        ...PersonFragment\n      }\n      total: personsCount(filter: $filter)\n    }\n    ${PersonFragments.person}`\n};\n\n\nconst PersonMutations: BaseEntityGraphqlMutations = {\n  saveAll: gql`\n    mutation savePersons($data:[PersonVOInput]){\n      data: savePersons(persons: $data){\n        ...PersonFragment\n      }\n    }\n    ${PersonFragments.person}`,\n  deleteAll: gql`\n    mutation deletePersons($ids:[Int]){\n      deletePersons(ids: $ids)\n    }`\n};\n\n@Injectable({providedIn: 'root'})\nexport class PersonService extends BaseEntityService<Person, PersonFilter>\n  implements SuggestService<Person, PersonFilter> {\n\n  constructor(\n    protected graphql: GraphqlService,\n    protected platform: PlatformService,\n    protected network: NetworkService,\n    protected entities: EntitiesStorage\n  ) {\n    super(graphql, platform, Person, PersonFilter, {\n      queries: PersonQueries,\n      mutations: PersonMutations,\n      defaultSortBy: 'lastName',\n      defaultSortDirection: 'asc'\n    });\n\n    // for DEV only -----\n    this._debug = !environment.production;\n  }\n\n  async loadAll(offset: number, size: number, sortBy?: string,\n                sortDirection?: SortDirection,\n                filter?: Partial<PersonFilter>, opts?: {\n        [key: string]: any;\n        fetchPolicy?: FetchPolicy;\n        debug?: boolean;\n        withTotal?: boolean;\n        toEntity?: boolean;\n      }): Promise<LoadResult<Person>> {\n\n    const offline = this.network.offline && (!opts || opts.fetchPolicy !== 'network-only');\n    if (offline) {\n      return this.loadAllLocally(offset, size, sortBy, sortDirection, filter, opts);\n    }\n\n    return super.loadAll(offset, size, sortBy, sortDirection, filter, opts);\n  }\n\n  async loadAllLocally(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection,\n                       filter?: Partial<PersonFilter>,\n                       opts?: {\n                         [key: string]: any;\n                         fetchPolicy?: FetchPolicy;\n                         debug?: boolean;\n                         withTotal?: boolean;\n                         toEntity?: boolean;\n                       }): Promise<LoadResult<Person>> {\n\n    filter = this.asFilter(filter);\n\n    const variables = {\n      offset: offset || 0,\n      size: size || 100,\n      sortBy: sortBy || this.defaultSortBy,\n      sortDirection: sortDirection || this.defaultSortDirection,\n      filter: filter && filter.asFilterFn()\n    };\n\n    const {data, total} = await this.entities.loadAll<Person>('PersonVO', variables);\n\n    const entities = (!opts || opts.toEntity !== false) ?\n      (data || []).map(Person.fromObject) :\n      (data || []) as Person[];\n    return {\n      data: entities,\n      total\n    };\n  }\n\n  async suggest(value: any, filter?: PersonFilter, sortBy?: string, sortDirection?: SortDirection): Promise<LoadResult<Person>> {\n    if (ReferentialUtils.isNotEmpty(value)) return {data: [value]};\n    value = (typeof value === 'string' && value !== '*') && value || undefined;\n    sortBy = sortBy || filter.searchAttribute || (filter.searchAttributes && filter.searchAttributes[0]);\n    return this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection,\n      {\n        ...filter,\n        searchText: value as string,\n        statusIds: filter && filter.statusIds || [StatusIds.ENABLE],\n        userProfiles: filter && filter.userProfiles\n      },\n      { withTotal: true /* need by autocomplete */ }\n      );\n  }\n\n  async executeImport(filter: Partial<PersonFilter>,\n                      opts: {\n                        maxProgression?: number;\n                        progression?: BehaviorSubject<number>;\n                      }): Promise<void> {\n\n    const maxProgression = opts && opts.maxProgression || 100;\n    filter = {\n      ...filter,\n      statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY],\n      userProfiles: <UserProfileLabel[]>['SUPERVISOR', 'USER', 'GUEST']\n    };\n\n    console.info('[person-service] Importing persons...');\n\n    const res = await JobUtils.fetchAllPages((offset, size) =>\n        super.loadAll(offset, size, 'id', null, filter, {\n          debug: false,\n          fetchPolicy: 'network-only',\n          withTotal: (offset === 0), // Compute total only once\n          toEntity: false\n        }),\n      {...opts, maxProgression: maxProgression * 0.9}\n    );\n\n    // Save result locally\n    await this.entities.saveAll(res.data, {entityName: 'PersonVO', reset: true});\n  }\n\n  /* -- protected methods -- */\n\n  protected asObject(source: Person | any): any {\n    if (!source) return undefined;\n\n    console.debug('TODO check isInstanceOf');\n    if (!(source instanceof Person)) {\n      source = Person.fromObject(source);\n    }\n    const target = source.asObject();\n\n    // Not known in server GraphQL schema\n    delete target.mainProfile;\n\n    // Minify the department object\n    target.department = source.department && source.department.asObject(true);\n\n    return target;\n  }\n\n}\n"]}
package/esm2015/src/app/shared/services/job.utils.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { __awaiter } from "tslib";
2
2
  import { BehaviorSubject, defer } from 'rxjs';
3
- import { isNil, isNotNil } from '../functions';
3
+ import { isNil, isNotNil, toNumber } from '../functions';
4
4
  // @dynamic
5
5
  export class JobUtils {
6
6
  static defers(runnableList, opts) {
@@ -11,22 +11,24 @@ export class JobUtils {
11
11
  }
12
12
  static run(runnable, opts) {
13
13
  const progression = new BehaviorSubject(0);
14
- runnable(progression, opts)
14
+ runnable(Object.assign(Object.assign({}, opts), { progression }))
15
15
  .then(() => {
16
- if (opts && opts.maxProgression)
16
+ if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
17
17
  progression.next(opts.maxProgression);
18
- progression.complete();
18
+ if (opts === null || opts === void 0 ? void 0 : opts.progression)
19
+ opts.progression.complete();
19
20
  })
20
21
  .catch(err => progression.error(err));
21
22
  return progression;
22
23
  }
23
- static fetchAllPages(loadPageFn, progression, opts) {
24
+ static fetchAllPages(loadPageFn, opts) {
25
+ var _a;
24
26
  return __awaiter(this, void 0, void 0, function* () {
25
27
  const maxProgression = opts && opts.maxProgression || undefined;
26
28
  let total;
27
- let loopCount;
29
+ let pageCount;
28
30
  let progressionStep;
29
- let loopDataCount;
31
+ let currentPageDataCount;
30
32
  const fetchSize = opts && opts.fetchSize || 1000;
31
33
  let offset = 0;
32
34
  let data = [];
@@ -36,37 +38,42 @@ export class JobUtils {
36
38
  // Get some items, using paging
37
39
  const res = yield loadPageFn(offset, fetchSize);
38
40
  data = data.concat(res.data);
39
- loopDataCount = res.data && res.data.length || 0;
40
- offset += loopDataCount;
41
+ currentPageDataCount = res.data && res.data.length || 0;
42
+ offset += currentPageDataCount;
41
43
  // Set total count (only if not already set)
42
44
  if (isNil(total) && isNotNil(res.total)) {
43
45
  total = res.total;
44
- loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer
45
- progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;
46
+ // Compute the number of page
47
+ pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
48
+ // Compute step, by dividing maxProgression by number of page
49
+ const actualProgression = Math.max(0, toNumber(opts && ((_a = opts.progression) === null || _a === void 0 ? void 0 : _a.value), 0));
50
+ progressionStep = maxProgression
51
+ ? (maxProgression - actualProgression) / pageCount
52
+ : undefined /*if 0 reset to undefined*/;
46
53
  }
47
54
  // Increment progression on each iteration (if possible)
48
- if (isNotNil(progressionStep)) {
49
- progression.next(progression.getValue() + progressionStep);
55
+ if (opts && opts.progression && isNotNil(progressionStep)) {
56
+ opts.progression.next(opts.progression.value + progressionStep);
50
57
  }
51
58
  if (opts && opts.onPageLoaded)
52
59
  opts.onPageLoaded(res);
53
- } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
60
+ } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
54
61
  // Complete progression to reach progressionStep value (because of round)
55
62
  if (isNotNil(progressionStep)) {
56
63
  // If total return by loadAll was bad !
57
64
  if (isNotNil(total) && data.length < total) {
58
65
  console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);
59
66
  total = data.length;
60
- loopCount = Math.round(data.length / fetchSize + 0.5);
67
+ pageCount = Math.round(data.length / fetchSize + 0.5);
61
68
  }
62
- const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
63
- if (lastProgressionStep > 0) {
64
- progression.next(progression.getValue() + lastProgressionStep);
69
+ const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
70
+ if (opts && opts.progression && lastProgressionStep > 0) {
71
+ opts.progression.next(opts.progression.value + lastProgressionStep);
65
72
  }
66
73
  }
67
74
  // Or increment once
68
- else if (opts.maxProgression) {
69
- progression.next(progression.getValue() + opts.maxProgression);
75
+ else if (opts && opts.progression && opts.maxProgression) {
76
+ opts.progression.next(opts.progression.value + opts.maxProgression);
70
77
  }
71
78
  return {
72
79
  data,
@@ -75,4 +82,4 @@ export class JobUtils {
75
82
  });
76
83
  }
77
84
  }
78
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"job.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/job.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {BehaviorSubject, defer, Observable, Subject} from 'rxjs';\nimport {isNil, isNotNil} from '../functions';\nimport {LoadResult, LoadResultByPageFn} from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (progression: BehaviorSubject<number>, opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: number;\n  [key: string]: any;\n}\n\n// @dynamic\nexport class JobUtils {\n\n  static defers<O extends CallableWithProgressionOptions>(runnableList: CallableWithProgressionFn<O>[], opts?: O): Observable<number>[] {\n    return runnableList.map(runnable => JobUtils.defer(runnable, opts));\n  }\n\n  static defer<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts?: O): Observable<number> {\n    return defer<Observable<number>>(() => JobUtils.run(runnable, opts));\n  }\n\n  static run<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts: O): Observable<number> {\n\n    const progression = new BehaviorSubject<number>(0);\n    runnable(progression, opts)\n      .then(() => {\n        if (opts && opts.maxProgression) progression.next(opts.maxProgression);\n        progression.complete();\n      })\n      .catch(err => progression.error(err));\n    return progression;\n  }\n\n  static async fetchAllPages<T>(\n    loadPageFn: LoadResultByPageFn<T>,\n    progression: BehaviorSubject<number>,\n    opts?: {\n      maxProgression?: number;\n      onPageLoaded?: (pageResult: LoadResult<T>) => any;\n      logPrefix?: string;\n      fetchSize?: number;\n    }): Promise<LoadResult<T>> {\n\n    const maxProgression = opts && opts.maxProgression || undefined;\n    let total; let loopCount; let progressionStep; let loopDataCount: number;\n    const fetchSize = opts && opts.fetchSize || 1000;\n    let offset = 0;\n    let data: T[] = [];\n    do {\n\n      if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);\n\n      // Get some items, using paging\n      const res = await loadPageFn(offset, fetchSize);\n      data = data.concat(res.data);\n      loopDataCount = res.data && res.data.length || 0;\n      offset += loopDataCount;\n\n      // Set total count (only if not already set)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer\n        progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (isNotNil(progressionStep)) {\n        progression.next(progression.getValue() + progressionStep);\n      }\n\n      if (opts && opts.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));\n\n    // Complete progression to reach progressionStep value (because of round)\n    if (isNotNil(progressionStep)) {\n\n      // If total return by loadAll was bad !\n      if (isNotNil(total) && data.length < total) {\n        console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);\n        total = data.length;\n        loopCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);\n      if (lastProgressionStep > 0) {\n        progression.next(progression.getValue() + lastProgressionStep);\n      }\n    }\n    // Or increment once\n    else if (opts.maxProgression) {\n      progression.next(progression.getValue() + opts.maxProgression);\n    }\n\n    return {\n      data,\n      total\n    };\n  }\n}\n"]}
85
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"job.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/job.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { BehaviorSubject, defer, Observable } from 'rxjs';\nimport { isNil, isNotNil, toNumber } from '../functions';\nimport { LoadResult, LoadResultByPageFn } from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: number;\n  progression?: BehaviorSubject<number>;\n  [key: string]: any;\n}\n\n// @dynamic\nexport class JobUtils {\n\n  static defers<O extends CallableWithProgressionOptions>(runnableList: CallableWithProgressionFn<O>[], opts?: O): Observable<number>[] {\n    return runnableList.map(runnable => JobUtils.defer(runnable, opts));\n  }\n\n  static defer<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts?: O): Observable<number> {\n    return defer<Observable<number>>(() => JobUtils.run(runnable, opts));\n  }\n\n  static run<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts: O): Observable<number> {\n\n    const progression = new BehaviorSubject<number>(0);\n    runnable({...opts, progression})\n      .then(() => {\n        if (opts?.maxProgression) progression.next(opts.maxProgression);\n        if (opts?.progression) opts.progression.complete();\n      })\n      .catch(err => progression.error(err));\n    return progression;\n  }\n\n  static async fetchAllPages<T>(\n    loadPageFn: LoadResultByPageFn<T>,\n    opts?: {\n      maxProgression?: number;\n      progression?: BehaviorSubject<number>;\n      onPageLoaded?: (pageResult: LoadResult<T>) => any;\n      logPrefix?: string;\n      fetchSize?: number;\n    }): Promise<LoadResult<T>> {\n\n    const maxProgression = opts && opts.maxProgression || undefined;\n    let total; let pageCount; let progressionStep; let currentPageDataCount: number;\n    const fetchSize = opts && opts.fetchSize || 1000;\n    let offset = 0;\n    let data: T[] = [];\n    do {\n\n      if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);\n\n      // Get some items, using paging\n      const res = await loadPageFn(offset, fetchSize);\n      data = data.concat(res.data);\n      currentPageDataCount = res.data && res.data.length || 0;\n      offset += currentPageDataCount;\n\n      // Set total count (only if not already set)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        // Compute the number of page\n        pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer\n        // Compute step, by dividing maxProgression by number of page\n        const actualProgression = Math.max(0, toNumber(opts && opts.progression?.value, 0));\n        progressionStep = maxProgression\n          ? (maxProgression - actualProgression) / pageCount\n          : undefined /*if 0 reset to undefined*/;\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (opts && opts.progression && isNotNil(progressionStep)) {\n        opts.progression.next(opts.progression.value + progressionStep);\n      }\n\n      if (opts && opts.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));\n\n    // Complete progression to reach progressionStep value (because of round)\n    if (isNotNil(progressionStep)) {\n\n      // If total return by loadAll was bad !\n      if (isNotNil(total) && data.length < total) {\n        console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);\n        total = data.length;\n        pageCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);\n      if (opts && opts.progression && lastProgressionStep > 0) {\n        opts.progression.next(opts.progression.value + lastProgressionStep);\n      }\n    }\n    // Or increment once\n    else if (opts && opts.progression && opts.maxProgression) {\n      opts.progression.next(opts.progression.value + opts.maxProgression);\n    }\n\n    return {\n      data,\n      total\n    };\n  }\n}\n"]}
package/fesm2015/sumaris-net.ngx-components.js CHANGED
@@ -17685,22 +17685,24 @@ class JobUtils {
17685
17685
  }
17686
17686
  static run(runnable, opts) {
17687
17687
  const progression = new BehaviorSubject(0);
17688
- runnable(progression, opts)
17688
+ runnable(Object.assign(Object.assign({}, opts), { progression }))
17689
17689
  .then(() => {
17690
- if (opts && opts.maxProgression)
17690
+ if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
17691
17691
  progression.next(opts.maxProgression);
17692
- progression.complete();
17692
+ if (opts === null || opts === void 0 ? void 0 : opts.progression)
17693
+ opts.progression.complete();
17693
17694
  })
17694
17695
  .catch(err => progression.error(err));
17695
17696
  return progression;
17696
17697
  }
17697
- static fetchAllPages(loadPageFn, progression, opts) {
17698
+ static fetchAllPages(loadPageFn, opts) {
17699
+ var _a;
17698
17700
  return __awaiter(this, void 0, void 0, function* () {
17699
17701
  const maxProgression = opts && opts.maxProgression || undefined;
17700
17702
  let total;
17701
- let loopCount;
17703
+ let pageCount;
17702
17704
  let progressionStep;
17703
- let loopDataCount;
17705
+ let currentPageDataCount;
17704
17706
  const fetchSize = opts && opts.fetchSize || 1000;
17705
17707
  let offset = 0;
17706
17708
  let data = [];
@@ -17710,37 +17712,42 @@ class JobUtils {
17710
17712
  // Get some items, using paging
17711
17713
  const res = yield loadPageFn(offset, fetchSize);
17712
17714
  data = data.concat(res.data);
17713
- loopDataCount = res.data && res.data.length || 0;
17714
- offset += loopDataCount;
17715
+ currentPageDataCount = res.data && res.data.length || 0;
17716
+ offset += currentPageDataCount;
17715
17717
  // Set total count (only if not already set)
17716
17718
  if (isNil(total) && isNotNil(res.total)) {
17717
17719
  total = res.total;
17718
- loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer
17719
- progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;
17720
+ // Compute the number of page
17721
+ pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
17722
+ // Compute step, by dividing maxProgression by number of page
17723
+ const actualProgression = Math.max(0, toNumber(opts && ((_a = opts.progression) === null || _a === void 0 ? void 0 : _a.value), 0));
17724
+ progressionStep = maxProgression
17725
+ ? (maxProgression - actualProgression) / pageCount
17726
+ : undefined /*if 0 reset to undefined*/;
17720
17727
  }
17721
17728
  // Increment progression on each iteration (if possible)
17722
- if (isNotNil(progressionStep)) {
17723
- progression.next(progression.getValue() + progressionStep);
17729
+ if (opts && opts.progression && isNotNil(progressionStep)) {
17730
+ opts.progression.next(opts.progression.value + progressionStep);
17724
17731
  }
17725
17732
  if (opts && opts.onPageLoaded)
17726
17733
  opts.onPageLoaded(res);
17727
- } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
17734
+ } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
17728
17735
  // Complete progression to reach progressionStep value (because of round)
17729
17736
  if (isNotNil(progressionStep)) {
17730
17737
  // If total return by loadAll was bad !
17731
17738
  if (isNotNil(total) && data.length < total) {
17732
17739
  console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);
17733
17740
  total = data.length;
17734
- loopCount = Math.round(data.length / fetchSize + 0.5);
17741
+ pageCount = Math.round(data.length / fetchSize + 0.5);
17735
17742
  }
17736
- const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
17737
- if (lastProgressionStep > 0) {
17738
- progression.next(progression.getValue() + lastProgressionStep);
17743
+ const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
17744
+ if (opts && opts.progression && lastProgressionStep > 0) {
17745
+ opts.progression.next(opts.progression.value + lastProgressionStep);
17739
17746
  }
17740
17747
  }
17741
17748
  // Or increment once
17742
- else if (opts.maxProgression) {
17743
- progression.next(progression.getValue() + opts.maxProgression);
17749
+ else if (opts && opts.progression && opts.maxProgression) {
17750
+ opts.progression.next(opts.progression.value + opts.maxProgression);
17744
17751
  }
17745
17752
  return {
17746
17753
  data,
@@ -25430,23 +25437,20 @@ class PersonService extends BaseEntityService {
25430
25437
  return this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection, Object.assign(Object.assign({}, filter), { searchText: value, statusIds: filter && filter.statusIds || [StatusIds.ENABLE], userProfiles: filter && filter.userProfiles }), { withTotal: true /* need by autocomplete */ });
25431
25438
  });
25432
25439
  }
25433
- executeImport(progression, opts) {
25440
+ executeImport(filter, opts) {
25434
25441
  const _super = Object.create(null, {
25435
25442
  loadAll: { get: () => super.loadAll }
25436
25443
  });
25437
25444
  return __awaiter(this, void 0, void 0, function* () {
25438
25445
  const maxProgression = opts && opts.maxProgression || 100;
25439
- const filter = {
25440
- statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY],
25441
- userProfiles: ['SUPERVISOR', 'USER', 'GUEST']
25442
- };
25446
+ filter = Object.assign(Object.assign({}, filter), { statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY], userProfiles: ['SUPERVISOR', 'USER', 'GUEST'] });
25443
25447
  console.info('[person-service] Importing persons...');
25444
25448
  const res = yield JobUtils.fetchAllPages((offset, size) => _super.loadAll.call(this, offset, size, 'id', null, filter, {
25445
25449
  debug: false,
25446
25450
  fetchPolicy: 'network-only',
25447
25451
  withTotal: (offset === 0),
25448
25452
  toEntity: false
25449
- }), progression, { maxProgression: maxProgression * 0.9 });
25453
+ }), Object.assign(Object.assign({}, opts), { maxProgression: maxProgression * 0.9 }));
25450
25454
  // Save result locally
25451
25455
  yield this.entities.saveAll(res.data, { entityName: 'PersonVO', reset: true });
25452
25456
  });
@@ -25456,7 +25460,7 @@ class PersonService extends BaseEntityService {
25456
25460
  if (!source)
25457
25461
  return undefined;
25458
25462
  console.debug('TODO check isInstanceOf');
25459
- if (!isInstanceOf(source, Person)) {
25463
+ if (!(source instanceof Person)) {
25460
25464
  source = Person.fromObject(source);
25461
25465
  }
25462
25466
  const target = source.asObject();