From 28cdcd9b09119194e80f14e41a58973750ad390a Mon Sep 17 00:00:00 2001 From: Ralf Aron Date: Fri, 8 Nov 2024 20:52:39 +0100 Subject: [PATCH] fix: bug fixing --- .../aas-lib/src/lib/index-change.service.ts | 8 +-- .../add-endpoint-form.component.html | 58 +++++++++---------- .../src/app/start/favorites.service.ts | 4 +- .../src/app/start/start-api.service.ts | 14 ++++- .../src/app/start/start.component.html | 4 +- .../src/app/start/start.component.ts | 8 ++- .../aas-portal/src/app/start/start.store.ts | 12 +++- .../aas-portal/src/assets/i18n/de-de.json | 14 ++++- .../aas-portal/src/assets/i18n/en-us.json | 14 ++++- .../aas-server/src/app/aas-index/aas-index.ts | 2 + .../src/app/aas-index/lowdb/lowdb-index.ts | 11 ++++ .../src/app/aas-index/mysql/mysql-index.ts | 42 ++++++++++---- .../src/app/aas-provider/aas-provider.ts | 16 ++++- .../app/controller/endpoints-controller.ts | 31 +++++++--- 14 files changed, 168 insertions(+), 70 deletions(-) diff --git a/projects/aas-lib/src/lib/index-change.service.ts b/projects/aas-lib/src/lib/index-change.service.ts index 3c02c78..8504d56 100644 --- a/projects/aas-lib/src/lib/index-change.service.ts +++ b/projects/aas-lib/src/lib/index-change.service.ts @@ -119,11 +119,11 @@ export class IndexChangeService { } private documentAdded(): void { - this.state.update(state => ({ ...state, addedDocuments: state.documentCount + 1 })); + this.state.update(state => ({ ...state, documentCount: state.documentCount + 1 })); } private documentRemoved(): void { - this.state.update(state => ({ ...state, removedDocuments: state.documentCount - 1 })); + this.state.update(state => ({ ...state, documentCount: state.documentCount - 1 })); } private documentUpdate(): void { @@ -131,10 +131,10 @@ export class IndexChangeService { } private endpointAdded(): void { - this.state.update(state => ({ ...state, addedEndpoints: state.endpointCount + 1 })); + this.state.update(state => ({ ...state, endpointCount: state.endpointCount + 1 })); } private endpointRemoved(): void { - this.state.update(state => ({ ...state, removedEndpoints: state.endpointCount - 1 })); + this.state.update(state => ({ ...state, endpointCount: state.endpointCount - 1 })); } } diff --git a/projects/aas-portal/src/app/start/add-endpoint-form/add-endpoint-form.component.html b/projects/aas-portal/src/app/start/add-endpoint-form/add-endpoint-form.component.html index c00578c..e68ec69 100644 --- a/projects/aas-portal/src/app/start/add-endpoint-form/add-endpoint-form.component.html +++ b/projects/aas-portal/src/app/start/add-endpoint-form/add-endpoint-form.component.html @@ -10,7 +10,7 @@

- CAPTION_ADD_ENDPOINT + AddEndpointForm.CAPTION_ADD_ENDPOINT

@@ -42,44 +42,42 @@

(input)="inputValue()"> @if (selectedItem().type === 'AAS_API') { -
-
- - -
-
- - -
-
- - -
- @if (schedule() === 'every') { -
- - AddEndpointForm.HOURS - - AddEndpointForm.MINUTES + +
+
+ + +
+
+ + +
+ @if (schedule() === 'every') { +
+ + AddEndpointForm.HOURS + + AddEndpointForm.MINUTES +
+ }
- } -
+ +
- - - + + diff --git a/projects/aas-portal/src/app/start/favorites.service.ts b/projects/aas-portal/src/app/start/favorites.service.ts index c13c839..26cedb3 100644 --- a/projects/aas-portal/src/app/start/favorites.service.ts +++ b/projects/aas-portal/src/app/start/favorites.service.ts @@ -67,7 +67,7 @@ export class FavoritesService { } } - return lists; + return [...lists]; }), mergeMap(lists => { return this.auth.setCookie('.Favorites', JSON.stringify(lists)).pipe( @@ -94,7 +94,7 @@ export class FavoritesService { lists[i] = list; - return lists; + return [...lists]; }), mergeMap(lists => { return this.auth.setCookie('.Favorites', JSON.stringify(lists)).pipe( diff --git a/projects/aas-portal/src/app/start/start-api.service.ts b/projects/aas-portal/src/app/start/start-api.service.ts index 843be45..5487ec2 100644 --- a/projects/aas-portal/src/app/start/start-api.service.ts +++ b/projects/aas-portal/src/app/start/start-api.service.ts @@ -28,15 +28,23 @@ export class StartApiService { } /** - * Adds a new endpoint to the AASServer configuration. - * @param endpoint The AAS container endpoint. + * Adds a new endpoint. + * @param endpoint The AAS endpoint. */ public addEndpoint(endpoint: AASEndpoint): Observable { return this.http.post(`/api/v1/endpoints/${encodeBase64Url(endpoint.name)}`, endpoint); } /** - * Removes the specified endpoint from the AASServer configuration. + * Updates an existing endpoint. + * @param endpoint The AAS endpoint. + */ + public updateEndpoint(endpoint: AASEndpoint): Observable { + return this.http.put(`/api/v1/endpoints/${encodeBase64Url(endpoint.name)}`, endpoint); + } + + /** + * Removes the specified endpoint. * @param name The name of the endpoint. */ public removeEndpoint(name: string): Observable { diff --git a/projects/aas-portal/src/app/start/start.component.html b/projects/aas-portal/src/app/start/start.component.html index c5d14f8..df294b5 100644 --- a/projects/aas-portal/src/app/start/start.component.html +++ b/projects/aas-portal/src/app/start/start.component.html @@ -21,7 +21,7 @@ [value]="activeFavorites()" (change)="setActiveFavorites(selectFavorites.value)"> @for (option of favoritesLists(); track option; let i = $index) { @if (i === 0) { - + } @else { } @@ -108,4 +108,4 @@ [placeholder]="'PLACEHOLDER_FILTER' | translate" (change)="setFilter(textInput.value)" (keydown.enter)="textInput.blur()"> - + \ No newline at end of file diff --git a/projects/aas-portal/src/app/start/start.component.ts b/projects/aas-portal/src/app/start/start.component.ts index 2c37155..0e4f191 100644 --- a/projects/aas-portal/src/app/start/start.component.ts +++ b/projects/aas-portal/src/app/start/start.component.ts @@ -7,6 +7,7 @@ *****************************************************************************/ import { Router } from '@angular/router'; +import { NgClass } from '@angular/common'; import { AfterViewInit, ChangeDetectionStrategy, @@ -45,14 +46,13 @@ import { StartApiService } from './start-api.service'; import { FavoritesService } from './favorites.service'; import { FavoritesFormComponent } from './favorites-form/favorites-form.component'; import { StartStore } from './start.store'; -import { AsyncPipe, NgClass } from '@angular/common'; @Component({ selector: 'fhg-start', templateUrl: './start.component.html', styleUrls: ['./start.component.scss'], standalone: true, - imports: [AASTableComponent, NgClass, AsyncPipe, TranslateModule, NgbModule], + imports: [AASTableComponent, NgClass, TranslateModule, NgbModule], changeDetection: ChangeDetectionStrategy.OnPush, }) export class StartComponent implements OnDestroy, AfterViewInit { @@ -160,7 +160,9 @@ export class StartComponent implements OnDestroy, AfterViewInit { }), mergeMap(modalRef => from>(modalRef.result)), mergeMap(result => { - if (!result) return EMPTY; + if (result === undefined) { + return EMPTY; + } return this.api.addEndpoint(result); }), diff --git a/projects/aas-portal/src/app/start/start.store.ts b/projects/aas-portal/src/app/start/start.store.ts index 2db55b4..ea5c308 100644 --- a/projects/aas-portal/src/app/start/start.store.ts +++ b/projects/aas-portal/src/app/start/start.store.ts @@ -15,7 +15,6 @@ export class StartStore { private readonly _limit = signal(10); private readonly _previous = signal(null); private readonly _next = signal(null); - private _totalCount = 0; private readonly _documents = signal([], { equal: (a, b) => equalArray(a, b) }); private readonly _activeFavorites = signal(''); @@ -81,16 +80,25 @@ export class StartStore { public setFilter(filter: string): void { this._filterText.set(filter); + if (!this._activeFavorites()) { + this.getFirstPage(); + } } public getFirstPage(filter?: string, limit?: number): void { + if (!filter) { + if (!this._activeFavorites()) { + filter = this._filterText(); + } + } + this.api .getPage( { previous: null, limit: limit ?? this._limit(), }, - filter ?? this._filterText(), + filter, this.translate.currentLang, ) .pipe(mergeMap(page => this.setPageAndLoadContents(page, limit, filter))) diff --git a/projects/aas-portal/src/assets/i18n/de-de.json b/projects/aas-portal/src/assets/i18n/de-de.json index 0d4c791..3be80f7 100644 --- a/projects/aas-portal/src/assets/i18n/de-de.json +++ b/projects/aas-portal/src/assets/i18n/de-de.json @@ -14,7 +14,6 @@ "CAPTION_CREATE_WORKSPACE": "Gruppieren", "CAPTION_EDIT_WORKSPACE": "Gruppe bearbeiten", "CAPTION_REMOVE_WORKSPACE": "Gruppe löschen", - "CAPTION_ADD_ENDPOINT": "AAS-Endpunkt hinzufügen", "CAPTION_REMOVE_ENDPOINT": "AAS-Endpunkt entfernen", "CAPTION_NEW_ELEMENT": "Neu hinzufügen", "CAPTION_EDIT_ELEMENT": "Bearbeiten", @@ -147,7 +146,6 @@ "ERROR_INVALID_CONTAINER_URL": "'{0}' adressiert eine ungülig oder nicht unterstützte VWS-Ressoure.", "ERROR_FAVORITES_LIST_NAME_USED_SEVERAL_TIMES": "'{0}' ist mehrfach verwendet.", "ERROR_INVALID_EMPTY_FAVORITES_LIST_NAME": "Ungültiger leerer Name.", - "FAVORITES": "Favoriten", "INFO_NEW_PASSWORD_SENT": "Ein neues Passwort wurde an '{0}' gesendet", "INFO_DOWNLOAD_FILE_SUCCESS": "{0} wurde erfolgreich heruntergeladen.", "INFO_UPLOAD_AASX_FILE_SUCCESS": "{0} wurde erfolgreich hochgeladen.", @@ -174,7 +172,11 @@ "OPTION_BAR_HORIZONTAL_CHART": "Balkendiagramm horizontal", "TEXT_ADD_FAVORITE": "1 Favorit hinzufügen ({0}).", "TEXT_ADD_FAVORITES": "{0} Favoriten hinzufügen ({1}).", + "Start": { + "FAVORITES": "Alle Verwaltungsschalen" + }, "AddEndpointForm": { + "CAPTION_ADD_ENDPOINT": "AAS-Endpunkt hinzufügen", "FileSystem": "Dateisystem", "AAS_API": "AAS API", "WebDAV": "WebDAV", @@ -187,8 +189,14 @@ "PLACEHOLDER_URL_OPCUA": "opc.tcp://", "PLACEHOLDER_URL_WEBDAV": "http(s)://", "ADVANCED_SETTINGS": "Erweiterte Einstellungen", + "SCHEDULE": "Endpunkt durchsuchen", + "ONCE": "einmalig", + "EVERY": "zyklisch", "MINUTES": "Minuten", - "HOURS": "Stunden" + "HOURS": "Stunden", + "HEADERS": "HTTP-Header-Felder", + "HEADER": "Feld", + "VALUE": "Wert" }, "CustomerFeedback": { "OverallRating": "Gesamtbewertung", diff --git a/projects/aas-portal/src/assets/i18n/en-us.json b/projects/aas-portal/src/assets/i18n/en-us.json index fc18c5b..e3a17e1 100644 --- a/projects/aas-portal/src/assets/i18n/en-us.json +++ b/projects/aas-portal/src/assets/i18n/en-us.json @@ -14,7 +14,6 @@ "CAPTION_CREATE_WORKSPACE": "Group", "CAPTION_EDIT_WORKSPACE": "Edit Group", "CAPTION_REMOVE_WORKSPACE": "Remove Group", - "CAPTION_ADD_ENDPOINT": "Add AAS Endpoint", "CAPTION_REMOVE_ENDPOINT": "Remove AAS Endpoint", "CAPTION_NEW_ELEMENT": "Insert New", "CAPTION_EDIT_ELEMENT": "Edit", @@ -149,7 +148,6 @@ "ERROR_INVALID_CONTAINER_URL": "'{0}' addresses an invalid or not supported AAS resource.", "ERROR_FAVORITES_LIST_NAME_USED_SEVERAL_TIMES": "'{0}' is used several times.", "ERROR_INVALID_EMPTY_FAVORITES_LIST_NAME": "Invalid empty name.", - "FAVORITES": "Favorites", "INFO_NEW_PASSWORD_SENT": "A new password was sent to '{0}'.", "INFO_DOWNLOAD_FILE_SUCCESS": "{0} was downloaded successfully.", "INFO_UPLOAD_AASX_FILE_SUCCESS": "{0} was uploaded successfully.", @@ -175,7 +173,11 @@ "OPTION_BAR_HORIZONTAL_CHART": "Horizontal bar chart", "TEXT_ADD_FAVORITE": "Add 1 favorite ({0}).", "TEXT_ADD_FAVORITES": "Add {0} favorites ({1}).", + "Start": { + "FAVORITES": "All shells" + }, "AddEndpointForm": { + "CAPTION_ADD_ENDPOINT": "Add AAS Endpoint", "FileSystem": "File system", "AAS_API": "AAS API", "WebDAV": "WebDAV", @@ -188,8 +190,14 @@ "PLACEHOLDER_URL_OPCUA": "opc.tcp://", "PLACEHOLDER_URL_WEBDAV": "http(s)://", "ADVANCED_SETTINGS": "Advanced settings", + "SCHEDULE": "Search endpoint", + "ONCE": "once", + "EVERY": "cyclic", "MINUTES": "Minutes", - "HOURS": "Hours" + "HOURS": "Hours", + "HEADERS": "HTTP headers", + "HEADER": "Header", + "VALUE": "Value" }, "CustomerFeedback": { "OverallRating": "Overall rating", diff --git a/projects/aas-server/src/app/aas-index/aas-index.ts b/projects/aas-server/src/app/aas-index/aas-index.ts index 0012420..9a820a3 100644 --- a/projects/aas-server/src/app/aas-index/aas-index.ts +++ b/projects/aas-server/src/app/aas-index/aas-index.ts @@ -40,6 +40,8 @@ export abstract class AASIndex { public abstract addEndpoint(endpoint: AASEndpoint): Promise; + public abstract updateEndpoint(endpoint: AASEndpoint): Promise; + public abstract removeEndpoint(endpointName: string): Promise; public abstract getDocuments(cursor: AASCursor, query?: string, language?: string): Promise; diff --git a/projects/aas-server/src/app/aas-index/lowdb/lowdb-index.ts b/projects/aas-server/src/app/aas-index/lowdb/lowdb-index.ts index 8588359..51a9435 100644 --- a/projects/aas-server/src/app/aas-index/lowdb/lowdb-index.ts +++ b/projects/aas-server/src/app/aas-index/lowdb/lowdb-index.ts @@ -102,6 +102,17 @@ export class LowDbIndex extends AASIndex { await this.db.write(); } + public override async updateEndpoint(endpoint: AASEndpoint): Promise { + await this.promise; + const index = this.db.data.endpoints.findIndex(item => item.name === endpoint.name); + if (index < 0) { + throw new Error(`An endpoint with the name ${name} does not exist.`); + } + + this.db.data.endpoints[index] = endpoint; + await this.db.write(); + } + public override async removeEndpoint(endpointName: string): Promise { await this.promise; const index = this.db.data.endpoints.findIndex(endpoint => endpoint.name === endpointName); diff --git a/projects/aas-server/src/app/aas-index/mysql/mysql-index.ts b/projects/aas-server/src/app/aas-index/mysql/mysql-index.ts index f5ce28b..54614a0 100644 --- a/projects/aas-server/src/app/aas-index/mysql/mysql-index.ts +++ b/projects/aas-server/src/app/aas-index/mysql/mysql-index.ts @@ -80,16 +80,24 @@ export class MySqlIndex extends AASIndex { } public override async getEndpoints(): Promise { - return (await (await this.connection).query('SELECT * FROM `endpoints`;'))[0].map( - row => - ({ - name: row.name, - url: row.url, - type: row.type, - version: row.version, - headers: row.headers ? JSON.parse(row.headers) : undefined, - }) as AASEndpoint, - ); + return (await (await this.connection).query('SELECT * FROM `endpoints`;'))[0].map(row => { + const endpoint: AASEndpoint = { + name: row.name, + url: row.url, + type: row.type, + version: row.version, + }; + + if (row.headers) { + endpoint.headers = JSON.parse(row.headers); + } + + if (row.schedule) { + endpoint.schedule = JSON.parse(row.schedule); + } + + return endpoint; + }); } public override async getEndpoint(name: string): Promise { @@ -142,10 +150,24 @@ export class MySqlIndex extends AASIndex { endpoint.type, endpoint.version, endpoint.headers ? JSON.stringify(endpoint.headers) : undefined, + endpoint.schedule ? JSON.stringify(endpoint.schedule) : undefined, ], ); } + public override async updateEndpoint(endpoint: AASEndpoint): Promise { + await ( + await this.connection + ).query('UPDATE `documents` SET url = ?, type = ?, version = ?, headers = ? WHERE name = ?;', [ + endpoint.url, + endpoint.type, + endpoint.version, + endpoint.headers ? JSON.stringify(endpoint.headers) : undefined, + endpoint.schedule ? JSON.stringify(endpoint.schedule) : undefined, + endpoint.name, + ]); + } + public override async removeEndpoint(endpointName: string): Promise { const connection = await this.connection; try { diff --git a/projects/aas-server/src/app/aas-provider/aas-provider.ts b/projects/aas-server/src/app/aas-provider/aas-provider.ts index d924a37..d75a7c4 100644 --- a/projects/aas-server/src/app/aas-provider/aas-provider.ts +++ b/projects/aas-server/src/app/aas-provider/aas-provider.ts @@ -220,7 +220,7 @@ export class AASProvider { /** * Adds a new endpoint. * @param endpointName The endpoint name. - * @param url The endpoint URL. + * @param endpoint The endpoint to update. */ public async addEndpointAsync(endpointName: string, endpoint: AASEndpoint): Promise { if (endpointName !== endpoint.name) { @@ -240,6 +240,20 @@ export class AASProvider { setTimeout(this.scanEndpoint, 0, this.taskHandler.createTaskId(), endpoint); } + /** + * Updates an existing endpoint. + * @param endpointName The endpoint name. + * @param endpoint The endpoint to update. + */ + public async updateEndpointAsync(endpointName: string, endpoint: AASEndpoint): Promise { + if (endpointName !== endpoint.name) { + await this.index.removeEndpoint(endpointName); + await this.index.addEndpoint(endpoint); + } else { + await this.index.updateEndpoint(endpoint); + } + } + /** * Removes the endpoint with the specified name. * @param endpointName The name of the registry to remove. diff --git a/projects/aas-server/src/app/controller/endpoints-controller.ts b/projects/aas-server/src/app/controller/endpoints-controller.ts index ff1114e..ab21259 100644 --- a/projects/aas-server/src/app/controller/endpoints-controller.ts +++ b/projects/aas-server/src/app/controller/endpoints-controller.ts @@ -7,7 +7,7 @@ *****************************************************************************/ import { inject, injectable } from 'tsyringe'; -import { Body, Delete, Get, OperationId, Path, Post, Route, Security, Tags } from 'tsoa'; +import { Body, Delete, Get, OperationId, Path, Post, Put, Route, Security, Tags } from 'tsoa'; import { AASEndpoint } from 'aas-core'; import { AASProvider } from '../aas-provider/aas-provider.js'; @@ -47,7 +47,7 @@ export class EndpointsController extends AASController { } /** - * Gets the number of registered endpoints. + * @summary Gets the number of registered endpoints. * @returns The number of registered endpoints. */ @Get('count') @@ -63,7 +63,7 @@ export class EndpointsController extends AASController { } /** - * The total count of AAS documents of the specified endpoint. + * @summary The total count of AAS documents of the specified endpoint. * @param endpoint The endpoint name or `undefined`. * @returns The total number of AAS documents. */ @@ -87,10 +87,27 @@ export class EndpointsController extends AASController { @Post('{name}') @Security('bearerAuth', ['editor']) @OperationId('addEndpoint') - public addEndpoint(@Path() name: string, @Body() endpoint: AASEndpoint): Promise { + public async addEndpoint(@Path() name: string, @Body() endpoint: AASEndpoint): Promise { try { this.logger.start('addEndpoint'); - return this.aasProvider.addEndpointAsync(decodeBase64Url(name), endpoint); + await this.aasProvider.addEndpointAsync(decodeBase64Url(name), endpoint); + } finally { + this.logger.stop(); + } + } + + /** + * @summary Updates an existing endpoint. + * @param name The old endpoint name. + * @param endpoint The endpoint to update. + */ + @Put('{name}') + @Security('bearerAuth', ['editor']) + @OperationId('updateEndpoint') + public async updateEndpoint(@Path() name: string, @Body() endpoint: AASEndpoint): Promise { + try { + this.logger.start('addEndpoint'); + await this.aasProvider.updateEndpointAsync(decodeBase64Url(name), endpoint); } finally { this.logger.stop(); } @@ -103,10 +120,10 @@ export class EndpointsController extends AASController { @Delete('{name}') @Security('bearerAuth', ['editor']) @OperationId('deleteEndpoint') - public deleteEndpoint(@Path() name: string): Promise { + public async deleteEndpoint(@Path() name: string): Promise { try { this.logger.start('removeEndpoint'); - return this.aasProvider.removeEndpointAsync(decodeBase64Url(name)); + await this.aasProvider.removeEndpointAsync(decodeBase64Url(name)); } finally { this.logger.stop(); }
Headers
#HeaderValueAddEndpointForm.HEADERAddEndpointForm.VALUE