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

Updates SM visualization compontents to the composition API #176

Draft
wants to merge 67 commits into
base: main
Choose a base branch
from
Draft

Updates SM visualization compontents to the composition API #176

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
477bb82
Initial commit
seicke Dec 22, 2024
aac136c
Add Nameplate v2 visualization
seicke Dec 23, 2024
7275a9c
Moved closing and opening tags of <span> to improve code readability
seicke Dec 23, 2024
035300a
Add transforming of NationalCode to country name
seicke Dec 23, 2024
132dfbf
Fix types
seicke Dec 23, 2024
4af8053
Remove console.log
seicke Dec 23, 2024
6ee5a8f
Remove unused imports and composables
seicke Dec 24, 2024
4c78603
Only show LangStringSets with available text
seicke Dec 24, 2024
cf53dd2
Revert tsconfig.tsbuildinfo
seicke Dec 24, 2024
ad57d1a
Improvement manufacturer contact information (SMT Nameplate v2)
seicke Dec 24, 2024
09c7fdd
Merge branch 'main' into composition-visualizations
seicke Dec 25, 2024
00fc1e1
Fix import of checkIdShort()
seicke Dec 25, 2024
52e0ee7
Improvement address determination and file handling (SMT Nameplate v2)
seicke Dec 26, 2024
0c26c68
Add country flags
seicke Dec 26, 2024
f4f07bd
Fix checkSemanticIdIri() for IRDIs with version
seicke Dec 26, 2024
32f282a
Adapt ContactInformation visualization to work with semanticId of SMT…
seicke Dec 26, 2024
61f9843
Add component VisualizationHeader
seicke Dec 26, 2024
5d56254
Improve address determination (SMT Nameplate v2)
seicke Dec 26, 2024
6525208
Add ContactInformation v1.0 visualization
seicke Dec 26, 2024
4041a4d
Improve ContactInformation v1.0 visualization
seicke Dec 27, 2024
7a8beaf
Harmonize Nameplate v2.0 and ContactInformation v1.0 visualizations
seicke Dec 27, 2024
da36fb6
Handle Language Property in ContactInformation v1.0 visualization
seicke Dec 27, 2024
4aec139
Add types
seicke Dec 27, 2024
395295c
Improvements Nameplate v2 and ContactInformation v1 visualizations
seicke Dec 27, 2024
d2fef24
Adds StringUtils tests
seicke Dec 27, 2024
77f6958
Harmonizes tests
seicke Dec 27, 2024
1995847
Adds LocalUtils tests
seicke Dec 27, 2024
0916e0b
<v-empty-state> note for "No selected Submodel / Submodel Element"
seicke Dec 28, 2024
8e253c7
Add missing comment
seicke Dec 28, 2024
756811d
Revert ComponentVisualization
seicke Dec 28, 2024
0244973
Completes renaming of SM Visualization components, see #160
seicke Dec 28, 2024
6eee26d
Fix value handling of Phone/Fax/Email MLP (in Nameplate v2 and Contac…
seicke Dec 28, 2024
0e360c8
Remove flag for language
seicke Dec 28, 2024
582aad1
Transfers HandoverDocumentation v1.2 Visualization to Composition API
seicke Dec 28, 2024
561115f
Fix typo in method name calculateSubmodelElementPaths()
seicke Dec 28, 2024
597794f
Transfers HierarchicalStructures v1.x Visualization to Composition API
seicke Dec 28, 2024
85495d5
Fix calculateSubmodelElementPaths() for modelType=Entity
seicke Dec 28, 2024
45c59d8
Fix TimeSeries v1.1 Visualization
seicke Dec 28, 2024
60af20f
Adapt loading state variable name
seicke Dec 28, 2024
9e365c9
Closes #171
seicke Dec 28, 2024
348323e
Usage of getSubmodelElementBy...() and hasValue() to simplify code
seicke Dec 28, 2024
f4e09ce
Fixes
seicke Dec 28, 2024
60ba4a0
Transfers TechnicalData v1.2 Visualization to Composition API
seicke Dec 28, 2024
b62e8d9
Replace language code by language name
seicke Dec 29, 2024
898fd89
Adds DescriptionTooltip component
seicke Dec 30, 2024
91c5649
Merge branch 'main' into composition-visualizations
seicke Jan 4, 2025
79b7fe3
Adds small improvements to Contact Informations SM PLugin
aaronzi Jan 4, 2025
d97e15f
Harmonizes langStringSet.language v-chips
seicke Jan 5, 2025
c5590d7
Fixes prepend-icon of v-chip for typesOfTelephone/typesOfFaxNumber/ty…
seicke Jan 5, 2025
ceb8f56
Fix margin of v-chip for typesOfTelephone/typesOfFaxNumber/typesOfEma…
seicke Jan 5, 2025
9d02e4d
Fix display of country name for NationalCode
seicke Jan 5, 2025
f463dc1
Removes check in v-container
seicke Jan 5, 2025
207c92c
Harmonizes langStringSet.language v-chips (Nameplate)
seicke Jan 5, 2025
c012fd9
Adds prepend-icon (Nameplate)
seicke Jan 5, 2025
6761209
Harmonizes Nameplate and ContactInformations visualizations
seicke Jan 5, 2025
c0b0f45
Harmonizes langStringSet.language v-chips (HandoverDocumentation, Tec…
seicke Jan 5, 2025
50e047f
Further harmonization of SM visualizations
seicke Jan 5, 2025
10bdaec
Fixes NationalCode in ContactInformations
seicke Jan 5, 2025
1401fc2
Fixes alternating table cell backgrounds (HandoverDocumentation)
seicke Jan 5, 2025
12accad
Commented out console.log
seicke Jan 5, 2025
f97a714
Optimizes StringUtils
seicke Jan 5, 2025
1cd47c0
Merge branch 'main' into composition-visualizations
seicke Jan 5, 2025
d334e20
Optimizes LocalUtils
seicke Jan 5, 2025
089281f
Optimizes PropertyUtils and MultiLanguagePropertyUtils
seicke Jan 5, 2025
fdc7098
Optimizes FileUtils
seicke Jan 6, 2025
8a15f78
Fixes documentation of PropertyUtils
seicke Jan 6, 2025
5fffdea
Fixes SM Visualization HierarchicalStructures
seicke Jan 6, 2025
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
1 change: 1 addition & 0 deletions aas-web-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@mdi/font": "^7.4.47",
"@vue-leaflet/vue-leaflet": "^0.10.1",
"apexcharts": "^4.1.0",
"i18n-iso-countries": "^7.13.0",
"keycloak-js": "^26.0.7",
"leaflet": "^1.9.4",
"lodash": "^4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion aas-web-ui/src/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ declare module 'vue' {
DataSpecificationContent: typeof import('./components/UIComponents/DataSpecificationContent.vue')['default']
DateTimeStampType: typeof import('./components/SubmodelElements/ValueTypes/DateTimeStampType.vue')['default']
DescriptionElement: typeof import('./components/UIComponents/DescriptionElement.vue')['default']
DigitalNameplate: typeof import('./components/Plugins/Submodels/DigitalNameplate.vue')['default']
DisplayField: typeof import('./components/Widgets/DisplayField.vue')['default']
DisplayNameElement: typeof import('./components/UIComponents/DisplayNameElement.vue')['default']
DonutChart: typeof import('./components/Widgets/DonutChart.vue')['default']
Expand All @@ -53,6 +52,7 @@ declare module 'vue' {
LineChart: typeof import('./components/Widgets/LineChart.vue')['default']
MainMenu: typeof import('./components/AppNavigation/MainMenu.vue')['default']
MultiLanguageProperty: typeof import('./components/SubmodelElements/MultiLanguageProperty.vue')['default']
'Nameplate_v2.0': typeof import('./components/Plugins/Submodels/Nameplate_v2.0.vue')['default']
NumberType: typeof import('./components/SubmodelElements/ValueTypes/NumberType.vue')['default']
Operation: typeof import('./components/SubmodelElements/Operation.vue')['default']
PDFPreview: typeof import('./components/Plugins/PDFPreview.vue')['default']
Expand Down
6 changes: 3 additions & 3 deletions aas-web-ui/src/components/ComponentVisualization.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
:is="plugin.name"
v-for="(plugin, index) in filteredPlugins"
:key="index"
:submodel-element-data="submodelElementData"
>{{ plugin.name }}</component
>
:submodel-element-data="submodelElementData">
{{ plugin.name }}
</component>
seicke marked this conversation as resolved.
Show resolved Hide resolved
</template>
<GenericDataVisu
v-if="viewerMode && filteredPlugins.length === 0"
Expand Down
14 changes: 8 additions & 6 deletions aas-web-ui/src/components/Plugins/Submodels/ContactInformation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@
v-for="(description, i) in generalProperty.description"
:key="i"
class="text-caption">
<span class="font-weight-bold">{{ description.language + ': ' }}</span
>{{ description.text }}
<span class="font-weight-bold">
{{ description.language + ': ' }}
</span>
{{ description.text }}
seicke marked this conversation as resolved.
Show resolved Hide resolved
</div>
</v-tooltip>
</div>
Expand All @@ -76,9 +78,9 @@
color="primary"
variant="elevated"
class="text-buttonText"
@click="downloadVCard(contact.vCard, 'ContactPerson.vcf')"
>{{ 'Download Contact' }}</v-btn
>
@click="downloadVCard(contact.vCard, 'ContactPerson.vcf')">
{{ 'Download Contact' }}
</v-btn>
seicke marked this conversation as resolved.
Show resolved Hide resolved
</v-card-actions>
</v-expansion-panel-text>
</v-expansion-panel>
Expand Down Expand Up @@ -133,7 +135,7 @@
async initContactInformation() {
this.loading = true;

if (Object.keys(this.submodelElementData).length === 0) {
if (this.submodelElementData && Object.keys(this.submodelElementData).length === 0) {
this.contactInformationData = {};
this.loading = false;
return;
Expand Down
652 changes: 0 additions & 652 deletions aas-web-ui/src/components/Plugins/Submodels/DigitalNameplate.vue
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions aas-web-ui/src/components/Plugins/Submodels/HandoverDocumentation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
v-for="(description, i) in versionPropertie.description"
:key="i"
class="text-caption">
<span class="font-weight-bold">{{
description.language + ': '
}}</span
>{{ description.text }}
<span class="font-weight-bold">
{{ description.language + ': ' }}
</span>
{{ description.text }}
seicke marked this conversation as resolved.
Show resolved Hide resolved
</div>
</v-tooltip>
</div>
Expand Down Expand Up @@ -315,7 +315,7 @@
async initHandoverDocumentation() {
this.loading = true;

if (Object.keys(this.submodelElementData).length === 0) {
if (this.submodelElementData && Object.keys(this.submodelElementData).length === 0) {
this.handoverDocuData = {};
this.loading = false;
return;
Expand Down
Loading
Loading