@sumaris-net/ngx-components 18.12.0 → 18.12.1

package/src/app/core/icon/icon.component.ts

@@ -1,22 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { AppColors, IconRef } from '../../shared/types';
-
-@Component({
-  selector: 'app-icon',
-  templateUrl: './icon.component.html',
-})
-export class AppIconComponent {
-  @Input() icon: string = null;
-  @Input() matIcon: string = null;
-  @Input() matSvgIcon: string = null;
-  @Input() color: AppColors = null;
-  @Input() height: number | string;
-  @Input() width: number | string;
-
-  @Input() set ref(value: IconRef) {
-    this.icon = value.icon;
-    this.matIcon = value.matIcon;
-    this.matSvgIcon = value.matSvgIcon;
-    this.color = value.color || this.color; // Keep existing, if not defined in the reference
-  }
-}

package/src/app/core/icon/icon.module.ts

@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
-// import ngx-translate and the http loader
-import { TranslateModule } from '@ngx-translate/core';
-import { AppIconComponent } from './icon.component';
-
-@NgModule({
-  imports: [SharedModule, TranslateModule],
-
-  declarations: [AppIconComponent],
-  exports: [AppIconComponent],
-})
-export class AppIconModule {}

package/src/app/core/install/install-upgrade-card.component.html

@@ -1,144 +0,0 @@
-<!-- Offline mode card-->
-<ion-card
-  *ngIf="showOfflineWarning && ((!loading && offline) || waitingNetwork)"
-  color="accent"
-  class="main ion-no-margin"
-  @slideUpDownAnimation
->
-  <ion-card-content class="ion-no-padding">
-    <ion-grid>
-      <ion-row>
-        <ion-col>
-          @if (waitingNetwork) {
-            <ion-text class="ion-text-wrap" [innerHTML]="'NETWORK.INFO.RETRY_TO_CONNECT' | translate"></ion-text>
-          } @else {
-            <ion-text class="ion-text-wrap">
-              <h4>
-                @if (isLogin) {
-                  <b [innerHTML]="'NETWORK.INFO.OFFLINE_OR_UNAUTHORIZED' | translate"></b>
-                } @else {
-                  <b [innerHTML]="'NETWORK.INFO.OFFLINE' | translate"></b>
-                }
-              </h4>
-              <h3>
-                <small [innerHTML]="'NETWORK.INFO.OFFLINE_HELP' | translate"></small>
-              </h3>
-            </ion-text>
-          }
-        </ion-col>
-        <ion-col size="auto" class="ion-align-items-end">
-          <!-- Retry button -->
-          @if (waitingNetwork) {
-            <ion-spinner color="light"></ion-spinner>
-          } @else {
-            <ion-button color="tertiary" class="ion-float-end" (click)="tryOnline()">
-              <span translate>NETWORK.BTN_CHECK_ALIVE</span>
-            </ion-button>
-          }
-        </ion-col>
-      </ion-row>
-    </ion-grid>
-  </ion-card-content>
-</ion-card>
-
-<!-- Upgrade links -->
-<ion-card
-  *ngIf="showUpgradeWarning && !loading && !offline && upgradeLinks"
-  color="accent"
-  class="ion-no-margin"
-  @slideUpDownAnimation
->
-  <ion-card-content class="ion-no-padding">
-    <ion-grid>
-      <ion-row *ngFor="let link of upgradeLinks; last as last">
-        <ion-col>
-          <ion-text class="ion-text-wrap">
-            <h3>
-              @if (link.version) {
-                <span [innerHTML]="'INFO.UPDATE_APP_TO_VERSION' | translate: link"></span>
-              } @else {
-                <span [innerHTML]="'INFO.UPDATE_APP' | translate: link"></span>
-              }
-            </h3>
-            <h4>
-              @if (last) {
-                <small [innerHTML]="'INFO.UPDATE_APP_HELP' | translate"></small>
-              }
-            </h4>
-          </ion-text>
-        </ion-col>
-
-        <ion-col size="auto">
-          <ng-container *ngTemplateOutlet="downloadButton; context: { $implicit: link }"></ng-container>
-        </ion-col>
-      </ion-row>
-    </ion-grid>
-  </ion-card-content>
-</ion-card>
-
-<!-- Install links -->
-<ion-card
-  *ngIf="showInstallButton && !loading && !offline && installLinks"
-  color="secondary"
-  class="ion-no-margin"
-  @slideUpDownAnimation
->
-  <ion-card-content class="ion-no-padding">
-    <ion-grid>
-      <ion-row *ngFor="let link of installLinks; last as last">
-        <ion-col size="12" size-sm="8">
-          <ion-text class="ion-text-wrap">
-            <h3
-              [innerHTML]="
-                'INFO.DOWNLOAD_APP_TITLE' | translate: { name: link.name, platform: getPlatformName(link.platform) }
-              "
-            ></h3>
-            <h4><small *ngIf="last" [innerHTML]="'INFO.DOWNLOAD_APP_HELP' | translate"></small></h4>
-          </ion-text>
-        </ion-col>
-        <ion-col size="12" size-sm="4">
-          <ng-container *ngTemplateOutlet="downloadButton; context: { $implicit: link }"></ng-container>
-        </ion-col>
-      </ion-row>
-    </ion-grid>
-  </ion-card-content>
-</ion-card>
-
-<!-- Display a download button, depending on the link URL, and the device platform -->
-<ng-template #downloadButton let-link>
-  @if (link.filename) {
-    @if (hasDownloader) {
-      <!-- Download using platform -->
-      @if (!link.location) {
-        <ion-button
-          (click)="download($event, asLink(link))"
-          [disabled]="link.downloading"
-          color="tertiary"
-          class="ion-float-end"
-        >
-          <ion-icon slot="start" *ngIf="!link.downloading" name="download"></ion-icon>
-          <ion-spinner slot="start" class="ion-no-padding" *ngIf="link.downloading"></ion-spinner>
-          <ion-label translate>COMMON.BTN_DOWNLOAD</ion-label>
-        </ion-button>
-      } @else {
-        <!-- Open APK button -->
-        <ion-button (click)="openFile($event, link)" color="tertiary" class="ion-float-end">
-          <ion-label translate>COMMON.BTN_INSTALL</ion-label>
-        </ion-button>
-      }
-    } @else {
-      <!-- Web download button -->
-      <ion-button [download]="link.filename" [href]="link.url" color="tertiary" class="ion-float-end">
-        <ion-label translate>COMMON.BTN_DOWNLOAD</ion-label>
-      </ion-button>
-    }
-  } @else {
-    <!-- Web redirect button -->
-    <ion-button [href]="link.url" rel="external" color="tertiary" class="ion-float-end" target="_blank">
-      <ion-label translate>COMMON.BTN_SHOW_MORE</ion-label>
-    </ion-button>
-    @if (debug) {
-      <ion-note>{{ link.url }}</ion-note>
-    }
-  }
-</ng-template>

package/src/app/core/install/install-upgrade-card.component.scss

@@ -1,3 +0,0 @@
-ion-text small {
-  font-size: 85%;
-}

package/src/app/core/install/install-upgrade-card.component.ts

@@ -1,445 +0,0 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
-import { AlertController, ModalController, ToastController } from '@ionic/angular';
-import { firstValueFrom, from, Observable, Subscription } from 'rxjs';
-import { Configuration } from '../services/model/config.model';
-import { ConfigService } from '../services/config.service';
-import { PlatformService } from '../services/platform.service';
-import { debounceTime, distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
-import { NetworkService } from '../services/network.service';
-import { CORE_CONFIG_OPTIONS } from '../services/config/core.config';
-import { VersionUtils } from '../../shared/version/versions';
-import { slideUpDownAnimation } from '../../shared/material/material.animations';
-import { isNilOrBlank, isNotEmptyArray, isNotNil, isNotNilOrBlank, sleep } from '../../shared/functions';
-import { Environment, ENVIRONMENT } from '../../../environments/environment.class';
-import { ShowToastOptions, Toasts } from '../../shared/toast/toasts';
-import { TranslateService } from '@ngx-translate/core';
-import { Peer } from '../services/model/peer.model';
-import { MimeTypes } from '../../shared/file/file.utils';
-import { UriUtils } from '../../shared/file/uri.utils';
-import { isAndroid, isIOS } from '../../shared/platforms';
-
-export declare interface InstallAppLink {
-  name: string;
-  url: string;
-  platform?: 'android' | 'ios' | 'electron';
-  version?: string;
-  filename?: string;
-  title?: string;
-  description?: string;
-  mimeType?: string;
-  downloading?: boolean;
-  location?: string;
-}
-
-@Component({
-  selector: 'app-install-upgrade-card',
-  templateUrl: 'install-upgrade-card.component.html',
-  styleUrls: ['./install-upgrade-card.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [slideUpDownAnimation],
-})
-export class AppInstallUpgradeCard implements OnInit, OnDestroy {
-  private _subscription = new Subscription();
-
-  loading = true;
-  hasDownloader = false;
-  downloading = false;
-  waitingNetwork = false;
-  installLinks: InstallAppLink[];
-  upgradeLinks: InstallAppLink[];
-  offline: boolean;
-
-  @Input() isLogin: boolean;
-  @Input() showUpgradeWarning = true;
-  @Input() showOfflineWarning = true;
-  @Input() showInstallButton = false;
-  @Input() debug: boolean;
-
-  constructor(
-    private configService: ConfigService,
-    private toastController: ToastController,
-    private alertController: AlertController,
-    private translate: TranslateService,
-    private cd: ChangeDetectorRef,
-    public platform: PlatformService,
-    public network: NetworkService,
-    @Inject(ENVIRONMENT) protected environment: Environment
-  ) {
-    this.debug = !environment.production;
-  }
-
-  ngOnInit() {
-    this.offline = this.network.offline;
-
-    // Listen pod config
-    this._subscription.add(
-      from(this.network.ready())
-        .pipe(
-          debounceTime(1000),
-          switchMap(() => this.configService.config),
-          filter(isNotNil)
-        )
-        .subscribe((config) => this.checkNeedInstallOrUpdate(config))
-    );
-
-    // Listen network changes
-    this._subscription.add(
-      this.network.onNetworkStatusChanges
-        .pipe(
-          //debounceTime(450),
-          //tap(() => this.waitingNetwork = false),
-          map((connectionType) => connectionType === 'none'),
-          distinctUntilChanged()
-        )
-        .subscribe((offline) => {
-          if (this.offline !== offline) {
-            this.offline = offline;
-            this.markForCheck();
-          }
-        })
-    );
-  }
-
-  ngOnDestroy() {
-    this._subscription.unsubscribe();
-    this._subscription = null;
-    this.installLinks = null;
-    this.upgradeLinks = null;
-  }
-
-  async download(event: Event, link: InstallAppLink) {
-    if (!link || !link.url) {
-      console.error("[install-upgrade-card] Missing required argument 'link.url'");
-      return; // Skip
-    }
-
-    // Mark link as downloading
-    link.downloading = true;
-    this.markForCheck();
-
-    this.listenDownloadJob(
-      link.url,
-      this.platform.download({
-        uri: link.url,
-        title: link.title,
-        filename: link.filename,
-        mimeType: link.mimeType,
-      })
-    )
-      .then((location) => {
-        if (this.platform.canOpenFile) link.location = location;
-        link.downloading = false;
-      })
-      .catch(() => (link.downloading = false))
-      .then(() => this.markForCheck());
-  }
-
-  async openFile(event: Event, link: InstallAppLink) {
-    if (!link || !link.location || !link.mimeType) {
-      console.error("[install-upgrade-card] Missing required argument 'link.location' or 'link.mimeType'");
-      return; // Skip
-    }
-    try {
-      await this.platform.open(link.location);
-    } catch (err) {
-      console.error('[install-upgrade-card] Cannot open file: ' + ((err && err.message) || err), err);
-    }
-  }
-
-  async tryOnline() {
-    this.waitingNetwork = true;
-    this.markForCheck();
-
-    try {
-      await this.network.tryOnline({
-        showLoadingToast: false,
-        showOnlineToast: true,
-        showOfflineToast: false,
-      });
-    } finally {
-      this.waitingNetwork = false;
-      this.markForCheck();
-    }
-  }
-
-  getPlatformName(platform: 'android' | 'ios' | 'electron') {
-    switch (platform) {
-      case 'android':
-        return 'Android';
-      case 'ios':
-        return 'iOS';
-      case 'electron':
-        return 'desktop';
-      default:
-        return '';
-    }
-  }
-
-  asLink(value: any): InstallAppLink {
-    return value as InstallAppLink;
-  }
-
-  /* -- private method  -- */
-
-  private async checkNeedInstallOrUpdate(config: Configuration) {
-    if (!config) return; // Skip
-
-    console.info('[install-upgrade-card] Check if need to install or upgrade...');
-
-    this.hasDownloader = this.platform.canDownload;
-
-    try {
-      const links = this.getLinks(config);
-
-      // Check for upgrade
-      this.upgradeLinks = this.getCompatibleUpgradeLinks(links, config);
-
-      if (isNotEmptyArray(this.upgradeLinks)) {
-        console.info(`[install-upgrade-card] Find upgrade links: ${this.upgradeLinks.map((l) => l.url).join(',')}`);
-        this.installLinks = null;
-        this.listenDownloadJobs();
-      } else {
-        // Check for install links
-        this.installLinks = this.getCompatibleInstallLinks(links);
-        if (isNotEmptyArray(this.installLinks)) {
-          console.info(`[install-upgrade-card] Find installation links ${this.installLinks.map((l) => l.url).join(',')}`);
-          await sleep(1000); // Add a delay, for animation
-        } else {
-          console.info(`[install-upgrade-card] No installation or upgrade links to display.`);
-        }
-      }
-    } finally {
-      this.loading = false;
-      this.markForCheck();
-    }
-  }
-
-  private getCompatibleInstallLinks(installLinks: InstallAppLink[]): InstallAppLink[] {
-    // Already an native App: not need to install
-    if (this.platform.isApp()) return undefined;
-
-    // If mobile web: return all compatible, depending on the platform
-    if (this.platform.isMobileWeb()) {
-      return installLinks.filter(
-        (link) =>
-          !link.platform ||
-          this.platform.is(link.platform) ||
-          (link.platform === 'android' && isAndroid(window)) ||
-          (link.platform === 'ios' && isIOS(window))
-      );
-    }
-
-    return undefined;
-  }
-
-  private getCompatibleUpgradeLinks(installLinks: InstallAppLink[], config: Configuration): InstallAppLink[] {
-    const appVersion = this.environment.version;
-    const appMinVersionFromPod = config.getProperty(CORE_CONFIG_OPTIONS.APP_MIN_VERSION);
-
-    if (!appVersion) {
-      console.error("Missing value for 'environment.version': cannot check app compatibility!");
-      return undefined;
-    }
-
-    const needUpgrade = appMinVersionFromPod && !VersionUtils.isCompatible(appMinVersionFromPod, appVersion);
-    if (!needUpgrade) return undefined;
-
-    // Filter on platform, if mobile App
-    const upgradeLinks = (installLinks || []).filter((link) => link.platform && this.platform.is(link.platform));
-
-    // Use min version as default version
-    upgradeLinks.forEach((link) => {
-      link.version = link.version || appMinVersionFromPod;
-    });
-
-    return isNotEmptyArray(upgradeLinks) ? upgradeLinks : undefined;
-  }
-
-  private getLinks(config: Configuration): InstallAppLink[] {
-    const result: InstallAppLink[] = [];
-
-    // Compute App name
-    const minVersion = config.getProperty(CORE_CONFIG_OPTIONS.APP_MIN_VERSION);
-    const defaultAppName = this.environment.defaultAppName || 'SUMARiS';
-
-    // Android
-    {
-      // Get URL (from config, or environment)
-      let url = config.getProperty(CORE_CONFIG_OPTIONS.ANDROID_INSTALL_URL);
-      if (isNilOrBlank(url)) url = this.environment.defaultAndroidInstallUrl || null;
-
-      // Resolve relative URL
-      const peer = this.network.peer;
-      if (peer && url && (url.startsWith('./') || url.startsWith('/'))) {
-        url = Peer.path(peer, url);
-      }
-
-      // Compute App name (use config if URL is specific)
-      const name: string = isNotNilOrBlank(url) ? config.label : defaultAppName;
-
-      if (url) {
-        let title: string;
-        let mimeType: string;
-
-        // Get file name
-        let filename = UriUtils.getFilename(url);
-        let version = minVersion || 'latest';
-
-        // OK, this is a downloadable APK file (e.g. NOT a link to a playstore)
-        if (filename?.toLowerCase().endsWith('.apk')) {
-          // Define mime type
-          mimeType = MimeTypes.ANDROID_APK;
-
-          // Get the file version (if any)
-          const versionMatches = /-v([1-9][0-9]*\.[0-9]+\.(:?(:?alpha|beta|rc)?[0-9]*))/i.exec(filename);
-          version = (versionMatches && versionMatches[1]) || version;
-
-          // Compute a new file name, with the version
-          if (isNotNilOrBlank(name) && version !== 'latest') {
-            filename = `${name}-v${version}.apk`.toLowerCase();
-            title = `${name} v${version}`;
-          }
-
-          // Replace 'latest' with the app version, if present in the filename
-          else if (filename.indexOf('latest') !== -1 && version !== 'latest') {
-            filename = filename.replace('latest', version);
-          }
-        }
-
-        result.push({ name, url, platform: 'android', version, filename, title, mimeType });
-      }
-    }
-
-    // iOS
-    {
-      // Get URL (from config, or environment)
-      let url = config.getProperty(CORE_CONFIG_OPTIONS.IOS_INSTALL_URL);
-      if (isNilOrBlank(url)) url = this.environment.defaultIOSInstallUrl || null;
-
-      // Resolve relative URL
-      const peer = this.network.peer;
-      if (peer && url && (url.startsWith('./') || url.startsWith('/'))) {
-        url = Peer.path(peer, url);
-      }
-
-      // Compute App name (use config if URL is specific)
-      const name: string = isNotNilOrBlank(url) ? config.label : defaultAppName;
-
-      if (url) {
-        const version = minVersion || 'latest';
-        const title = `${name} v${version}`;
-        result.push({ name, url, platform: 'ios', version, title });
-      }
-    }
-
-    // Desktop (Electron)
-    {
-      // Get URL (from config, or environment)
-      let url = config.getProperty(CORE_CONFIG_OPTIONS.DESKTOP_INSTALL_URL);
-      if (isNilOrBlank(url)) url = this.environment.defaultDesktopInstallUrl || null;
-
-      // Resolve relative URL
-      const peer = this.network.peer;
-      if (peer && url && (url.startsWith('./') || url.startsWith('/'))) {
-        url = Peer.path(peer, url);
-      }
-
-      // Compute App name (use config if URL is specific)
-      const name: string = isNotNilOrBlank(url) ? config.label : defaultAppName;
-
-      if (url) {
-        const version = minVersion || 'latest';
-        const title = `${name} v${version}`;
-        result.push({ name, url, platform: 'electron', version, title });
-      }
-    }
-
-    return result;
-  }
-
-  private listenDownloadJobs() {
-    // Listening downloading promise, if exists
-    (this.upgradeLinks || []).forEach((link) => {
-      const job = this.platform.getDownloadingJob(link.url);
-      if (job) {
-        link.downloading = true;
-        this.listenDownloadJob(link.url, job)
-          .then((location) => {
-            link.location = location;
-            link.downloading = false;
-          })
-          .catch(() => (link.downloading = false))
-          .then(() => this.markForCheck());
-      }
-    });
-  }
-
-  private async listenDownloadJob(url: string, job: Observable<string>): Promise<string> {
-    if (!url || !job) return; // Skip
-
-    try {
-      // Mark as downloading
-      if (!this.downloading) {
-        console.info(`[install-upgrade-card] Asking platform to download '${url}'...`);
-        this.downloading = true;
-        this.markForCheck();
-      } else {
-        console.info(`[install-upgrade-card] Platform is already downloading!`);
-      }
-
-      const location = await firstValueFrom(job);
-      if (location) {
-        console.info('[install-upgrade-card] File downloaded at: ' + location);
-        this.showDownloadCompleteDialog();
-      }
-      return location;
-    } catch (err) {
-      // Failed: display a toast
-      console.error('[install-upgrade-card] Download failed: ' + ((err && err.message) || err));
-      this.showDownloadFailedToast(err);
-      throw err;
-    } finally {
-      this.downloading = false;
-      this.markForCheck();
-    }
-  }
-
-  private showDownloadFailedToast(err) {
-    return this.showToast({
-      message: 'ERROR.DOWNLOAD_FAILED',
-      messageParams: { error: err },
-      type: 'error',
-      showCloseButton: true,
-    });
-  }
-
-  private async showDownloadCompleteDialog() {
-    if (!this._subscription) return; // Skip if component has been destroyed
-
-    const translations = await this.translate.instant(['INFO.ALERT_HEADER', 'INFO.UPDATE_APP_DOWNLOADED', 'COMMON.BTN_CLOSE']);
-    const alert = await this.alertController.create({
-      header: translations['INFO.ALERT_HEADER'],
-      message: translations['INFO.UPDATE_APP_DOWNLOADED'],
-      buttons: [
-        {
-          text: translations['COMMON.BTN_CLOSE'],
-          role: 'cancel',
-          cssClass: 'secondary',
-        },
-      ],
-    });
-
-    await alert.present();
-    await alert.onDidDismiss();
-  }
-
-  private markForCheck() {
-    if (!this._subscription) return; // Skip if destroyed
-    this.cd.markForCheck();
-  }
-
-  private async showToast(opts: ShowToastOptions) {
-    if (!this._subscription) return; // Skip if component has been destroyed
-    await Toasts.show(this.toastController, this.translate, opts);
-  }
-}

package/src/app/core/install/install-upgrade-card.module.ts

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
-import { AppInstallUpgradeCard } from './install-upgrade-card.component';
-import { TranslateModule } from '@ngx-translate/core';
-
-@NgModule({
-  imports: [SharedModule, TranslateModule.forChild()],
-  declarations: [
-    // Components
-    AppInstallUpgradeCard,
-  ],
-  exports: [
-    TranslateModule,
-    // Components
-    AppInstallUpgradeCard,
-  ],
-})
-export class AppInstallUpgradeCardModule {}