Merge branch 'release/2.8.11'

.gitlab-ci.yml

@@ -27,7 +27,7 @@ variables:
   ARTIFACT_ZIP_FILES: ${OUTPUT_DIR}/${CI_PROJECT_NAME}-*.zip
   ENV_FILE: variables.env
   IONIC_CLI_VERSION: 7.1.1
-  ANGULAR_CLI_VERSION: 14.2.12
+  ANGULAR_CLI_VERSION: 14.2.13
 # ---------------------------------------------------------------
 # Jobs templates
 # ---------------------------------------------------------------
@@ -83,7 +83,8 @@ build:env:
   needs: ["build:env"]
   script:
     # Show version
-    - ng version
+    # FIXME fail since 13/11/2023
+    #- ng version
     - npm version
     # Build
     - npm run build.${BUILD_ENVIRONMENT}
@@ -164,7 +165,8 @@ failsafe-build:
       - ls -artl "${BUILD_CACHE_DIR}"
       - cp -R "${BUILD_CACHE_DIR}/node_modules" .
       # Show version
-      - ng version
+      # FIXME fail since 13/11/2023
+      #- ng version
       - npm version
       # Build
       - export NODE_OPTIONS=--max-old-space-size=4096
@@ -230,7 +232,8 @@ release:tags:
     - ls -artl "${BUILD_CACHE_DIR}"
     - cp -R "${BUILD_CACHE_DIR}/node_modules" .
     # Show version
-    - ng version
+    # FIXME fail since 13/11/2023
+    #- ng version
     - npm version
     # Build
     - export NODE_OPTIONS=--max-old-space-size=4096

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "net.sumaris.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20810
-        versionName "2.8.10"
+        versionCode 20811
+        versionName "2.8.11"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionCode="20810" android:versionName="2.8.10" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+<manifest android:versionCode="20811" android:versionName="2.8.11" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:exported="true" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="net.sumaris.app.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>

install.sh

@@ -15,7 +15,7 @@ if [[ "_$INSTALL_DIR" == "_" ]]; then
 fi
 
 latest_version() {
-  echo "2.8.10" #lastest
+  echo "2.8.11" #lastest
 }
 
 api_release_url() {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sumaris-app",
   "description": "SUMARiS app",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "author": "[email protected]",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",
@@ -82,7 +82,7 @@
     "@rx-angular/state": "^14.0.0",
     "@rx-angular/template": "^14.0.0",
     "@sgratzl/chartjs-chart-boxplot": "~3.9.1",
-    "@sumaris-net/ngx-components": "2.4.148",
+    "@sumaris-net/ngx-components": "2.4.154",
     "angular-split": "^14.1.0",
     "angular2-text-mask": "~9.0.0",
     "apollo-angular": "~4.2.1",

scripts/docker/build/Dockerfile

@@ -2,7 +2,7 @@
 ARG IMAGE_REGISTRY
 ARG DOCKER_IMAGE="node:16-slim"
 ARG IONIC_CLI_VERSION="7.1.1"
-ARG ANGULAR_CLI_VERSION="14.2.12"
+ARG ANGULAR_CLI_VERSION="14.2.13"
 FROM $IMAGE_REGISTRY$DOCKER_IMAGE AS prepare
 FROM $DOCKER_IMAGE AS prepare
 ARG CACHE_DIR=/tmp/.build-cache

src/app/admin/job/job-list.component.ts

@@ -4,9 +4,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { RxState } from '@rx-angular/state';
 import { Job, JobFilter, JobStatusEnum, JobStatusUtils } from '@app/social/job/job.model';
 import { JobService } from '@app/social/job/job.service';
-import { filter, first, map, mergeMap, switchMap, takeUntil, tap } from 'rxjs/operators';
+import { first, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
 import { APP_JOB_PROGRESSION_SERVICE, IJobProgressionService, JobProgression } from '@sumaris-net/ngx-components';
-import { merge, Subject, Subscription } from 'rxjs';
+import { merge, Subscription } from 'rxjs';
 import { ProgressionModel } from '@app/shared/progression/progression.model';
 
 interface JobListState {
@@ -121,7 +121,7 @@ export class JobListComponent implements OnInit{
   }
 
   openAddJobMenu() {
-    const buttons = this.state.get('types')
+    const buttons = (this.state.get('types') || [])
       .map(({ label, name }) => ({
         text: label,
         handler: () => this.addJob(name),

src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { APP_BASE_HREF } from '@angular/common';
 import { BrowserModule, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule, SecurityContext } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MomentDateAdapter } from '@angular/material-moment-adapter';
 
@@ -65,7 +65,6 @@ import { IonicStorageModule } from '@ionic/storage-angular';
 import { IonicModule } from '@ionic/angular';
 import { CacheModule } from 'ionic-cache';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { MarkdownModule, MarkedOptions } from 'ngx-markdown';
 import { TypePolicies } from '@apollo/client/core';
 import { TRIP_TESTING_PAGES } from './trip/trip.testing.module';
 import { EXTRACTION_CONFIG_OPTIONS, EXTRACTION_GRAPHQL_TYPE_POLICIES } from './extraction/common/extraction.config';
@@ -101,6 +100,7 @@ import { NgChartsModule } from 'ng2-charts';
 import { PMFM_VALIDATOR_I18N_ERROR_KEYS } from '@app/referential/services/validator/pmfm.validators';
 import { IchthyometerService } from '@app/shared/ichthyometer/ichthyometer.service';
 import { AppEnvironment } from '@environments/environment.class';
+import { AppMarkdownModule } from '@app/shared/markdown/markdown.module';
 
 @NgModule({
   declarations: [AppComponent],
@@ -140,20 +140,7 @@ import { AppEnvironment } from '@environments/environment.class';
         deps: [HttpClient],
       },
     }),
-    MarkdownModule.forRoot({
-      loader: HttpClient, // Allow to load using [src]
-      sanitize: SecurityContext.NONE,
-      markedOptions: {
-        provide: MarkedOptions,
-        useValue: <MarkedOptions>{
-          gfm: true,
-          breaks: false,
-          pedantic: false,
-          smartLists: true,
-          smartypants: false,
-        },
-      },
-    }),
+    AppMarkdownModule.forRoot(),
     NgChartsModule.forRoot({
       plugins: [],
     }),
@@ -378,6 +365,7 @@ import { AppEnvironment } from '@environments/environment.class';
         // Settings
         { title: '' /*empty divider*/, cssClass: 'flex-spacer' },
         { title: 'MENU.TESTING', path: '/testing', icon: 'code', color: 'danger', ifProperty: 'sumaris.testing.enable', profile: 'SUPERVISOR' },
+        { title: 'MENU.INBOX', path: '/inbox', icon: 'mail', profile: 'USER', ifProperty: 'sumaris.social.notification.icons.enable' },
         { title: 'MENU.LOCAL_SETTINGS', path: '/settings', icon: 'settings', color: 'medium' },
         { title: 'MENU.ABOUT', action: 'about', matIcon: 'help_outline', color: 'medium', cssClass: 'visible-mobile' },