Skip to content

Commit 9edb85d

Browse files
authored
Merge pull request #17 from catenax-ng/feature/TRACEFOSS-1023-package-update-2
Feature/tracefoss 1023 package update
2 parents 6680039 + dc103a7 commit 9edb85d

File tree

83 files changed

+4357
-3523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4357
-3523
lines changed

.github/scripts/eclipse_dash.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
java -jar org.eclipse.dash.licenses-0.0.1-20221105.055038-599.jar yarn.lock -project automotive.tractusx -summary DASH_SUMMARY
2-
grep "restricted" DASH_SUMMARY | if test $(wc -l) -gt 0; then exit 1; fi
2+
grep -E '(restricted, #)|(restricted$)' DASH_SUMMARY | if test $(wc -l) -gt 0; then exit 1; fi

DEPENDENCIES

Lines changed: 450 additions & 366 deletions
Large diffs are not rendered by default.

angular.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,5 @@
243243
}
244244
}
245245
}
246-
},
247-
"defaultProject": "trace-x"
246+
}
248247
}

karma.conf.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module.exports = function (config) {
2727
plugins: [
2828
require('karma-jasmine'),
2929
require('karma-chrome-launcher'),
30-
require('karma-jasmine-html-reporter'),
3130
require('karma-coverage'),
3231
require('karma-sonarqube-reporter'),
3332
require('@angular-devkit/build-angular/plugins/karma'),
@@ -38,7 +37,6 @@ module.exports = function (config) {
3837
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
3938
// for example, you can disable the random execution with `random: false`
4039
// or set a specific seed with `seed: 4321`
41-
seed: 39166,
4240
},
4341
clearContext: false, // leave Jasmine Spec Runner output visible in browser
4442
},
@@ -54,7 +52,7 @@ module.exports = function (config) {
5452
{ type: 'lcov', subdir: 'lcov-report' },
5553
],
5654
},
57-
reporters: ['progress', 'kjhtml', 'sonarqube'],
55+
reporters: ['sonarqube'],
5856
sonarqubeReporter: {
5957
basePath: 'src', // test files folder
6058
filePattern: '**/*spec.ts', // test files glob pattern

package.json

Lines changed: 66 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -33,91 +33,94 @@
3333
},
3434
"private": true,
3535
"dependencies": {
36-
"@angular-material-components/datetime-picker": "7.0.1",
37-
"@angular/animations": "13.3.6",
38-
"@angular/cdk": "13.3.6",
39-
"@angular/common": "13.3.6",
40-
"@angular/compiler": "13.3.6",
41-
"@angular/core": "13.3.6",
42-
"@angular/forms": "13.3.6",
43-
"@angular/material": "13.3.6",
44-
"@angular/platform-browser": "13.3.6",
45-
"@angular/platform-browser-dynamic": "13.3.6",
46-
"@angular/router": "13.3.6",
47-
"@deck.gl/core": "8.8.20",
48-
"@deck.gl/layers": "8.7.12",
49-
"@deck.gl/mapbox": "8.8.22",
50-
"@mapbox/mapbox-gl-language": "^1.0.0",
36+
"@angular-material-components/datetime-picker": "9.0.0",
37+
"@angular/animations": "15.1.5",
38+
"@angular/cdk": "15.1.5",
39+
"@angular/common": "15.1.5",
40+
"@angular/compiler": "15.1.5",
41+
"@angular/core": "15.1.5",
42+
"@angular/forms": "15.1.5",
43+
"@angular/material": "15.1.5",
44+
"@angular/platform-browser": "15.1.5",
45+
"@angular/platform-browser-dynamic": "15.1.5",
46+
"@angular/router": "15.1.5",
47+
"@deck.gl/core": "8.8.25",
48+
"@deck.gl/layers": "8.8.25",
49+
"@deck.gl/mapbox": "8.8.25",
50+
"@loaders.gl/core": "^3.3.1",
51+
"@luma.gl/core": "^8.5.18",
52+
"@mapbox/mapbox-gl-language": "^1.0.1",
5153
"@types/lodash-es": "4.17.6",
52-
"angular-i18next": "11.0.0",
54+
"angular-i18next": "15.0.5",
5355
"autoprefixer": "10.4.13",
54-
"d3": "7.8.0",
55-
"i18next": "21.10.0",
56+
"d3": "7.8.2",
57+
"esbuild": "^0.17.10",
58+
"i18next": "22.4.10",
5659
"i18next-browser-languagedetector": "7.0.1",
57-
"i18next-http-backend": "2.0.2",
58-
"keycloak-angular": "10.0.2",
59-
"keycloak-js": "18.0.1",
60+
"i18next-http-backend": "2.1.1",
61+
"keycloak-angular": "13.0.0",
62+
"keycloak-js": "20.0.5",
6063
"lodash-es": "4.17.21",
64+
"mapbox-gl": "^2.12.1",
6165
"maplibre-gl": "^2.4.0",
62-
"postcss": "8.4.19",
63-
"rxjs": "7.5.7",
64-
"tailwindcss": "3.2.4",
65-
"tslib": "2.4.1",
66+
"postcss": "8.4.21",
67+
"rxjs": "7.8.0",
68+
"tailwindcss": "3.2.7",
69+
"tslib": "2.5.0",
6670
"webpack": "5.75.0",
67-
"zone.js": "0.11.8"
71+
"zone.js": "0.12.0"
6872
},
6973
"devDependencies": {
70-
"@angular-builders/custom-webpack": "13.1.0",
71-
"@angular-devkit/build-angular": "13.3.5",
72-
"@angular-eslint/builder": "15.1.0",
73-
"@angular-eslint/eslint-plugin": "15.2.0",
74-
"@angular-eslint/eslint-plugin-template": "13.2.1",
75-
"@angular-eslint/schematics": "13.5.0",
76-
"@angular-eslint/template-parser": "13.2.1",
77-
"@angular/cli": "13.3.5",
78-
"@angular/compiler-cli": "13.3.6",
79-
"@angular/language-service": "13.3.6",
80-
"@badeball/cypress-cucumber-preprocessor": "^15.0.0",
81-
"@bahmutov/cypress-esbuild-preprocessor": "^2.1.5",
82-
"@commitlint/cli": "17.4.2",
83-
"@commitlint/config-conventional": "16.2.4",
84-
"@cypress/schematic": "2.4.0",
85-
"@testing-library/angular": "11.0.4",
86-
"@testing-library/jasmine-dom": "1.2.0",
74+
"@angular-builders/custom-webpack": "15.0.0",
75+
"@angular-devkit/build-angular": "15.1.6",
76+
"@angular-eslint/builder": "15.2.1",
77+
"@angular-eslint/eslint-plugin": "15.2.1",
78+
"@angular-eslint/eslint-plugin-template": "15.2.1",
79+
"@angular-eslint/schematics": "15.2.1",
80+
"@angular-eslint/template-parser": "15.2.1",
81+
"@angular/cli": "15.1.6",
82+
"@angular/compiler-cli": "15.1.5",
83+
"@angular/language-service": "15.1.5",
84+
"@badeball/cypress-cucumber-preprocessor": "^15.1.4",
85+
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
86+
"@commitlint/cli": "17.4.4",
87+
"@commitlint/config-conventional": "17.4.4",
88+
"@cypress/schematic": "2.5.0",
89+
"@testing-library/angular": "13.2.1",
90+
"@testing-library/jasmine-dom": "1.3.3",
8791
"@types/d3": "7.4.0",
8892
"@types/jasmine": "4.3.1",
8993
"@types/luxon": "3.2.0",
90-
"@types/node": "18.11.4",
91-
"@types/testing-library__jasmine-dom": "^1.0.3",
92-
"@typescript-eslint/eslint-plugin": "5.48.0",
93-
"@typescript-eslint/parser": "5.49.0",
94-
"cypress": "^12.4.0",
95-
"eslint": "8.28.0",
96-
"eslint-config-prettier": "8.5.0",
94+
"@types/node": "^18.14.0",
95+
"@types/testing-library__jasmine-dom": "^1.3.0",
96+
"@typescript-eslint/eslint-plugin": "5.53.0",
97+
"@typescript-eslint/parser": "5.53.0",
98+
"cypress": "^12.6.0",
99+
"eslint": "8.34.0",
100+
"eslint-config-prettier": "8.6.0",
97101
"eslint-plugin-import": "2.27.5",
98-
"eslint-plugin-jsdoc": "39.6.4",
102+
"eslint-plugin-jsdoc": "40.0.0",
99103
"eslint-plugin-prefer-arrow": "1.2.3",
100-
"husky": "8.0.2",
101-
"jasmine-core": "4.3.0",
104+
"husky": "8.0.3",
105+
"jasmine-core": "4.5.0",
102106
"karma": "6.4.1",
103-
"karma-chrome-launcher": "3.1.0",
107+
"karma-chrome-launcher": "3.1.1",
104108
"karma-coverage": "2.2.0",
105109
"karma-jasmine": "5.1.0",
106-
"karma-jasmine-html-reporter": "2.0.0",
107110
"karma-sonarqube-reporter": "1.4.0",
108-
"lint-staged": "13.0.3",
109-
"msw": "1.0.0",
111+
"lint-staged": "13.1.2",
112+
"msw": "1.0.1",
110113
"playwright-webkit": "^1.30.0",
111114
"postcss-import": "15.1.0",
112115
"postcss-loader": "7.0.2",
113-
"postcss-scss": "4.0.4",
114-
"prettier": "2.7.1",
115-
"stylelint": "14.16.1",
116-
"stylelint-config-standard-scss": "4.0.0",
116+
"postcss-scss": "4.0.6",
117+
"prettier": "2.8.4",
118+
"stylelint": "15.2.0",
119+
"stylelint-config-standard-scss": "7.0.1",
117120
"ts-loader": "^9.4.2",
118121
"ts-node": "10.9.1",
119-
"typescript": "4.6.4",
120-
"webpack-bundle-analyzer": "4.5.0"
122+
"typescript": "4.9.5",
123+
"webpack-bundle-analyzer": "4.8.0"
121124
},
122125
"msw": {
123126
"workerDirectory": "src"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ export const partsHandlersTest = [
7979
return res(ctx.status(200), ctx.json(mockAssets));
8080
}),
8181

82-
rest.post(`*${environment.apiUrl}/assets/detail-information`, (req, res, ctx) => {
83-
const { assetIds } = typeof req.body === 'string' ? JSON.parse(req.body) : req.body;
82+
rest.post(`*${environment.apiUrl}/assets/detail-information`, async (req, res, ctx) => {
83+
const { assetIds } = await req.json();
8484
return res(ctx.status(200), ctx.json(assetIds.map(id => mockAssetList[id] || getAssetById(id))));
8585
}),
8686

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const routes: Routes = [
4141
];
4242

4343
@NgModule({
44-
imports: [RouterModule.forRoot(routes, { onSameUrlNavigation: 'reload', relativeLinkResolution: 'legacy' })],
44+
imports: [RouterModule.forRoot(routes, { onSameUrlNavigation: 'reload' })],
4545
exports: [RouterModule],
4646
providers: [AuthGuard],
4747
})

src/app/modules/core/extensions/fetch-custom-protocols.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ export const buildCustomProtocolResolver = (customProtocolsRegistry: CustomProto
5858
const resolution = customProtocolResolution[prefix];
5959
const fullPrefix = customProtocolName + ':' + prefix;
6060

61-
const originalQueryParams = Object.fromEntries(new URL(url).searchParams);
61+
const originalQueryParams = Object.fromEntries(new URL(url).searchParams as any);
6262
const cleanUrl = url.split('?')[0];
6363

6464
const targetQueryParams = new HttpParams({
6565
fromObject: { ...originalQueryParams, ...resolution.queryParams },
6666
}).toString();
6767

6868
const hasQueryParams = Object.keys(targetQueryParams).length > 0;
69-
const tartegUrlWithoutParams = cleanUrl.replace(fullPrefix, resolution.pathname) + (resolution.postfix ?? '');
70-
return tartegUrlWithoutParams + (hasQueryParams ? '?' + targetQueryParams : '');
69+
const targetUrlWithoutParams = cleanUrl.replace(fullPrefix, resolution.pathname) + (resolution.postfix ?? '');
70+
return targetUrlWithoutParams + (hasQueryParams ? '?' + targetQueryParams : '');
7171
};
7272
};
7373

src/app/modules/core/layout/nav-bar/nav-bar.component.spec.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,24 @@
2121

2222
import { LayoutModule } from '@layout/layout.module';
2323
import { NavBarComponent } from '@layout/nav-bar/nav-bar.component';
24-
import { screen, waitFor } from '@testing-library/angular';
24+
import { fireEvent, screen, waitFor } from '@testing-library/angular';
2525
import { renderComponent } from '@tests/test-render.utils';
2626

2727
describe('Navbar', () => {
28+
const renderNavbar = () => renderComponent(NavBarComponent, { imports: [LayoutModule] });
2829
it('should render navbar', async () => {
29-
await renderComponent(NavBarComponent, {
30-
imports: [LayoutModule],
31-
});
30+
await renderNavbar();
3231

3332
expect(await waitFor(() => screen.getByText('OEM A'))).toBeInTheDocument();
3433
});
3534

3635
it('should open details', async () => {
37-
await renderComponent(NavBarComponent, {
38-
imports: [LayoutModule],
39-
});
36+
await renderNavbar();
37+
fireEvent.click(await waitFor(() => screen.getByTestId('user-menu')));
4038

41-
const userAvatarButton = await waitFor(() => screen.getByTestId('user-menu'));
42-
userAvatarButton.click();
4339
expect((await waitFor(() => screen.getAllByText('OEM A'))).length).toEqual(2);
4440
expect(await waitFor(() => screen.getByText('user'))).toBeInTheDocument();
4541
expect(await waitFor(() => screen.getByText('[email protected]'))).toBeInTheDocument();
46-
expect(await waitFor(() => screen.getByText('Sign out'))).toBeInTheDocument();
42+
expect(await waitFor(() => screen.getByText('layout.nav.signOut'))).toBeInTheDocument();
4743
});
4844
});

src/app/modules/core/layout/sidebar/sidebar-section/sidebar-section.component.html

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

2222
<section [class.active]="this.isActive" class="sidebar-menu-container__item">
23-
<mat-icon [tooltip]="this.name" [class.item-active]="this.isActive" appTooltip class="item text-dark">{{
23+
<mat-icon [tooltip]="this.name" [class.item-active]="this.isActive" appTooltip class="text-dark">{{
2424
this.iconName
2525
}}</mat-icon>
2626
<p class="regular-text" [class.item-active]="this.isActive" [class.disable]="!this.isExpanded">

0 commit comments

Comments
 (0)