Pull request #1525: Release/patch 12.0.1

Merge in OUI/oblique from release/patch_12.0.1 to master * commit '7a27462508b91b79a1c4449cc73184530e81b697': chore(toolchain): release version 12.0.1 chore(toolchain): update dependencies and refactor accordingly fix(oblique/master-layout): add a padding around the service navigation fix(oblique/service-navigation): make sure the language selection's height is consistent fix(oblique/breadcrumb): ensure accessibility using aria attributes fix(oblique/button): make it an inline element fix(sds/tabbed-page): don't navigate to welcome page when clicking on component links fix(sds/text-page): don't reload whole page for internal links
oblique-bit · Nov 1, 2024 · 7be37c8 · 7be37c8
2 parents 46fb3b8 + 7a27462
commit 7be37c8
Show file tree

Hide file tree

Showing 32 changed files with 1,019 additions and 1,018 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "Oblique",
   "name": "oblique",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "license": "MIT",
   "organization": {
     "name": "Federal Office of Information Technology, Systems and Telecommunication FOITT",
@@ -47,12 +47,12 @@
     "@angular/common": "^18.2.4",
     "@angular/compiler": "^18.2.4",
     "@angular/core": "^18.2.4",
-    "@angular/forms": "^18.2.7",
+    "@angular/forms": "^18.2.10",
     "@angular/material": "^18.2.4",
-    "@angular/material-moment-adapter": "^18.2.7",
+    "@angular/material-moment-adapter": "^18.2.11",
     "@angular/platform-browser": "^18.2.4",
-    "@angular/platform-browser-dynamic": "^18.2.7",
-    "@angular/router": "^18.2.7",
+    "@angular/platform-browser-dynamic": "^18.2.10",
+    "@angular/router": "^18.2.10",
     "@ngx-translate/core": "^15.0.0",
     "@popperjs/core": "^2.11.8",
     "ajv": "^8.17.1",
@@ -61,21 +61,21 @@
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.7.0",
+    "tslib": "^2.8.1",
     "zone.js": "^0.14.10"
   },
   "devDependencies": {
     "@angular-builders/jest": "^18.0.0",
-    "@angular-devkit/build-angular": "^18.2.7",
+    "@angular-devkit/build-angular": "^18.2.11",
     "@angular-devkit/core": "^18.2.4",
     "@angular-eslint/eslint-plugin": "^18.3.1",
     "@angular-eslint/eslint-plugin-template": "^18.3.1",
-    "@angular-eslint/template-parser": "^18.3.1",
-    "@angular/cli": "^18.2.7",
-    "@angular/compiler-cli": "^18.2.7",
-    "@types/jest": "^29.5.13",
+    "@angular-eslint/template-parser": "^18.4.0",
+    "@angular/cli": "^18.2.11",
+    "@angular/compiler-cli": "^18.2.10",
+    "@types/jest": "^29.5.14",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.16.11",
+    "@types/node": "^20.17.5",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "chalk": "^4.1.2",
@@ -86,10 +86,10 @@
     "jest-sonar": "^0.2.16",
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
-    "stylelint": "^16.9.0",
+    "stylelint": "^16.10.0",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-scss": "^6.7.0",
+    "stylelint-scss": "^6.8.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   }

diff --git a/projects/cli/package.json b/projects/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oblique/cli",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "description": "Command Line Interface to manage Oblique projects",
   "keywords": [
     "ob",

diff --git a/projects/cli/sonar-project.properties b/projects/cli/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/cli
 sonar.projectKey=oblique_cli
-sonar.projectVersion=12.0.0-rc.1
+sonar.projectVersion=12.0.1-rc.1
 sonar.typescript.lcov.reportPaths=coverage/cli/lcov.info
 sonar.testExecutionReportPaths=coverage/cli/sqr.xml
 sonar.tests=projects/cli/src

diff --git a/projects/design-system/package.json b/projects/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oblique/design-system",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "scripts": {
     "lint": "ts-node scripts/lint.ts",
     "format": "ts-node scripts/lint.ts --fix",
@@ -14,7 +14,7 @@
     "@angular/common": "^18.0.0 || ^19.0.0",
     "@angular/core": "^18.0.0 || ^19.0.0",
     "@angular/material": "^18.0.0 || ^19.0.0",
-    "@ngx-translate/core": ">=15.0.0"
+    "@ngx-translate/core": "^15.0.0"
   },
   "devDependencies": {
     "ng-packagr": "^18.2.1"

diff --git a/projects/design-system/sonar-project.properties b/projects/design-system/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/design-system
 sonar.projectKey=oblique_design-system
-sonar.projectVersion=12.0.0-rc.1
+sonar.projectVersion=12.0.1-rc.1
 sonar.typescript.lcov.reportPaths=coverage/design-system/lcov.info
 sonar.testExecutionReportPaths=coverage/design-system/sqr.xml
 sonar.tests=projects/design-system/src/lib

diff --git a/projects/oblique/CHANGELOG.md b/projects/oblique/CHANGELOG.md
@@ -1,3 +1,12 @@
+# [12.0.1](https://github.com/oblique-bit/oblique/compare/12.0.0...12.0.1) (2024-11-01)
+
+## Bug Fixes
+
+- **breadcrumb:** ensure accessibility using aria attributes ([9cabfc04](https://github.com/oblique-bit/oblique/commit/9cabfc044672645a513aea4fb7064f91cb1d359b))
+- **button:** make it an inline element ([d854f320](https://github.com/oblique-bit/oblique/commit/d854f32086acfa95ee6750e3e1d42233af9754f0))
+- **master-layout:** add a padding around the service navigation ([12a3dfe2](https://github.com/oblique-bit/oblique/commit/12a3dfe221080d57ca0a729566c5707404326f9c))
+- **service-navigation:** make sure the language selection's height is consistent ([506c5f1a](https://github.com/oblique-bit/oblique/commit/506c5f1a7a4c7743867e9d3dcd22cb0c77f2ee5d))
+
 # [12.0.0](https://github.com/oblique-bit/oblique/compare/11.3.4...12.0.0) (2024-10-08)
 
 ## Bug Fixes

diff --git a/projects/oblique/package.json b/projects/oblique/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oblique/oblique",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },
@@ -39,7 +39,7 @@
     "rxjs": "^7.0.0"
   },
   "dependencies": {
-    "@angular-eslint/schematics": "^18.3.1",
+    "@angular-eslint/schematics": "^18.4.0",
     "@angular/cdk": "^18.0.0 || ^19.0.0",
     "@schematics/angular": "^18.2.4",
     "ansi-colors": "^4.1.3",

diff --git a/projects/oblique/sonar-project.properties b/projects/oblique/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/oblique
 sonar.projectKey=oblique_oblique
-sonar.projectVersion=12.0.0-rc.1
+sonar.projectVersion=12.0.1-rc.1
 sonar.typescript.lcov.reportPaths=coverage/oblique/lcov.info
 sonar.testExecutionReportPaths=coverage/oblique/sqr.xml
 sonar.tests=projects/oblique/src/lib

diff --git a/projects/oblique/src/assets/i18n/oblique-de.json b/projects/oblique/src/assets/i18n/oblique-de.json
@@ -10,6 +10,7 @@
   "i18n.common.action": "Aktion",
   "i18n.common.close": "Schliessen",
   "i18n.common.clear": "Löschen",
+  "i18n.oblique.breadcrumb": "Brotkrümelnavigation",
   "i18n.oblique.occurrences": "Anzahl Notifikationen: {{occurrences}}",
   "i18n.oblique.external": "Öffnet in einem neuen Tab.",
   "i18n.oblique.file-upload.all.select": "Alle Zeilen auswählen",

diff --git a/projects/oblique/src/assets/i18n/oblique-en.json b/projects/oblique/src/assets/i18n/oblique-en.json
@@ -10,6 +10,7 @@
   "i18n.common.action": "Action",
   "i18n.common.close": "Close",
   "i18n.common.clear": "Clear",
+  "i18n.oblique.breadcrumb": "Breadcrumb",
   "i18n.oblique.occurrences": "Number of notifications: {{occurrences}}",
   "i18n.oblique.external": "Opens in a new tab.",
   "i18n.oblique.file-upload.all.select": "Select all rows",

diff --git a/projects/oblique/src/assets/i18n/oblique-fr.json b/projects/oblique/src/assets/i18n/oblique-fr.json
@@ -10,6 +10,7 @@
   "i18n.common.action": "Action",
   "i18n.common.close": "Fermer",
   "i18n.common.clear": "Supprimer",
+  "i18n.oblique.breadcrumb": "Fil d'Ariane",
   "i18n.oblique.occurrences": "Nombre de notifications : {{occurrences}}",
   "i18n.oblique.external": "S'ouvre dans un nouvel onglet.",
   "i18n.oblique.file-upload.all.select": "Sélectionner toutes les lignes",

diff --git a/projects/oblique/src/assets/i18n/oblique-it.json b/projects/oblique/src/assets/i18n/oblique-it.json
@@ -10,6 +10,7 @@
   "i18n.common.action": "Azione",
   "i18n.common.close": "Chiudere",
   "i18n.common.clear": "Eliminare",
+  "i18n.oblique.breadcrumb": "Le Breadcrumb",
   "i18n.oblique.occurrences": "Numero di notifiche: {{occurrences}}",
   "i18n.oblique.external": "Si apre in una nuova scheda.",
   "i18n.oblique.file-upload.all.select": "Selezionare tutte le righe",

diff --git a/projects/oblique/src/lib/breadcrumb/breadcrumb.component.html b/projects/oblique/src/lib/breadcrumb/breadcrumb.component.html
@@ -1,9 +1,10 @@
-<nav>
+<nav [attr.aria-label]="'i18n.oblique.breadcrumb' | translate">
 	<ol class="ob-breadcrumbs">
 		<li *ngFor="let crumb of breadcrumbs$ | async; last as isLast">
 			<ng-container *ngIf="!isLast">
 				<a
 					class="ob-breadcrumb-label"
+					[attr.mat-label]="crumb.label | translate"
 					#element
 					[routerLink]="crumb.url"
 					[style.max-width]="maxWidth"
@@ -15,7 +16,7 @@
 				<span class="ob-breadcrumb-separator ob-icon-text"><mat-icon svgIcon="chevron-small-right" /></span>
 			</ng-container>
 
-			<span class="ob-breadcrumb-label" *ngIf="isLast">{{ crumb.label | translate }}</span>
+			<span aria-current="page" class="ob-breadcrumb-label" *ngIf="isLast">{{ crumb.label | translate }}</span>
 		</li>
 	</ol>
 </nav>
diff --git a/...e/src/lib/master-layout/master-layout-header/master-layout-header.component-controls.scss b/...e/src/lib/master-layout/master-layout-header/master-layout-header.component-controls.scss
@@ -78,8 +78,7 @@
 		align-items: center;
 		justify-content: flex-end;
 		flex-wrap: wrap;
-		padding-right: variables.$ob-spacing-default;
-		padding-left: variables.$ob-spacing-default;
+		padding: variables.$ob-spacing-xs variables.$ob-spacing-default;
 
 		.ob-service-navigation-list {
 			flex-wrap: wrap;

diff --git a/.../oblique/src/lib/service-navigation/languages/service-navigation-languages.component.scss b/.../oblique/src/lib/service-navigation/languages/service-navigation-languages.component.scss
@@ -4,8 +4,6 @@
 .ob-service-navigation-languages {
 	.ob-language-dropdown {
 		&.ob-form-field {
-			padding-top: variables.$ob-spacing-default;
-
 			.mat-mdc-text-field-wrapper {
 				padding-left: variables.$ob-spacing-sm;
 			}
@@ -16,6 +14,8 @@
 
 			.mat-mdc-form-field-infix {
 				width: min-content;
+				min-height: variables.$ob-button-height;
+				padding: 0;
 
 				.mat-mdc-select-value {
 					padding-left: variables.$ob-spacing-xs;
@@ -34,6 +34,10 @@
 				padding-bottom: 0.25 * variables.$ob-spacing-xs;
 				cursor: pointer;
 			}
+
+			.mat-mdc-form-field-subscript-wrapper {
+				display: none;
+			}
 		}
 	}
 }

diff --git a/projects/oblique/src/lib/version.ts b/projects/oblique/src/lib/version.ts
@@ -1 +1 @@
-export const appVersion = '12.0.0';
+export const appVersion = '12.0.1';
diff --git a/projects/oblique/src/styles/scss/material/_mat-button.scss b/projects/oblique/src/styles/scss/material/_mat-button.scss
@@ -27,7 +27,7 @@
 		&.mat-mdc-icon-button {
 			padding: core-variables.$ob-spacing-md;
 			line-height: 1;
-			display: flex;
+			display: inline-flex;
 			justify-content: center;
 			align-items: center;
 
@@ -96,7 +96,7 @@
 
 			&.ob-external-link {
 				&.mat-mdc-icon-button {
-					display: flex;
+					display: inline-flex;
 					align-items: center;
 					justify-content: center;
 					font-size: unset;

diff --git a/projects/sandbox-ssr/package.json b/projects/sandbox-ssr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox-ssr",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "scripts": {
     "start": "ng serve",
     "start-ssr": "node ../../dist/sandbox-ssr/server/server.mjs",
@@ -12,9 +12,9 @@
     "release": "ts-node scripts/release.ts"
   },
   "dependencies": {
-    "@angular/platform-server": "^18.2.7",
-    "@angular/ssr": "^18.2.7",
-    "express": "^4.21.0"
+    "@angular/platform-server": "^18.2.10",
+    "@angular/ssr": "^18.2.11",
+    "express": "^4.21.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.21"

diff --git a/projects/sandbox-ssr/sonar-project.properties b/projects/sandbox-ssr/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/sandbox-ssr
 sonar.projectKey=oblique_sandbox-ssr
-sonar.projectVersion=12.0.0-rc.1
+sonar.projectVersion=12.0.1-rc.1
 sonar.typescript.lcov.reportPaths=coverage/sandbox-ssr/lcov.info
 sonar.testExecutionReportPaths=coverage/sandbox-ssr/sqr.xml
 sonar.tests=projects/sandbox-ssr/src/app

diff --git a/projects/sandbox/package.json b/projects/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "scripts": {
     "start": "ng serve",
     "start-pams": "ng serve --configuration pams",

diff --git a/projects/sandbox/sonar-project.properties b/projects/sandbox/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/sandbox
 sonar.projectKey=oblique_sandbox
-sonar.projectVersion=12.0.0-rc.1
+sonar.projectVersion=12.0.1-rc.1
 sonar.typescript.lcov.reportPaths=coverage/sandbox/lcov.info
 sonar.testExecutionReportPaths=coverage/sandbox/sqr.xml
 sonar.tests=projects/sandbox/src/app

diff --git a/projects/sds/CHANGELOG.md b/projects/sds/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [12.0.1](https://github.com/oblique-bit/oblique/compare/12.0.0...12.0.1) (2024-11-01)
+
+## Bug Fixes
+
+- **tabbed-page:** don't navigate to welcome page when clicking on component links ([22b84a83](https://github.com/oblique-bit/oblique/commit/22b84a834a08db3fd365892f8758478a93841a48))
+- **text-page:** don't reload whole page for internal links ([f3cf8219](https://github.com/oblique-bit/oblique/commit/f3cf8219d4fd3d42fd8c72d47f51859c28bfb326))
+
 # [12.0.0](https://github.com/oblique-bit/oblique/compare/11.3.4...12.0.0) (2024-10-08)
 
 ## Bug Fixes

diff --git a/projects/sds/package.json b/projects/sds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swiss-design-system",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "scripts": {
     "start": "ng serve",
     "lint": "ts-node scripts/lint.ts",

diff --git a/projects/sds/sonar-project.properties b/projects/sds/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/sds
 sonar.projectKey=oblique_sds
-sonar.projectVersion=12.0.0-rc.1
+sonar.projectVersion=12.0.1-rc.1
 sonar.typescript.lcov.reportPaths=coverage/sds/lcov.info
 sonar.testExecutionReportPaths=coverage/sds/sqr.xml
 sonar.tests=projects/sds/src/app

diff --git a/projects/sds/src/app/tabbed-page/tabbed-page.component.ts b/projects/sds/src/app/tabbed-page/tabbed-page.component.ts
@@ -3,7 +3,7 @@ import {ActivatedRoute, NavigationEnd, Router, UrlSerializer} from '@angular/rou
 import {CmsDataService} from '../cms/cms-data.service';
 import {CodeExampleDirective} from '../code-examples/code-example.directive';
 import {CodeExamplesMapper} from '../code-examples/code-examples.mapper';
-import {Observable, distinctUntilChanged, filter, map, mergeWith, partition, switchMap} from 'rxjs';
+import {Observable, concatWith, filter, first, map, partition, switchMap} from 'rxjs';
 import {SlugToIdService} from '../shared/slug-to-id/slug-to-id.service';
 import {URL_CONST} from '../shared/url/url.const';
 import {IdPipe} from '../shared/id/id.pipe';
@@ -76,9 +76,9 @@ export class TabbedPageComponent {
 	private buildPageIdObservables(): [Observable<number>, Observable<number>] {
 		return partition(
 			this.slugToIdService.readyToMap.pipe(
-				mergeWith(this.router.events.pipe(filter(event => event instanceof NavigationEnd))),
+				first(),
+				concatWith(this.router.events.pipe(filter(event => event instanceof NavigationEnd))),
 				map(() => this.activatedRoute.snapshot.paramMap.get(URL_CONST.urlParams.selectedSlug) ?? ''),
-				distinctUntilChanged(),
 				map(slug => this.slugToIdService.getIdForSlug(slug))
 			),
 			id => id !== undefined

diff --git a/projects/sds/src/app/text-page/text-page.component.ts b/projects/sds/src/app/text-page/text-page.component.ts
@@ -1,4 +1,4 @@
-import {Component, inject} from '@angular/core';
+import {Component, HostListener, inject} from '@angular/core';
 import {DomSanitizer, SafeHtml} from '@angular/platform-browser';
 import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
 import {Observable, concatWith, filter, first, map, partition, switchMap} from 'rxjs';
@@ -34,6 +34,16 @@ export class TextPageComponent {
 		this.selectedContent$ = this.buildSelectedContentObservable(validPageId$);
 	}
 
+	@HostListener('click', ['$event'])
+	onClick(event: MouseEvent): void {
+		const {target} = event;
+		if (!(target instanceof HTMLAnchorElement && target.target !== '_blank')) {
+			return;
+		}
+		event.preventDefault();
+		void this.router.navigate([target.pathname]);
+	}
+
 	private buildPageIdObservables(): [Observable<number>, Observable<number>] {
 		return partition(
 			this.slugToIdService.readyToMap.pipe(

diff --git a/projects/sds/src/obliqueVersion.ts b/projects/sds/src/obliqueVersion.ts
@@ -1 +1 @@
-export const latest = '12.0.0';
+export const latest = '12.0.1';
diff --git a/projects/service-navigation-web-component/CHANGELOG.md b/projects/service-navigation-web-component/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [12.0.1](https://github.com/oblique-bit/oblique/compare/12.0.0...12.0.1) (2024-11-01)
+
+## Bug Fixes
+
+- **service-navigation:** make sure the language selection's height is consistent ([506c5f1a](https://github.com/oblique-bit/oblique/commit/506c5f1a7a4c7743867e9d3dcd22cb0c77f2ee5d))
+
 # [12.0.0](https://github.com/oblique-bit/oblique/compare/11.3.4...12.0.0) (2024-10-08)
 
 ## Bug Fixes