Pull request #1456: Release/patch 11.3.1

Merge in OUI/oblique from release/patch_11.3.1 to master * commit '744fc186c1a6f910cb539c78188be4d4edb4bca9': chore(toolchain): release version 11.3.1 chore(toolchain): update dependencies and refactor accordingly fix(service-navigation/web-component): ensure the service-navigation component is embedded in PROD fix(sandbox/master-layout): remove styling that breaks the external link icons fix(oblique/master-layout): correctly size external link icons in the footer
oblique-bit · Jul 12, 2024 · 9cc60cc · 9cc60cc
2 parents b606298 + 744fc18
commit 9cc60cc
Show file tree

Hide file tree

Showing 20 changed files with 372 additions and 361 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.0",
+  "version": "11.3.1",
   "license": "MIT",
   "organization": {
     "name": "Federal Office of Information Technology, Systems and Telecommunication FOITT",
@@ -71,7 +71,7 @@
     "@angular/compiler-cli": "^17.3.11",
     "@types/jest": "^29.5.12",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.14.9",
+    "@types/node": "^20.14.10",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.57.0",
@@ -84,7 +84,7 @@
     "stylelint": "^16.6.1",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-scss": "^6.3.2",
+    "stylelint-scss": "^6.4.1",
     "ts-node": "^10.9.2",
     "typescript": "~5.2.2"
   }

diff --git a/projects/oblique/CHANGELOG.md b/projects/oblique/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [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))
+
 # [11.3.0](https://github.com/oblique-bit/oblique/compare/11.2.4...11.3.0) (2024-07-05)
 
 ## Bug Fixes

diff --git a/projects/oblique/package.json b/projects/oblique/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oblique/oblique",
-  "version": "11.3.0",
+  "version": "11.3.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },

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.0
+sonar.projectVersion=11.3.1
 sonar.typescript.lcov.reportPaths=coverage/oblique/lcov.info
 sonar.testExecutionReportPaths=coverage/oblique/sqr.xml
 sonar.tests=projects/oblique/src/lib

diff --git a/...ts/oblique/src/lib/master-layout/master-layout-footer/master-layout-footer.component.scss b/...ts/oblique/src/lib/master-layout/master-layout-footer/master-layout-footer.component.scss
@@ -108,12 +108,6 @@
 			margin-right: 1rem;
 			font-size: variables.$ob-font-size-sm;
 
-			&.ob-external-link .mat-icon {
-				width: 1.2em;
-				height: 0.65em;
-				margin-bottom: -1px;
-			}
-
 			&:not(.ob-show-external-link-icon) {
 				.mat-icon {
 					display: none;

diff --git a/projects/oblique/src/lib/version.ts b/projects/oblique/src/lib/version.ts
@@ -1 +1 @@
-export const appVersion = '11.3.0';
+export const appVersion = '11.3.1';
diff --git a/projects/oblique/src/styles/scss/material/_mat-card.scss b/projects/oblique/src/styles/scss/material/_mat-card.scss
@@ -1,7 +1,7 @@
 @use "../core/variables";
 @use "../core/mixins/shadow";
 @use "../core/mixins/typography";
-@use "mixins/mat-card.scss";
+@use "mixins/mat-card";
 
 .mat-mdc-button-base.ob-button.mat-mdc-button.mat-mdc-button-base.ob-button-card {
 	height: initial;

diff --git a/projects/sandbox/CHANGELOG.md b/projects/sandbox/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [11.3.1](https://github.com/oblique-bit/oblique/compare/11.3.0...11.3.1) (2024-07-12)
+
+## Bug Fixes
+
+- **master-layout:** remove styling that breaks the external link icons ([2154e032](https://github.com/oblique-bit/oblique/commit/2154e0322))
+
 # [11.3.0](https://github.com/oblique-bit/oblique/compare/11.2.4...11.3.0) (2024-07-05)
 
 ## Features

diff --git a/projects/sandbox/package.json b/projects/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "11.3.0",
+  "version": "11.3.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=11.3.0
+sonar.projectVersion=11.3.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/sandbox/src/app/app.component.scss b/projects/sandbox/src/app/app.component.scss
@@ -4,7 +4,3 @@
 	transform: rotate(180deg);
 	transition: transform variables.$ob-duration-default;
 }
-
-a.ob-external-link {
-	display: inline-block;
-}
diff --git a/projects/sds/package.json b/projects/sds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swiss-design-system",
-  "version": "11.3.0",
+  "version": "11.3.1",
   "scripts": {
     "start": "ng serve",
     "lint": "ts-node scripts/lint.ts",
@@ -14,7 +14,7 @@
     "release": "ts-node scripts/release.ts"
   },
   "dependencies": {
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^11.10.0",
     "jquery": "^3.7.1",
     "raw-loader": "^4.0.2"
   },

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.0
+sonar.projectVersion=11.3.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/obliqueVersion.ts b/projects/sds/src/obliqueVersion.ts
@@ -1 +1 @@
-export const latest = '11.3.0';
+export const latest = '11.3.1';
diff --git a/projects/service-navigation-web-component/CHANGELOG.md b/projects/service-navigation-web-component/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [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))
+
 # [11.2.0](https://github.com/oblique-bit/oblique/compare/11.1.3...11.2.0) (2024-05-31)
 
 ## Bug Fixes

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.0",
+  "version": "11.3.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.com/"
   },

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.0
+sonar.projectVersion=11.3.1
 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/.../service-navigation-web-component/src/app/service-navigation-web-component.component.html b/.../service-navigation-web-component/src/app/service-navigation-web-component.component.html
@@ -1,5 +1,5 @@
 <ob-service-navigation
-	*ngIf="environmentParsed"
+	*ngIf="environmentParsed !== undefined"
 	[environment]="environmentParsed"
 	[infoContact]="infoContactParsed"
 	[infoLinks]="infoLinksParsed"

diff --git a/...rvice-navigation-web-component/src/app/service-navigation-web-component.component.spec.ts b/...rvice-navigation-web-component/src/app/service-navigation-web-component.component.spec.ts
@@ -3,7 +3,8 @@ import {ObServiceNavigationWebComponentComponent} from './service-navigation-web
 import {TranslateModule} from '@ngx-translate/core';
 import {SimpleChange, SimpleChanges} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
-import {multiTranslateLoader} from '../../../oblique/src/lib/utilities';
+import {By} from '@angular/platform-browser';
+import {ObServiceNavigationComponent, multiTranslateLoader} from '@oblique/oblique';
 
 function defaultChangesValues(): SimpleChanges {
 	return {environment: new SimpleChange(undefined, 'DEV', undefined)};
@@ -51,6 +52,14 @@ describe(ObServiceNavigationWebComponentComponent.name, () => {
 				}
 			);
 		});
+
+		it.each(['DEV', 'TEST', 'REF', 'ABN', 'PROD'])('should embed service-navigation', environment => {
+			component.environment = environment as 'DEV' | 'TEST' | 'REF' | 'ABN' | 'PROD';
+			component.languageList = 'en';
+			fixture.detectChanges();
+			const serviceNavigation = fixture.debugElement.query(By.directive(ObServiceNavigationComponent));
+			expect(serviceNavigation).toBeTruthy();
+		});
 	});
 
 	describe('languageList', () => {