Pull request #1486: Release/patch 11.3.3

Merge in OUI/oblique from release/patch_11.3.3 to master

* commit '0ed914b35957483b037f4e8b6a7cf5cee954acf0':
  chore(toolchain): release version 11.3.3
  chore(toolchain): update dependencies and refactor accordingly
  fix(oblique/master-layout): fix scroll to top behavior
  fix(sandbox/material): move actions header outside table caption

package.json

@@ -1,7 +1,7 @@
 {
   "title": "Oblique",
   "name": "oblique",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "license": "MIT",
   "organization": {
     "name": "Federal Office of Information Technology, Systems and Telecommunication FOITT",
@@ -57,34 +57,34 @@
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
     "rxjs": "^7.8.1",
-    "tslib": "^2.6.3",
-    "zone.js": "^0.14.8"
+    "tslib": "^2.7.0",
+    "zone.js": "^0.14.10"
   },
   "devDependencies": {
     "@angular-builders/jest": "^17.0.3",
-    "@angular-devkit/build-angular": "^17.3.8",
+    "@angular-devkit/build-angular": "^17.3.9",
     "@angular-devkit/core": "^17.2.0",
     "@angular-eslint/eslint-plugin": "^17.1.1",
     "@angular-eslint/eslint-plugin-template": "^17.1.1",
     "@angular-eslint/template-parser": "^17.5.2",
-    "@angular/cli": "^17.3.8",
+    "@angular/cli": "^17.3.9",
     "@angular/compiler-cli": "^17.3.12",
     "@types/jest": "^29.5.12",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.14.11",
+    "@types/node": "^20.16.2",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "husky": "^9.1.1",
+    "husky": "^9.1.5",
     "jest": "^29.7.0",
     "jest-sonar": "^0.2.16",
-    "lint-staged": "^15.2.7",
+    "lint-staged": "^15.2.9",
     "prettier": "^3.3.3",
-    "stylelint": "^16.7.0",
+    "stylelint": "^16.9.0",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-scss": "^6.4.1",
+    "stylelint-scss": "^6.5.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.2.2"
   }

projects/oblique/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [11.3.3](https://github.com/oblique-bit/oblique/compare/11.3.2...11.3.3) (2024-08-30)
+
+## Bug Fixes
+
+- **master-layout:** fix scroll to top behavior ([e5839299](https://github.com/oblique-bit/oblique/commit/e5839299a1c1020993c834cc97539eb6c9054579))
+
 # [11.3.2](https://github.com/oblique-bit/oblique/compare/11.3.1...11.3.2) (2024-07-19)
 
 ## Bug Fixes

projects/oblique/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oblique/oblique",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "ng-packagr": "^17.3.0",
-    "uglify-js": "^3.19.0"
+    "uglify-js": "^3.19.3"
   },
   "schematics": "./schematics/collection.json",
   "ng-update": {

projects/oblique/sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/oblique
 sonar.projectKey=oblique_oblique
-sonar.projectVersion=11.3.2
+sonar.projectVersion=11.3.3
 sonar.typescript.lcov.reportPaths=coverage/oblique/lcov.info
 sonar.testExecutionReportPaths=coverage/oblique/sqr.xml
 sonar.tests=projects/oblique/src/lib

projects/oblique/src/lib/master-layout/master-layout/master-layout.component.ts

@@ -211,20 +211,22 @@ export class ObMasterLayoutComponent implements OnInit, DoCheck, AfterViewInit,
 		this.masterLayout.header.configEvents$
 			.pipe(
 				filter((evt: ObIMasterLayoutEvent) => evt.name === ObEMasterLayoutEventValues.HEADER_IS_STICKY),
+				tap((evt: ObIMasterLayoutEvent) => (this.isHeaderSticky = evt.value)),
 				tap(() => (this.scrollTarget = this.getScrollTarget())),
 				takeUntil(this.unsubscribe)
 			)
-			.subscribe(event => (this.isHeaderSticky = event.value));
+			.subscribe();
 	}
 
 	private footerIsStickyChange(): void {
 		this.masterLayout.footer.configEvents$
 			.pipe(
 				filter((evt: ObIMasterLayoutEvent) => evt.name === ObEMasterLayoutEventValues.FOOTER_IS_STICKY),
+				tap((evt: ObIMasterLayoutEvent) => (this.isFooterSticky = evt.value)),
 				tap(() => (this.scrollTarget = this.getScrollTarget())),
 				takeUntil(this.unsubscribe)
 			)
-			.subscribe(event => (this.isFooterSticky = event.value));
+			.subscribe();
 	}
 
 	private focusFragment(): void {

projects/oblique/src/lib/version.ts

@@ -1 +1 @@
-export const appVersion = '11.3.2';
+export const appVersion = '11.3.3';

projects/sandbox/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [11.3.3](https://github.com/oblique-bit/oblique/compare/11.3.2...11.3.3) (2024-08-30)
+
+## Bug Fixes
+
+- **material:** move actions header outside table caption ([967f6896](https://github.com/oblique-bit/oblique/commit/967f68961cd783e391eccfe636609b2ac10ff2d1))
+
 # [11.3.1](https://github.com/oblique-bit/oblique/compare/11.3.0...11.3.1) (2024-07-12)
 
 ## Bug Fixes

projects/sandbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "scripts": {
     "start": "ng serve",
     "start-pams": "ng serve --configuration pams",

projects/sandbox/sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/sandbox
 sonar.projectKey=oblique_sandbox
-sonar.projectVersion=11.3.2
+sonar.projectVersion=11.3.3
 sonar.typescript.lcov.reportPaths=coverage/sandbox/lcov.info
 sonar.testExecutionReportPaths=coverage/sandbox/sqr.xml
 sonar.tests=projects/sandbox/src/app

projects/sandbox/src/app/material/table/table.component.html

@@ -1,19 +1,13 @@
 <h2 class="page-header">Table</h2>
 <ob-column-layout [left]="false">
 	<div column-main-content [class.ob-table-scrollable]="isScrollable$ | async">
-		<form [formGroup]="tableManager.editForm">
-			<table
-				*ngIf="isStructureDefault$ | async"
-				mat-table
-				matSort
-				[dataSource]="tableManager.dataSource"
-				[ngClass]="obliqueStyles$ | async"
-			>
+		<form [formGroup]="tableManager.editForm" [ngClass]="collapsedStyles$ | async">
+			<div class="actions-header">
+				<ng-container [ngTemplateOutlet]="actionsHeader" [ngTemplateOutletContext]="{ tableManager }" />
+			</div>
+			<table *ngIf="isStructureDefault$ | async" mat-table matSort [dataSource]="tableManager.dataSource" [ngClass]="tableStyles$ | async">
 				<caption *ngIf="hasCaption$ | async">
 					This is a table caption
-					<div class="collapsed-table">
-						<ng-container [ngTemplateOutlet]="actionsHeader" [ngTemplateOutletContext]="{ tableManager }" />
-					</div>
 				</caption>
 				<ng-container [matColumnDef]="COLUMN_NAME_SELECT">
 					<th mat-header-cell *matHeaderCellDef>

projects/sandbox/src/app/material/table/table.component.scss

@@ -67,31 +67,30 @@
 	width: unset;
 }
 
-table {
-	&:not(.ob-table),
+form {
 	&:not(.ob-table-collapse),
 	&:not(.ob-table-collapse-sm),
 	&:not(.ob-table-collapse-md) {
-		.collapsed-table {
+		.actions-header {
 			display: none;
 		}
 	}
 
 	@include layout.ob-media-breakpoint-down(md) {
-		&.ob-table.ob-table-collapse .collapsed-table {
-			display: table;
+		&.ob-table-collapse .actions-header {
+			display: block;
 		}
 	}
 
 	@include layout.ob-media-breakpoint-down(md) {
-		&.ob-table.ob-table-collapse-md .collapsed-table {
-			display: table;
+		&.ob-table-collapse-md .actions-header {
+			display: block;
 		}
 	}
 
 	@include layout.ob-media-breakpoint-down(sm) {
-		&.ob-table.ob-table-collapse-sm .collapsed-table {
-			display: table;
+		&.ob-table-collapse-sm .actions-header {
+			display: block;
 		}
 	}
 }

projects/sandbox/src/app/material/table/table.component.ts

@@ -19,7 +19,8 @@ export class TableComponent implements OnInit, AfterViewInit, OnDestroy {
 	@ViewChild(MatPaginator) paginator: MatPaginator;
 	@ViewChild(MatInput) firstInput: MatInput;
 	controls: UntypedFormGroup;
-	obliqueStyles$: Observable<Record<string, boolean>>;
+	tableStyles$: Observable<Record<string, boolean>>;
+	collapsedStyles$: Observable<Record<string, boolean>>;
 	isStructureDefault$: Observable<boolean>;
 	hasCaption$: Observable<boolean>;
 	isScrollable$: Observable<boolean>;
@@ -120,7 +121,8 @@ export class TableComponent implements OnInit, AfterViewInit, OnDestroy {
 		this.isStructureDefault$ = this.valueChanges<boolean>('default').pipe(tap(isDefault => this.structureChange(isDefault)));
 		this.hasCaption$ = this.valueChanges<boolean>('caption');
 		this.isScrollable$ = this.valueChanges<string>('collapsed').pipe(map(value => value === 'ob-table-scrollable'));
-		this.obliqueStyles$ = this.getCollapsedStylesObservable();
+		this.tableStyles$ = this.getTableStylesObservable();
+		this.collapsedStyles$ = this.getCollapsedStylesObservable();
 	}
 
 	private valueChanges<T>(field: string): Observable<T> {
@@ -160,14 +162,17 @@ export class TableComponent implements OnInit, AfterViewInit, OnDestroy {
 		}
 	}
 
+	private getTableStylesObservable(): Observable<Record<string, boolean>> {
+		return combineLatest([this.valueChanges<Record<string, boolean>>('style'), this.getCollapsedStylesObservable()]).pipe(
+			map(classes => ({...classes[0], ...classes[1]}))
+		);
+	}
+
 	private getCollapsedStylesObservable(): Observable<Record<string, boolean>> {
 		const collapse = ['ob-table-collapse', 'ob-table-collapse-sm', 'ob-table-collapse-md'];
-		return combineLatest([
-			this.valueChanges<Record<string, boolean>>('style'),
-			this.valueChanges<string>('collapsed').pipe(
-				map(value => collapse.reduce<Record<string, boolean>>((total, current) => ({...total, [current]: current === value}), {}))
-			)
-		]).pipe(map(classes => ({...classes[0], ...classes[1]})));
+		return this.valueChanges<string>('collapsed').pipe(
+			map(value => collapse.reduce<Record<string, boolean>>((total, current) => ({...total, [current]: current === value}), {}))
+		);
 	}
 
 	private handleDisableState(isEnabled: boolean): void {

projects/sds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swiss-design-system",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "scripts": {
     "start": "ng serve",
     "lint": "ts-node scripts/lint.ts",

projects/sds/sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/sds
 sonar.projectKey=oblique_sds
-sonar.projectVersion=11.3.2
+sonar.projectVersion=11.3.3
 sonar.typescript.lcov.reportPaths=coverage/sds/lcov.info
 sonar.testExecutionReportPaths=coverage/sds/sqr.xml
 sonar.tests=projects/sds/src/app

projects/sds/src/obliqueVersion.ts

@@ -1 +1 @@
-export const latest = '11.3.2';
+export const latest = '11.3.3';

projects/service-navigation-web-component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oblique/service-navigation-web-component",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },

projects/service-navigation-web-component/sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectName=@oblique/service-navigation
 sonar.projectKey=oblique_service-navigation
-sonar.projectVersion=11.3.2
+sonar.projectVersion=11.3.3
 sonar.typescript.lcov.reportPaths=coverage/service-navigation-web-component/lcov.info
 sonar.testExecutionReportPaths=coverage/service-navigation-web-component/sqr.xml
 sonar.tests=projects/service-navigation-web-component/src/app