Adds derivedFrom attribute to editor (eclipse-basyx#1067)

aaronzi · web-flow · commit 7146478d4f66 · 2026-02-24T13:52:11.000+01:00
* Adds derivedFrom attribute to editor

* Fixes incorrect Reference Type for Submodel Reference
diff --git a/aas-web-ui/src/components/EditorComponents/AASForm.vue b/aas-web-ui/src/components/EditorComponents/AASForm.vue
@@ -111,8 +111,18 @@
                     <!-- Derivation -->
                     <v-expansion-panel class="border-s-thin border-e-thin" :class="bordersToShow(2)">
                         <v-expansion-panel-title>Derivation</v-expansion-panel-title>
-                        <v-expansion-panel-text class="pt-2">
-                            <span class="text-subtitleText text-subtitle-2">Coming soon!</span>
+                        <v-expansion-panel-text>
+                            <v-row align="center">
+                                <v-col class="py-0">
+                                    <ReferenceInput
+                                        v-model="derivedFrom"
+                                        label="Derived From"
+                                        :default-key-type="aasTypes.KeyTypes.AssetAdministrationShell" />
+                                </v-col>
+                                <v-col cols="auto" class="px-0">
+                                    <HelpInfoButton help-type="derivedFrom" />
+                                </v-col>
+                            </v-row>
                         </v-expansion-panel-text>
                     </v-expansion-panel>
                     <!-- Asset -->
@@ -220,6 +230,7 @@
     const revision = ref<string | null>(null);
     const creator = ref<aasTypes.Reference | null>(null);
     const templateId = ref<string | null>(null);
+    const derivedFrom = ref<aasTypes.Reference | null>(null);
 
     const assetKind = ref<aasTypes.AssetKind>(aasTypes.AssetKind.Instance);
     const globalAssetId = ref<string | null>(null);
@@ -302,6 +313,7 @@
             displayName.value = AASObject.value.displayName ?? null;
             description.value = AASObject.value.description ?? null;
             AASCategory.value = AASObject.value.category ?? null;
+            derivedFrom.value = AASObject.value.derivedFrom ?? null;
             if (AASObject.value.administration !== null && AASObject.value.administration !== undefined) {
                 version.value = AASObject.value.administration.version ?? null;
                 revision.value = AASObject.value.administration.revision ?? null;
@@ -407,7 +419,7 @@
             AASObject.value.administration = administrativeInformation;
         }
 
-        // TODO: Add optional parameter derivedFrom
+        AASObject.value.derivedFrom = derivedFrom.value;
 
         // embeddedDataSpecifications are out of scope
         // extensions are out of scope
@@ -485,6 +497,7 @@
         revision.value = null;
         creator.value = null;
         templateId.value = null;
+        derivedFrom.value = null;
         assetKind.value = aasTypes.AssetKind.Instance;
         globalAssetId.value = null;
         specificAssetIds.value = null;
diff --git a/aas-web-ui/src/components/EditorComponents/HelpInfoButton.vue b/aas-web-ui/src/components/EditorComponents/HelpInfoButton.vue
@@ -51,6 +51,7 @@
         revision: 'Revision of the element.',
         creator: 'The subject ID of the subject\nresponsible for making the element.',
         templateId: 'Identifier of the template that guided\nthe creation of the element.',
+        derivedFrom: 'The reference to the AAS the element is derived from.',
         semanticId:
             'Identifier of the semantic definition of the element called semantic ID\n' +
             'or also main semantic ID of the element.',
diff --git a/aas-web-ui/src/components/EditorComponents/InputTypes/ReferenceInput.vue b/aas-web-ui/src/components/EditorComponents/InputTypes/ReferenceInput.vue
@@ -54,10 +54,14 @@
         label: string;
         noHeader?: boolean;
         modelValue: aasTypes.Reference | null;
+        defaultReferenceType?: aasTypes.ReferenceTypes;
+        defaultKeyType?: aasTypes.KeyTypes;
     };
 
     const props = withDefaults(defineProps<Props>(), {
         noHeader: false,
+        defaultReferenceType: aasTypes.ReferenceTypes.ModelReference,
+        defaultKeyType: aasTypes.KeyTypes.GlobalReference,
     });
 
     const emit = defineEmits<{
@@ -117,13 +121,13 @@
 
     function addReferenceKey(): void {
         if (referenceValue.value === null) {
-            referenceValue.value = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [
-                new aasTypes.Key(aasTypes.KeyTypes.GlobalReference, ''),
+            referenceValue.value = new aasTypes.Reference(props.defaultReferenceType, [
+                new aasTypes.Key(props.defaultKeyType, ''),
             ]);
         } else if (referenceValue.value.keys === undefined) {
-            referenceValue.value.keys = [new aasTypes.Key(aasTypes.KeyTypes.GlobalReference, '')];
+            referenceValue.value.keys = [new aasTypes.Key(props.defaultKeyType, '')];
         } else {
-            referenceValue.value.keys.push(new aasTypes.Key(aasTypes.KeyTypes.GlobalReference, ''));
+            referenceValue.value.keys.push(new aasTypes.Key(props.defaultKeyType, ''));
         }
     }
 
diff --git a/aas-web-ui/src/components/EditorComponents/JsonInsert.vue b/aas-web-ui/src/components/EditorComponents/JsonInsert.vue
@@ -201,7 +201,7 @@
         }
         const aas = instanceOrError.mustValue();
         // Create new SubmodelReference
-        const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [
+        const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ModelReference, [
             new aasTypes.Key(aasTypes.KeyTypes.Submodel, submodel.id),
         ]);
         // Check if Submodels are null
diff --git a/aas-web-ui/src/components/EditorComponents/SubmodelForm.vue b/aas-web-ui/src/components/EditorComponents/SubmodelForm.vue
@@ -447,7 +447,7 @@
         }
         const aas = instanceOrError.mustValue();
         // Create new SubmodelReference
-        const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [
+        const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ModelReference, [
             new aasTypes.Key(aasTypes.KeyTypes.Submodel, submodel.id),
         ]);
         // Check if Submodels are null
diff --git a/aas-web-ui/src/components/EditorComponents/help-links.json b/aas-web-ui/src/components/EditorComponents/help-links.json
@@ -16,6 +16,7 @@
   "revision": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/datatypes.html#RevisionType",
   "creator": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/referencing.html#Reference",
   "templateId": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/datatypes.html#Identifier",
+  "derivedFrom": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/referencing.html#Reference",
   "semanticId": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/referencing.html#Reference",
   "dataType": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/datatypes.html",
   "range-minmax": "https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/spec-metamodel/datatypes.html#ValueDataType",
diff --git a/aas-web-ui/src/composables/ClipboardUtil.ts b/aas-web-ui/src/composables/ClipboardUtil.ts
@@ -224,7 +224,7 @@ export function useClipboardUtil() {
         }
         const aas = instanceOrError.mustValue();
         // Create new SubmodelReference
-        const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [
+        const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ModelReference, [
             new aasTypes.Key(aasTypes.KeyTypes.Submodel, submodel.id),
         ]);
         // Check if Submodels are null

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@`
`201`	`201`	`}`
`202`	`202`	`const aas = instanceOrError.mustValue();`
`203`	`203`	`// Create new SubmodelReference`
`204`		`- const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [`
	`204`	`+ const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ModelReference, [`
`205`	`205`	`new aasTypes.Key(aasTypes.KeyTypes.Submodel, submodel.id),`
`206`	`206`	`]);`
`207`	`207`	`// Check if Submodels are null`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@`
`447`	`447`	`}`
`448`	`448`	`const aas = instanceOrError.mustValue();`
`449`	`449`	`// Create new SubmodelReference`
`450`		`- const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [`
	`450`	`+ const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ModelReference, [`
`451`	`451`	`new aasTypes.Key(aasTypes.KeyTypes.Submodel, submodel.id),`
`452`	`452`	`]);`
`453`	`453`	`// Check if Submodels are null`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ export function useClipboardUtil() {`
`224`	`224`	`}`
`225`	`225`	`const aas = instanceOrError.mustValue();`
`226`	`226`	`// Create new SubmodelReference`
`227`		`- const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ExternalReference, [`
	`227`	`+ const submodelReference = new aasTypes.Reference(aasTypes.ReferenceTypes.ModelReference, [`
`228`	`228`	`new aasTypes.Key(aasTypes.KeyTypes.Submodel, submodel.id),`
`229`	`229`	`]);`
`230`	`230`	`// Check if Submodels are null`