Skip to content

Commit

Permalink
Merge branch 'zoneless' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@ralfaron
ralfaron committed Jul 2, 2024
2 parents 7e2eddc + f0f169b commit 51d6767
Show file tree
Hide file tree
Showing 140 changed files with 23,491 additions and 17,984 deletions.
1 change: 1 addition & 0 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
{
"name": "Start aas-server",
"type": "node",
"args": ["--security-revert=CVE-2023-46809"],
"request": "launch",
"preLaunchTask": "build-aas-server",
"program": "${workspaceFolder}/projects/aas-server/build/aas-server.js",
Expand Down
6 changes: 4 additions & 2 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"index": "projects/aas-portal/src/index.html",
"browser": "projects/aas-portal/src/main.ts",
"polyfills": [
"zone.js"
"zone.js",
"@angular/localize/init"
],
"tsConfig": "projects/aas-portal/tsconfig.app.json",
"inlineStyleLanguage": "scss",
Expand Down Expand Up @@ -96,7 +97,8 @@
"options": {
"polyfills": [
"zone.js",
"zone.js/testing"
"zone.js/testing",
"@angular/localize/init"
],
"tsConfig": "projects/aas-portal/tsconfig.spec.json",
"karmaConfig": "projects/aas-portal/karma.conf.cjs",
Expand Down
35,181 changes: 20,653 additions & 14,528 deletions package-lock.json
View file

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@
"projects/aas-portal"
],
"dependencies": {
"@angular/animations": "^17.3.4",
"@angular/common": "^17.3.4",
"@angular/compiler": "^17.3.4",
"@angular/core": "^17.3.4",
"@angular/forms": "^17.3.4",
"@angular/localize": "^17.3.4",
"@angular/platform-browser": "^17.3.4",
"@angular/platform-browser-dynamic": "^17.3.4",
"@angular/router": "^17.3.4",
"@angular/animations": "^18.0.4",
"@angular/common": "^18.0.4",
"@angular/compiler": "^18.0.4",
"@angular/core": "^18.0.4",
"@angular/forms": "^18.0.4",
"@angular/localize": "^18.0.4",
"@angular/platform-browser": "^18.0.4",
"@angular/platform-browser-dynamic": "^18.0.4",
"@angular/router": "^18.0.4",
"@babel/polyfill": "^7.4.4",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@ng-bootstrap/ng-bootstrap": "^17.0.0",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@popperjs/core": "^2.11.8",
"@xmldom/xmldom": "^0.8.10",
"bcryptjs": "^2.4.3",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"chart.js": "^4.4.2",
"chart.js": "^4.4.3",
"cors": "^2.8.5",
"express": "^4.19.2",
"form-data": "^4.0.0",
Expand All @@ -66,61 +66,61 @@
"jwt-decode": "^4.0.0",
"lodash-es": "^4.17.21",
"lowdb": "^7.0.1",
"mongoose": "^8.3.1",
"mongoose": "^8.4.3",
"morgan": "^1.10.0",
"multer": "^1.4.5-lts.1",
"mysql2": "^3.9.4",
"node-opcua": "^2.124.0",
"mysql2": "^3.10.1",
"node-opcua": "^2.126.0",
"node-opcua-client-crawler": "^2.124.0",
"nodemailer": "^6.9.13",
"nodemailer": "^6.9.14",
"reflect-metadata": "^0.2.2",
"rxjs": "~7.8.1",
"swagger-ui-express": "^5.0.0",
"tslib": "^2.6.2",
"swagger-ui-express": "^5.0.1",
"tslib": "^2.6.3",
"tsoa": "^5.1.1",
"tsyringe": "^4.8.0",
"uuid": "^9.0.1",
"webdav": "^5.5.0",
"uuid": "^10.0.0",
"webdav": "^5.6.0",
"winston": "^3.13.0",
"winston-daily-rotate-file": "^5.0.0",
"ws": "^8.16.0",
"ws": "^8.17.1",
"xpath": "^0.0.34",
"zone.js": "~0.14.4"
"zone.js": "~0.14.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.4",
"@angular-eslint/builder": "17.3.0",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/schematics": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "^17.3.4",
"@angular/compiler-cli": "^17.3.4",
"@babel/plugin-syntax-import-attributes": "^7.24.1",
"@angular-devkit/build-angular": "^18.0.5",
"@angular-eslint/builder": "18.0.1",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular-eslint/eslint-plugin-template": "18.0.1",
"@angular-eslint/schematics": "18.0.1",
"@angular-eslint/template-parser": "18.0.1",
"@angular/cli": "^18.0.5",
"@angular/compiler-cli": "^18.0.4",
"@babel/plugin-syntax-import-attributes": "^7.24.7",
"@jest/globals": "^29.7.0",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^10.0.3",
"@semantic-release/github": "^10.0.6",
"@types/bcryptjs": "^2.4.6",
"@types/bootstrap": "^5.2.10",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/jasmine": "^5.1.4",
"@types/jquery": "^3.5.29",
"@types/jquery": "^3.5.30",
"@types/jsonwebtoken": "^9.0.6",
"@types/lodash-es": "^4.17.12",
"@types/morgan": "^1.9.9",
"@types/multer": "^1.4.11",
"@types/node": "^20.11.18",
"@types/nodemailer": "^6.4.14",
"@types/node": "^20.14.8",
"@types/nodemailer": "^6.4.15",
"@types/supertest": "^6.0.2",
"@types/swagger-ui-express": "^4.1.6",
"@types/uuid": "^9.0.8",
"@types/uuid": "^10.0.0",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"babel-plugin-transform-import-meta": "^2.2.1",
"esbuild": "^0.20.2",
"eslint": "^8.56.0",
"esbuild": "^0.21.5",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"fhg-jest": "./projects/fhg-jest",
Expand All @@ -134,13 +134,13 @@
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"karma-junit-reporter": "^2.0.1",
"ng-packagr": "^17.3.0",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"semantic-release": "^23.0.8",
"supertest": "^6.3.4",
"ts-jest": "^29.1.2",
"ng-packagr": "^18.0.0",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"semantic-release": "^24.0.0",
"supertest": "^7.0.0",
"ts-jest": "^29.1.5",
"ts-node": "^10.9.2",
"typescript": "^5.2.2"
"typescript": "^5.4.5"
}
}
4 changes: 4 additions & 0 deletions projects/aas-lib/src/lib/aas-table/aas-table-row.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ export class AASTableRow extends TreeNode<AASDocument> {
super(document, parent, level, expanded, selected, highlighted, firstChild, nextSibling);
}

public get trackId(): string {
return this.element.endpoint + '.' + this.element.id;
}

public get id(): string {
return this.element.id;
}
Expand Down
14 changes: 7 additions & 7 deletions projects/aas-lib/src/lib/aas-table/aas-table.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
!
!---------------------------------------------------------------------------->

@if (rows.length > 0) {
@if (viewMode === 'list') {
@if (rows().length > 0) {
@if (viewMode() === 'list') {
<table class="table table-sm table-hover table-striped">
<thead>
<tr>
<th class="th-w-checkbox">
<input id="aas-table-checkbox" type="checkbox" class="form-check-input" [indeterminate]="someSelected"
[checked]="everySelected" (change)="toggleSelections()">
<input id="aas-table-checkbox" type="checkbox" class="form-check-input" [indeterminate]="someSelected()"
[checked]="everySelected()" (change)="toggleSelections()">
</th>
<th scope="col" class="th-w-icon">
<i class="bi bi-tag"></i>
Expand All @@ -27,7 +27,7 @@
</tr>
</thead>
<tbody>
@for (row of rows; track row) {
@for (row of rows(); track row.trackId) {
<tr class="align-middle">
<td>
<input type="checkbox" class="form-check-input" (change)="toggleSelected(row)" [checked]="row.selected"
Expand Down Expand Up @@ -77,7 +77,7 @@
<thead>
<tr>
<th class="th-w-checkbox">
<input type="checkbox" class="form-check-input" [indeterminate]="someSelected" [checked]="everySelected"
<input type="checkbox" class="form-check-input" [indeterminate]="someSelected()" [checked]="everySelected()"
(change)="toggleSelections()">
</th>
<th scope="col">
Expand All @@ -89,7 +89,7 @@
</tr>
</thead>
<tbody>
@for (row of rows; track row) {
@for (row of rows(); track row.trackId) {
<tr class="align-middle">
<td>
<input type="checkbox" class="form-check-input" (change)="toggleSelected(row)" [checked]="row.selected"
Expand Down
Loading

0 comments on commit 51d6767

Please sign in to comment.