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

.github/workflows/audit.yml

@@ -33,5 +33,6 @@ jobs:
           recursive: true
           environment: all
       - name: Summary
+        if: success() || failure()
         run: echo "${{ steps.audit.outputs.reportMarkdown }}" >> $GITHUB_STEP_SUMMARY
 

.github/workflows/publish-pr.yml

@@ -19,9 +19,10 @@ jobs:
         uses: actions/github-script@v6
         with:
           script: |
-            let download = await github.rest.actions.downloadWorkflowRunLogs({
+            let download = await github.rest.actions.downloadWorkflowRunAttemptLogs({
                ...context.repo,
                run_id: context.payload.workflow_run.id,
+               attempt_number: 1
             });
             let fs = require('fs');
             fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/logs.zip`, Buffer.from(download.data));
@@ -39,7 +40,7 @@ jobs:
       id-token: write
     secrets: inherit
     with:
-      version: ${{ needs.version.outputs.nextVersionTag }}
+      version: ${{ needs.version.outputs.nextVersionTag }}-${{ github.event.workflow_run.run_attempt }}
       prerelease: true
       isPullRequest: true
       gitRef: ${{ github.event.workflow_run.pull_requests[0].base.ref }}

.nxignore

@@ -3,3 +3,4 @@ packages/@ama-sdk/generator-sdk/src/**/templates/**/*.{j,t}s
 packages/@*/*/{builders,schematics}/**/templates/**/*.ts
 packages/@*/*/{builders,schematics}/**/mocks/**/*.ts
 packages/@*/*/build/**
+!**/schematics/**/target

.renovaterc.json

@@ -42,6 +42,12 @@
   ],
   "automerge": true,
   "platformAutomerge": true,
+  "lockFileMaintenance": {
+    "enabled": true,
+    "schedule": [
+      "before 4am on monday"
+    ]
+  },
   "packageRules": [
     {
       "matchPackageNames": [
@@ -187,6 +193,60 @@
           ".yarn/sdks/**"
         ]
       }
+    },
+    {
+      "groupName": "Update of bootstrap disabled as it is not supported by design-factory (Can be removed when upgrading design-factory to v16)",
+      "matchCurrentVersion": "<=5.2.0",
+      "matchPackageNames": [
+        "bootstrap"
+      ],
+      "enabled": false
+    },
+    {
+      "groupName": "Update of zone-js disabled as it is not supported by Angular < 17 (Can be removed when v10 goes into main)",
+      "matchUpdateTypes": [
+        "major",
+        "minor"
+      ],
+      "matchCurrentVersion": "<0.14",
+      "matchPackageNames": [
+        "zone.js"
+      ],
+      "enabled": false
+    },
+    {
+      "groupName": "Update of @angular-devkit/architect disabled as it is not supported by Angular < 17 (Can be removed when v10 goes into main)",
+      "matchUpdateTypes": [
+        "major",
+        "minor"
+      ],
+      "matchCurrentVersion": "<0.1700",
+      "matchPackageNames": [
+        "@angular-devkit/architect"
+      ],
+      "enabled": false
+    },
+    {
+      "groupName": "Major update of chalk disabled as it drops support on CommonJS",
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "matchCurrentVersion": "<5",
+      "matchPackageNames": [
+        "chalk"
+      ],
+      "enabled": false
+    },
+    {
+      "groupName": "Major update of globby disabled as it drops support on CommonJS",
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "matchCurrentVersion": "<14",
+      "matchPackageNames": [
+        "globby"
+      ],
+      "enabled": false
     }
   ]
 }

.yarnrc.yml

@@ -1,10 +1,12 @@
+compressionLevel: mixed
+
+enableScripts: false
+
+enableGlobalCache: false
+
 nodeLinker: pnp
 
 packageExtensions:
-  "probot@*":
-    dependencies:
-      bottleneck: "^2.19.5"
-      body-parser: "^1.20.2"
   "@design-factory/design-factory@*":
     peerDependencies:
       "@angular/router": ~16.2.0
@@ -17,10 +19,10 @@ packageExtensions:
       "@angular/compiler-cli": ~16.2.0
       "@schematics/angular": ~16.2.0
       "@types/node": ^17.0.23
+      esbuild: ^0.17.5
       eslint: ^8.42.0
-      rxjs: ^7.8.1
       nx: ^16.10.0
-      esbuild: ^0.17.5
+      rxjs: ^7.8.1
       typescript: ~5.1.6
   "@nx/cypress@^16.10.0":
     dependencies:
@@ -29,15 +31,19 @@ packageExtensions:
     dependencies:
       nx: ^16.10.0
       typescript: ~5.1.6
+  "@nx/eslint-plugin@^16.10.0":
+    dependencies:
+      "@typescript-eslint/parser": ^5.60.1
+      eslint: ^8.42.0
   "@nx/jest@^16.10.0":
     dependencies:
       nx: ^16.10.0
       typescript: ~5.1.6
   "@nx/js@^16.10.0":
     dependencies:
+      "@types/node": ^18.0.0
       nx: ^16.10.0
       typescript: ~5.1.6
-      "@types/node": "^18.0.0"
   "@nx/linter@^16.10.0":
     dependencies:
       nx: ^16.10.0
@@ -46,10 +52,6 @@ packageExtensions:
       "@types/node": ^17.0.23
       nx: ^16.10.0
       typescript: ~5.1.6
-  "@nx/eslint-plugin@^16.10.0":
-    dependencies:
-      "@typescript-eslint/parser": "^5.60.1"
-      eslint: ^8.42.0
   "@storybook/core-common@*":
     dependencies:
       react: ^16.14.0
@@ -58,12 +60,12 @@ packageExtensions:
     dependencies:
       react: ^16.14.0
       react-dom: ^16.14.0
-  "postcss-loader@^7.2.4":
+  postcss-loader@^7.2.4:
     dependencies:
       "@types/node": ^17.0.23
+  probot@*:
+    dependencies:
+      body-parser: ^1.20.2
+      bottleneck: ^2.19.5
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

README.md

@@ -9,7 +9,9 @@ The **Otter** project is a highly modular framework whose goal is to provide a c
 It is split into several units to cover different aspects of these applications (localization, testing, customization, etc.).
 Also, to customize an application, metadata can be extracted from the application source code and injected into a CMS to manage dynamic configuration.
 
-> **Note**:  The full documentation is available [here](./docs/README.md).
+> **Note**: The full documentation is available [here](./docs/README.md). 
+> 
+> **Note**: A showcase to help you integrate some simple use case is available [here](https://amadeusitgroup.github.io/otter/#/home) 
 
 ## Built With
 

apps/chrome-devtools/package.json

@@ -29,10 +29,10 @@
   ],
   "devDependencies": {
     "@angular-devkit/build-angular": "~16.2.0",
-    "@angular-eslint/builder": "~16.2.0",
-    "@angular-eslint/eslint-plugin": "~16.2.0",
-    "@angular-eslint/eslint-plugin-template": "~16.2.0",
-    "@angular-eslint/template-parser": "~16.2.0",
+    "@angular-eslint/builder": "~16.3.0",
+    "@angular-eslint/eslint-plugin": "~16.3.0",
+    "@angular-eslint/eslint-plugin-template": "~16.3.0",
+    "@angular-eslint/template-parser": "~16.3.0",
     "@angular/cli": "~16.2.0",
     "@angular/compiler": "~16.2.0",
     "@angular/compiler-cli": "~16.2.0",
@@ -44,7 +44,7 @@
     "@o3r/eslint-plugin": "workspace:^",
     "@o3r/localization": "workspace:^",
     "@o3r/rules-engine": "workspace:^",
-    "@types/chrome": "^0.0.248",
+    "@types/chrome": "^0.0.254",
     "@types/jest": "~29.5.2",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",

apps/github-cascading-app/package.json

@@ -20,9 +20,9 @@
     "@actions/github": "^5.1.1",
     "@angular-devkit/build-angular": "~16.2.0",
     "@angular-devkit/core": "~16.2.0",
-    "@angular-eslint/builder": "~16.2.0",
-    "@angular-eslint/eslint-plugin": "~16.2.0",
-    "@angular-eslint/eslint-plugin-template": "~16.2.0",
+    "@angular-eslint/builder": "~16.3.0",
+    "@angular-eslint/eslint-plugin": "~16.3.0",
+    "@angular-eslint/eslint-plugin-template": "~16.3.0",
     "@angular/common": "~16.2.0",
     "@angular/compiler": "~16.2.0",
     "@angular/compiler-cli": "~16.2.0",

apps/showcase/package.json

@@ -36,7 +36,7 @@
     "@design-factory/design-factory": "^15.2.2",
     "@formatjs/intl-numberformat": "~8.9.0",
     "@ng-bootstrap/ng-bootstrap": "^15.1.1",
-    "@ng-select/ng-select": "~11.0.0",
+    "@ng-select/ng-select": "~11.2.0",
     "@ngrx/effects": "~16.3.0",
     "@ngrx/entity": "~16.3.0",
     "@ngrx/store": "~16.3.0",
@@ -74,9 +74,9 @@
     "@angular-devkit/build-angular": "~16.2.0",
     "@angular-devkit/core": "~16.2.0",
     "@angular-devkit/schematics": "~16.2.0",
-    "@angular-eslint/eslint-plugin": "~16.2.0",
-    "@angular-eslint/eslint-plugin-template": "~16.2.0",
-    "@angular-eslint/template-parser": "~16.2.0",
+    "@angular-eslint/eslint-plugin": "~16.3.0",
+    "@angular-eslint/eslint-plugin-template": "~16.3.0",
+    "@angular-eslint/template-parser": "~16.3.0",
     "@angular/cli": "~16.2.0",
     "@angular/compiler-cli": "~16.2.0",
     "@nx/eslint-plugin": "~16.10.0",

apps/showcase/project.json

@@ -147,7 +147,10 @@
         "name": "showcase",
         "libraries": [],
         "placeholdersMetadataFilePath": "apps/showcase/placeholders.metadata.manual.json",
-        "exposedComponentSupport": true
+        "exposedComponentSupport": true,
+        "globalConfigCategories": [
+          { "name": "globalCategory", "label": "Global category" }
+        ]
       },
       "dependsOn": [
         "compile"
@@ -238,7 +241,8 @@
         "libraries": [],
         "extraFilePatterns": [
           "src/i18n/*.localization.json"
-        ]
+        ],
+        "strictMode": true
       },
       "dependsOn": [
         "^build",

apps/showcase/src/app/app.component.html

@@ -1,5 +1,7 @@
 <header>
-  <button class="btn btn-lg d-xl-none mobile-menu-btn" (click)="open(content)"><i class="bi bi-list"></i></button>
+  <button class="btn btn-lg d-xl-none mobile-menu-btn" (click)="open(content)" title="Open side navigation">
+    <i class="bi bi-list"></i>
+  </button>
   <div class="header-title p-xl-3">
     <div class="header-icon">
       <img src="assets/otter-sticker.svg" width="48" height="48" alt="Otter logo" />
@@ -27,7 +29,7 @@
       <div class="col-12 col-md-8">
       </div>
       <div class="col-12 col-md-4">
-        <h5>Links</h5>
+        <h2 class="h5">Links</h2>
         <ul class="list-unstyled">
           <li>
             <a href="https://github.com/AmadeusITGroup/otter">Github</a>

apps/showcase/src/app/configuration/configuration.template.html

@@ -30,8 +30,10 @@ <h2 id="configuration-examples">Examples</h2>
       <div class="row">
         <o3r-copy-text-pres language="html" [text]="codeConfig()" class="col-12 col-md-8 col-lg-9"></o3r-copy-text-pres>
         <div class="d-flex gap-2 align-self-start mt-md-2 pb-3 col-12 col-md-4 col-lg-3">
-          <button type="button" class="btn btn-primary" [class.disabled]="config()" (click)="toggleConfig()">Override</button>
-          <button type="button" class="btn btn-danger" [class.disabled]="!config()" (click)="toggleConfig()">Clear</button>
+          <button type="button" class="btn btn-primary" disabled="{{config()}}"
+                  [class.disabled]="config()" (click)="toggleConfig()">Override</button>
+          <button type="button" class="btn btn-danger" disabled="{{!config()}}"
+                  [class.disabled]="!config()" (click)="toggleConfig()">Clear</button>
         </div>
       </div>
       <p>
@@ -49,7 +51,7 @@ <h2 id="configuration-add-config-later">How to add configuration to a component<
     <o3r-copy-text-pres [wrap]="true" language="bash" text="ng g configuration-to-component --path='path/to/the/component/class/file'"></o3r-copy-text-pres>
     <h2 id="configuration-metadata">Metadata</h2>
     <div>
-      <h4>How to extract</h4>
+      <h3>How to extract</h3>
       <o3r-copy-text-pres [wrap]="true" language="bash" text="ng run project-name:extract-components"></o3r-copy-text-pres>
       <p>It will extract components' configuration and generate the two following files: <code>component.config.metadata.json</code> and <code>component.class.metadata.json</code></p>
       <p>Check the list of options available by running:</p>

apps/showcase/src/app/dynamic-content/dynamic-content.template.html

@@ -24,8 +24,10 @@ <h2 id="dynamic-content-example">Example</h2>
       <div class="row">
         <o3r-copy-text-pres class="col-12 col-md-8 col-lg-9" language="html" [text]="codeDataDynamicContentPath"></o3r-copy-text-pres>
         <div class="d-flex gap-2 align-self-start mt-md-2 pb-3 col-12 col-md-4 col-lg-3">
-          <button type="button" class="btn btn-primary" [class.disabled]="bodyDynamicContentPath" (click)="setLocalStorage()">Override</button>
-          <button type="button" class="btn btn-danger" [class.disabled]="!bodyDynamicContentPath" (click)="clearLocalStorage()">Clear</button>
+          <button type="button" class="btn btn-primary" disabled="{{bodyDynamicContentPath}}"
+                  [class.disabled]="bodyDynamicContentPath" (click)="setLocalStorage()">Override</button>
+          <button type="button" class="btn btn-danger" disabled="{{!bodyDynamicContentPath}}"
+                  [class.disabled]="!bodyDynamicContentPath" (click)="clearLocalStorage()">Clear</button>
         </div>
       </div>
       <p>

apps/showcase/src/app/rules-engine/rules-engine.component.ts

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { AfterViewInit, ChangeDetectionStrategy, Component, OnInit, QueryList, ViewChildren, ViewEncapsulation } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { NgbNav, NgbNavItem, NgbNavLink } from '@ng-bootstrap/ng-bootstrap';
+import { NgbNav, NgbNavContent, NgbNavItem, NgbNavLink, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { ApplicationDevtoolsModule } from '@o3r/application';
 import { ComponentsDevtoolsModule } from '@o3r/components';
@@ -49,7 +49,9 @@ import { CurrentTimeFactsService } from '../../services/current-time-facts.servi
     IN_PAGE_NAV_PRES_DIRECTIVES,
     NgbNav,
     NgbNavItem,
-    NgbNavLink
+    NgbNavLink,
+    NgbNavContent,
+    NgbNavOutlet
   ],
   templateUrl: './rules-engine.template.html',
   styleUrls: ['./rules-engine.style.scss'],