@sumaris-net/ngx-components 18.11.0 → 18.12.0

package/scripts/node/resources.js

@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+const projectDir = path.resolve(__dirname, '../..');
+
+const SOURCE_IOS_ICON = 'resources/ios/icon/';
+const SOURCE_IOS_SPLASH = 'resources/ios/splash/';
+
+const TARGET_IOS_ICON = 'ios/App/App/Assets.xcassets/AppIcon.appiconset/';
+const TARGET_IOS_SPLASH = 'ios/App/App/Assets.xcassets/Splash.imageset/';
+
+const SOURCE_ANDROID_ICON = 'resources/android/icon/';
+const SOURCE_ANDROID_SPLASH = 'resources/android/splash/';
+
+const TARGET_ANDROID_ICON = 'android/app/src/main/res/';
+const TARGET_ANDROID_SPLASH = 'android/app/src/main/res/';
+
+const IOS_ICONS = [
+  { source: 'icon-20.png', target: 'AppIcon-20x20@1x.png' },
+  { source: 'icon-20@2x.png', target: 'AppIcon-20x20@2x.png' },
+  { source: 'icon-20@2x.png', target: 'AppIcon-20x20@2x-1.png' },
+  { source: 'icon-20@3x.png', target: 'AppIcon-20x20@3x.png' },
+  { source: 'icon-29.png', target: 'AppIcon-29x29@1x.png' },
+  { source: 'icon-29@2x.png', target: 'AppIcon-29x29@2x.png' },
+  { source: 'icon-29@2x.png', target: 'AppIcon-29x29@2x-1.png' },
+  { source: 'icon-29@3x.png', target: 'AppIcon-29x29@3x.png' },
+  { source: 'icon-40.png', target: 'AppIcon-40x40@1x.png' },
+  { source: 'icon-40@2x.png', target: 'AppIcon-40x40@2x.png' },
+  { source: 'icon-40@2x.png', target: 'AppIcon-40x40@2x-1.png' },
+  { source: 'icon-40@3x.png', target: 'AppIcon-40x40@3x.png' },
+  { source: 'icon-60@2x.png', target: 'AppIcon-60x60@2x.png' },
+  { source: 'icon-60@3x.png', target: 'AppIcon-60x60@3x.png' },
+  { source: 'icon-76.png', target: 'AppIcon-76x76@1x.png' },
+  { source: 'icon-76@2x.png', target: 'AppIcon-76x76@2x.png' },
+  { source: 'icon-83.5@2x.png', target: 'AppIcon-83.5x83.5@2x.png' },
+  { source: 'icon-1024.png', target: 'AppIcon-512@2x.png' }
+];
+const IOS_SPLASHES = [
+  { source: 'Default-Portrait@~ipadpro.png', target: 'splash-2732x2732.png' },
+  { source: 'Default-Portrait@~ipadpro.png', target: 'splash-2732x2732-1.png' },
+  { source: 'Default-Portrait@~ipadpro.png', target: 'splash-2732x2732-2.png' }
+];
+
+const ANDROID_ICONS = [
+  { source: 'drawable-ldpi-icon.png', target: 'drawable-hdpi-icon.png' },
+  { source: 'drawable-mdpi-icon.png', target: 'mipmap-mdpi/ic_launcher.png' },
+  { source: 'drawable-mdpi-icon.png', target: 'mipmap-mdpi/ic_launcher_round.png' },
+  { source: 'drawable-mdpi-icon.png', target: 'mipmap-mdpi/ic_launcher_foreground.png' },
+  { source: 'drawable-hdpi-icon.png', target: 'mipmap-hdpi/ic_launcher.png' },
+  { source: 'drawable-hdpi-icon.png', target: 'mipmap-hdpi/ic_launcher_round.png' },
+  { source: 'drawable-hdpi-icon.png', target: 'mipmap-hdpi/ic_launcher_foreground.png' },
+  { source: 'drawable-xhdpi-icon.png', target: 'mipmap-xhdpi/ic_launcher.png' },
+  { source: 'drawable-xhdpi-icon.png', target: 'mipmap-xhdpi/ic_launcher_round.png' },
+  { source: 'drawable-xhdpi-icon.png', target: 'mipmap-xhdpi/ic_launcher_foreground.png' },
+  { source: 'drawable-xxhdpi-icon.png', target: 'mipmap-xxhdpi/ic_launcher.png' },
+  { source: 'drawable-xxhdpi-icon.png', target: 'mipmap-xxhdpi/ic_launcher_round.png' },
+  { source: 'drawable-xxhdpi-icon.png', target: 'mipmap-xxhdpi/ic_launcher_foreground.png' },
+  { source: 'drawable-xxxhdpi-icon.png', target: 'mipmap-xxxhdpi/ic_launcher.png' },
+  { source: 'drawable-xxxhdpi-icon.png', target: 'mipmap-xxxhdpi/ic_launcher_round.png' },
+  { source: 'drawable-xxxhdpi-icon.png', target: 'mipmap-xxxhdpi/ic_launcher_foreground.png' }
+];
+const ANDROID_SPLASHES = [
+  { source: 'drawable-land-mdpi-screen.png', target: 'drawable/splash.png' },
+  { source: 'drawable-land-mdpi-screen.png', target: 'drawable-land-mdpi/splash.png' },
+  { source: 'drawable-land-hdpi-screen.png', target: 'drawable-land-hdpi/splash.png' },
+  { source: 'drawable-land-xhdpi-screen.png', target: 'drawable-land-xhdpi/splash.png' },
+  { source: 'drawable-land-xxhdpi-screen.png', target: 'drawable-land-xxhdpi/splash.png' },
+  { source: 'drawable-land-xxxhdpi-screen.png', target: 'drawable-land-xxxhdpi/splash.png' },
+  { source: 'drawable-port-mdpi-screen.png', target: 'drawable-port-mdpi/splash.png' },
+  { source: 'drawable-port-hdpi-screen.png', target: 'drawable-port-hdpi/splash.png' },
+  { source: 'drawable-port-xhdpi-screen.png', target: 'drawable-port-xhdpi/splash.png' },
+  { source: 'drawable-port-xxhdpi-screen.png', target: 'drawable-port-xxhdpi/splash.png' },
+  { source: 'drawable-port-xxxhdpi-screen.png', target: 'drawable-port-xxxhdpi/splash.png' }
+];
+
+function copyImages(sourcePath, targetPath, images) {
+  for (const icon of images) {
+    let source = path.join(projectDir, sourcePath, icon.source);
+    let target = path.join(projectDir, targetPath, icon.target);
+    console.debug(` - Copying ${source} -> ${target}`);
+    fs.copyFileSync(source, target);
+  }
+}
+
+function copyResources() {
+
+  // Copy resources for iOS
+  if (fs.existsSync(path.join(projectDir, 'ios'))) {
+    console.debug(`--- Copy iOS images...`);
+    copyImages(SOURCE_IOS_ICON, TARGET_IOS_ICON, IOS_ICONS);
+    copyImages(SOURCE_IOS_SPLASH, TARGET_IOS_SPLASH, IOS_SPLASHES);
+    console.debug(`--- Copy iOS images [OK]`);
+  }
+
+// Copy resources for Android
+  if (fs.existsSync(path.join(projectDir, 'android'))) {
+    console.debug(`--- Copy Android images...`);
+    copyImages(SOURCE_ANDROID_ICON, TARGET_ANDROID_ICON, ANDROID_ICONS);
+    copyImages(SOURCE_ANDROID_SPLASH, TARGET_ANDROID_SPLASH, ANDROID_SPLASHES);
+    console.debug(`--- Copy Android images [OK]`);
+  }
+
+}
+
+// MAIN
+copyResources();

package/scripts/release.sh

@@ -0,0 +1,162 @@
+#!/bin/bash
+# Get to the root project
+if [[ "_" == "_${PROJECT_DIR}" ]]; then
+  SCRIPT_DIR=$(dirname "$0")
+  PROJECT_DIR=$(cd "${SCRIPT_DIR}/.." && pwd)
+  export PROJECT_DIR
+fi;
+
+cd "${PROJECT_DIR}" || exit 1
+
+# Preparing environment
+# TODO check if env-global can be run with JDK17
+#. "${PROJECT_DIR}"/scripts/env-global.sh
+#[[ $? -ne 0 ]] && exit 1
+
+# Read parameters
+version=$1
+release_description=$2
+
+
+# Check parameters
+if [[ ! $version =~ ^[0-9]+.[0-9]+.[0-9]+(-(alpha|beta|rc)[0-9]+)?$ ]]; then
+  echo "Wrong version format"
+  echo "Usage:"
+  echo " > $0 <version> <release_description>"
+  echo "with:"
+  echo " - version: x.y.z"
+  echo " - release_description: a optional comment on release"
+  exit 1
+fi
+
+if [[ "_$release_description" == "_" ]]; then
+  release_description="Release $version"
+fi
+
+# Control if there is no uncommitted files
+if [[ -n $(git status -s) ]]
+then
+  echo "Please commit changes before running release"
+#  exit 1
+fi
+
+# Control that the script is run on `dev` branch
+branch_origin="develop"
+if [[ "$version" =~ ^2\.6(\.[0-9]+)?(-(alpha|beta|rc)[0-9]+)?$ ]]; then
+    branch_origin="v2.6.x"
+fi
+if [[ "$version" =~ ^2\.9(\.[0-9]+)?(-(alpha|beta|rc)[0-9]+)?$ ]]; then
+    branch_origin="v2.9.x"
+fi
+resumeRelease=0
+branch=$(git rev-parse --abbrev-ref HEAD)
+if [[ ! "$branch" == "$branch_origin" ]]; then
+  if [[ "$branch" == "release/$version" ]]; then
+    echo "Resuming release ..."
+    resumeRelease=1
+  else
+    echo ">> This script must be run under \`$branch_origin\` or \`release/$version\` branch (actual branch: $branch)"
+    exit 1
+  fi
+fi
+
+### Get current version (package.json)
+package=$(node -p "require('./package.json').name")
+if [[ "$(uname)" == "Darwin" ]]; then
+  current=$(awk -F'"' '/"version": "/ {print $4}' package.json | head -n 1)
+else
+  current=$(grep -oP "version\": \"\d+.\d+.\d+(-(alpha|beta|rc)[0-9]+)?" package.json | grep -m 1 -oP "\d+.\d+.\d+(-(alpha|beta|rc)[0-9]+)?")
+fi
+if [[ "_$current" == "_" ]]; then
+  echo ">> Unable to read the current version in 'package.json'. Please check version format is: x.y.z (x and y should be an integer)."
+  exit 1;
+fi
+
+echo "----------------------------------"
+if [[ $resumeRelease = 0 ]]
+then
+  echo "- Starting release..."
+else
+  echo "- Resuming release..."
+fi
+echo "----------------------------------"
+if [[ $resumeRelease = 0 ]]
+then
+  echo "- Current version: $current"
+fi
+echo "- Release version: $version"
+echo "----------------------------------"
+
+# Check version already published
+if [[ "$(npm view "$package"@"$version" version 2>/dev/null)" == "$version" ]]; then
+  echo "Version $version already published"
+  exit 1
+fi
+
+if [[ $resumeRelease == 0 ]]; then
+  read -r -p "Is these new versions correct ? [y/N] " response
+  [[ ! "$response" =~ ^(yes|y|Y)$ ]] && exit 1
+  # Create release branch
+  git checkout -b release/"$version"
+  [[ $? -ne 0 ]] && exit 1
+fi
+
+if [[ "$(uname)" == "Darwin" ]]; then
+  # Changer la version dans 'package.json' et 'config.xml'
+  sed -i '' "s/version\": \"$current\"/version\": \"$version\"/g" package.json
+
+  # Récupérer la version actuelle depuis 'src/assets/manifest.json'
+  currentManifestJsonVersion=$(awk -F'"' '/"version": "/ {print $4}' src/assets/manifest.json | head -n 1)
+
+  # Changer la version dans 'src/assets/manifest.json'
+  sed -i '' "s/version\": \"$currentManifestJsonVersion\"/version\": \"$version\"/g" src/assets/manifest.json
+else
+  # Change the version in files: 'package.json' and 'config.xml'
+  sed -i "s/version\": \"$current\"/version\": \"$version\"/g" package.json
+  # Change version in file: 'src/assets/manifest.json'
+  currentManifestJsonVersion=$(grep -oP "version\": \"\d+.\d+.\d+(-(alpha|beta|rc)[0-9]*)?\"" src/assets/manifest.json | grep -oP "\d+.\d+.\d+(-(alpha|beta|rc)[0-9]*)?")
+  sed -i "s/version\": \"$currentManifestJsonVersion\"/version\": \"$version\"/g" src/assets/manifest.json
+fi
+
+echo "----------------------------------"
+echo "- Build..."
+echo "----------------------------------"
+npm run packagr
+[[ $? -ne 0 ]] && exit 1
+
+echo "----------------------------------"
+echo "- Publish..."
+echo "----------------------------------"
+cd dist || exit 1
+npm publish --tag 18.12.0-alpha1
+[[ $? -ne 0 ]] && exit 1
+
+echo "----------------------------------"
+echo "- Finish release..."
+echo "----------------------------------"
+
+# Git process for release (ISO gitflow)
+cd..
+git commit -a -m "Prepare release $version"
+# -- Merge to master
+if [[ "$branch_origin" == "develop" ]]; then
+  git checkout master
+  git reset --hard origin/master
+  git merge --no-ff --no-edit -m "Release $version" "release/$version"
+  git tag -a "$version" -m "$release_description"
+  git push origin master
+fi
+
+# -- Merge to the origin branch
+git checkout $branch_origin
+git merge --no-ff --no-edit -m "[skip ci] Release $version" "release/$version"
+if [[ "$branch_origin" == "develop" ]]; then
+  git tag -a "$version" -m "$release_description"
+fi
+git push origin $branch_origin
+git push --tags
+git branch -D "release/$version"
+
+echo "----------------------------------"
+echo "- Release OK"
+echo "----------------------------------"

package/scripts/run-android.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+BUILD_CONFIGURATION=development
+
+# Get to the root project
+if [[ "_" == "_${PROJECT_DIR}" ]]; then
+  SCRIPT_DIR=$(dirname $0)
+  PROJECT_DIR=$(cd ${SCRIPT_DIR}/.. && pwd)
+  export PROJECT_DIR
+fi;
+
+# Preparing Android environment
+. ${PROJECT_DIR}/scripts/env-android.sh
+[[ $? -ne 0 ]] && exit 1
+
+# Ask user, before cleaning old APK
+if [[ -f ${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release.apk ]] ||
+   [[ -f "${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-unsigned.apk" ]] ||
+   [[ -f "${ANDROID_OUTPUT_APK_DEBUG}/${ANDROID_OUTPUT_APK_PREFIX}-debug.apk" ]]; then
+
+  echo "-------------------------------------------"
+  echo "--- There is existing APK files!"
+  read -r -p "> Would you like to recompile ? [y/N] " response
+  response=${response,,}    # tolower
+
+  # Use confirm: Clean old APK files
+  if [[ "$response" =~ ^(yes|y)$ ]]; then
+
+    if [[ -d "${ANDROID_OUTPUT_APK_RELEASE}" ]]; then
+      rm -f ${ANDROID_OUTPUT_APK_RELEASE}/*.apk
+    fi
+    if [[ -d "${ANDROID_OUTPUT_APK_DEBUG}" ]]; then
+      rm -f ${ANDROID_OUTPUT_APK_DEBUG}/*.apk
+    fi
+  fi
+fi
+
+# Building APK file
+if [[ ! -f ${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release.apk ]] &&
+   [[ ! -f "${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-unsigned.apk" ]] &&
+   [[ ! -f "${ANDROID_OUTPUT_APK_DEBUG}/${ANDROID_OUTPUT_APK_PREFIX}-debug.apk" ]]; then
+  echo "-------------------------------------------"
+  echo "--- Building Android APK..."
+  cd ${PROJECT_DIR}
+
+  ionic capacitor run android -l --external
+  [[ $? -ne 0 ]] && exit 1
+fi
+
+echo "-------------------------------------------"
+echo "--- Running Android application..."
+if [[ -f "${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release.apk" ]]; then
+  native-run android --app ${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release.apk
+elif [[ -f "${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-unsigned.apk" ]]; then
+  native-run android --app ${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-unsigned.apk
+else
+  native-run android --app ${ANDROID_OUTPUT_APK_DEBUG}/${ANDROID_OUTPUT_APK_PREFIX}-debug.apk
+fi
+

package/scripts/test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Get to the root project
+if [[ "_" == "_${PROJECT_DIR}" ]]; then
+  SCRIPT_DIR=$(dirname $0)
+  PROJECT_DIR=$(cd ${SCRIPT_DIR}/.. && pwd)
+  export PROJECT_DIR
+fi;
+
+# Override with a local file, if any
+if [[ -f "${PROJECT_DIR}/.local/env.sh" ]]; then
+  echo "Loading environment variables from: '.local/env.sh'"
+  source ${PROJECT_DIR}/.local/env.sh
+  [[ $? -ne 0 ]] && exit 1
+else
+  echo "No file '${PROJECT_DIR}/.local/env.sh' found. Will use defaults"
+fi
+
+# launch tests
+ng test --browsers=ChromeHeadless --watch=false

package/src/app/admin/admin-routing.module.ts

@@ -0,0 +1,26 @@
+import { RouterModule, Routes } from '@angular/router';
+import { UsersPage } from './users/users';
+import { AuthGuardService } from '../core/services/auth-guard.service';
+import { NgModule } from '@angular/core';
+import { SharedRoutingModule } from '../shared/shared-routing.module';
+import { AdminModule } from './admin.module';
+import { ComponentDirtyGuard } from '../shared/guard/component-dirty.guard';
+
+const routes: Routes = [
+  {
+    path: 'users',
+    pathMatch: 'full',
+    component: UsersPage,
+    canActivate: [AuthGuardService],
+    canDeactivate: [ComponentDirtyGuard],
+    data: {
+      profile: 'ADMIN',
+    },
+  },
+];
+
+@NgModule({
+  imports: [SharedRoutingModule, AdminModule, RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AdminRoutingModule {}

package/src/app/admin/admin.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { CoreModule } from '../core/core.module';
+import { AdminUsersModule } from './users/users.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    CoreModule,
+
+    // Sub modules
+    AdminUsersModule,
+  ],
+  exports: [AdminUsersModule],
+})
+export class AdminModule {
+  constructor() {
+    console.debug('[admin] Creating module');
+  }
+}

package/src/app/admin/services/filter/person.filter.ts

@@ -0,0 +1,86 @@
+import { EntityClass } from '../../../core/services/model/entity.decorators';
+import { EntityFilter } from '../../../core/services/model/filter.model';
+import { Person } from '../../../core/services/model/person.model';
+import { EntityAsObjectOptions, EntityUtils } from '../../../core/services/model/entity.model';
+import { StoreObject } from '@apollo/client/core';
+import { isNil, isNotEmptyArray, isNotNil } from '../../../shared/functions';
+import { FilterFn } from '../../../shared/types';
+
+// @dynamic
+@EntityClass({ typename: 'PersonFilterVO' })
+export class PersonFilter extends EntityFilter<PersonFilter, Person> {
+  static fromObject: (source, opts?: any) => PersonFilter;
+
+  static searchFilter(source: any): FilterFn<Person> {
+    return source && PersonFilter.fromObject(source).asFilterFn();
+  }
+
+  email: string;
+  pubkey: string;
+  searchText: string;
+  statusIds: number[];
+  userProfiles: string[];
+  includedIds: number[];
+  excludedIds: number[];
+  searchAttribute: string;
+  searchAttributes: string[];
+
+  constructor() {
+    super(PersonFilter.TYPENAME);
+  }
+
+  fromObject(source: any, opts?: EntityAsObjectOptions) {
+    super.fromObject(source, opts);
+    this.email = source.email;
+    this.pubkey = source.pubkey;
+    this.searchText = source.searchText;
+    this.statusIds = source.statusIds || (isNotNil(source.statusId) ? [source.statusId] : undefined);
+    this.userProfiles = source.userProfiles;
+    this.excludedIds = source.excludedIds;
+    this.searchAttribute = source.searchAttribute;
+    this.searchAttributes = source.searchAttributes;
+  }
+
+  asObject(opts?: EntityAsObjectOptions): StoreObject {
+    const target = super.asObject(opts);
+    target.email = this.email;
+    target.pubkey = this.pubkey;
+    target.searchText = this.searchText;
+    target.statusIds = this.statusIds;
+    target.userProfiles = this.userProfiles;
+    target.excludedIds = this.excludedIds;
+    target.searchAttribute = this.searchAttribute;
+    target.searchAttributes = this.searchAttributes;
+    return target;
+  }
+
+  protected buildFilter(): FilterFn<Person>[] {
+    const filterFns = super.buildFilter();
+
+    // Filter by status
+    if (isNotEmptyArray(this.statusIds)) {
+      filterFns.push((e) => this.statusIds.includes(e.statusId));
+    }
+
+    // Filter included ids
+    const includedIds = this.includedIds;
+    if (isNotEmptyArray(includedIds)) {
+      filterFns.push((e) => isNotNil(e.id) && includedIds.includes(e.id));
+    }
+
+    // Filter excluded ids
+    const excludedIds = this.excludedIds;
+    if (isNotEmptyArray(excludedIds)) {
+      filterFns.push((e) => isNil(e.id) || !excludedIds.includes(e.id));
+    }
+
+    // Search text
+    const searchTextFilter = EntityUtils.searchTextFilter(
+      this.searchAttribute || this.searchAttributes || ['lastName', 'firstName', 'department.name'],
+      this.searchText
+    );
+    if (searchTextFilter) filterFns.push(searchTextFilter);
+
+    return filterFns;
+  }
+}