merge master

.browserslistrc

@@ -1,9 +1,10 @@
 # This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
-# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
+# adjust as needed
 > 0.5%
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11
+not IE 9-10
+not IE 11

.github/workflows/codeql-analysis.yml

@@ -18,23 +18,20 @@ on:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]
   schedule:
-    - cron: '34 22 * * 5'
+    - cron: '32 22 * * 5'
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
         language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
     - name: Checkout repository
@@ -48,25 +45,23 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    # 📚 https://git.io/JvXDl
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
+    #- run: |
+    #   make bootstrap
+    #   make release
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/gh-release.yml

@@ -4,12 +4,13 @@ on:
   push:
     tags:
       - "*.*.*"
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install [email protected]
         if: startsWith(github.ref, 'refs/tags/')
         run: npm install [email protected]
@@ -20,7 +21,6 @@ jobs:
       - name: Install zip
         uses: montudor/action-zip@v1
       - name: Zip output
-        run: zip igo2.zip *
         run: zip -qq -r igo2.zip *
         working-directory: dist/igo2
       - name: Release

.github/workflows/onPush.js.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.x]
 
     steps:
     - name: The branch or tag ref that triggered the workflow run.
       run: echo ${GITHUB_REF#refs/*/}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install @angular/cli

CHANGELOG.md

@@ -0,0 +1,40 @@
+## [1.0.2-beta](https://github.com/infra-geo-ouverte/igo2-quebec/compare/1.0.1-beta...1.0.2-beta) (2023-03-09)
+
+
+### Bug Fixes
+
+* **github-demo:** fix gh pages icherche path ([030521f](https://github.com/infra-geo-ouverte/igo2-quebec/commit/030521f1d71f18bed00982281f6cfa65a4e2ac78))
+
+
+
+## [1.0.1-beta](https://github.com/infra-geo-ouverte/igo2-quebec/compare/1.0.0-beta...1.0.1-beta) (2023-03-09)
+
+
+### Bug Fixes
+
+* **app:** fix gh-pages deploy ([a80f483](https://github.com/infra-geo-ouverte/igo2-quebec/commit/a80f48382896cc72c56d8e711b0ed9da2ababd0d))
+
+
+
+# [1.0.0-beta](https://github.com/infra-geo-ouverte/igo2-quebec/compare/da1fb91ad337472d53555f06fba648c8b80053f8...1.0.0-beta) (2023-03-09)
+
+
+### Bug Fixes
+
+* **app:** fix release script ([a747eaf](https://github.com/infra-geo-ouverte/igo2-quebec/commit/a747eaf391731f2166bda576c2e90b96a9afb048))
+* **menu:** fixed error when exiting portal using the navigation ([#2](https://github.com/infra-geo-ouverte/igo2-quebec/issues/2)) ([4a44106](https://github.com/infra-geo-ouverte/igo2-quebec/commit/4a44106f7a9cab39c9a1207cdba2a7bbc8695821))
+* **portal:** Removed ("showInLayerList" = false) layers from legend ([#14](https://github.com/infra-geo-ouverte/igo2-quebec/issues/14)) ([c964a3a](https://github.com/infra-geo-ouverte/igo2-quebec/commit/c964a3a954ee4c29109c7a94308a41dc06ce4b5a))
+* **test:** fix e2e app-portal check ([bf681ba](https://github.com/infra-geo-ouverte/igo2-quebec/commit/bf681ba5f2afe2c1e2e38b0b25de32cffd3230c3))
+
+
+### Features
+
+* **app:** maj IGO2 1.14.1 ([ab0394f](https://github.com/infra-geo-ouverte/igo2-quebec/commit/ab0394f08f975c7be99a5ed189e70a291a8ed1b8))
+* **app:** upgrade libs (angular 14 and +) ([caad701](https://github.com/infra-geo-ouverte/igo2-quebec/commit/caad701a0bdc103f30b09c5b62e89914fc3c0521))
+* **app:** upgrade to igo2 1.13.0 ([ae137e2](https://github.com/infra-geo-ouverte/igo2-quebec/commit/ae137e26a3da53d46e77bbf3b3c3e03dc410afc4))
+* **codeQL:** add code QL scan ([ef67a16](https://github.com/infra-geo-ouverte/igo2-quebec/commit/ef67a169a96ffbde8dac788eb5f01565abb53c2a))
+* **package:** update libs ([da1fb91](https://github.com/infra-geo-ouverte/igo2-quebec/commit/da1fb91ad337472d53555f06fba648c8b80053f8))
+* **portal:** search for mobile mode ([#4](https://github.com/infra-geo-ouverte/igo2-quebec/issues/4)) ([0611583](https://github.com/infra-geo-ouverte/igo2-quebec/commit/0611583677b951265b1dbc83d75020c5d295fc6b))
+
+
+

README.md

@@ -108,12 +108,12 @@ $ npm install
 # changements de code ne sont pas recompilées.
 # Pour corriger ceci, désactiver la cache avec la variable d'environnement NG_BUILD_CACHE = "false"
 $ npm start
-# Ouvrir un navigateur http://localhost:4201/
+# Ouvrir un navigateur http://localhost:4202/
 
 # Build prod
 $ npm run build.prod
 $ npm run serve.prod
-# Ouvrir un navigateur http://localhost:4201/
+# Ouvrir un navigateur http://localhost:4202/
 
 # Générer l'api de documentation
 $ npm run doc
@@ -205,12 +205,12 @@ $ npm install
 # code changes are not recompiled.
 # To fix this, disable the cache with the environment variable NG_BUILD_CACHE = "false"
 $ npm start
-# Open your browser at http://localhost:4201/
+# Open your browser at http://localhost:4202/
 
 # Build prod
 $ npm run build.prod
 $ npm run serve.prod
-# Open your browser at http://localhost:4201/
+# Open your browser at http://localhost:4202/
 
 # Doc API generation
 $ npm run doc

angular.json

@@ -30,8 +30,7 @@
               "src/assets",
               "src/config",
               "src/contexts",
-              "src/locale",
-              "src/particular/locale",
+              "src/locale"
               {
                 "glob": "**/*",
                 "input": "./node_modules/@igo2/common/assets/",
@@ -224,7 +223,7 @@
         }
       }
     },
-    "igo2-e2e": {
+    "igo2-quebec-e2e": {
       "root": "e2e/",
       "projectType": "application",
       "architect": {

e2e/src/app.e2e-spec.ts

@@ -8,10 +8,10 @@ describe('igo App', () => {
     page = new IgoPage();
   });
 
-  it('should have navigator div', () => {
-    page.navigateTo();
-    expect(page.getNavigatorDiv().isPresent()).toBeTruthy();
-  });
+  // it('should have navigator div', () => {
+  //   page.navigateTo();
+  //   expect(page.getNavigatorDiv().isPresent()).toBeTruthy();
+  // });
 
   // it('should display placeholder in search bar', () => {
   //   page.navigateTo();

e2e/src/app.po.ts

@@ -6,7 +6,7 @@ export class IgoPage {
   }
 
   getNavigatorDiv() {
-    return element(by.css('app-portal'));
+    return element(by.css('app-root'));
   }
 
 }

gulpfile.js

@@ -1,7 +1,5 @@
 /*jshint esversion: 6 */
 const gulp = require('gulp');
-const bump = require('gulp-bump');
-const package = require('./package.json')
 
 gulp.task('copyLocaleFromLib', done => {
   gulp
@@ -15,9 +13,3 @@ gulp.task('watch:locale', function () {
   gulp.watch('./node_modules/@igo2/core/locale/*.json', gulp.series('copyLocaleFromLib'));
 });
 
-gulp.task('bumpPwaVersionDev', done => {
-  gulp.src(['./ngsw-config.json'])
-    .pipe(bump({ type: 'prerelease' }))
-    .pipe(gulp.dest('./'));
-  done();
-});

ngsw-config.json

@@ -2,8 +2,8 @@
   "$schema": "./node_modules/@angular/service-worker/config/schema.json",
   "index": "/index.html",
   "appData": {
-    "changelog": "Initial version",
-    "version": "1.13.4"
+    "changelog": "Version update",
+    "version": "1.15.0"
   },
   "assetGroups": [
     {
@@ -48,7 +48,7 @@
       "resources": {
         "files": [
           "/assets/**",
-          "/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
+          "/*.(pdf|eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
         ]
       }
     }