Cascading main to 10 next (#1170)

.github/workflows/publish.yml

@@ -109,7 +109,7 @@ jobs:
       - name: 'Publish Cascading Azure Functions'
         env:
           PUBLISH_PROFILE: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_8996AC226FB9456EA73A6B8439B12946 || secrets.CASCADING_AZURE_APP_PUBLISH_PROFILE }}
-        if: env.PUBLISH_PROFILE != null && steps.get-npm-tag.outputs.tag == 'latest'
+        if: env.PUBLISH_PROFILE != null && (github.base_ref == 'main' || github.ref_name == 'main')
         uses: Azure/functions-action@v1
         with:
           app-name: 'github-cascading'

.renovaterc.json

@@ -195,12 +195,39 @@
       }
     },
     {
+      "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"
       ],
@@ -211,6 +238,7 @@
       "enabled": false
     },
     {
+      "groupName": "Major update of globby disabled as it drops support on CommonJS",
       "matchUpdateTypes": [
         "major"
       ],

apps/github-cascading-app/src/cascading/templates/pull-request-content.ejs

@@ -51,7 +51,7 @@ You can fix the issue locally with the following commands:
   and update this Pull Request with
 
   ```shell
-  git push origin <%= targetBranch %>
+  git push origin HEAD:<%= originBranchName %>
   ```
 </details>
 

apps/showcase/project.json

@@ -230,7 +230,8 @@
         "tsConfig": "apps/showcase/tsconfig.cms.json",
         "outputFile": "apps/showcase/localisation.metadata.json",
         "libraries": [],
-        "extraFilePatterns": ["src/i18n/*.localization.json"]
+        "extraFilePatterns": ["src/i18n/*.localization.json"],
+        "strictMode": true
       },
       "dependsOn": ["^build", "^build-builders"]
     },

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 { AsyncPipe } 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';
@@ -53,6 +53,8 @@ import { CurrentTimeFactsService } from '../../services/current-time-facts.servi
     NgbNav,
     NgbNavItem,
     NgbNavLink,
+    NgbNavContent,
+    NgbNavOutlet,
     AsyncPipe
   ],
   templateUrl: './rules-engine.template.html',

apps/showcase/src/app/rules-engine/rules-engine.template.html

@@ -109,7 +109,7 @@ <h3>How to extract</h3>
       <p>It will extract application facts and operators in the following files: <code>rules.facts.metadata.json</code> and <code>rules.operators.metadata.json</code></p>
       <p>Check the list of options available by running:</p>
       <o3r-copy-text-pres [wrap]="true" language="bash" text="ng run project-name:extract-rules-engine --help"></o3r-copy-text-pres>
-      </div>
+    </div>
     <h2 id="rules-engine-references">References</h2>
     <ul>
       <li>

apps/showcase/src/components/showcase/basic/basic-pres.template.html

@@ -11,7 +11,7 @@ <h2 class="bg-body-tertiary text-secondary border border-light-subtle border-3 r
             <div aria-hidden="true" class="bg-body-tertiary position-absolute start-0 top-50 border border-light-subtle border-3 border-end-0 border-bottom-0"></div>
           </h2>
         </div>
-        <h5 class="row card-text mt-auto ms-1">Where do you want to go?</h5>
+        <h3 class="row card-text mt-auto ms-1 h5">Where do you want to go?</h3>
         <form class="row g-2" [formGroup]="form">
           <div class="col-12 col-xl-6">
             <div class="input-group">

apps/showcase/src/components/showcase/configuration/configuration-pres.template.html

@@ -11,7 +11,7 @@ <h2 class="bg-body-tertiary text-secondary border border-light-subtle border-3 b
             <div aria-hidden="true" class="bg-body-tertiary position-absolute start-0 top-50 border border-light-subtle border-3 border-end-0 border-bottom-0"></div>
           </h2>
         </div>
-        <h5 class="row card-text mt-auto ms-1">Where do you want to go?</h5>
+        <h3 class="row card-text mt-auto ms-1 h5">Where do you want to go?</h3>
         <form class="row g-2" [formGroup]="form">
           <div class="col-12 col-xl-6" [class.col-xl-12]="(config$ | async)?.shouldProposeRoundTrip">
             <div class="input-group">

apps/showcase/src/components/showcase/dynamic-content/dynamic-content-pres.template.html

@@ -11,7 +11,7 @@ <h2 class="bg-body-tertiary text-secondary border border-light-subtle border-3 b
             <div aria-hidden="true" class="bg-body-tertiary position-absolute start-0 top-50 border border-light-subtle border-3 border-end-0 border-bottom-0"></div>
           </h2>
         </div>
-        <h5 class="row card-text mt-auto ms-1">Where do you want to go?</h5>
+        <h3 class="row card-text mt-auto ms-1 h5">Where do you want to go?</h3>
         <form class="row g-2" [formGroup]="form">
           <div class="col-12 col-xl-6">
             <div class="input-group">

apps/showcase/src/components/showcase/localization/localization-pres.template.html

@@ -15,7 +15,7 @@ <h2 class="bg-body-tertiary text-secondary border border-light-subtle border-3 b
             <div aria-hidden="true" class="bg-body-tertiary position-absolute start-0 top-50 border border-light-subtle border-3 border-end-0 border-bottom-0"></div>
           </h2>
         </div>
-        <h5 class="row card-text mt-auto ms-1">{{ translations.question | translate }}</h5>
+        <h3 class="row card-text mt-auto ms-1 h5">{{ translations.question | translate }}</h3>
         <form class="row g-2" [formGroup]="form">
           <div class="col-12 col-xl-6">
             <div class="input-group">

apps/showcase/src/components/showcase/rules-engine/rules-engine-pres.template.html

@@ -15,7 +15,7 @@ <h2 class="bg-body-tertiary text-secondary border border-light-subtle border-3 b
             <div aria-hidden="true" class="bg-body-tertiary position-absolute start-0 top-50 border border-light-subtle border-3 border-end-0 border-bottom-0"></div>
           </h2>
         </div>
-        <h5 class="row card-text mt-auto ms-1">{{ translations.question | translate }}</h5>
+        <h3 class="row card-text mt-auto ms-1 h5">{{ translations.question | translate }}</h3>
         <form class="row g-2" [formGroup]="form">
           <div class="col-12 col-xl-6" [class.col-xl-12]="(config$ | async)?.shouldProposeRoundTrip">
             <div class="input-group">

apps/showcase/src/components/showcase/sdk/sdk-pres.template.html

@@ -125,7 +125,7 @@
         </ngb-pagination>
 
         <select class="form-select w-auto" name="pageSize" [ngModel]="pageSize()"
-                (ngModelChange)="pageSize.set($event)">
+                (ngModelChange)="pageSize.set($event)" aria-label="Select the number of items per page">
           <option [ngValue]="10">10 items per page</option>
           <option [ngValue]="50">50 items per page</option>
           <option [ngValue]="100">100 items per page</option>

apps/showcase/src/components/utilities/in-page-nav/in-page-nav-pres.template.html

@@ -1,4 +1,4 @@
-<h5>On this page</h5>
+<h2>On this page</h2>
 <nav [id]="id" class="navbar px-3 mb-3">
   <ul class="nav nav-pills flex-column">
     @for (link of links; track link.id) {

apps/showcase/src/styles.scss

@@ -32,10 +32,23 @@ h1, h2 {
   z-index: inherit;
 }
 
+.hljs-built_in, .hljs-symbol {
+  color: #bd5208;
+}
+.hljs-name, .hljs-quote, .hljs-selector-tag, .hljs-selector-pseudo {
+  color: #218338;
+}
+
 // Start overrides of design factory
 .navbar {
   box-shadow: none;
 }
+@include design-factory.media-breakpoint-down(lg) {
+  .nav-pills .nav-link {
+    font-size: 1.25rem;
+    --bs-nav-link-padding-y: 1rem;
+  }
+}
 // End overrides
 
 // Start temporary workarounds until we migrate back to bootstrap 5.3