fix: bug fixing

FraunhoferIOSB · Nov 12, 2024 · 8dc1520 · 8dc1520
1 parent 76c6a10
commit 8dc1520
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/projects/aas-portal/src/app/start/start.component.html b/projects/aas-portal/src/app/start/start.component.html
@@ -53,8 +53,8 @@
     }
     <div class="btn-group me-2 my-1">
         <div ngbDropdown class="btn-group" role="group">
-            <button type="button" class="btn btn-primary" ngbDropdownToggle id="menuEndpoints">
-                <i class="bi bi-gear"></i>
+            <button type="button" class="btn btn-primary" ngbDropdownToggle id="menuEndpoints" translate>
+                Start.ENDPOINT
             </button>
             <div ngbDropdownMenu class="dropdown-menu" id="menuEndpoints">
                 <button ngbDropdownItem (click)="addEndpoint().subscribe()" translate>Start.ADD_ENDPOINT</button>

diff --git a/projects/aas-portal/src/assets/i18n/de-de.json b/projects/aas-portal/src/assets/i18n/de-de.json
@@ -171,6 +171,7 @@
     "TEXT_ADD_FAVORITES": "{0} Favoriten hinzufügen ({1}).",
     "Start": {
         "FAVORITES": "Alle Verwaltungsschalen",
+        "ENDPOINT": "Endpunkt",
         "ADD_ENDPOINT": "Hinzufügen...",
         "UPDATE_ENDPOINT": "Bearbeiten...",
         "REMOVE_ENDPOINT": "Entfernen...",
@@ -190,7 +191,7 @@
         "PLACEHOLDER_URL_OPCUA": "opc.tcp://",
         "PLACEHOLDER_URL_WEBDAV": "http(s)://",
         "ADVANCED_SETTINGS": "Erweiterte Einstellungen",
-        "SCHEDULE": "Endpunkt durchsuchen",
+        "SCHEDULE": "Endpunkt-Index aktualisieren",
         "MANUAL": "manuell",
         "ONCE": "einmalig",
         "EVERY": "zyklisch",
@@ -212,7 +213,7 @@
         "PLACEHOLDER_URL_HTTP": "http(s)://",
         "PLACEHOLDER_URL_OPCUA": "opc.tcp://",
         "PLACEHOLDER_URL_WEBDAV": "http(s)://",
-        "SCHEDULE": "Endpunkt durchsuchen",
+        "SCHEDULE": "Endpunkt-Index aktualisieren",
         "MANUAL": "manuell",
         "ONCE": "einmalig",
         "EVERY": "zyklisch",

diff --git a/projects/aas-portal/src/assets/i18n/en-us.json b/projects/aas-portal/src/assets/i18n/en-us.json
@@ -172,6 +172,7 @@
     "TEXT_ADD_FAVORITES": "Add {0} favorites ({1}).",
     "Start": {
         "FAVORITES": "All shells",
+        "ENDPOINT": "Endpoint",
         "ADD_ENDPOINT": "Add...",
         "UPDATE_ENDPOINT": "Edit...",
         "REMOVE_ENDPOINT": "Remove...",
@@ -191,7 +192,7 @@
         "PLACEHOLDER_URL_OPCUA": "opc.tcp://",
         "PLACEHOLDER_URL_WEBDAV": "http(s)://",
         "ADVANCED_SETTINGS": "Advanced settings",
-        "SCHEDULE": "Search endpoint",
+        "SCHEDULE": "Update endpoint index",
         "MANUAL": "manual",
         "ONCE": "once",
         "EVERY": "cyclic",
@@ -213,7 +214,7 @@
         "PLACEHOLDER_URL_HTTP": "http(s)://",
         "PLACEHOLDER_URL_OPCUA": "opc.tcp://",
         "PLACEHOLDER_URL_WEBDAV": "http(s)://",
-        "SCHEDULE": "Search endpoint",
+        "SCHEDULE": "Update endpoint index",
         "MANUAL": "manual",
         "ONCE": "once",
         "EVERY": "cyclic",

diff --git a/projects/aas-server/src/app/aas-index/aas-index.ts b/projects/aas-server/src/app/aas-index/aas-index.ts
@@ -44,7 +44,7 @@ export abstract class AASIndex {
 
     public abstract removeEndpoint(endpointName: string): Promise<boolean>;
 
-    public abstract getDocuments(cursor: AASCursor, query?: string, language?: string): Promise<AASPagedResult>;
+    public abstract getDocuments(cursor: AASCursor, expression?: string, language?: string): Promise<AASPagedResult>;
 
     public abstract nextPage(
         endpointName: string,

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
@@ -183,27 +183,31 @@ export class LowDbIndex extends AASIndex {
         return { result, paging_metadata: { cursor: encodeBase64Url(items[k].id) } };
     }
 
-    public override async getDocuments(cursor: AASCursor, query?: string, language?: string): Promise<AASPagedResult> {
+    public override async getDocuments(
+        cursor: AASCursor,
+        expression?: string,
+        language?: string,
+    ): Promise<AASPagedResult> {
         await this.promise;
 
-        let filter: LowDbQuery | undefined;
-        if (query) {
-            filter = new LowDbQuery(query, language ?? 'en');
+        let query: LowDbQuery | undefined;
+        if (expression) {
+            query = new LowDbQuery(expression, language ?? 'en');
         }
 
         if (cursor.next) {
-            return this.getNextPage(cursor.next, cursor.limit, filter);
+            return this.getNextPage(cursor.next, cursor.limit, query);
         }
 
         if (cursor.previous) {
-            return this.getPreviousPage(cursor.previous, cursor.limit, filter);
+            return this.getPreviousPage(cursor.previous, cursor.limit, query);
         }
 
         if (cursor.previous === null) {
-            return this.getFirstPage(cursor.limit, filter);
+            return this.getFirstPage(cursor.limit, query);
         }
 
-        return this.getLastPage(cursor.limit, filter);
+        return this.getLastPage(cursor.limit, query);
     }
 
     public override async update(document: AASDocument): Promise<void> {

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
@@ -211,25 +211,25 @@ export class MySqlIndex extends AASIndex {
         }
     }
 
-    public override getDocuments(cursor: AASCursor, query?: string, language?: string): Promise<AASPagedResult> {
-        let q: MySqlQuery | undefined;
-        if (query) {
-            q = new MySqlQuery(query, language ?? 'en');
+    public override getDocuments(cursor: AASCursor, expression?: string, language?: string): Promise<AASPagedResult> {
+        let query: MySqlQuery | undefined;
+        if (expression) {
+            query = new MySqlQuery(expression, language ?? 'en');
         }
 
         if (cursor.next) {
-            return this.getNextPage(cursor.next, cursor.limit);
+            return this.getNextPage(cursor.next, cursor.limit, query);
         }
 
         if (cursor.previous) {
-            return this.getPreviousPage(cursor.previous, cursor.limit);
+            return this.getPreviousPage(cursor.previous, cursor.limit, query);
         }
 
         if (cursor.previous === null) {
-            return this.getFirstPage(cursor.limit, q);
+            return this.getFirstPage(cursor.limit, query);
         }
 
-        return this.getLastPage(cursor.limit);
+        return this.getLastPage(cursor.limit, query);
     }
 
     public override async nextPage(