Skip to content

Commit 4c760e1

Browse files
committed
Merge branch 'main' of github.com:catenax-ng/tx-traceability-foss-frontend into feature/TRACEFOSS-893_UUX_FE_Rework_user_menu_to_align_with_CX_guidelines
2 parents 504a553 + df2102b commit 4c760e1

File tree

22 files changed

+144
-152
lines changed

22 files changed

+144
-152
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
build:
1010

1111
runs-on: ubuntu-latest
12-
continue-on-error: true
1312

1413
steps:
1514
- uses: actions/checkout@v3
@@ -25,9 +24,8 @@ jobs:
2524
cmd: install # will run `yarn install` command
2625
- name: Run npm test:ci
2726
run: CHROMIUM_BIN=$(which chrome) npm run test:ci # will run `test:ci` command
28-
continue-on-error: true
2927
- name: Run SonarCloud with organzation and project key from environment
30-
if: always() && ${{ vars.SONAR_ORGANIZATION != '' && vars.SONAR_PROJECT_KEY != '' }}
28+
if: ${{ vars.SONAR_ORGANIZATION != '' && vars.SONAR_PROJECT_KEY != '' }}
3129
uses: SonarSource/sonarcloud-github-action@master
3230
env:
3331
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any

DEPENDENCIES

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ npm/npmjs/-/acorn-node/1.8.2, Apache-2.0, approved, clearlydefined
88
npm/npmjs/-/acorn-walk/7.2.0, MIT, approved, clearlydefined
99
npm/npmjs/-/acorn-walk/8.2.0, MIT, approved, clearlydefined
1010
npm/npmjs/-/acorn/7.4.1, MIT, approved, clearlydefined
11-
npm/npmjs/-/acorn/8.7.1, MIT, approved, clearlydefined
12-
npm/npmjs/-/acorn/8.8.1, MIT, approved, #6951
11+
npm/npmjs/-/acorn/8.8.2, MIT, approved, #6951
1312
npm/npmjs/-/adjust-sourcemap-loader/4.0.0, MIT, approved, clearlydefined
1413
npm/npmjs/-/agent-base/6.0.2, MIT, approved, clearlydefined
1514
npm/npmjs/-/agentkeepalive/4.2.1, MIT, approved, clearlydefined
@@ -135,6 +134,7 @@ npm/npmjs/-/color/3.2.1, MIT, approved, clearlydefined
135134
npm/npmjs/-/colord/2.9.3, MIT, approved, clearlydefined
136135
npm/npmjs/-/colorette/2.0.19, MIT, approved, clearlydefined
137136
npm/npmjs/-/colors/1.0.3, MIT, approved, clearlydefined
137+
npm/npmjs/-/colors/1.4.0, MIT, approved, clearlydefined
138138
npm/npmjs/-/colorspace/1.1.4, MIT, approved, clearlydefined
139139
npm/npmjs/-/combined-stream/1.0.8, MIT, approved, clearlydefined
140140
npm/npmjs/-/commander/2.20.3, MIT, approved, clearlydefined
@@ -578,7 +578,6 @@ npm/npmjs/-/json-schema/0.4.0, AFL-2.1 OR BSD-3-Clause, approved, #2410
578578
npm/npmjs/-/json-stable-stringify-without-jsonify/1.0.1, MIT, approved, clearlydefined
579579
npm/npmjs/-/json-stringify-safe/5.0.1, ISC, approved, clearlydefined
580580
npm/npmjs/-/json5/1.0.2, MIT, approved, CQ22351
581-
npm/npmjs/-/json5/2.2.1, MIT, approved, #2126
582581
npm/npmjs/-/json5/2.2.3, MIT, approved, #2126
583582
npm/npmjs/-/jsonc-parser/3.2.0, MIT, approved, clearlydefined
584583
npm/npmjs/-/jsonfile/4.0.0, MIT, approved, clearlydefined
@@ -590,6 +589,7 @@ npm/npmjs/-/karma-coverage/2.2.0, MIT, approved, clearlydefined
590589
npm/npmjs/-/karma-jasmine/5.1.0, MIT, approved, clearlydefined
591590
npm/npmjs/-/karma-sonarqube-reporter/1.4.0, MIT, approved, clearlydefined
592591
npm/npmjs/-/karma-source-map-support/1.4.0, MIT, approved, clearlydefined
592+
npm/npmjs/-/karma-spec-reporter/0.0.36, MIT, approved, clearlydefined
593593
npm/npmjs/-/karma/6.4.1, MIT, approved, clearlydefined
594594
npm/npmjs/-/kdbush/3.0.0, ISC, approved, clearlydefined
595595
npm/npmjs/-/keycloak-angular/13.0.0, , restricted, clearlydefined
@@ -609,7 +609,7 @@ npm/npmjs/-/lint-staged/13.1.2, , restricted, clearlydefined
609609
npm/npmjs/-/listr2/3.14.0, MIT, approved, clearlydefined
610610
npm/npmjs/-/listr2/5.0.7, MIT, approved, clearlydefined
611611
npm/npmjs/-/loader-runner/4.3.0, MIT, approved, clearlydefined
612-
npm/npmjs/-/loader-utils/2.0.2, MIT, approved, #4986
612+
npm/npmjs/-/loader-utils/2.0.4, MIT, approved, #4986
613613
npm/npmjs/-/loader-utils/3.2.1, MIT, approved, clearlydefined
614614
npm/npmjs/-/locate-path/5.0.0, MIT, approved, clearlydefined
615615
npm/npmjs/-/locate-path/6.0.0, MIT, approved, clearlydefined
@@ -623,7 +623,6 @@ npm/npmjs/-/lodash.merge/4.6.2, MIT, approved, clearlydefined
623623
npm/npmjs/-/lodash.mergewith/4.6.2, MIT, approved, clearlydefined
624624
npm/npmjs/-/lodash.once/4.1.1, MIT, approved, clearlydefined
625625
npm/npmjs/-/lodash.snakecase/4.1.1, MIT, approved, clearlydefined
626-
npm/npmjs/-/lodash.sortby/4.7.0, MIT, approved, clearlydefined
627626
npm/npmjs/-/lodash.startcase/4.4.0, MIT, approved, clearlydefined
628627
npm/npmjs/-/lodash.truncate/4.4.2, MIT, approved, clearlydefined
629628
npm/npmjs/-/lodash.uniq/4.5.0, MIT, approved, clearlydefined
@@ -934,7 +933,6 @@ npm/npmjs/-/source-map-resolve/0.6.0, MIT, approved, clearlydefined
934933
npm/npmjs/-/source-map-support/0.5.21, MIT, approved, clearlydefined
935934
npm/npmjs/-/source-map/0.6.1, BSD-3-Clause, approved, #2417
936935
npm/npmjs/-/source-map/0.7.4, BSD-3-Clause, approved, #2416
937-
npm/npmjs/-/source-map/0.8.0-beta.0, BSD-3-Clause, approved, #2984
938936
npm/npmjs/-/spdx-correct/3.1.1, Apache-2.0, approved, #990
939937
npm/npmjs/-/spdx-exceptions/2.3.0, CC-BY-3.0, approved, clearlydefined
940938
npm/npmjs/-/spdx-expression-parse/3.0.1, MIT, approved, #1127
@@ -988,7 +986,6 @@ npm/npmjs/-/tailwindcss/3.2.7, , restricted, clearlydefined
988986
npm/npmjs/-/tapable/2.2.1, MIT, approved, clearlydefined
989987
npm/npmjs/-/tar/6.1.11, ISC, approved, #4566
990988
npm/npmjs/-/terser-webpack-plugin/5.3.1, MIT, approved, clearlydefined
991-
npm/npmjs/-/terser/5.13.1, BSD-2-Clause, approved, clearlydefined
992989
npm/npmjs/-/terser/5.16.1, BSD-2-Clause AND BSD-3-Clause AND BSD-2-Clause AND ISC, approved, #7045
993990
npm/npmjs/-/test-exclude/6.0.0, ISC, approved, clearlydefined
994991
npm/npmjs/-/text-extensions/1.9.0, MIT, approved, clearlydefined
@@ -1007,7 +1004,6 @@ npm/npmjs/-/toidentifier/1.0.1, MIT, approved, clearlydefined
10071004
npm/npmjs/-/totalist/1.1.0, MIT, approved, clearlydefined
10081005
npm/npmjs/-/tough-cookie/2.5.0, BSD-3-Clause, approved, clearlydefined
10091006
npm/npmjs/-/tr46/0.0.3, MIT, approved, clearlydefined
1010-
npm/npmjs/-/tr46/1.0.1, MIT, approved, clearlydefined
10111007
npm/npmjs/-/tree-kill/1.2.2, MIT, approved, clearlydefined
10121008
npm/npmjs/-/trim-newlines/3.0.1, MIT, approved, clearlydefined
10131009
npm/npmjs/-/triple-beam/1.3.0, MIT, approved, clearlydefined
@@ -1068,7 +1064,6 @@ npm/npmjs/-/wbuf/1.7.3, MIT, approved, clearlydefined
10681064
npm/npmjs/-/wcwidth/1.0.1, MIT, approved, #944
10691065
npm/npmjs/-/web-encoding/1.1.5, MIT, approved, clearlydefined
10701066
npm/npmjs/-/webidl-conversions/3.0.1, BSD-2-Clause, approved, clearlydefined
1071-
npm/npmjs/-/webidl-conversions/4.0.2, BSD-2-Clause, approved, clearlydefined
10721067
npm/npmjs/-/webpack-bundle-analyzer/4.8.0, , restricted, clearlydefined
10731068
npm/npmjs/-/webpack-dev-middleware/5.3.3, MIT, approved, clearlydefined
10741069
npm/npmjs/-/webpack-dev-middleware/6.0.1, MIT, approved, clearlydefined
@@ -1080,7 +1075,6 @@ npm/npmjs/-/webpack/5.75.0, MIT, approved, #5005
10801075
npm/npmjs/-/websocket-driver/0.7.4, Apache-2.0, approved, clearlydefined
10811076
npm/npmjs/-/websocket-extensions/0.1.4, Apache-2.0, approved, CQ23021
10821077
npm/npmjs/-/whatwg-url/5.0.0, MIT, approved, clearlydefined
1083-
npm/npmjs/-/whatwg-url/7.1.0, MIT, approved, clearlydefined
10841078
npm/npmjs/-/which-boxed-primitive/1.0.2, MIT, approved, clearlydefined
10851079
npm/npmjs/-/which-collection/1.0.1, MIT, approved, clearlydefined
10861080
npm/npmjs/-/which-typed-array/1.1.9, MIT, approved, #4864
@@ -1097,7 +1091,7 @@ npm/npmjs/-/wrap-ansi/7.0.0, MIT, approved, clearlydefined
10971091
npm/npmjs/-/wrappy/1.0.2, ISC, approved, clearlydefined
10981092
npm/npmjs/-/write-file-atomic/5.0.0, ISC, approved, clearlydefined
10991093
npm/npmjs/-/ws/7.5.7, MIT, approved, #1940
1100-
npm/npmjs/-/ws/8.12.1, , restricted, clearlydefined
1094+
npm/npmjs/-/ws/8.12.1, MIT, approved, clearlydefined
11011095
npm/npmjs/-/ws/8.2.3, MIT, approved, clearlydefined
11021096
npm/npmjs/-/xmlcreate/2.0.4, Apache-2.0, approved, clearlydefined
11031097
npm/npmjs/-/xtend/4.0.2, MIT, approved, clearlydefined
@@ -1300,9 +1294,9 @@ npm/npmjs/@commitlint/to-lines/17.4.0, MIT, approved, clearlydefined
13001294
npm/npmjs/@commitlint/top-level/17.4.0, MIT, approved, clearlydefined
13011295
npm/npmjs/@commitlint/types/17.4.4, , restricted, clearlydefined
13021296
npm/npmjs/@cspotcode/source-map-support/0.8.1, MIT, approved, clearlydefined
1303-
npm/npmjs/@csstools/css-parser-algorithms/2.0.1, , restricted, clearlydefined
1297+
npm/npmjs/@csstools/css-parser-algorithms/2.0.1, MIT, approved, clearlydefined
13041298
npm/npmjs/@csstools/css-tokenizer/2.0.2, , restricted, clearlydefined
1305-
npm/npmjs/@csstools/media-query-list-parser/2.0.1, , restricted, clearlydefined
1299+
npm/npmjs/@csstools/media-query-list-parser/2.0.1, MIT, approved, clearlydefined
13061300
npm/npmjs/@csstools/selector-specificity/2.1.1, CC0-1.0, approved, #7043
13071301
npm/npmjs/@cucumber/cucumber-expressions/16.1.1, MIT, approved, clearlydefined
13081302
npm/npmjs/@cucumber/gherkin/24.1.0, MIT, approved, clearlydefined
@@ -1396,11 +1390,12 @@ npm/npmjs/@istanbuljs/schema/0.1.3, MIT, approved, clearlydefined
13961390
npm/npmjs/@jridgewell/gen-mapping/0.1.1, MIT, approved, clearlydefined
13971391
npm/npmjs/@jridgewell/gen-mapping/0.3.2, MIT, approved, clearlydefined
13981392
npm/npmjs/@jridgewell/resolve-uri/3.0.6, MIT, approved, clearlydefined
1393+
npm/npmjs/@jridgewell/resolve-uri/3.1.0, MIT, approved, clearlydefined
13991394
npm/npmjs/@jridgewell/set-array/1.1.0, MIT, approved, clearlydefined
14001395
npm/npmjs/@jridgewell/set-array/1.1.2, MIT, approved, clearlydefined
14011396
npm/npmjs/@jridgewell/source-map/0.3.2, MIT, approved, clearlydefined
1402-
npm/npmjs/@jridgewell/sourcemap-codec/1.4.12, MIT, approved, clearlydefined
14031397
npm/npmjs/@jridgewell/sourcemap-codec/1.4.14, MIT, approved, clearlydefined
1398+
npm/npmjs/@jridgewell/trace-mapping/0.3.17, MIT, approved, clearlydefined
14041399
npm/npmjs/@jridgewell/trace-mapping/0.3.9, MIT, approved, clearlydefined
14051400
npm/npmjs/@leichtgewicht/ip-codec/2.0.4, MIT, approved, clearlydefined
14061401
npm/npmjs/@loaders.gl/core/3.2.12, MIT, approved, clearlydefined
@@ -1475,7 +1470,7 @@ npm/npmjs/@material/textfield/15.0.0-canary.684e33d25.0, MIT, approved, clearlyd
14751470
npm/npmjs/@material/theme/15.0.0-canary.684e33d25.0, MIT, approved, clearlydefined
14761471
npm/npmjs/@material/tokens/15.0.0-canary.684e33d25.0, MIT, approved, clearlydefined
14771472
npm/npmjs/@material/tooltip/15.0.0-canary.684e33d25.0, , restricted, clearlydefined
1478-
npm/npmjs/@material/top-app-bar/15.0.0-canary.684e33d25.0, , restricted, clearlydefined
1473+
npm/npmjs/@material/top-app-bar/15.0.0-canary.684e33d25.0, MIT, approved, clearlydefined
14791474
npm/npmjs/@material/touch-target/15.0.0-canary.684e33d25.0, MIT, approved, clearlydefined
14801475
npm/npmjs/@material/typography/15.0.0-canary.684e33d25.0, MIT, approved, clearlydefined
14811476
npm/npmjs/@math.gl/core/3.6.3, MIT, approved, clearlydefined
@@ -1582,7 +1577,7 @@ npm/npmjs/@types/mkdirp/1.0.2, MIT, approved, clearlydefined
15821577
npm/npmjs/@types/ms/0.7.31, MIT, approved, clearlydefined
15831578
npm/npmjs/@types/node/14.18.34, MIT, approved, #4611
15841579
npm/npmjs/@types/node/18.11.9, MIT, approved, #5746
1585-
npm/npmjs/@types/node/18.14.0, , restricted, clearlydefined
1580+
npm/npmjs/@types/node/18.14.0, MIT, approved, clearlydefined
15861581
npm/npmjs/@types/normalize-package-data/2.4.1, MIT, approved, clearlydefined
15871582
npm/npmjs/@types/offscreencanvas/2019.7.0, MIT, approved, clearlydefined
15881583
npm/npmjs/@types/parse-json/4.0.0, MIT, approved, clearlydefined

cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default defineConfig({
2727
specPattern: '**/*.feature',
2828
supportFile: false,
2929
viewportWidth: 1366,
30-
viewportHeight: 768,
30+
viewportHeight: 900,
3131
experimentalWebKitSupport: true, // https://docs.cypress.io/guides/guides/launching-browsers#WebKit-Experimental
3232
setupNodeEvents,
3333
},

karma.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ module.exports = function (config) {
3030
require('karma-coverage'),
3131
require('karma-sonarqube-reporter'),
3232
require('@angular-devkit/build-angular/plugins/karma'),
33+
'karma-spec-reporter',
3334
],
3435
client: {
3536
jasmine: {
@@ -52,7 +53,7 @@ module.exports = function (config) {
5253
{ type: 'lcov', subdir: 'lcov-report' },
5354
],
5455
},
55-
reporters: ['sonarqube'],
56+
reporters: ['spec', 'sonarqube'],
5657
sonarqubeReporter: {
5758
basePath: 'src', // test files folder
5859
filePattern: '**/*spec.ts', // test files glob pattern

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
"karma-coverage": "2.2.0",
109109
"karma-jasmine": "5.1.0",
110110
"karma-sonarqube-reporter": "1.4.0",
111+
"karma-spec-reporter": "^0.0.36",
111112
"lint-staged": "13.1.2",
112113
"msw": "1.0.1",
113114
"playwright-webkit": "^1.30.0",

src/app/mocks/services/parts-mock/parts.handler.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ export const partsHandlers = [
4242
return res(ctx.status(200), ctx.json(applyPagination(mockBmwAssets, pagination)));
4343
}),
4444

45-
rest.post(`*${environment.apiUrl}/assets/detail-information`, (req, res, ctx) => {
46-
const { assetIds } = typeof req.body === 'string' ? JSON.parse(req.body) : req.body;
47-
return res(ctx.status(200), ctx.json(assetIds.map(id => getAssetById(id))));
45+
rest.post(`*${environment.apiUrl}/assets/detail-information`, async (req, res, ctx) => {
46+
const { assetIds } = await req.json();
47+
48+
const response = assetIds.map(id => getAssetById(id));
49+
return res(ctx.status(200), ctx.json(response.filter(data => !!data)));
4850
}),
4951

5052
rest.get(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
@@ -56,7 +58,7 @@ export const partsHandlers = [
5658
rest.patch(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
5759
const { partId } = req.params;
5860
const currentPart = getAssetById(partId as string);
59-
return res(ctx.status(200), ctx.json({ ...currentPart, ...(req.body as Record<string, any>) }));
61+
return res(ctx.status(200), ctx.json({ ...currentPart, ...req.json() }));
6062
}),
6163

6264
rest.get(`*${environment.apiUrl}/assets/:assetId/children/:childId`, (req, res, ctx) => {
@@ -81,7 +83,9 @@ export const partsHandlersTest = [
8183

8284
rest.post(`*${environment.apiUrl}/assets/detail-information`, async (req, res, ctx) => {
8385
const { assetIds } = await req.json();
84-
return res(ctx.status(200), ctx.json(assetIds.map(id => mockAssetList[id] || getAssetById(id))));
86+
87+
const response = assetIds.map(id => mockAssetList[id] || getAssetById(id));
88+
return res(ctx.status(200), ctx.json(response.filter(data => !!data)));
8589
}),
8690

8791
rest.get(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
@@ -93,7 +97,7 @@ export const partsHandlersTest = [
9397
rest.patch(`*${environment.apiUrl}/assets/:partId`, (req, res, ctx) => {
9498
const { partId } = req.params;
9599
const currentPart = mockAssetList[partId as string];
96-
return res(ctx.status(200), ctx.json({ ...currentPart, ...(req.body as Record<string, any>) }));
100+
return res(ctx.status(200), ctx.json({ ...currentPart, ...req.json() }));
97101
}),
98102

99103
rest.get(`*${environment.apiUrl}/assets/:assetId/children/:childId`, (req, res, ctx) => {

src/app/modules/core/layout/header/header.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import { Component } from '@angular/core';
2323
import { NavigationEnd, Router } from '@angular/router';
24-
import { KnownUrl, NavigableUrls } from '@core/kown-route';
24+
import { KnownUrl, NavigableUrls } from '@core/known-route';
2525
import { filter } from 'rxjs/operators';
2626

2727
@Component({

src/app/modules/core/layout/header/user-navigation/user-menu.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
********************************************************************************/
2121

2222
import { Component, HostListener } from '@angular/core';
23-
import { NavigableUrls } from '@core/kown-route';
2423
import { LayoutFacade } from '@shared/abstraction/layout-facade';
2524
import { NavigationEnd, Router } from '@angular/router';
2625
import { environment } from '@env';
2726
import { filter } from 'rxjs/operators';
27+
import { NavigableUrls } from '@core/known-route';
2828

2929
@Component({
3030
selector: 'app-user-navigation',

src/app/modules/core/layout/layout.routing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
NO_PERMISSION_BASE_ROUTE,
3030
OTHER_PARTS_BASE_ROUTE,
3131
PARTS_BASE_ROUTE,
32-
} from '@core/kown-route';
32+
} from '@core/known-route';
3333
import { RoleGuard } from '@core/user/role.guard';
3434
import { ErrorPageType } from '@page/error-page/model/error-page.model';
3535

0 commit comments

Comments
 (0)