Merge branch 'main' of https://github.com/AmadeusITGroup/otter into f…

…eat/otter-training-rebase
fpaul-1A · Nov 12, 2024 · 2dea1bb · 2dea1bb
2 parents 0a0cc4d + 7b2d5af
commit 2dea1bb
Show file tree

Hide file tree

Showing 815 changed files with 28,395 additions and 13,905 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -10,6 +10,6 @@ generated-doc/
 /apps/*/**/templates/**
 /.pnp.js
 /.vscode
-/tools/github-actions/*/packaged-action/
+/tools/github-actions/*/packaged-action/**
 /**/src/**/package.json
 !/.yarnrc.yml
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -60,7 +60,7 @@ module.exports = {
       ],
       'rules': {
         '@o3r/json-dependency-versions-harmonize': ['error', {
-          ignoredPackages: ['@o3r/build-helpers'],
+          ignoredPackages: ['@o3r/build-helpers', '@o3r/workspace-helpers'],
           alignPeerDependencies: false,
           alignEngines: true
         }],
@@ -81,7 +81,7 @@ module.exports = {
       ],
       'rules': {
         '@o3r/json-dependency-versions-harmonize': ['error', {
-          ignoredPackages: ['@o3r/build-helpers'],
+          ignoredPackages: ['@o3r/build-helpers', '@o3r/workspace-helpers'],
           ignoredDependencies: ['npm'],
           alignPeerDependencies: false,
           alignEngines: true

diff --git a/.gitattributes b/.gitattributes
@@ -7,7 +7,11 @@
 *.jar binary
 *.ico binary
 
-# Ignore Packaged Github Actions from the repository language detection
-tools/github-actions/*/packaged-action/** linguist-vendored
+# Ignored files from the repository language detection
 .yarn/** linguist-vendored
 *.jar linguist-vendored
+
+# Generated files
+tools/github-actions/*/packaged-action/** linguist-generated
+packages/@o3r-training/showcase-sdk/src/api/** linguist-generated
+packages/@o3r-training/showcase-sdk/src/models/base/** linguist-generated
diff --git a/.github/.pr-labelrc.json b/.github/.pr-labelrc.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../tools/@o3r/build-helpers/schemas/pr-labels.configuration.schema.json",
+  "$schema": "../tools/@o3r/workspace-helpers/schemas/pr-labels.configuration.schema.json",
   "projectLabelPrefix": "project:",
   "ignoredProjects": [],
   "ignoreProjectForLabels": ["cascading"]

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -14,3 +14,4 @@
 
 ## Default reviewers for Intellij extension
 /apps/intellij-extension/ @OxyFlax
+/apps/intellij-extension/build.gradle.kts @AmadeusITGroup/otter_admins
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
@@ -19,7 +19,7 @@ runs:
       with:
         maven-version: ${{ inputs.mvn-version }}
     - name: Set up JDK 17
-      uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       if: inputs.install-jdk == 'true'
       with:
         java-version: '17'

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,10 +1,20 @@
 ## Proposed change
 
-<!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that is required for this change. -->
+<!--
+Please include a summary of the changes and the related issue.
+Please also include relevant motivation and context.
+-->
 
 ## Related issues
 
-- :bug: Fixes #(issue)
-- :rocket: Feature #(issue)
+<!--
+Please make sure to follow the [contribution guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
+-->
 
-<!-- Please make sure to follow the contributing guidelines on https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md -->
+*- No issue associated -*
+
+<!-- * :bug: Fix #issue -->
+<!-- * :bug: Fix resolves #issue -->
+<!-- * :rocket: Feature #issue -->
+<!-- * :rocket: Feature resolves #issue -->
+<!-- * :octocat: Pull Request #issue -->
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -24,7 +24,7 @@ jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup
         uses: ./tools/github-actions/setup
       - name: Audit

diff --git a/.github/workflows/clean-cache.yml b/.github/workflows/clean-cache.yml
@@ -18,7 +18,7 @@ jobs:
       # Needed to delete cache from action
       actions: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Clean Branch Cache
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         env:

diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml
@@ -17,10 +17,14 @@ on:
       NX_CLOUD_ACCESS_TOKEN:
         required: false
         description: Token to use Nx Cloud token
+      CODECOV_TOKEN:
+        required: false
+        description: Token Report to Codecov
 
 env:
   NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
   YARN_ENABLE_HARDENED_MODE: 0
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
 
 permissions:
   contents: read
@@ -30,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # v1.0.15
       with:
         base-branch: 'main'
@@ -43,10 +47,8 @@ jobs:
       matrix:
         os: ${{ fromJson(github.event_name != 'push' && '["ubuntu-latest", "windows-latest"]' || '["ubuntu-latest"]') }}
     runs-on: ${{ matrix.os }}
-    env:
-      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: ${{ inputs.affected && '0' || '1' }}
       - name: Setup
@@ -55,7 +57,7 @@ jobs:
         with:
           install-jdk: 'true'
       - name: Cache Jest
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         env:
           hash: ${{ hashFiles('package.json', 'tsconfig.base.json', 'tsconfig.build.json', 'nx.json') }}
         with:
@@ -71,10 +73,15 @@ jobs:
         env:
           testCmd: ${{ inputs.affected && format('test:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'test'}}
           NODE_OPTIONS: ${{ runner.os == 'Windows' && '--max_old_space_size=4096' || '' }}
-        run: yarn ${{ env.testCmd }}
+        run: yarn ${{ env.testCmd }} --collectCoverage
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+        with:
+          flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Publish tests reports
         if: always()
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: ut-reports-${{ matrix.os }}
           path: |
@@ -83,16 +90,14 @@ jobs:
             tools/**/dist-test/ut-report.xml
   lint:
     runs-on: ubuntu-latest
-    env:
-      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: ${{ inputs.affected && '0' || '1' }}
       - name: Setup
         uses: ./tools/github-actions/setup
       - name: Cache Eslint
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: .cache/eslint
           key: ${{ runner.os }}-eslint-${{ hashFiles('yarn.lock') }}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -46,19 +46,19 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/deploy-showcase.yml b/.github/workflows/deploy-showcase.yml
@@ -31,7 +31,7 @@ jobs:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./tools/github-actions/setup
       - name: build
         run: yarn nx build showcase

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -35,7 +35,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./tools/github-actions/setup
       - name: Generate doc
         run: yarn doc:generate
@@ -46,7 +46,7 @@ jobs:
         run: yarn update-package ${{ inputs.docFolder }}/package.json --name ${{ inputs.packageName }} --version ${{ inputs.version }}
       - run: zip -q -r ${{ inputs.artifactName }}.zip "${{ inputs.docFolder }}" -x "*/node_modules/*" ".cache/*"
         shell: bash
-      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: ${{ inputs.artifactName }}
           path: ${{ inputs.artifactName }}.zip
@@ -60,7 +60,7 @@ jobs:
       name: azure-static-webapp
       url: ${{ steps.deploy.outputs.static_web_app_url }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: ${{ inputs.artifactName }}

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -26,7 +26,7 @@ jobs:
     env:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./tools/github-actions/download-build-output
       - uses: ./tools/github-actions/setup
       - run: yarn playwright install
@@ -41,7 +41,7 @@ jobs:
 
       - name: Publish tests reports
         if: failure()
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: e2e-report
           path: apps/showcase/playwright-reports
diff --git a/.github/workflows/it-tests.yml b/.github/workflows/it-tests.yml
@@ -12,6 +12,9 @@ on:
       NX_CLOUD_ACCESS_TOKEN:
         required: false
         description: Token to use Nx Cloud token
+      CODECOV_TOKEN:
+        required: false
+        description: Token Report to Codecov
 
 env:
   NX_SKIP_NX_CACHE: ${{ inputs.skipNxCache }}
@@ -26,7 +29,7 @@ jobs:
     env:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./tools/github-actions/download-build-output
       - uses: ./tools/github-actions/setup
       - name: Setup verdaccio once for all tests
@@ -41,7 +44,7 @@ jobs:
         run: zip -r verdaccio.zip ./.verdaccio
         shell: bash
       - name: Publish verdaccio storage
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: verdaccio
           path: verdaccio.zip
@@ -63,7 +66,7 @@ jobs:
       ENFORCED_PACKAGE_MANAGER: ${{ matrix.packageManager }}
       PREPARE_TEST_ENV_TYPE: ${{ matrix.testEnvironment }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./tools/github-actions/download-build-output
       - uses: ./tools/github-actions/setup
       - shell: bash
@@ -77,7 +80,7 @@ jobs:
         run: echo "currentMonth=$(date +'%Y-%m')" >> $GITHUB_ENV
         shell: bash
       - name: Cache test-app yarn
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
         with:
           path: |
             .cache/test-app
@@ -106,7 +109,12 @@ jobs:
         shell: bash
       - name: Test
         id: it-tests
-        run: yarn test-int
+        run: yarn test-int --collectCoverage
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+        with:
+          flags: integration
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Zip generated app on failure
         if: failure() && steps.it-tests.conclusion == 'failure'
         run: |
@@ -120,13 +128,13 @@ jobs:
         shell: bash
       - name: Publish generated tests environment on failure
         if: failure() && steps.it-tests.conclusion == 'failure'
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: it-tests-${{ matrix.os }}-${{ matrix.packageManager }}
           path: it-tests.zip
       - name: Publish tests reports
         if: always()
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: it-reports-${{ matrix.os }}-${{ matrix.packageManager }}
           path: 'packages/**/dist-test/it-report.xml'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@

		## Default reviewers for Intellij extension
		/apps/intellij-extension/ @OxyFlax
		/apps/intellij-extension/build.gradle.kts @AmadeusITGroup/otter_admins