Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check of semanticId #260

Merged
merged 4 commits into from
Aug 29, 2024
Merged

Check of semanticId #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74850a5
Usage of checkSemanticId() of mixin SubmodelElementHandling
seicke Aug 28, 2024
6434936
Added possibility to check semanticId also without consideration of t…
seicke Aug 28, 2024
e938a47
Usage of checkSemanticId() in HandoverDocumentation Plugin
seicke Aug 28, 2024
3810cc7
Usage of "for...of loop" (instead Array.prototype.forEach()) to break…
seicke Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions aas-gui/Frontend/aas-web-gui/src/components/Dashboard/DashboardEditElement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</template>
</v-combobox>
<template v-if="aasData && Object.keys(aasData).length > 0">
<TimeSeriesData v-if="checkSemanticId('https://admin-shell.io/idta/TimeSeries/1/1')" class="py-2" :submodelElementData="aasData" :configData="dashboardData" :editDialog="true" @newOptions="setNewOptions"></TimeSeriesData>
<TimeSeriesData v-if="checkSemanticId(dashboardData.configObject, 'https://admin-shell.io/idta/TimeSeries/1/1')" class="py-2" :submodelElementData="aasData" :configData="dashboardData" :editDialog="true" @newOptions="setNewOptions"></TimeSeriesData>
</template>
</v-card-text>
<v-divider></v-divider>
Expand All @@ -46,6 +46,7 @@
import { defineComponent } from 'vue';
import { useEnvStore } from '@/store/EnvironmentStore';
import DashboardHandling from '@/mixins/DashboardHandling';
import SubmodelElementHandling from '@/mixins/SubmodelElementHandling';
import TimeSeriesData from '../SubmodelPlugins/TimeSeriesData.vue';

export default defineComponent({
Expand All @@ -54,7 +55,7 @@
TimeSeriesData,
DashboardHandling,
},
mixins: [DashboardHandling],
mixins: [SubmodelElementHandling, DashboardHandling],
props: ['aasData', 'dashboardData'],

setup() {
Expand Down Expand Up @@ -92,11 +93,6 @@
},

methods: {
checkSemanticId(semanticId: string): boolean {
// console.log(this.dashboardData)
return this.dashboardData.configObject.semanticId === semanticId;
},

async getAvailableGroups() {
this.groups = await this.getGroups();
},
Expand Down
9 changes: 3 additions & 6 deletions aas-gui/Frontend/aas-web-gui/src/components/Dashboard/DashboardElement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</v-col>
</v-row>
<template v-if="AASData && Object.keys(AASData).length > 0">
<TimeSeriesData v-if="checkSemanticId('https://admin-shell.io/idta/TimeSeries/1/1')" :submodelElementData="AASData" :configData="localDashboardData" :editDialog="false" :loadTrigger="trigger"></TimeSeriesData>
<TimeSeriesData v-if="checkSemanticId(localDashboardData.configObject, 'https://admin-shell.io/idta/TimeSeries/1/1')" :submodelElementData="AASData" :configData="localDashboardData" :editDialog="false" :loadTrigger="trigger"></TimeSeriesData>
</template>
</v-card>
<!-- Dialog for deleting a dashboard element -->
Expand All @@ -45,6 +45,7 @@
import { defineComponent } from 'vue';
import { useEnvStore } from '@/store/EnvironmentStore';
import DashboardHandling from '@/mixins/DashboardHandling';
import SubmodelElementHandling from '@/mixins/SubmodelElementHandling';
import TimeSeriesData from '../SubmodelPlugins/TimeSeriesData.vue';
import DashboardEditElement from '../Dashboard/DashboardEditElement.vue';

Expand All @@ -55,7 +56,7 @@ export default defineComponent({
TimeSeriesData,
DashboardEditElement,
},
mixins: [DashboardHandling],
mixins: [SubmodelElementHandling, DashboardHandling],
props: ['dashboardData', 'globalSyncStatus'],
emits: ['deleteElement', 'updateElement'],

Expand Down Expand Up @@ -134,10 +135,6 @@ export default defineComponent({
});

},
// Function to check if the SemanticID of a SubmodelElement matches the given SemanticID
checkSemanticId(semanticId: string): boolean {
return this.localDashboardData.configObject.semanticId === semanticId;
},

updateVisibility() {
this.localDashboardData.visibility = !this.localDashboardData.visibility;
Expand Down
10 changes: 5 additions & 5 deletions aas-gui/Frontend/aas-web-gui/src/components/SubmodelPlugins/HandoverDocumentation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) => {
Expand All @@ -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');
});
},

Expand All @@ -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);
});
},
},
Expand Down
30 changes: 10 additions & 20 deletions aas-gui/Frontend/aas-web-gui/src/components/SubmodelPlugins/_SubmodelEntrypoint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<v-container fluid class="pa-0">
<!-- List of all available Submodel and SubmodelElement Plugins matched by their SemanticID -->
<template v-if="SelectedNode && Object.keys(SelectedNode).length > 0 && Object.keys(submodelElementData).length > 0 && submodelElementData.semanticId && submodelElementData.semanticId.keys && submodelElementData.semanticId.keys.length > 0">
<HTWFuehrungskomponente v-if="checkSemanticId('http://htw-berlin.de/smc_statemachine')" :submodelElementData="submodelElementData" :selectedNode="selectedNode"></HTWFuehrungskomponente>
<DigitalNameplate v-else-if="checkSemanticId('https://admin-shell.io/zvei/nameplate/2/0/Nameplate')" :submodelElementData="submodelElementData"></DigitalNameplate>
<TimeSeriesData v-else-if="checkSemanticId('https://admin-shell.io/idta/TimeSeries/1/1')" :submodelElementData="submodelElementData"></TimeSeriesData>
<BillsOfMaterial v-else-if="checkSemanticId('https://admin-shell.io/idta/HierarchicalStructures/1/0/Submodel') || checkSemanticId('https://admin-shell.io/idta/HierarchicalStructures/1/1/Submodel')" :submodelElementData="submodelElementData"></BillsOfMaterial>
<HandoverDocumentation v-else-if="checkSemanticId('0173-1#01-AHF578#001')" :submodelElementData="submodelElementData"></HandoverDocumentation>
<ContactInformation v-else-if="checkSemanticId('https://admin-shell.io/zvei/nameplate/1/0/ContactInformations')" :submodelElementData="submodelElementData"></ContactInformation>
<TechnicalData v-else-if="checkSemanticId('https://admin-shell.io/ZVEI/TechnicalData/Submodel/1/2')" :submodelElementData="submodelElementData"></TechnicalData>
<JSONArrayProperty v-else-if="checkSemanticId('http://iese.fraunhofer.de/prop_jsonarray')" :submodelElementData="submodelElementData"></JSONArrayProperty>
<HTWFuehrungskomponente v-if="checkSemanticId(submodelElementData, 'http://htw-berlin.de/smc_statemachine')" :submodelElementData="submodelElementData" :selectedNode="selectedNode"></HTWFuehrungskomponente>
<DigitalNameplate v-else-if="checkSemanticId(submodelElementData, 'https://admin-shell.io/zvei/nameplate/2/0/Nameplate')" :submodelElementData="submodelElementData"></DigitalNameplate>
<TimeSeriesData v-else-if="checkSemanticId(submodelElementData, 'https://admin-shell.io/idta/TimeSeries/1/1')" :submodelElementData="submodelElementData"></TimeSeriesData>
<BillsOfMaterial v-else-if="checkSemanticId(submodelElementData, 'https://admin-shell.io/idta/HierarchicalStructures/1/0/Submodel') || checkSemanticId(submodelElementData, 'https://admin-shell.io/idta/HierarchicalStructures/1/1/Submodel')" :submodelElementData="submodelElementData"></BillsOfMaterial>
<HandoverDocumentation v-else-if="checkSemanticId(submodelElementData, '0173-1#01-AHF578#001')" :submodelElementData="submodelElementData"></HandoverDocumentation>
<ContactInformation v-else-if="checkSemanticId(submodelElementData, 'https://admin-shell.io/zvei/nameplate/1/0/ContactInformations')" :submodelElementData="submodelElementData"></ContactInformation>
<TechnicalData v-else-if="checkSemanticId(submodelElementData, 'https://admin-shell.io/ZVEI/TechnicalData/Submodel/1/2')" :submodelElementData="submodelElementData"></TechnicalData>
<JSONArrayProperty v-else-if="checkSemanticId(submodelElementData, 'http://iese.fraunhofer.de/prop_jsonarray')" :submodelElementData="submodelElementData"></JSONArrayProperty>
<GenericDataVisu v-else-if="viewerMode" :submodelElementData="submodelElementData.submodelElements"></GenericDataVisu>
<!-- Plugins added by the user are dynamically registered here -->
<component v-for="(plugin, i) in filteredPlugins" :key="i" :is="plugin.name" :submodelElementData="submodelElementData"></component>
Expand All @@ -31,6 +31,7 @@ import { defineComponent } from 'vue';
import { useRoute } from 'vue-router';
import { useNavigationStore } from '@/store/NavigationStore';
import { useAASStore } from '@/store/AASDataStore';
import SubmodelElementHandling from '@/mixins/SubmodelElementHandling';

import HTWFuehrungskomponente from './HTWFuehrungskomponente.vue';
import DigitalNameplate from './DigitalNameplate.vue';
Expand Down Expand Up @@ -62,6 +63,7 @@ export default defineComponent({
PDFPreview,
CADPreview,
},
mixins: [SubmodelElementHandling],
props: ['submodelElementData', 'selectedNode'],

setup() {
Expand Down Expand Up @@ -102,17 +104,5 @@ export default defineComponent({
},
},

methods: {
// Function to check if the SemanticID of a SubmodelElement matches the given SemanticID
checkSemanticId(semanticId: string): boolean {
let result = false;
this.submodelElementData.semanticId.keys.forEach((key: any) => {
if (key.value === semanticId) {
result = true;
}
});
return result;
},
},
});
</script>
39 changes: 32 additions & 7 deletions aas-gui/Frontend/aas-web-gui/src/mixins/SubmodelElementHandling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,39 @@ export default defineComponent({
},

// Function to check if the SemanticID of a SubmodelElement matches the given SemanticID
checkSemanticId(submodelElementData: any, semanticId: string): boolean {
let result = false;
submodelElementData.semanticId.keys.forEach((key: any) => {
if (key.value === semanticId) {
result = true;
checkSemanticId(submodelElement: any, semanticId: string): boolean {

if (semanticId.trim() == '') return false;

if (!submodelElement.semanticId
|| !submodelElement.semanticId.keys
|| submodelElement.semanticId.keys.length == 0) return false;

for (const key of submodelElement.semanticId.keys) {

if (key.value.startsWith('http://') || 'https://') {
// e.g. IDTA IRI like
if (new RegExp('\/\d\/\d\/{0,1}' + '$').test(semanticId)) {
if (key.value === semanticId) return true;
} else {
if (key.value.startsWith(semanticId)) return true;
}
} else if (key.value.startsWith('0173-1')) {
// ECLASS IRDI like 0173-1#01-AHF578#001 resp. 0173-1-01-AHF578-001
if (new RegExp('[#-]{1}\d{3}$').test(semanticId)) {
// ECLASS IRDI with version (like 0173-1#01-AHF578#001 resp. 0173-1-01-AHF578-001)
if (key.value === semanticId) return true;
} else {
// ECLASS IRDI without version (like 0173-1#01-AHF578 resp. 0173-1-01-AHF578)
if (key.value.startsWith(semanticId)) return true;
}
} else {
if (key.value === semanticId) return true;
}
});
return result;


}
return false;
},

// Function to check if the valueType is a number
Expand Down