Skip to content

Fixes resetting of form inputs in the BaSyx Editor #1003

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

Merged
aaronzi merged 1 commit into from
Jan 28, 2026
Merged

Fixes resetting of form inputs in the BaSyx Editor #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions aas-web-ui/src/components/EditorComponents/AASForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@
);

async function initializeInputs(): Promise<void> {
// Always reset form values first to clear any stale data from previously opened elements
clearForm();

if (props.newShell === false && props.aas) {
const aas = await fetchAasById(props.aas.id);

Expand All @@ -293,23 +296,23 @@
AASObject.value = instanceOrError.mustValue();
// console.log('AASObject: ', AASObject.value);
// Set values of AAS
AASId.value = AASObject.value.id;
AASIdShort.value = AASObject.value.idShort;
displayName.value = AASObject.value.displayName;
description.value = AASObject.value.description;
AASCategory.value = AASObject.value.category;
AASId.value = AASObject.value.id ?? generateUUID();
AASIdShort.value = AASObject.value.idShort ?? null;
displayName.value = AASObject.value.displayName ?? null;
description.value = AASObject.value.description ?? null;
AASCategory.value = AASObject.value.category ?? null;
if (AASObject.value.administration !== null && AASObject.value.administration !== undefined) {
version.value = AASObject.value.administration.version;
revision.value = AASObject.value.administration.revision;
creator.value = AASObject.value.administration.creator;
templateId.value = AASObject.value.administration.templateId;
version.value = AASObject.value.administration.version ?? null;
revision.value = AASObject.value.administration.revision ?? null;
creator.value = AASObject.value.administration.creator ?? null;
templateId.value = AASObject.value.administration.templateId ?? null;
}
if (AASObject.value.assetInformation !== null && AASObject.value.assetInformation !== undefined) {
assetKind.value = AASObject.value.assetInformation.assetKind;
globalAssetId.value = AASObject.value.assetInformation.globalAssetId;
specificAssetIds.value = AASObject.value.assetInformation.specificAssetIds;
assetType.value = AASObject.value.assetInformation.assetType;
defaultThumbnail.value = AASObject.value.assetInformation.defaultThumbnail;
assetKind.value = AASObject.value.assetInformation.assetKind ?? aasTypes.AssetKind.Instance;
globalAssetId.value = AASObject.value.assetInformation.globalAssetId ?? null;
specificAssetIds.value = AASObject.value.assetInformation.specificAssetIds ?? null;
assetType.value = AASObject.value.assetInformation.assetType ?? null;
defaultThumbnail.value = AASObject.value.assetInformation.defaultThumbnail ?? null;
}
}
}
Expand Down
57 changes: 21 additions & 36 deletions aas-web-ui/src/components/EditorComponents/SubmodelElements/BlobForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,21 @@ usage of the 'Enter' key, make sure to edit the keyDown/keyUp method to not exec
return border;
});

function resetFormValues(): void {
blobIdShort.value = null;
displayName.value = null;
description.value = null;
blobCategory.value = null;
blobContent.value = null;
contentType.value = 'application/unknown';
semanticId.value = null;
openPanels.value = [0, 1];
}

async function initializeInputs(): Promise<void> {
// Always reset form values first to clear any stale data from previously opened elements
resetFormValues();

if (!props.newBlob && props.blob) {
const blobJSON = await fetchSme(props.blob.path);
const instanceOrError = jsonization.blobFromJsonable(blobJSON);
Expand All @@ -240,42 +254,13 @@ usage of the 'Enter' key, make sure to edit the keyDown/keyUp method to not exec

blobObject.value = instanceOrError.mustValue();

blobIdShort.value = blobObject.value.idShort;

if (blobObject.value.displayName) {
displayName.value = blobObject.value.displayName;
}

if (blobObject.value.description) {
description.value = blobObject.value.description;
}

if (blobObject.value.category) {
blobCategory.value = blobObject.value.category;
}

if (blobObject.value.value) {
blobContent.value = blobObject.value.value;
}

if (blobObject.value.contentType) {
contentType.value = blobObject.value.contentType;
}

if (blobObject.value.semanticId) {
semanticId.value = blobObject.value.semanticId;
}

openPanels.value = [0, 1];
} else {
blobIdShort.value = null;
displayName.value = null;
description.value = null;
blobCategory.value = null;
blobContent.value = null;
contentType.value = 'application/unknown';
semanticId.value = null;
openPanels.value = [0, 1];
blobIdShort.value = blobObject.value.idShort ?? null;
displayName.value = blobObject.value.displayName ?? null;
description.value = blobObject.value.description ?? null;
blobCategory.value = blobObject.value.category ?? null;
blobContent.value = blobObject.value.value ?? null;
contentType.value = blobObject.value.contentType ?? 'application/unknown';
semanticId.value = blobObject.value.semanticId ?? null;
}
}

Expand Down
38 changes: 17 additions & 21 deletions aas-web-ui/src/components/EditorComponents/SubmodelElements/CollectionForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,19 @@
editSMCDialog.value = false;
}

function resetFormValues(): void {
smcIdShort.value = null;
displayName.value = null;
description.value = null;
smcCategory.value = null;
semanticId.value = null;
openPanels.value = [0];
}

async function initializeInputs(): Promise<void> {
// Always reset form values first to clear any stale data from previously opened elements
resetFormValues();

if (!props.newSmc && props.smc) {
const smcJSON = await fetchSme(props.smc.path);

Expand All @@ -314,27 +326,11 @@
}
smcObject.value = instanceOrError.mustValue();

smcIdShort.value = smcObject.value.idShort;
if (smcObject.value.displayName) {
displayName.value = smcObject.value.displayName;
}
if (smcObject.value.description) {
description.value = smcObject.value.description;
}
if (smcObject.value.category) {
smcCategory.value = smcObject.value.category;
}
if (smcObject.value.semanticId) {
semanticId.value = smcObject.value.semanticId;
}
openPanels.value = [0];
} else {
smcIdShort.value = null;
displayName.value = null;
description.value = null;
smcCategory.value = null;
semanticId.value = null;
openPanels.value = [0];
smcIdShort.value = smcObject.value.idShort ?? null;
displayName.value = smcObject.value.displayName ?? null;
description.value = smcObject.value.description ?? null;
smcCategory.value = smcObject.value.category ?? null;
semanticId.value = smcObject.value.semanticId ?? null;
}
}
</script>
56 changes: 23 additions & 33 deletions aas-web-ui/src/components/EditorComponents/SubmodelElements/EntityForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,22 @@
editEntityDialog.value = false;
}

function resetFormValues(): void {
entityIdShort.value = null;
displayName.value = null;
description.value = null;
entityCategory.value = null;
semanticId.value = null;
entityType.value = aasTypes.EntityType.SelfManagedEntity;
globalAssetId.value = null;
specificAssetIds.value = null;
openPanels.value = [0, 1];
}

async function initializeInputs(): Promise<void> {
// Always reset form values first to clear any stale data from previously opened elements
resetFormValues();

if (!props.newEntity && props.entity) {
const entityJSON = await fetchSme(props.entity.path);

Expand All @@ -357,39 +372,14 @@
}
entityObject.value = instanceOrError.mustValue();

entityIdShort.value = entityObject.value.idShort;
if (entityObject.value.displayName) {
displayName.value = entityObject.value.displayName;
}
if (entityObject.value.description) {
description.value = entityObject.value.description;
}
if (entityObject.value.category) {
entityCategory.value = entityObject.value.category;
}
if (entityObject.value.semanticId) {
semanticId.value = entityObject.value.semanticId;
}
if (entityObject.value.entityType) {
entityType.value = entityObject.value.entityType;
}
if (entityObject.value.globalAssetId) {
globalAssetId.value = entityObject.value.globalAssetId;
}
if (entityObject.value.specificAssetIds) {
specificAssetIds.value = entityObject.value.specificAssetIds;
}
openPanels.value = [0, 1];
} else {
entityIdShort.value = null;
displayName.value = null;
description.value = null;
entityCategory.value = null;
semanticId.value = null;
entityType.value = aasTypes.EntityType.SelfManagedEntity;
globalAssetId.value = null;
specificAssetIds.value = null;
openPanels.value = [0, 1];
entityIdShort.value = entityObject.value.idShort ?? null;
displayName.value = entityObject.value.displayName ?? null;
description.value = entityObject.value.description ?? null;
entityCategory.value = entityObject.value.category ?? null;
semanticId.value = entityObject.value.semanticId ?? null;
entityType.value = entityObject.value.entityType ?? aasTypes.EntityType.SelfManagedEntity;
globalAssetId.value = entityObject.value.globalAssetId ?? null;
specificAssetIds.value = entityObject.value.specificAssetIds ?? null;
}
}
</script>
57 changes: 21 additions & 36 deletions aas-web-ui/src/components/EditorComponents/SubmodelElements/FileForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,21 @@
return border;
});

function resetFormValues(): void {
fileIdShort.value = null;
displayName.value = null;
description.value = null;
fileCategory.value = null;
filePath.value = null;
contentType.value = 'application/unknown';
semanticId.value = null;
openPanels.value = [0, 1];
}

async function initializeInputs(): Promise<void> {
// Always reset form values first to clear any stale data from previously opened elements
resetFormValues();

if (!props.newFile && props.file) {
const fileJSON = await fetchSme(props.file.path);
const instanceOrError = jsonization.fileFromJsonable(fileJSON);
Expand All @@ -242,42 +256,13 @@

fileObject.value = instanceOrError.mustValue();

fileIdShort.value = fileObject.value.idShort;

if (fileObject.value.displayName) {
displayName.value = fileObject.value.displayName;
}

if (fileObject.value.description) {
description.value = fileObject.value.description;
}

if (fileObject.value.category) {
fileCategory.value = fileObject.value.category;
}

if (fileObject.value.value) {
filePath.value = fileObject.value.value;
}

if (fileObject.value.contentType) {
contentType.value = fileObject.value.contentType;
}

if (fileObject.value.semanticId) {
semanticId.value = fileObject.value.semanticId;
}

openPanels.value = [0, 1];
} else {
fileIdShort.value = null;
displayName.value = null;
description.value = null;
fileCategory.value = null;
filePath.value = null;
contentType.value = 'application/unknown';
semanticId.value = null;
openPanels.value = [0, 1];
fileIdShort.value = fileObject.value.idShort ?? null;
displayName.value = fileObject.value.displayName ?? null;
description.value = fileObject.value.description ?? null;
fileCategory.value = fileObject.value.category ?? null;
filePath.value = fileObject.value.value ?? null;
contentType.value = fileObject.value.contentType ?? 'application/unknown';
semanticId.value = fileObject.value.semanticId ?? null;
}
}

Expand Down
66 changes: 23 additions & 43 deletions aas-web-ui/src/components/EditorComponents/SubmodelElements/ListForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,22 @@
return errors.value.get(field);
}

function resetFormValues(): void {
smlIdShort.value = null;
displayName.value = null;
description.value = null;
smlCategory.value = null;
orderRelevant.value = false;
typeValueListElement.value = null;
valueTypeListElement.value = aasTypes.DataTypeDefXsd.String;
semanticId.value = null;
openPanels.value = [0, 1];
}

async function initializeInputs(): Promise<void> {
// Always reset form values first to clear any stale data from previously opened elements
resetFormValues();

if (!props.newSml && props.sml) {
const smlJSON = await fetchSme(props.sml.path);

Expand All @@ -263,49 +278,14 @@
}
smlObject.value = instanceOrError.mustValue();

smlIdShort.value = smlObject.value.idShort;

if (smlObject.value.displayName) {
displayName.value = smlObject.value.displayName;
}

if (smlObject.value.description) {
description.value = smlObject.value.description;
}

if (smlObject.value.category) {
smlCategory.value = smlObject.value.category;
}

if (smlObject.value.orderRelevant !== null) {
orderRelevant.value = smlObject.value.orderRelevant;
} else {
orderRelevant.value = false;
}

if (smlObject.value.typeValueListElement) {
typeValueListElement.value = smlObject.value.typeValueListElement;
}

if (smlObject.value.valueTypeListElement) {
valueTypeListElement.value = smlObject.value.valueTypeListElement;
}

if (smlObject.value.semanticId) {
semanticId.value = smlObject.value.semanticId;
}

openPanels.value = [0, 1];
} else {
smlIdShort.value = null;
displayName.value = null;
description.value = null;
smlCategory.value = null;
orderRelevant.value = false;
typeValueListElement.value = null;
valueTypeListElement.value = aasTypes.DataTypeDefXsd.String;
semanticId.value = null;
openPanels.value = [0, 1];
smlIdShort.value = smlObject.value.idShort ?? null;
displayName.value = smlObject.value.displayName ?? null;
description.value = smlObject.value.description ?? null;
smlCategory.value = smlObject.value.category ?? null;
orderRelevant.value = smlObject.value.orderRelevant ?? false;
typeValueListElement.value = smlObject.value.typeValueListElement ?? null;
valueTypeListElement.value = smlObject.value.valueTypeListElement ?? aasTypes.DataTypeDefXsd.String;
semanticId.value = smlObject.value.semanticId ?? null;
}
}

Expand Down
Loading
Loading