Pull request #1464: Release/patch 11.3.2

Merge in OUI/oblique from release/patch_11.3.2 to master * commit '0981c8eb4b0a7aa6c2bfbe51f4a4cc8e88a46bcb': chore(toolchain): release version 11.3.2 chore(toolchain): update dependencies and refactor accordingly fix(oblique/service-navigation): increase icon size refactor(oblique/service-navigation): use interpolation in `calc` to avoid confusing the IDE fix(toolchain): ensure packages are correctly matched when collecting commits for the changelog fix(service-navigation/toolchain): fix changelog links fix(sds/toolchain): fix changelog links fix(sandbox/toolchain): fix changelog links fix(oblique/toolchain): fix changelog links fix(toolchain): list commits with long hash fix(oblique/service-navigation): ensure the status icon are tied to their applications
oblique-bit · Jul 19, 2024 · d9ed7d7 · d9ed7d7
2 parents 9cc60cc + 0981c8e
commit d9ed7d7
Show file tree

Hide file tree

Showing 22 changed files with 324 additions and 256 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": "11.3.1",
+  "version": "11.3.2",
   "license": "MIT",
   "organization": {
     "name": "Federal Office of Information Technology, Systems and Telecommunication FOITT",
@@ -43,22 +43,22 @@
     "@angular/common": "^17.2.1",
     "@angular/compiler": "^17.2.1",
     "@angular/core": "^17.2.1",
-    "@angular/forms": "^17.3.11",
+    "@angular/forms": "^17.3.12",
     "@angular/material": "^17.2.0",
     "@angular/material-moment-adapter": "^17.3.10",
     "@angular/platform-browser": "^17.2.1",
-    "@angular/platform-browser-dynamic": "^17.3.11",
-    "@angular/router": "^17.3.11",
+    "@angular/platform-browser-dynamic": "^17.3.12",
+    "@angular/router": "^17.3.12",
     "@ngx-translate/core": "^15.0.0",
     "@popperjs/core": "^2.11.8",
-    "ajv": "^8.16.0",
+    "ajv": "^8.17.1",
     "ajv-formats": "^2.1.1",
     "js-cookie": "^3.0.5",
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
     "rxjs": "^7.8.1",
     "tslib": "^2.6.3",
-    "zone.js": "^0.14.7"
+    "zone.js": "^0.14.8"
   },
   "devDependencies": {
     "@angular-builders/jest": "^17.0.3",
@@ -68,20 +68,20 @@
     "@angular-eslint/eslint-plugin-template": "^17.1.1",
     "@angular-eslint/template-parser": "^17.5.2",
     "@angular/cli": "^17.3.8",
-    "@angular/compiler-cli": "^17.3.11",
+    "@angular/compiler-cli": "^17.3.12",
     "@types/jest": "^29.5.12",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.14.11",
     "@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.0.11",
+    "husky": "^9.1.1",
     "jest": "^29.7.0",
     "jest-sonar": "^0.2.16",
     "lint-staged": "^15.2.7",
-    "prettier": "^3.3.2",
-    "stylelint": "^16.6.1",
+    "prettier": "^3.3.3",
+    "stylelint": "^16.7.0",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.1.0",
     "stylelint-scss": "^6.4.1",

diff --git a/projects/oblique/CHANGELOG.md b/projects/oblique/CHANGELOG.md
@@ -1,25 +1,32 @@
+# [11.3.2](https://github.com/oblique-bit/oblique/compare/11.3.1...11.3.2) (2024-07-19)
+
+## Bug Fixes
+
+- **service-navigation:** increase icon size ([83f5b171](https://github.com/oblique-bit/oblique/commit/83f5b171b3dfecda14873a090bbe5e1b718444ff))
+- **service-navigation:** ensure the status icon are tied to their applications ([a9f8b640](https://github.com/oblique-bit/oblique/commit/a9f8b64071f578adab52c2c0b75ad3d430c755e1))
+
 # [11.3.1](https://github.com/oblique-bit/oblique/compare/11.3.0...11.3.1) (2024-07-12)
 
 ## Bug Fixes
 
-- **master-layout:** correctly size external link icons in the footer ([069a87a1](https://github.com/oblique-bit/oblique/commit/069a87a11))
+- **master-layout:** correctly size external link icons in the footer ([069a87a1](https://github.com/oblique-bit/oblique/commit/069a87a11927101a0da98a49bee72e9a2a087ac1))
 
 # [11.3.0](https://github.com/oblique-bit/oblique/compare/11.2.4...11.3.0) (2024-07-05)
 
 ## Bug Fixes
 
-- **input-clear:** prevent input clear icon from flickering during initial loading ([6d2800e8](https://github.com/oblique-bit/oblique/commit/6d2800e8e))
-- **master-layout:** make sure the menu item shadow don't overflow into the flyout ([098ffc1c](https://github.com/oblique-bit/oblique/commit/098ffc1c6))
-- **master-layout:** remove empty icon wrapper in the main navigation ([f71c0641](https://github.com/oblique-bit/oblique/commit/f71c0641e))
-- **selectable:** remove `private` modifier on `disabled` input ([ac162a6b](https://github.com/oblique-bit/oblique/commit/ac162a6b6))
+- **input-clear:** prevent input clear icon from flickering during initial loading ([6d2800e8](https://github.com/oblique-bit/oblique/commit/6d2800e8e9bcdb64f8d71592bed5f3b9b117e282))
+- **master-layout:** make sure the menu item shadow don't overflow into the flyout ([098ffc1c](https://github.com/oblique-bit/oblique/commit/098ffc1c6bdde42e53d2e3552ae1965acda059ca))
+- **master-layout:** remove empty icon wrapper in the main navigation ([f71c0641](https://github.com/oblique-bit/oblique/commit/f71c0641ea3436d27dd3853aefd0da99c321d6a7))
+- **selectable:** remove `private` modifier on `disabled` input ([ac162a6b](https://github.com/oblique-bit/oblique/commit/ac162a6b6cfd0d9118e923ba1664760ad7e9f217))
 
 ## Features
 
-- **language:** deprecate `ObLanguageService` ([da3953d9](https://github.com/oblique-bit/oblique/commit/da3953d94))
-- **language:** deprecate `setLocaleOnAdapter` and automate its logic ([a8507418](https://github.com/oblique-bit/oblique/commit/a8507418c))
-- **master-layout:** reduce and harmonize padding on main navigation flyouts ([b3cd4da4](https://github.com/oblique-bit/oblique/commit/b3cd4da4f))
-- **selectable:** turn `ObSelectableGroup` into a custom form element ([5fca7f1d](https://github.com/oblique-bit/oblique/commit/5fca7f1dd))
-- **selectable:** add generics for the `value` type ([b44beec7](https://github.com/oblique-bit/oblique/commit/b44beec75))
+- **language:** deprecate `ObLanguageService` ([da3953d9](https://github.com/oblique-bit/oblique/commit/da3953d9499a36a43028dfdfcab7bb615594c4a8))
+- **language:** deprecate `setLocaleOnAdapter` and automate its logic ([a8507418](https://github.com/oblique-bit/oblique/commit/a8507418c2e49f82a834ba5abb26651298dd42f4))
+- **master-layout:** reduce and harmonize padding on main navigation flyouts ([b3cd4da4](https://github.com/oblique-bit/oblique/commit/b3cd4da4f9342741b79ac84cd13598b0c306b820))
+- **selectable:** turn `ObSelectableGroup` into a custom form element ([5fca7f1d](https://github.com/oblique-bit/oblique/commit/5fca7f1ddaaf32ff7695f5fc1a2ff025dca033cb))
+- **selectable:** add generics for the `value` type ([b44beec7](https://github.com/oblique-bit/oblique/commit/b44beec759d2db14e6b664d2e05d2c24aac7bb78))
 
 # [11.2.4](https://github.com/oblique-bit/oblique/compare/11.2.3...11.2.4) (2024-06-28)
 

diff --git a/projects/oblique/package.json b/projects/oblique/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oblique/oblique",
-  "version": "11.3.1",
+  "version": "11.3.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "ng-packagr": "^17.3.0",
-    "uglify-js": "^3.18.0"
+    "uglify-js": "^3.19.0"
   },
   "schematics": "./schematics/collection.json",
   "ng-update": {

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=11.3.1
+sonar.projectVersion=11.3.2
 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/lib/alert/alert.component.ts b/projects/oblique/src/lib/alert/alert.component.ts
@@ -68,6 +68,6 @@ export class ObAlertComponent implements OnInit {
 	}
 
 	private getAlertRole(): string {
-		return this.hasRoleAlert ?? this.hasGlobalAlertRole ?? (this.initialRole !== null && this.role === 'alert') ? 'alert' : undefined;
+		return (this.hasRoleAlert ?? this.hasGlobalAlertRole ?? (this.initialRole !== null && this.role === 'alert')) ? 'alert' : undefined;
 	}
 }
diff --git a/projects/oblique/src/lib/external-link/external-link.directive.ts b/projects/oblique/src/lib/external-link/external-link.directive.ts
@@ -86,7 +86,7 @@ export class ObExternalLinkDirective implements OnInit, OnChanges, OnDestroy {
 	}
 
 	private static initializeAttribute(currentValue: string, defaultValue: string): string {
-		return currentValue === '' ? undefined : currentValue ?? defaultValue;
+		return currentValue === '' ? undefined : (currentValue ?? defaultValue);
 	}
 
 	private addScreenReaderOnlyTextElement(): void {

diff --git a/...ue/src/lib/service-navigation/applications/service-navigation-applications.component.scss b/...ue/src/lib/service-navigation/applications/service-navigation-applications.component.scss
@@ -24,17 +24,21 @@ $ob-application-icon-size: 2.5em; // empiric value
 		}
 	}
 
-	.ob-application-image {
-		height: $ob-application-icon-size;
-		width: $ob-application-icon-size;
+	li {
+		position: relative;
 
-		&.ob-status-image {
-			position: absolute;
-			z-index: 2;
-		}
+		.ob-application-image {
+			height: $ob-application-icon-size;
+			width: $ob-application-icon-size;
+
+			&.ob-status-image {
+				position: absolute;
+				z-index: 2;
+			}
 
-		&.ob-offline {
-			filter: grayscale(1);
+			&.ob-offline {
+				filter: grayscale(1);
+			}
 		}
 	}
 

diff --git a/projects/oblique/src/lib/service-navigation/service-navigation.component.scss b/projects/oblique/src/lib/service-navigation/service-navigation.component.scss
@@ -13,7 +13,7 @@
 		@mixin full-width() {
 			&:not(.ob-autocomplete, .mat-mdc-form-field),
 			& .mat-mdc-form-field {
-				width: calc(100vw - variables.$ob-spacing-xl);
+				width: calc(100vw - #{variables.$ob-spacing-xl});
 			}
 		}
 
@@ -27,4 +27,11 @@
 			@include full-width();
 		}
 	}
+
+	.ob-button,
+	.mat-mdc-button-base.ob-button[class*="ob-button-"].ob-external-link.mat-mdc-icon-button {
+		.mat-icon {
+			font-size: variables.$ob-font-size-bigger;
+		}
+	}
 }
diff --git a/projects/oblique/src/lib/version.ts b/projects/oblique/src/lib/version.ts
@@ -1 +1 @@
-export const appVersion = '11.3.1';
+export const appVersion = '11.3.2';
diff --git a/projects/sandbox/CHANGELOG.md b/projects/sandbox/CHANGELOG.md
@@ -2,13 +2,13 @@
 
 ## Bug Fixes
 
-- **master-layout:** remove styling that breaks the external link icons ([2154e032](https://github.com/oblique-bit/oblique/commit/2154e0322))
+- **master-layout:** remove styling that breaks the external link icons ([2154e032](https://github.com/oblique-bit/oblique/commit/2154e0322477dce5c8303b0d569c455e63dd4126))
 
 # [11.3.0](https://github.com/oblique-bit/oblique/compare/11.2.4...11.3.0) (2024-07-05)
 
 ## Features
 
-- **selectable:** add sample as custom form element ([52c37889](https://github.com/oblique-bit/oblique/commit/52c37889d))
+- **selectable:** add sample as custom form element ([52c37889](https://github.com/oblique-bit/oblique/commit/52c37889d845645320225d1908e5c278618c2afa))
 
 # [11.2.4](https://github.com/oblique-bit/oblique/compare/11.2.3...11.2.4) (2024-06-28)
 

diff --git a/projects/sandbox/package.json b/projects/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "11.3.1",
+  "version": "11.3.2",
   "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=11.3.1
+sonar.projectVersion=11.3.2
 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
@@ -2,9 +2,9 @@
 
 ## Features
 
-- **code-examples:** add external link example ([1b16c1c5](https://github.com/oblique-bit/oblique/commit/1b16c1c56))
-- **selectable:** add sample as custom form element ([f35bac94](https://github.com/oblique-bit/oblique/commit/f35bac94b))
-- **styles:** enable separate scrolling for side navigation and content ([8b0f1eb3](https://github.com/oblique-bit/oblique/commit/8b0f1eb35))
+- **code-examples:** add external link example ([1b16c1c5](https://github.com/oblique-bit/oblique/commit/1b16c1c56072f69eee6ff987d76288ad5671d6e8))
+- **selectable:** add sample as custom form element ([f35bac94](https://github.com/oblique-bit/oblique/commit/f35bac94bfdefccf81576654ed67b356eee4503b))
+- **styles:** enable separate scrolling for side navigation and content ([8b0f1eb3](https://github.com/oblique-bit/oblique/commit/8b0f1eb35b0281d18a05d420349f4c4eed444b55))
 
 # [11.2.4](https://github.com/oblique-bit/oblique/compare/11.2.3...11.2.4) (2024-06-28)
 

diff --git a/projects/sds/package.json b/projects/sds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swiss-design-system",
-  "version": "11.3.1",
+  "version": "11.3.2",
   "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=11.3.1
+sonar.projectVersion=11.3.2
 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/obliqueVersion.ts b/projects/sds/src/obliqueVersion.ts
@@ -1 +1 @@
-export const latest = '11.3.1';
+export const latest = '11.3.2';
diff --git a/projects/service-navigation-web-component/CHANGELOG.md b/projects/service-navigation-web-component/CHANGELOG.md
@@ -1,8 +1,15 @@
+# [11.3.2](https://github.com/oblique-bit/oblique/compare/11.3.1...11.3.2) (2024-07-19)
+
+## Bug Fixes
+
+- **service-navigation:** increase icon size ([83f5b171](https://github.com/oblique-bit/oblique/commit/83f5b171b3dfecda14873a090bbe5e1b718444ff))
+- **service-navigation:** ensure the status icon are tied to their applications ([a9f8b640](https://github.com/oblique-bit/oblique/commit/a9f8b64071f578adab52c2c0b75ad3d430c755e1))
+
 # [11.3.1](https://github.com/oblique-bit/oblique/compare/11.3.0...11.3.1) (2024-07-12)
 
 ## Bug Fixes
 
-- **web-component:** ensure the service-navigation component is embedded in PROD ([4155b147](https://github.com/oblique-bit/oblique/commit/4155b147e))
+- **web-component:** ensure the service-navigation component is embedded in PROD ([4155b147](https://github.com/oblique-bit/oblique/commit/4155b147e2d19f71e197c08249de58f1559d0d39))
 
 # [11.2.0](https://github.com/oblique-bit/oblique/compare/11.1.3...11.2.0) (2024-05-31)
 

diff --git a/projects/service-navigation-web-component/package.json b/projects/service-navigation-web-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oblique/service-navigation-web-component",
-  "version": "11.3.1",
+  "version": "11.3.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },
@@ -17,6 +17,6 @@
     "service-navigation-web-component"
   ],
   "devDependencies": {
-    "@angular/elements": "^17.3.11"
+    "@angular/elements": "^17.3.12"
   }
 }
diff --git a/projects/service-navigation-web-component/sonar-project.properties b/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.1
+sonar.projectVersion=11.3.2
 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

diff --git a/scripts/shared/changelog.ts b/scripts/shared/changelog.ts
@@ -39,7 +39,7 @@ export class Changelog extends StaticScript {
 		return Git.listCommits(['subject', 'body', 'hash'], separator, commitSeparator, from, to)
 			.replace(/\n/g, '')
 			.split(commitSeparator)
-			.filter(commit => new RegExp(`^(?:fix|feat)\\(${projectName}(?!/toolchain)`).test(commit))
+			.filter(commit => new RegExp(`^(?:fix|feat)\\(${projectName}(?!/toolchain)(?:/[a-z-]+)?\\)`).test(commit))
 			.map(commit => commit.replace(`${projectName}/`, ''))
 			.map(commit => Changelog.formatCommit(commit, separator))
 			.sort((first, second) => first.scope.localeCompare(second.scope))

diff --git a/scripts/shared/git.ts b/scripts/shared/git.ts
@@ -4,7 +4,7 @@ export class Git {
 	private static readonly format = {
 		subject: '%s',
 		body: '%b',
-		hash: '%h'
+		hash: '%H'
 	};
 	private static readonly diffRange = {
 		changedFiles: '--cached',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const appVersion = '11.3.1';
		export const appVersion = '11.3.2';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const latest = '11.3.1';
		export const latest = '11.3.2';