Merge remote-tracking branch 'origin/master' into feature/remove-db-abstract

* origin/master: (29 commits)
  Added the checkout to the latest tags for ng packages.
  Updated the version and the dependencies.
  Update releases.yml
  Update link_modules_resources.sh
  Update releases.yml
  Update releases.yml
  Updated the backoffice dev with the fix of clients' search.
  Updated the Core dependency with the fix of models duplication.
  Downgraded the version of the laminas-dependency-plugin dependency to fix cross dependencies issues.
  Updated the core dependency version with the fixes.
  updated dependency to monarc/backoffice and new QRCode backend.
  fixed link of dependencies
  chg: [dependencies] Updated JavaScript dependencies.
  FIxed the doctrine driver class.
  chg: [ci-releases] Do not install dev packages.
  prepare pull-request with correct branch
  [skip ci] allowing dash in release tags
  removing partials symlinking in ng_backoffice
  pinning ng-anr and ng-backoffice versions
  release workflow initial release
  ...

# Conflicts:
#	composer.json
#	composer.lock
#	config/autoload/global.php.dist

.github/workflows/releases.yml

@@ -0,0 +1,107 @@
+name: MonarcAppBO releases
+
+on:
+  push:
+    branches: [ 'master' ]
+    tags: [ 'v*.*', 'v*.*.*', 'v*.*.*-*' ]
+  pull_request:
+    branches: [ 'master' ]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        node-version: [ "16.x" ]
+        php-version: [ "7.4" ]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: install deps
+      run: sudo apt-get update && sudo apt install -y gettext
+
+    # PHP
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        tools: composer:v2.3
+        extensions: bcmath
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Install PHP dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest --no-dev
+
+    - name: Symlink Monarc modules
+      run: | 
+        mkdir -p module/Monarc
+        ln -s ../../vendor/monarc/core module/Monarc/Core
+        ln -s ../../vendor/monarc/backoffice module/Monarc/BackOffice
+
+    # javascript
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - uses: oprypin/find-latest-tag@v1
+      with:
+        repository: monarc-project/ng-anr
+        releases-only: true
+      id: ng_anr_lasttag
+
+    - run: echo "ng-anr is at version ${{ steps.ng_anr_lasttag.outputs.tag }}"
+
+    - name: Install ng-anr
+      uses: actions/checkout@v3
+      with:
+        repository: monarc-project/ng-anr
+        ref: ${{ steps.ng_anr_lasttag.outputs.tag }}
+        path: './node_modules/ng_anr'
+
+    - uses: oprypin/find-latest-tag@v1
+      with:
+        repository: monarc-project/ng-backoffice
+        releases-only: true
+      id: ng_backoffice_lasttag
+
+    - run: echo "ng-backoffice is at version ${{ steps.ng_backoffice_lasttag.outputs.tag }}"
+
+    - name: Install ng-backoffice
+      uses: actions/checkout@v3
+      with:
+        repository: monarc-project/ng-backoffice
+        ref: ${{ steps.ng_backoffice_lasttag.outputs.tag }}
+        path: './node_modules/ng_backoffice'
+
+    - name: Install ng-backoffice dependencies
+      run: |
+        cd node_modules/ng_backoffice
+        npm ci
+
+    # final "cleanup"
+    - name: post job
+      run: |
+        bash -ex ./scripts/link_modules_resources.sh
+        bash -ex ./scripts/compile_translations.sh
+
+    # prepare release
+    - name: Get repository name
+      id: repository
+      run: echo "::set-output name=pathref::$(echo '${{ github.repository }}' | cut -d'/' -f2)-$(echo '${{ github.ref_name }}' | sed 's/[^[:alnum:]\.-]/_/g')"
+
+    - name: create artifact archive
+      run: |
+        tar --exclude .git --exclude .github -zcf '../${{ steps.repository.outputs.pathref }}.tar.gz' .
+
+    - name: release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          ../${{ steps.repository.outputs.pathref }}.tar.gz
+        fail_on_unmatched_files: true
+      if: startsWith(github.ref, 'refs/tags/')

README.md

@@ -24,14 +24,14 @@ License
 This software is licensed under
 [GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html)
 
-- Copyright (C) 2016-2021 Jérôme Lombardi - https://github.com/jerolomb
-- Copyright (C) 2016-2021 Juan Rocha - https://github.com/jfrocha
-- Copyright (C) 2016-2021 SMILE gie securitymadein.lu
-- Copyright (C) 2017-2021 Cédric Bonhomme - https://www.cedricbonhomme.org
+- Copyright (C) 2016-2022 SECURITYMADEIN.LU
+- Copyright (C) 2016-2022 Jérôme Lombardi - https://github.com/jerolomb
+- Copyright (C) 2016-2022 Juan Rocha - https://github.com/jfrocha
+- Copyright (C) 2017-2022 Cédric Bonhomme - https://www.cedricbonhomme.org
 - Copyright (C) 2016-2017 Guillaume Lesniak
 - Copyright (C) 2016-2017 Thomas Metois
 - Copyright (C) 2016-2017 Jérôme De Almeida
-- Copyright (C) 2019-2021 Ruslan Baidan - https://github.com/ruslanbaydan
+- Copyright (C) 2019-2022 Ruslan Baidan - https://github.com/ruslanbaydan
 
 For more information, [the list of authors and contributors](AUTHORS) is available.
 

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":11, "hotfix":0}
+{"major":2, "minor":12, "hotfix":3}

composer.json

@@ -51,7 +51,8 @@
         "laminas/laminas-log": "^2.11",
         "laminas/laminas-i18n": "^2.9",
         "laminas/laminas-dependency-plugin": "^2.0",
-        "laminas/laminas-mvc-middleware": "^2.2"
+        "laminas/laminas-mvc-middleware": "^2.2",
+        "endroid/qr-code": "^4.4"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master"

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "MONARC",
-  "version": "2.9.12",
-  "description": "Monarc back office",
+  "name": "MONARC Back Office",
+  "version": "2.12.3",
+  "description": "MONARC Back Office",
   "private": true,
   "repository": {
     "type": "git",
@@ -10,11 +10,11 @@
   "author": "CASES",
   "license": "GNU Affero General Public License version 3",
   "dependencies": {
-    "ng_anr": "git+https://github.com/monarc-project/ng-anr.git#master",
-    "ng_backoffice": "git+https://github.com/monarc-project/ng-backoffice.git#master"
+    "ng_anr": "git+https://github.com/monarc-project/ng-anr.git",
+    "ng_backoffice": "git+https://github.com/monarc-project/ng-backoffice.git"
   },
   "devDependencies": {
-    "grunt": "~1.4.0",
-    "grunt-cli": "~1.4.2"
+    "grunt": "~1.5.3",
+    "grunt-cli": "~1.4.3"
   }
 }

scripts/link_modules_resources.sh

@@ -40,11 +40,11 @@ fi
 # Link modules resources. TODO: Replace with Grunt tasks to minify the JS and CSS.
 cd public/views/ && find ../../node_modules/ng_backoffice/views -maxdepth 1 -name "*.html" -exec ln -s {} \; 2>/dev/null
 cd dialogs/ && find ../../../node_modules/ng_backoffice/views/dialogs -maxdepth 1 -name "*.html" -exec ln -s {} \; 2>/dev/null
-cd ../partials/ && find ../../../node_modules/ng_backoffice/views/partials -maxdepth 1 -name "*.html" -exec ln -s {} \; 2>/dev/null
+#cd ../partials/ && find ../../../node_modules/ng_backoffice/views/partials -maxdepth 1 -name "*.html" -exec ln -s {} \; 2>/dev/null
 cd ../../js/ && find ../../node_modules/ng_backoffice/src -maxdepth 1 -name "*" -exec ln -s {} \; 2>/dev/null
 cd ../css/ && find ../../node_modules/ng_backoffice/css -name "*" -exec ln -s {} \; 2>/dev/null
 cd ../img/ && find ../../node_modules/ng_backoffice/img -name "*" -exec ln -s {} \; 2>/dev/null
-cd ../flags/ && find ../../node_modules/ng_backoffice/node_modules/ng-country-flags/dist/flags -mindepth 1 -type d -exec ln -s {} \; 2>/dev/null
+cd ../flags/ && find ../../node_modules/ng_backoffice/node_modules/flag-icons/flags -mindepth 1 -type d -exec ln -s {} \; 2>/dev/null
 
 cd ../js/
 mkdir -p anr

scripts/update-all.sh

@@ -26,6 +26,17 @@ do
 	esac
 done
 
+checkout_to_latest_tag() {
+    if [ -d $1 ]; then
+        pushd $1
+        git fetch --tags
+        tag=$(git describe --tags `git rev-list --tags --max-count=1`)
+        git checkout $tag -b $tag
+        git pull origin $tag
+        popd
+    fi
+}
+
 pull_if_exists() {
 	if [ -d $1 ]; then
 		pushd $1
@@ -62,24 +73,22 @@ composer install -o --no-dev
 pathCore="module/Monarc/Core"
 pathBO="module/Monarc/BackOffice"
 
-if [[ -d node_modules && -d node_modules/ng_anr ]]; then
-	if [[ -d node_modules/ng_anr/.git ]]; then
-		pull_if_exists node_modules/ng_backoffice
-		pull_if_exists node_modules/ng_anr
-	else
-		npm update
-	fi
-else
-	npm install
-fi
-
 if [[ $bypass -eq 0 ]]; then
 	migrate_module $pathCore
 	migrate_module $pathBO
 fi
 
+if [[ -d node_modules && -d node_modules/ng_anr ]]; then
+	if [[ -d node_modules/ng_anr/.git ]]; then
+		checkout_to_latest_tag node_modules/ng_backoffice
+		checkout_to_latest_tag node_modules/ng_anr
+	else
+		npm update
+	fi
+fi
+
 cd node_modules/ng_backoffice
-npm install
+npm ci
 cd ../..
 
 ./scripts/link_modules_resources.sh