Skip to content

Commit

Permalink
Merge pull request #372 from catenax-ng/main
Browse files Browse the repository at this point in the history
reformatted Frontend source code
  • Loading branch information
ds-mwesener authored Nov 30, 2023
2 parents b680067 + 36bc4c9 commit 95ea008
Show file tree
Hide file tree
Showing 321 changed files with 10,174 additions and 9,916 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Upgraded asciidoctorj-diagram from 2.2.9 to 2.2.13
- Cucumber test steps for creating notifications no longer support default assetId when no asset is provided with previous step
- Upgraded the Upload_Testdata job in Argo Workflow to fix bugs
- Auto format for frontend source code applied

### Removed
- removed asset filters ( qualityInvestigationIdsInStatusActive, qualityInvestigationIdsInStatusActive )
Expand Down
248 changes: 124 additions & 124 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,133 +1,133 @@
{
"name": "trace-x",
"version": "9.0.0-rc3",
"scripts": {
"analyze": "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json",
"build:prod": "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/ ",
"build:prodDebug": "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/",
"format": "prettier --write \"src/**/*.{js,ts,json,md,css,scss,html}\"",
"lint": "eslint --color --fix -c .eslintrc.js --ext .ts ./src/app",
"ng": "ng",
"ng-cdk": "ng update --force @angular/cdk",
"ng-cli": "ng update --force @angular/cli",
"ng-core": "ng update --force @angular/core",
"ng-material": "ng update --force @angular/material",
"prepare": "cd .. && husky install frontend/.husky",
"start": "ng serve",
"start:auth": "ng serve --configuration=dev,auth",
"start:auth:dev": "ng serve --configuration=dev,authDev",
"start:auth:test": "ng serve --configuration=dev,authTest",
"start:auth:e2ea": "ng serve --configuration=dev,authE2eA",
"start:auth:e2eb": "ng serve --configuration=dev,authE2eB",
"start:auth:mock": "ng serve --configuration=authMock",
"start:auth:local": "ng serve --configuration=authLocal",
"start:auth:localBe": "ng serve --configuration=localBackend",
"start:noAuth:localBe": "ng serve --configuration=localBackendNoAuth",
"env:mock": "docker-compose up",
"test": "ng test",
"test:ci": "ng test --no-watch --no-progress --browsers=ChromeHeadless",
"add-license-header": "node ./scripts/add-license-header.js --src=src",
"dependencies:download-tool": "mkdir -p ./scripts/download && curl -L --output ./scripts/download/org.eclipse.dash.licenses-0.0.1-SNAPSHOT.jar 'https://repo.eclipse.org/service/local/artifact/maven/redirect?r=dash-licenses&g=org.eclipse.dash&a=org.eclipse.dash.licenses&v=0.0.1-SNAPSHOT'",
"dependencies:generate": "./scripts/eclipse_dash.sh 0.0.1-SNAPSHOT --summary ",
"dependencies:validate": "./scripts/eclipse_dash.sh 0.0.1-SNAPSHOT",
"e2e": "ng e2e",
"cypress:open": "cypress open",
"cypress:run": "cypress run"
"name" : "trace-x",
"version" : "9.0.0-rc3",
"scripts" : {
"analyze" : "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json",
"build:prod" : "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/ ",
"build:prodDebug" : "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/",
"format" : "prettier --write \"src/**/*.{js,ts,json,md,css,scss,html}\"",
"lint" : "eslint --color --fix -c .eslintrc.js --ext .ts ./src/app",
"ng" : "ng",
"ng-cdk" : "ng update --force @angular/cdk",
"ng-cli" : "ng update --force @angular/cli",
"ng-core" : "ng update --force @angular/core",
"ng-material" : "ng update --force @angular/material",
"prepare" : "cd .. && husky install frontend/.husky",
"start" : "ng serve",
"start:auth" : "ng serve --configuration=dev,auth",
"start:auth:dev" : "ng serve --configuration=dev,authDev",
"start:auth:test" : "ng serve --configuration=dev,authTest",
"start:auth:e2ea" : "ng serve --configuration=dev,authE2eA",
"start:auth:e2eb" : "ng serve --configuration=dev,authE2eB",
"start:auth:mock" : "ng serve --configuration=authMock",
"start:auth:local" : "ng serve --configuration=authLocal",
"start:auth:localBe" : "ng serve --configuration=localBackend",
"start:noAuth:localBe" : "ng serve --configuration=localBackendNoAuth",
"env:mock" : "docker-compose up",
"test" : "ng test",
"test:ci" : "ng test --no-watch --no-progress --browsers=ChromeHeadless",
"add-license-header" : "node ./scripts/add-license-header.js --src=src",
"dependencies:download-tool" : "mkdir -p ./scripts/download && curl -L --output ./scripts/download/org.eclipse.dash.licenses-0.0.1-SNAPSHOT.jar 'https://repo.eclipse.org/service/local/artifact/maven/redirect?r=dash-licenses&g=org.eclipse.dash&a=org.eclipse.dash.licenses&v=0.0.1-SNAPSHOT'",
"dependencies:generate" : "./scripts/eclipse_dash.sh 0.0.1-SNAPSHOT --summary ",
"dependencies:validate" : "./scripts/eclipse_dash.sh 0.0.1-SNAPSHOT",
"e2e" : "ng e2e",
"cypress:open" : "cypress open",
"cypress:run" : "cypress run"
},
"private": true,
"dependencies": {
"@angular-material-components/datetime-picker": "9.0.0",
"@angular/animations": "15.2.8",
"@angular/cdk": "15.2.8",
"@angular/common": "15.2.8",
"@angular/compiler": "15.2.8",
"@angular/core": "15.2.8",
"@angular/forms": "15.2.8",
"@angular/material": "15.2.8",
"@angular/platform-browser": "15.2.8",
"@angular/platform-browser-dynamic": "15.2.8",
"@angular/router": "15.2.8",
"@types/lodash-es": "4.17.7",
"angular-i18next": "15.0.5",
"angular-split": "15.0.0",
"autoprefixer": "10.4.14",
"d3": "7.8.4",
"esbuild": "^0.17.18",
"i18next": "22.4.15",
"i18next-browser-languagedetector": "7.0.1",
"i18next-http-backend": "2.2.0",
"keycloak-angular": "13.0.0",
"keycloak-js": "21.0.2",
"lodash-es": "4.17.21",
"postcss": "8.4.31",
"rxjs": "7.8.0",
"tailwindcss": "3.3.1",
"tslib": "2.5.0",
"webpack": "5.76.1",
"zone.js": "0.13.0"
"private" : true,
"dependencies" : {
"@angular-material-components/datetime-picker" : "9.0.0",
"@angular/animations" : "15.2.8",
"@angular/cdk" : "15.2.8",
"@angular/common" : "15.2.8",
"@angular/compiler" : "15.2.8",
"@angular/core" : "15.2.8",
"@angular/forms" : "15.2.8",
"@angular/material" : "15.2.8",
"@angular/platform-browser" : "15.2.8",
"@angular/platform-browser-dynamic" : "15.2.8",
"@angular/router" : "15.2.8",
"@types/lodash-es" : "4.17.7",
"angular-i18next" : "15.0.5",
"angular-split" : "15.0.0",
"autoprefixer" : "10.4.14",
"d3" : "7.8.4",
"esbuild" : "^0.17.18",
"i18next" : "22.4.15",
"i18next-browser-languagedetector" : "7.0.1",
"i18next-http-backend" : "2.2.0",
"keycloak-angular" : "13.0.0",
"keycloak-js" : "21.0.2",
"lodash-es" : "4.17.21",
"postcss" : "8.4.31",
"rxjs" : "7.8.0",
"tailwindcss" : "3.3.1",
"tslib" : "2.5.0",
"webpack" : "5.76.1",
"zone.js" : "0.13.0"
},
"devDependencies": {
"@angular-builders/custom-webpack": "15.0.0",
"@angular-devkit/build-angular": "15.2.8",
"@angular-eslint/builder": "15.2.1",
"@angular-eslint/eslint-plugin": "15.2.1",
"@angular-eslint/eslint-plugin-template": "15.2.1",
"@angular-eslint/schematics": "15.2.1",
"@angular-eslint/template-parser": "15.2.1",
"@angular/cli": "15.2.6",
"@angular/compiler-cli": "15.2.8",
"@angular/language-service": "15.2.8",
"@badeball/cypress-cucumber-preprocessor": "^16.0.3",
"@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
"@cypress/schematic": "2.5.0",
"@testing-library/angular": "13.4.0",
"@testing-library/jasmine-dom": "1.3.3",
"@types/d3": "7.4.0",
"@types/jasmine": "4.3.1",
"@types/luxon": "3.3.0",
"@types/node": "18.16.0",
"@types/testing-library__jasmine-dom": "^1.3.0",
"@typescript-eslint/eslint-plugin": "5.59.1",
"@typescript-eslint/parser": "5.59.1",
"cypress": "^12.10.0",
"eslint": "8.39.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsdoc": "43.1.1",
"eslint-plugin-prefer-arrow": "1.2.3",
"husky": "8.0.3",
"jasmine-core": "4.6.0",
"karma": "6.4.2",
"karma-chrome-launcher": "3.2.0",
"karma-coverage": "2.2.0",
"karma-jasmine": "5.1.0",
"karma-sonarqube-reporter": "1.4.0",
"karma-spec-reporter": "^0.0.36",
"lint-staged": "13.2.1",
"msw": "1.2.1",
"playwright-webkit": "^1.32.3",
"postcss-import": "15.1.0",
"postcss-loader": "7.2.4",
"postcss-scss": "4.0.6",
"prettier": "2.8.8",
"stylelint": "15.6.0",
"stylelint-config-standard-scss": "9.0.0",
"ts-loader": "^9.4.2",
"ts-node": "10.9.1",
"typescript": "4.9.5",
"webpack-bundle-analyzer": "4.8.0"
"devDependencies" : {
"@angular-builders/custom-webpack" : "15.0.0",
"@angular-devkit/build-angular" : "15.2.8",
"@angular-eslint/builder" : "15.2.1",
"@angular-eslint/eslint-plugin" : "15.2.1",
"@angular-eslint/eslint-plugin-template" : "15.2.1",
"@angular-eslint/schematics" : "15.2.1",
"@angular-eslint/template-parser" : "15.2.1",
"@angular/cli" : "15.2.6",
"@angular/compiler-cli" : "15.2.8",
"@angular/language-service" : "15.2.8",
"@badeball/cypress-cucumber-preprocessor" : "^16.0.3",
"@bahmutov/cypress-esbuild-preprocessor" : "^2.2.0",
"@cypress/schematic" : "2.5.0",
"@testing-library/angular" : "13.4.0",
"@testing-library/jasmine-dom" : "1.3.3",
"@types/d3" : "7.4.0",
"@types/jasmine" : "4.3.1",
"@types/luxon" : "3.3.0",
"@types/node" : "18.16.0",
"@types/testing-library__jasmine-dom" : "^1.3.0",
"@typescript-eslint/eslint-plugin" : "5.59.1",
"@typescript-eslint/parser" : "5.59.1",
"cypress" : "^12.10.0",
"eslint" : "8.39.0",
"eslint-config-prettier" : "8.8.0",
"eslint-plugin-import" : "2.27.5",
"eslint-plugin-jsdoc" : "43.1.1",
"eslint-plugin-prefer-arrow" : "1.2.3",
"husky" : "8.0.3",
"jasmine-core" : "4.6.0",
"karma" : "6.4.2",
"karma-chrome-launcher" : "3.2.0",
"karma-coverage" : "2.2.0",
"karma-jasmine" : "5.1.0",
"karma-sonarqube-reporter" : "1.4.0",
"karma-spec-reporter" : "^0.0.36",
"lint-staged" : "13.2.1",
"msw" : "1.2.1",
"playwright-webkit" : "^1.32.3",
"postcss-import" : "15.1.0",
"postcss-loader" : "7.2.4",
"postcss-scss" : "4.0.6",
"prettier" : "2.8.8",
"stylelint" : "15.6.0",
"stylelint-config-standard-scss" : "9.0.0",
"ts-loader" : "^9.4.2",
"ts-node" : "10.9.1",
"typescript" : "4.9.5",
"webpack-bundle-analyzer" : "4.8.0"
},
"resolutions": {
"@angular-devkit/build-angular": "15.2.8"
"resolutions" : {
"@angular-devkit/build-angular" : "15.2.8"
},
"msw": {
"workerDirectory": "src"
"msw" : {
"workerDirectory" : "src"
},
"cypress-cucumber-preprocessor": {
"json": {
"enabled": true,
"formatter": "cypress/cucumber-json-formatter",
"output": "cypress/reports/cucumber-report.json"
"cypress-cucumber-preprocessor" : {
"json" : {
"enabled" : true,
"formatter" : "cypress/cucumber-json-formatter",
"output" : "cypress/reports/cucumber-report.json"
}
}
}
10 changes: 5 additions & 5 deletions frontend/src/app/mocks/services/admin-mock/admin.handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ import { buildMockRegistryProcesses, getBpnConfig } from './admin.model';
export const adminHandler = (_ => {
const mockRegistryProcesses = buildMockRegistryProcesses();
return [
rest.get(`*${environment.apiUrl}/metrics/registry-lookup`, (req, res, ctx) => {
rest.get(`*${ environment.apiUrl }/metrics/registry-lookup`, (req, res, ctx) => {
const pagination = extractPagination(req);

return res(ctx.status(200), ctx.json(applyPagination(mockRegistryProcesses, pagination)));
}),

rest.post(`*${environment.apiUrl}/bpn-config`, (req, res, ctx) => {
rest.post(`*${ environment.apiUrl }/bpn-config`, (req, res, ctx) => {
return res(ctx.status(204));
}),

rest.get(`*${environment.apiUrl}/bpn-config`, (req, res, ctx) => {
rest.get(`*${ environment.apiUrl }/bpn-config`, (req, res, ctx) => {
return res(ctx.status(200), ctx.json(getBpnConfig()));
}),

rest.put(`*${environment.apiUrl}/bpn-config`, (req, res, ctx) => {
rest.put(`*${ environment.apiUrl }/bpn-config`, (req, res, ctx) => {
return res(ctx.status(204));
}),

rest.delete(`*${environment.apiUrl}/bpn-config/:bpn`, (req, res, ctx) => {
rest.delete(`*${ environment.apiUrl }/bpn-config/:bpn`, (req, res, ctx) => {
return res(ctx.status(204));
}),
];
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/mocks/services/admin-mock/admin.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export const buildMockRegistryProcesses = (): RegistryProcessResponse[] =>

return {
registryLookupStatus,
startDate: `${year}-${numberToString(month)}-${numberToString(day)}T12:34:12`,
endDate: `${year}-${numberToString(month + 1)}-${numberToString(day)}T12:34:12`,
startDate: `${ year }-${ numberToString(month) }-${ numberToString(day) }T12:34:12`,
endDate: `${ year }-${ numberToString(month + 1) }-${ numberToString(day) }T12:34:12`,

successShellDescriptorsFetchCount: failedCount,
failedShellDescriptorsFetchCount: successCount,
Expand Down
Loading

0 comments on commit 95ea008

Please sign in to comment.