Usage of checkSemanticId() in HandoverDocumentation Plugin

eclipse-basyx · Aug 28, 2024 · e938a47 · e938a47
1 parent 6434936
commit e938a47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/aas-gui/Frontend/aas-web-gui/src/components/SubmodelPlugins/HandoverDocumentation.vue b/aas-gui/Frontend/aas-web-gui/src/components/SubmodelPlugins/HandoverDocumentation.vue
@@ -212,7 +212,7 @@ export default defineComponent({
             submodelElementData = await this.calculateSubmodelElementPathes(submodelElementData, this.SelectedNode.path);
             // create array of documents
             let documents = this.submodelElementData.submodelElements.filter((element: any) => {
-                return element.semanticId.keys[0].value.includes("0173-1#02-ABI500#001/0173-1#01-AHF579#001");
+                return this.checkSemanticId(element, '0173-1#02-ABI500#001/0173-1#01-AHF579#001');
             });
             documents.forEach((document: any) => {
                 this.extractDocumentVersions(document);
@@ -227,7 +227,7 @@ export default defineComponent({
         extractDocumentVersions(document: any) {
             // create an array with every DocumentVersion SubmodelElementCollection
             document.documentVersions = document.value.filter((element: any) => {
-                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && element.semanticId.keys[0].value.includes("0173-1#02-ABI503#001/0173-1#01-AHF582#001");
+                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && this.checkSemanticId(element, '0173-1#02-ABI503#001/0173-1#01-AHF582#001');
             });
             // prepare each DocumentVersion
             document.documentVersions.forEach((documentVersion: any) => {
@@ -246,13 +246,13 @@ export default defineComponent({
 
         extractDocumentIds(document: any) {
             document.documentIds = document.value.filter((element: any) => {
-                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && element.semanticId.keys[0].value.includes("0173-1#02-ABI501#001/0173-1#01-AHF580#001");
+                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && this.checkSemanticId(element, '0173-1#02-ABI501#001/0173-1#01-AHF580#001');
             });
         },
 
         extractDocumentClassifications(document: any) {
             document.documentClassifications = document.value.filter((element: any) => {
-                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && element.semanticId.keys[0].value.includes("0173-1#02-ABI502#001/0173-1#01-AHF581#001*02");
+                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && this.checkSemanticId(element, '0173-1#02-ABI502#001/0173-1#01-AHF581#001*02');
             });
         },
 
@@ -275,7 +275,7 @@ export default defineComponent({
 
         getElementBySemanticId(semanticId: string, parentElement: any) {
             return parentElement.value.find((element: any) => {
-                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && element.semanticId.keys[0].value.includes(semanticId);
+                return element.semanticId && element.semanticId.keys && element.semanticId.keys.length > 0 && this.checkSemanticId(element, semanticId);
             });
         },
     },

diff --git a/aas-gui/Frontend/aas-web-gui/src/mixins/SubmodelElementHandling.ts b/aas-gui/Frontend/aas-web-gui/src/mixins/SubmodelElementHandling.ts
@@ -129,7 +129,6 @@ export default defineComponent({
                         if (key.value.startsWith(semanticId)) result = true;
                     }
                 } else {
-                    console.log('5 submodelElement.semanticId.keys', key.value, semanticId);
                     if (key.value === semanticId) result = true;
                 }