Merge branch 'release/16.0.0' of https://github.com/infra-geo-ouverte…

…/igo2 into 1346-symbolic-link-between-our-projects-and-the-library-1
infra-geo-ouverte · Oct 12, 2023 · b130996 · b130996
2 parents 5cf6622 + 83e65e0
commit b130996
Show file tree

Hide file tree

Showing 118 changed files with 6,147 additions and 5,255 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+text eol=lf
diff --git a/.github/workflows/onPush.js.yml b/.github/workflows/onPush.js.yml
@@ -24,3 +24,4 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm install @angular/cli
     - run: npm run lint
+    - run: npm run e2e
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
+/e2e/dist
+
 # bundled locale for the demo
 /src/locale/libs_locale
 
@@ -20,7 +22,7 @@
 .settings/
 
 # IDE - VSCode
-.vscode/
+.vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+/src/test.ts
diff --git a/.prettierrc b/.prettierrc
@@ -1,4 +1,10 @@
 {
   "singleQuote": true,
-  "trailingComma": "none"
+  "trailingComma": "none",
+  "endOfLine": "lf",
+  "importOrder": ["^@angular/(.*)$", "^@igo2/(.*)$", "^ol/(.*)$", "<THIRD_PARTY_MODULES>", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "importOrderParserPlugins": ["typescript", "decorators-legacy"],
+  "plugins": ["@trivago/prettier-plugin-sort-imports"]
 }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,29 @@
+{
+  "angular.enable-strict-mode-prompt": false,
+  "files.watcherExclude": {
+    "**/.git/objects/**": true,
+    "**/.git/subtree-cache/**": true,
+    "**/node_modules/**": true,
+    "**/dist/**": true
+  },
+  "search.exclude": {
+    "**/node_modules": true,
+    "**/dist": true
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  },
+  "[scss]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
+  }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,33 +1,54 @@
-## [1.15.4](https://github.com/infra-geo-ouverte/igo2/compare/1.15.2...1.15.4) (2023-07-05)
+# [16.0.0-rc.3](https://github.com/infra-geo-ouverte/igo2/compare/v16.0.0-rc.2...v16.0.0-rc.3) (2023-10-11)
 
 
-### Features
+### Bug Fixes
 
-* **app:** upgrade igo2-lib ([a8ed9cd](https://github.com/infra-geo-ouverte/igo2/commit/a8ed9cdb51c3f4eba0705535923cce18ec35a859))
+* **Prettier:** ignore test file ([e6a4ff5](https://github.com/infra-geo-ouverte/igo2/commit/e6a4ff56fa577b23198adb9ddb70b4c5cb6f0dfe))
 
 
-### Reverts
+### Features
 
-* Revert "chore(cadastre): delete cadastre provider" ([84b5393](https://github.com/infra-geo-ouverte/igo2/commit/84b53932faa3051d6a5ec901cfa8e65bcd43c777))
+* add types for app environment and config ([cd33a3a](https://github.com/infra-geo-ouverte/igo2/commit/cd33a3a0b53ff726ab9c617c24e19f3aaef91a9f))
+* **app:** upgrade igo2-lib 16.0.0-rc.2 ([9108b45](https://github.com/infra-geo-ouverte/igo2/commit/9108b4504cd12c46e69c4704c7fe7744fd0387aa))
 
 
 
-## [1.15.3](https://github.com/infra-geo-ouverte/igo2/compare/1.15.2...1.15.3) (2023-06-13)
+# [16.0.0-rc.2](https://github.com/infra-geo-ouverte/igo2/compare/v16.0.0-rc.0...v16.0.0-rc.2) (2023-09-22)
 
 
 ### Bug Fixes
 
-* **GithubActions:** remove ([f69bfc5](https://github.com/infra-geo-ouverte/igo2/commit/f69bfc57e52a1a997bffa119a3454d6da1f500ea))
+* **InteractiveTour:** replace deprecated position "auto" by "right" ([#1019](https://github.com/infra-geo-ouverte/igo2/issues/1019)) ([70dfb47](https://github.com/infra-geo-ouverte/igo2/commit/70dfb4715faeb34b4de39168d10eb417304dd0e8))
+* **Openlayers:** downgrade to 7.5.2 due to wms regression ([#1020](https://github.com/infra-geo-ouverte/igo2/issues/1020)) ([8880f52](https://github.com/infra-geo-ouverte/igo2/commit/8880f52bd3e1d9264cabdfd3961c3ecbdeb7c888))
+* **portal:** search bar position when open/close sidenav ([#1021](https://github.com/infra-geo-ouverte/igo2/issues/1021)) ([e52e8ae](https://github.com/infra-geo-ouverte/igo2/commit/e52e8ae0991cd185da0577bdf15032a2efec3a64))
 
 
 ### Features
 
-* **app:** upgrade igo2-lib ([a8ed9cd](https://github.com/infra-geo-ouverte/igo2/commit/a8ed9cdb51c3f4eba0705535923cce18ec35a859))
+* **app:** upgrade igo2-lib 16.0.0-rc.1 ([1c38dd0](https://github.com/infra-geo-ouverte/igo2/commit/1c38dd083d35d1672c6e7833f09aa9b874e573fa))
+* **Prettier:** be specific for the endOfLine type ([7adf6fe](https://github.com/infra-geo-ouverte/igo2/commit/7adf6fe2aae25266a51ff8963594c988bdc9c4bd))
 
 
-### Reverts
 
-* Revert "chore(cadastre): delete cadastre provider" ([84b5393](https://github.com/infra-geo-ouverte/igo2/commit/84b53932faa3051d6a5ec901cfa8e65bcd43c777))
+# [16.0.0-rc.0](https://github.com/infra-geo-ouverte/igo2/compare/1.15.2...v16.0.0-rc.0) (2023-09-19)
+
+
+### Bug Fixes
+
+* change logo path, size and url for copyrights info ([d2bf44e](https://github.com/infra-geo-ouverte/igo2/commit/d2bf44ecf366560142143a6f243a656e967755e3))
+* **toast:** https://github.com/angular/components/issues/27035 ([1f4b3f4](https://github.com/infra-geo-ouverte/igo2/commit/1f4b3f41622018580ba61b340b64186e47c6b9af))
+* **toast:** https://github.com/infra-geo-ouverte/igo2/issues/1002 ([bcc3f49](https://github.com/infra-geo-ouverte/igo2/commit/bcc3f49e1bb3e82627efc0a84d2f96e05261a8bc))
+* **toast:** missing tooltip ([90cfe20](https://github.com/infra-geo-ouverte/igo2/commit/90cfe2012972abf99448a59b339b341909d6fc37))
+* **tsconfig:** interference between types Jasmine and Chai ([f09b0e7](https://github.com/infra-geo-ouverte/igo2/commit/f09b0e7bd448a01717481ecb808b09f075aa2cf9))
+* **workspace:** paginator now positioned on right side ([3c2881b](https://github.com/infra-geo-ouverte/igo2/commit/3c2881b4249f0570424721451e433dbbeb3bc318))
+
+
+### Features
+
+* **demo:** add an demo context to explain how add layer from index file ([#968](https://github.com/infra-geo-ouverte/igo2/issues/968)) ([48b573d](https://github.com/infra-geo-ouverte/igo2/commit/48b573d01a4c312737ceb7b8b3e927578083561c))
+* **demo:** add sample context for keepCurrentView = false ([9a2f118](https://github.com/infra-geo-ouverte/igo2/commit/9a2f1184641df80f0bcc79b2235344a8116bbf00))
+* **SplashScreen:** add a replaceable image ([#1012](https://github.com/infra-geo-ouverte/igo2/issues/1012)) ([315445c](https://github.com/infra-geo-ouverte/igo2/commit/315445cbf751c4b6c1dfcffb53e01ffb108863d1))
+* **toast:** clear query result trigger workspace clear selection ([#958](https://github.com/infra-geo-ouverte/igo2/issues/958)) ([a069b03](https://github.com/infra-geo-ouverte/igo2/commit/a069b03a86c61886950284af00c5ff59027191e6))
 
 
 

diff --git a/angular.json b/angular.json
@@ -333,6 +333,23 @@
           "options": {
             "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
+        },
+        "e2e": {
+          "builder": "@cypress/schematic:cypress",
+          "options": {
+            "configFile": "e2e/cypress.config.ts",
+            "devServerTarget": "igo2:serve",
+            "browser": "chrome"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "igo2:serve:production"
+            },
+            "local": {
+              "watch": true,
+              "headless": false
+            }
+          }
         }
       }
     },
@@ -341,10 +358,16 @@
       "projectType": "application",
       "architect": {
         "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
+          "builder": "@cypress/schematic:cypress",
           "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "igo2:serve"
+            "devServerTarget": "igo2-e2e:serve",
+            "watch": true,
+            "headless": false
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "igo2-e2e:serve:production"
+            }
           }
         },
         "lint": {
@@ -357,11 +380,14 @@
     }
   },
   "cli": {
-    "schematicCollections": ["@angular-eslint/schematics"],
+    "schematicCollections": [
+      "@angular-eslint/schematics",
+      "@schematics/angular"
+    ],
     "cache": {
       "enabled": false,
       "environment": "all"
     },
     "analytics": false
   }
-}
+}
diff --git a/docs/_tables/fr/interactiveTour/interactiveTourOptions.csv b/docs/_tables/fr/interactiveTour/interactiveTourOptions.csv
@@ -1,7 +1,7 @@
 Propriétés,Type,Description,Valeurs possibles,Valeur défaut
 disableInteraction ,Boolean ,Permet ou non à l'utilisateur de cliquer sur les éléments en surbrillance ,true | false ,true 
 highlightClass ,Boolean ,Définit la classe à appliquer aux éléments en surbrillance ,,
-position ,String ,Définit la position des boites aide ,"'auto', 'right', 'left', 'bottom', 'top'.","| NB.: Si la propriété position n'est pas présente, 
+position ,String ,Définit la position des boites aide ,"'top' | 'top-start' | 'top-end' | 'bottom' | 'bottom-start' | 'bottom-end' | 'right' | 'right-start' | 'right-end' | 'left' | 'left-start' | 'left-end'","| NB.: Si la propriété position n'est pas présente, 
 | les boites seront disposées au centre de l'écran."
 scrollToElement ,Boolean ,Indique si on défile la page sur l'élément en surbrillance ,true | false ,
 steps ,:ref:`InteractiveTourStep <igoInteractiveTourStep>` , Une liste de step (étapes du tour inteactif),,

diff --git a/docs/config_json.rst b/docs/config_json.rst
@@ -700,10 +700,20 @@ menuButtonReverseColor
 
     .. line-block::
 
-        Permet d'indiquer si les couleurs du bouton de menu sont inversées ou non.
+        Ne sera plus géré à partir du 6 juin 2024, Remplacé par menu.button.useThemeColor
 
-.. _optionsApi:
+        Permet d'indiquer si les couleurs du bouton de menu sont inversées ou non.
+
+*****************
+menu.button.useThemeColor
+*****************
+
+    .. line-block::
 
+
+        Permet d'indiquer si l'arrière plan du menu est blanc OU est géré par le thème appliqué dans l'application.
+
+.. _optionsApi:
 ************
 OptionsApi
 ************
@@ -864,8 +874,22 @@ showMenuButton
 
     .. line-block::
 
+        Ne sera plus géré à partir du 6 juin 2024, Remplacé par menu.button.visible
+
         Permet de définir si le bouton de menu permettant d'accéder
-        aux outils est affiché dans le coin supérieur gauche.
+        aux outils est affiché.
+
+********************************
+menu.button.visible
+********************************
+
+    .. line-block::
+
+        Remplace showMenuButton
+
+        Permet de définir si le bouton de menu permettant d'accéder
+        aux outils est visible ou non.
+
 
 ********************************
 showRotationButtonIfNoRotation
@@ -942,7 +966,8 @@ Exemples
                 "order": 2,
                 "params": {
                   "limit": "5"
-                  }
+                  },
+                "showAdvancedSettings": true
                 },
 
               "icherchereverse": {

diff --git a/docs/interactiveTour_config.rst b/docs/interactiveTour_config.rst
@@ -39,7 +39,7 @@ Exemples
 
         {
           "global": {
-            "position": "auto",
+            "position": "right",
             "scrollToElement":true,
             "title": "Titre de toutes les boites du tour",
             "steps": [
@@ -64,7 +64,7 @@ Propriétés - Objet InteractiveTourOptions
 
 
 Liens
-      - `TourOptions interface <https://github.com/infra-geo-ouverte/igo2-lib/tree/master/packages/common/src/lib/interactive-tour/interactive-tour.interface>`_
+      - `TourOptions interface <https://github.com/infra-geo-ouverte/igo2-lib/tree/master/packages/common/src/lib/interactive-tour/interactive-tour.interface.ts>`_
 
 
 Configurer les 'steps' des tours
@@ -120,7 +120,7 @@ Exemples
 
       {
         "global": {
-          "position": "auto",
+          "position": "right",
           "steps": [
             {
               "element": ".menu-button",

diff --git a/e2e/.eslintrc.json b/e2e/.eslintrc.json
@@ -1,40 +1,11 @@
 {
   "extends": "../.eslintrc.json",
-  "ignorePatterns": [
-    "!**/*"
-  ],
+  "ignorePatterns": ["!**/*"],
   "overrides": [
     {
-      "files": [
-        "*.ts"
-      ],
-      "parserOptions": {
-        "project": [
-          "e2e/tsconfig.e2e.json"
-        ],
-        "createDefaultProgram": true
-      },
-      "rules": {
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "style": "camelCase"
-          }
-        ],
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "style": "kebab-case"
-          }
-        ]
-      }
-    },
-    {
-      "files": [
-        "*.html"
-      ],
+      "extends": "plugin:cypress/recommended",
+      "plugins": ["cypress"],
+      "files": ["*.ts"],
       "rules": {}
     }
   ]

diff --git a/e2e/cypress.config.ts b/e2e/cypress.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:4201',
+    specPattern: 'e2e/src/*.spec.ts',
+    supportFile: 'e2e/support/e2e.ts',
+    videosFolder: "e2e/dist/videos",
+    screenshotsFolder: "e2e/dist/screenshots",
+  }
+});
diff --git a/e2e/fixtures/example.json b/e2e/fixtures/example.json
@@ -0,0 +1,5 @@
+{
+    "name": "Using fixtures to represent data",
+    "email": "hello@cypress.io"
+}
+
diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js