@sumaris-net/ngx-components 18.12.0 → 18.12.1

package/src/app/shared/version/versions.ts

@@ -1,89 +0,0 @@
-const regexp = {
-  POSITIVE_INTEGER: /^\d+$/,
-  VERSION_PART_REGEXP: /^[0-9]+|alpha[0-9]+|beta[0-9]+|rc[0-9]+|[0-9]+-SNAPSHOT$/,
-};
-
-export class VersionUtils {
-  static compare = compareVersionNumbers;
-  static isCompatible = isVersionCompatible;
-  static isSame = isSameVersion;
-}
-
-/**
- * Compare two software version numbers (e.g. 1.7.1)
- * Returns:
- *
- *  0 if they're identical
- *  negative if v1 < v2
- *  positive if v1 > v2
- *  Nan if they in the wrong format
- *
- *  E.g.:
- *
- *  assert(version_number_compare("1.7.1", "1.6.10") > 0);
- *  assert(version_number_compare("1.7.1", "1.7.10") < 0);
- *
- *  "Unit tests": http://jsfiddle.net/ripper234/Xv9WL/28/
- *
- *  Taken from http://stackoverflow.com/a/6832721/11236
- */
-export function compareVersionNumbers(v1, v2) {
-  const v1parts = v1.split('.');
-  const v2parts = v2.split('.');
-
-  // First, validate both numbers are true version numbers
-
-  if (!validateParts(v1parts) || !validateParts(v2parts)) {
-    return NaN;
-  }
-
-  for (let i = 0; i < v1parts.length; ++i) {
-    if (v2parts.length === i) {
-      return 1;
-    }
-
-    if (v1parts[i] === v2parts[i]) {
-      continue;
-    }
-    if (v1parts[i] > v2parts[i]) {
-      return 1;
-    }
-    return -1;
-  }
-
-  if (v1parts.length !== v2parts.length) {
-    return -1;
-  }
-
-  return 0;
-}
-
-function validateParts(parts) {
-  for (let i = 0; i < parts.length; i++) {
-    let isNumber = regexp.POSITIVE_INTEGER.test(parts[i]);
-    // First part MUST be an integer
-    if (i === 0 && !isNumber) return false;
-    // If not integer, should be 'alpha', 'beta', etc.
-    if (!isNumber) {
-      if (!regexp.VERSION_PART_REGEXP.test(parts[i])) return false;
-      // Remove '-SNAPSHOT', as it should never be in prod
-      parts[i] = parts[i].replace('-SNAPSHOT', '');
-      // Check again if numeric
-      isNumber = regexp.POSITIVE_INTEGER.test(parts[i]);
-    }
-
-    // Convert string to int (need by compare operators)
-    if (isNumber) parts[i] = parseInt(parts[i]);
-  }
-  return true;
-}
-
-export function isVersionCompatible(minVersion, actualVersion): boolean {
-  // DEV ONLY
-  //console.debug(`[http] Checking actual version {${actualVersion}} is compatible with min expected version {${minVersion}}`);
-  return compareVersionNumbers(minVersion, actualVersion) <= 0;
-}
-
-export function isSameVersion(v1, v2): boolean {
-  return compareVersionNumbers(v1, v2) === 0;
-}

package/src/app/social/job/job.module.ts

@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared/shared.module';
-import { JobProgressionIcon } from './progression/job-progression.icon';
-import { JobProgressionList } from './progression/job-progression.list';
-import { JobProgressionComponent } from './progression/job-progression.component';
-
-@NgModule({
-  imports: [CommonModule, SharedModule, TranslateModule.forChild()],
-  declarations: [JobProgressionIcon, JobProgressionList, JobProgressionComponent],
-  exports: [JobProgressionIcon, JobProgressionList, JobProgressionComponent],
-})
-export class JobModule {}

package/src/app/social/job/progression/job-progression.component.html

@@ -1,19 +0,0 @@
-<ion-item class="ion-item-job-progression">
-  <ion-grid class="ion-no-margin">
-    <ion-row *ngIf="showName" class="name">
-      <ion-col>
-        {{ name$ | push }}
-      </ion-col>
-    </ion-row>
-    <ion-row class="message">
-      <ion-col>
-        {{ message$ | push }}
-      </ion-col>
-    </ion-row>
-    <ion-row class="progress-bar">
-      <ion-col>
-        <ion-progress-bar [value]="value$ | push" [type]="type$ | push"></ion-progress-bar>
-      </ion-col>
-    </ion-row>
-  </ion-grid>
-</ion-item>

package/src/app/social/job/progression/job-progression.component.scss

@@ -1,15 +0,0 @@
-.ion-item-job-progression {
-  font-size: 0.9em;
-
-  .name {
-  }
-
-  .message {
-    font-style: italic;
-  }
-
-  .progress-bar {
-    margin-top: 5px;
-    margin-bottom: 5px;
-  }
-}

package/src/app/social/job/progression/job-progression.component.ts

@@ -1,39 +0,0 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { JobProgression } from './job-progression.model';
-import { RxState } from '@rx-angular/state';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-export interface JobProgressionState {
-  name: string;
-  message: string;
-  value: number;
-  type: 'determinate' | 'indeterminate';
-}
-
-@Component({
-  selector: 'app-job-progression-component',
-  templateUrl: './job-progression.component.html',
-  styleUrls: ['./job-progression.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class JobProgressionComponent extends RxState<JobProgressionState> implements OnInit {
-  @Input() showName = true;
-  @Input() jobProgression$: Observable<JobProgression>;
-
-  name$ = this.select('name');
-  message$ = this.select('message');
-  value$ = this.select('value');
-  type$ = this.select('type');
-
-  constructor() {
-    super();
-  }
-
-  ngOnInit() {
-    this.connect('name', this.jobProgression$.pipe(map((value) => value.name)));
-    this.connect('message', this.jobProgression$.pipe(map((value) => value.message)));
-    this.connect('value', this.jobProgression$.pipe(map((value) => (value.total > 0 ? value.current / value.total : undefined))));
-    this.connect('type', this.jobProgression$.pipe(map((value) => (value.total > 0 ? 'determinate' : 'indeterminate'))));
-  }
-}

package/src/app/social/job/progression/job-progression.icon.html

@@ -1,30 +0,0 @@
-<button
-  #button
-  mat-icon-button
-  [title]="titleI18n | translate"
-  [disabled]="disabled"
-  *rxIf="visible$"
-  (click)="showList($event)"
->
-  <mat-icon
-    *rxLet="jobCount$; let jobCount"
-    [matBadge]="jobCount"
-    [matBadgeHidden]="!jobCount"
-    matBadgeColor="accent"
-    matBadgeSize="small"
-    matBadgePosition="above after"
-    aria-hidden="false"
-  >
-    {{ disabled || jobCount ? 'schedule' : 'task_alt' }}
-  </mat-icon>
-  <mat-spinner
-    #spinner
-    *rxIf="jobCount$"
-    class="floating-spinner"
-    [color]="color"
-    [mode]="mode$ | push"
-    [value]="value$ | push"
-    diameter="30"
-    strokeWidth="3"
-  ></mat-spinner>
-</button>

package/src/app/social/job/progression/job-progression.icon.scss

@@ -1,7 +0,0 @@
-.floating-spinner {
-  position: absolute;
-  height: 24px !important;
-  width: 24px !important;
-  top: 12px;
-  left: 12px;
-}

package/src/app/social/job/progression/job-progression.icon.ts

@@ -1,276 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Inject,
-  Input,
-  OnDestroy,
-  OnInit,
-  Optional,
-  Output,
-} from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
-import { APP_JOB_PROGRESSION_SERVICE, IJobProgressionService } from './job-progression.service';
-import { JobProgression } from './job-progression.model';
-import { BehaviorSubject, delay, of, Subscription, switchMap } from 'rxjs';
-import { arraySize, isNil, remove, toBoolean, toNumber } from '../../../shared/functions';
-import { filter, map, tap } from 'rxjs/operators';
-import { PopoverController } from '@ionic/angular';
-import { JobProgressionList, JobProgressionListOptions } from './job-progression.list';
-import { IUserEventAction } from '../../user-event/user-event.model';
-import { ProgressSpinnerMode } from '@angular/material/progress-spinner';
-import { RxState } from '@rx-angular/state';
-import { ObjectMap } from '../../../shared/types';
-
-export interface JobProgressionOptions {
-  autoHide: boolean;
-  autoHideDelay: number;
-  autoRemove: boolean;
-  autoRemoveDelay: number;
-}
-
-export interface JobProgressionIconState {
-  visible: boolean;
-  mode: ProgressSpinnerMode;
-  value: number;
-  jobProgressions: BehaviorSubject<JobProgression>[];
-  jobCount: number;
-}
-
-@Component({
-  selector: 'app-job-progression-icon',
-  templateUrl: './job-progression.icon.html',
-  styleUrls: ['./job-progression.icon.scss'],
-  // providers: [RxState],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class JobProgressionIcon extends RxState<JobProgressionIconState> implements OnInit, OnDestroy {
-  @Input() debug = false;
-  @Input() titleI18n = 'SOCIAL.JOB.PROGRESSION.TITLE';
-  @Input() options: JobProgressionOptions;
-  @Input() autoHide: boolean;
-  @Input() headerActions: IUserEventAction[];
-  @Output() jobFinished = new EventEmitter<number>();
-
-  disabled = true;
-  color: ThemePalette = 'accent';
-  jobProgressions$ = this.select('jobProgressions');
-  jobCount$ = this.select('jobCount');
-  visible$ = this.select('visible');
-  mode$ = this.select('mode');
-  value$ = this.select('value');
-
-  protected autoHideDelay: number;
-  protected autoRemove: boolean;
-  protected autoRemoveDelay: number;
-
-  private _listPopover: HTMLIonPopoverElement;
-  private _subscriptions = new Subscription();
-  private _subscriptionsById: ObjectMap<Subscription> = {};
-  private _logPrefix = '[job-progression] ';
-
-  constructor(
-    @Optional() @Inject(APP_JOB_PROGRESSION_SERVICE) protected jobProgressionService: IJobProgressionService,
-    protected popoverController: PopoverController,
-    protected cd: ChangeDetectorRef
-  ) {
-    super();
-  }
-
-  get jobProgressions(): BehaviorSubject<JobProgression>[] {
-    return this.get('jobProgressions');
-  }
-
-  ngOnInit() {
-    if (isNil(this.jobProgressionService)) {
-      console.warn(`${this._logPrefix}No service injected`);
-    }
-    // parse options
-    this.autoHide = toBoolean(this.autoHide, this.options?.autoHide || false);
-    this.set({ visible: !this.autoHide, mode: 'determinate', value: 0 });
-    this.autoHideDelay = toNumber(this.options?.autoHideDelay, 1000);
-    this.autoRemove = toBoolean(this.options?.autoRemove, true);
-    this.autoRemoveDelay = toNumber(this.options?.autoRemoveDelay, 1000);
-
-    if (this.jobProgressionService) {
-      this.connect('jobProgressions', this.jobProgressionService.watchAll(), (state, items) => {
-        const existingJobIds = state.jobProgressions?.map((job) => job.value.id) || [];
-        const result = (items || []).map((item) => {
-          remove(existingJobIds, (id) => id === item.id);
-          // Add job to listen
-          return this.startListenJob(item.id, item);
-        });
-        // Remove old jobs
-        if (existingJobIds.length > 0) {
-          existingJobIds.forEach((id) => this.stopListenJob(id, { emitEvent: false }));
-        }
-        return result;
-      });
-    }
-
-    this.connect('jobCount', this.jobProgressions$.pipe(map((jobs) => jobs?.length || 0)));
-
-    this.connect(
-      'visible',
-      this.jobCount$.pipe(
-        map((jobCount) => jobCount > 0),
-        switchMap((hasJob) =>
-          hasJob
-            ? of(true)
-            : of(false).pipe(
-                filter(() => this.autoHide),
-                delay(this.autoHideDelay),
-                tap(() => {
-                  if (this._listPopover) this._listPopover.dismiss();
-                })
-              )
-        )
-      )
-    );
-  }
-
-  protected startListenJob(id: number, job?: JobProgression) {
-    if (isNil(this.jobProgressionService)) {
-      console.warn(`${this._logPrefix}No service injected. Can't add a job`);
-      return;
-    }
-    if (isNil(id)) {
-      console.error(`${this._logPrefix}Missing required argument 'id'. Cannot listen changes !`);
-      return;
-    }
-    let result = this.getProgression(id);
-    if (result) {
-      //console.warn(`${this._logPrefix}Job (id=${id}) already present`);
-      return result;
-    }
-    if (this.debug) {
-      console.debug(`${this._logPrefix}Add job id=${id}`);
-    }
-    // Adding empty job progression
-    result = new BehaviorSubject(job || new JobProgression(id));
-
-    this.disabled = false;
-
-    const sub = this.jobProgressionService
-      .listenChanges(id)
-      .pipe(
-        filter((progression) => {
-          if (id !== progression.id) {
-            console.error(`${this._logPrefix}Job progression (id=${progression.id}) doesn't match expected job (id=${id})`);
-            return false;
-          }
-          return true;
-        }),
-        map((progression) => {
-          // update current
-          result.next(progression);
-          if (this.debug) {
-            console.debug(`${this._logPrefix}Progression updated id=${id}`, progression);
-          }
-          return progression;
-        })
-      )
-      .subscribe((progression) => {
-        // update value
-        this.updateValue();
-
-        // job finished
-        if (progression.total > 0 && progression.current === progression.total) {
-          if (this.debug) {
-            console.debug(`${this._logPrefix}Finished job id=${progression.id}`);
-          }
-          // emit event
-          this.jobFinished.emit(progression.id);
-          if (this.autoRemove) {
-            setTimeout(() => {
-              this.stopListenJob(progression.id);
-            }, this.autoRemoveDelay);
-          }
-        }
-      });
-
-    this._subscriptionsById[id] = sub;
-    this._subscriptions.add(sub);
-
-    return result;
-  }
-
-  protected stopListenJob(id: number, opts?: { emitEvent?: boolean }) {
-    if (this.debug) {
-      console.debug(`${this._logPrefix}Remove job id=${id}`);
-    }
-    const sub = this._subscriptionsById[id];
-    if (sub) {
-      this._subscriptions.remove(sub);
-      sub.unsubscribe();
-    }
-    // Remove job from service
-    this.jobProgressionService.removeJob(id);
-    if (!opts?.emitEvent !== false) {
-      this.updateValue();
-    }
-  }
-
-  protected getProgression(id: number): BehaviorSubject<JobProgression> | undefined {
-    return this.jobProgressions?.find((progression) => progression.value.id === id);
-  }
-
-  protected updateValue() {
-    if (this.debug) {
-      console.debug(`${this._logPrefix}Updating value`);
-    }
-    let value = 0;
-    const nbProgression = arraySize(this.jobProgressions);
-    let allIndeterminate = nbProgression > 0;
-
-    if (nbProgression) {
-      this.jobProgressions
-        .map((subject) => subject.value)
-        .forEach((progression) => {
-          const indeterminate = progression.total === 0;
-          allIndeterminate = allIndeterminate && indeterminate;
-          if (!indeterminate) {
-            value = value + (progression.current * 100) / progression.total;
-          }
-        });
-    }
-
-    this.set({ mode: allIndeterminate ? 'indeterminate' : 'determinate', value: nbProgression > 0 ? value / nbProgression : 0 });
-    if (this.debug) {
-      console.debug(`${this._logPrefix}Setting value=${this.get('value')}, mode=${this.get('mode')}`);
-    }
-
-    this.markForCheck();
-  }
-
-  async showList(event: Event) {
-    this._listPopover = await this.popoverController.create({
-      component: JobProgressionList,
-      componentProps: <JobProgressionListOptions>{
-        titleI18n: this.titleI18n,
-        jobProgressions: this.jobProgressions$,
-        headerActions: this.headerActions,
-      },
-      backdropDismiss: true,
-      keyboardClose: true,
-      event,
-      translucent: true,
-      cssClass: 'popover-large',
-    });
-    await this._listPopover.present();
-    await this._listPopover.onDidDismiss();
-    this._listPopover = undefined;
-  }
-
-  protected markForCheck() {
-    this.cd.markForCheck();
-  }
-
-  ngOnDestroy(): void {
-    if (this.debug) {
-      console.debug(`${this._logPrefix}Destroying`);
-    }
-    this._subscriptions.unsubscribe();
-  }
-}

package/src/app/social/job/progression/job-progression.list.html

@@ -1,25 +0,0 @@
-<ion-list class="ion-list-popover">
-  <ion-row class="ion-list-header column">
-    <ion-col>
-      <ion-label>{{ titleI18n | translate }}</ion-label>
-    </ion-col>
-    <ion-col size="auto" class="header-action">
-      @for (action of headerActions; track $index) {
-        <ion-text>
-          <a (click)="executeAction($event, action)" [title]="action.title || action.name | translate">
-            {{ action.name | translate }}
-          </a>
-        </ion-text>
-      }
-    </ion-col>
-  </ion-row>
-
-  @if (jobProgressions | async | isEmptyArray) {
-    <ion-item>
-      {{ 'SOCIAL.JOB.PROGRESSION.EMPTY' | translate }}
-    </ion-item>
-  }
-  @for (jobProgression$ of jobProgressions | push; track $index) {
-    <app-job-progression-component [jobProgression$]="jobProgression$"></app-job-progression-component>
-  }
-</ion-list>

package/src/app/social/job/progression/job-progression.list.scss

@@ -1,17 +0,0 @@
-:host(.popover-viewport) {
-  overflow-y: auto;
-  user-select: none;
-}
-
-.header-action {
-  text-align: end;
-  margin-right: 8px;
-  a {
-    cursor: pointer;
-    color: var(--ion-color-contrast);
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-}

package/src/app/social/job/progression/job-progression.list.ts

@@ -1,40 +0,0 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { JobProgression } from './job-progression.model';
-import { IUserEventAction } from '../../user-event/user-event.model';
-import { PopoverController } from '@ionic/angular';
-import { Observable } from 'rxjs';
-
-export interface JobProgressionListOptions {
-  titleI18n?: string;
-  headerActions?: IUserEventAction[];
-}
-
-@Component({
-  selector: 'app-job-progression-list',
-  templateUrl: './job-progression.list.html',
-  styleUrls: ['./job-progression.list.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class JobProgressionList implements JobProgressionListOptions {
-  @Input() titleI18n: string;
-  @Input() headerActions: IUserEventAction[];
-  @Input() jobProgressions: Observable<Observable<JobProgression>[]>;
-
-  constructor(protected popoverController: PopoverController) {}
-
-  async executeAction(event: Event, action: IUserEventAction) {
-    if (event?.defaultPrevented) return; // Skip if prevented
-
-    // Disable default action (.e.g avoid to call click() function)
-    if (event) event.preventDefault();
-
-    // Execute then close popover
-    this.popoverController.dismiss();
-    try {
-      const res = action.executeAction(undefined);
-      if (res instanceof Promise) await res;
-    } catch (err) {
-      console.error(err);
-    }
-  }
-}

package/src/app/social/job/progression/job-progression.model.ts

@@ -1,26 +0,0 @@
-import { EntityClass } from '../../../core/services/model/entity.decorators';
-import { Entity } from '../../../core/services/model/entity.model';
-
-// @dynamic
-@EntityClass({ typename: 'JobProgressionVO' })
-export class JobProgression extends Entity<JobProgression> {
-  static fromObject: (source: any, opts?: any) => JobProgression;
-
-  name: string;
-  message: string;
-  current: number;
-  total: number;
-
-  constructor(id?: number) {
-    super(JobProgression.TYPENAME);
-    this.id = id;
-  }
-
-  fromObject(source: any) {
-    super.fromObject(source);
-    this.name = source.name;
-    this.message = source.message;
-    this.current = source.current;
-    this.total = source.total;
-  }
-}