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

Fixes indefinite loading of AAS Treeview after invalid selection #72

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Fixes indefinite loading of AAS Treeview after invalid selection #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6a5f6
Fixes indefinite loading of AAS Treeview after invalid selection
aaronzi Oct 29, 2024
dbf50f6
Addresses review remarks
aaronzi Oct 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
86 changes: 48 additions & 38 deletions aas-web-ui/src/components/AASTreeview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,43 +163,50 @@
let path = shellHref + '/submodel-refs';
let context = 'retrieving Submodel References';
let disableMessage = false;
this.getRequest(path, context, disableMessage).then(async (response: any) => {
if (response.success) {
// execute if the Request was successful
try {
// request submodels from the retrieved AAS (top layer of the Treeview)
let submodelData = await this.requestSubmodels(response.data.result);
// set the isActive prop of the initialNode if it exists and the initialUpdate flag is set
if (this.initialUpdate && this.initialNode) {
let expandedSubmodelData = this.expandTree(submodelData, this.initialNode); // Update the Treeview to expand until the initially set node is reached
// this.updateNode(this.initialNode); // set the isActive prop of the initialNode to true
this.initialUpdate = false;
this.initialNode = {};
// console.log('Expanded Treeview Data: ', expandedSubmodelData)
this.submodelData = expandedSubmodelData; // set the Treeview Data
} else {
this.submodelData = submodelData; // set the Treeview Data
// console.log('Treeview Data: ', this.submodelData)
this.getRequest(path, context, disableMessage)
.then(async (response: any) => {
if (response.success) {
// execute if the Request was successful
try {
// request submodels from the retrieved AAS (top layer of the Treeview)
let submodelData = await this.requestSubmodels(response.data.result);
// set the isActive prop of the initialNode if it exists and the initialUpdate flag is set
if (this.initialUpdate && this.initialNode) {
let expandedSubmodelData = this.expandTree(submodelData, this.initialNode); // Update the Treeview to expand until the initially set node is reached
// this.updateNode(this.initialNode); // set the isActive prop of the initialNode to true
this.initialUpdate = false;
this.initialNode = {};
// console.log('Expanded Treeview Data: ', expandedSubmodelData)
this.submodelData = expandedSubmodelData; // set the Treeview Data
} else {
this.submodelData = submodelData; // set the Treeview Data
// console.log('Treeview Data: ', this.submodelData)
}
} catch (error: any) {
// console.error('Error while parsing the Submodel References: ', error);
const errorMessage = error.message;
const errorStack = error.stack;
const errorLocation = errorStack ? errorStack.split('\n')[1] : '';
this.navigationStore.dispatchSnackbar({
status: true,
timeout: 60000,
color: 'error',
btnColor: 'buttonText',
baseError: 'Error while parsing the Submodel References!',
extendedError: `Error: ${errorMessage}\nLocation: ${errorLocation.trim()}`,
});
} finally {
this.aasStore.dispatchLoadingState(false);
}
} catch (error: any) {
// console.error('Error while parsing the Submodel References: ', error);
const errorMessage = error.message;
const errorStack = error.stack;
const errorLocation = errorStack ? errorStack.split('\n')[1] : '';
this.navigationStore.dispatchSnackbar({
status: true,
timeout: 60000,
color: 'error',
btnColor: 'buttonText',
baseError: 'Error while parsing the Submodel References!',
extendedError: `Error: ${errorMessage}\nLocation: ${errorLocation.trim()}`,
});
} else {
// execute if the Request failed
this.submodelData = [];
this.aasStore.dispatchLoadingState(false);
}
} else {
// execute if the Request failed
this.submodelData = [];
}
});
})
.catch(() => {
this.aasStore.dispatchLoadingState(false);
});
},

// Function to request all Submodels for the selected AAS
Expand Down Expand Up @@ -252,9 +259,12 @@
}
});
});
let submodels = await Promise.all(submodelPromises);
this.aasStore.dispatchLoadingState(false); // set loading state to false
return submodels;
try {
const submodels = await Promise.all(submodelPromises);
return submodels;
} finally {
this.aasStore.dispatchLoadingState(false);
}
},

// Function to prepare the Datastructure for the Treeview
Expand Down
90 changes: 50 additions & 40 deletions aas-web-ui/src/components/SubmodelList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,46 +179,53 @@
let path = shellHref + '/submodel-refs';
let context = 'retrieving Submodel References';
let disableMessage = false;
this.getRequest(path, context, disableMessage).then(async (response: any) => {
if (response.success) {
// execute if the Request was successful
try {
// request submodels from the retrieved AAS
let submodelData = await this.requestSubmodels(response.data.result);
if (this.initialUpdate && this.initialNode) {
// set the isActive Property of the initial Node to true and dispatch it to the store
submodelData.forEach((submodel: any) => {
if (submodel.path === this.initialNode.path) {
submodel.isActive = true;
this.aasStore.dispatchNode(submodel);
this.aasStore.dispatchRealTimeObject(submodel);
}
this.getRequest(path, context, disableMessage)
.then(async (response: any) => {
if (response.success) {
// execute if the Request was successful
try {
// request submodels from the retrieved AAS
let submodelData = await this.requestSubmodels(response.data.result);
if (this.initialUpdate && this.initialNode) {
// set the isActive Property of the initial Node to true and dispatch it to the store
submodelData.forEach((submodel: any) => {
if (submodel.path === this.initialNode.path) {
submodel.isActive = true;
this.aasStore.dispatchNode(submodel);
this.aasStore.dispatchRealTimeObject(submodel);
}
});
this.initialUpdate = false;
this.initialNode = {};
this.submodelData = submodelData; // set the Submodel Data
} else {
this.submodelData = submodelData; // set the Submodel Data
}
} catch (error: any) {
// console.error('Error while parsing the Submodel References: ', error);
const errorMessage = error.message;
const errorStack = error.stack;
const errorLocation = errorStack ? errorStack.split('\n')[1] : '';
this.navigationStore.dispatchSnackbar({
status: true,
timeout: 60000,
color: 'error',
btnColor: 'buttonText',
baseError: 'Error while parsing the Submodel References!',
extendedError: `Error: ${errorMessage}\nLocation: ${errorLocation.trim()}`,
});
this.initialUpdate = false;
this.initialNode = {};
this.submodelData = submodelData; // set the Submodel Data
} else {
this.submodelData = submodelData; // set the Submodel Data
} finally {
this.aasStore.dispatchLoadingState(false);
}
} catch (error: any) {
// console.error('Error while parsing the Submodel References: ', error);
const errorMessage = error.message;
const errorStack = error.stack;
const errorLocation = errorStack ? errorStack.split('\n')[1] : '';
this.navigationStore.dispatchSnackbar({
status: true,
timeout: 60000,
color: 'error',
btnColor: 'buttonText',
baseError: 'Error while parsing the Submodel References!',
extendedError: `Error: ${errorMessage}\nLocation: ${errorLocation.trim()}`,
});
} else {
// execute if the Request failed
this.submodelData = [];
this.aasStore.dispatchLoadingState(false);
}
} else {
// execute if the Request failed
this.submodelData = [];
}
});
})
.catch(() => {
this.aasStore.dispatchLoadingState(false);
});
},

// Function to request all Submodels for the selected AAS
Expand Down Expand Up @@ -260,9 +267,12 @@
}
});
});
let submodels = await Promise.all(submodelPromises);
this.aasStore.dispatchLoadingState(false); // set loading state to false
return submodels;
try {
const submodels = await Promise.all(submodelPromises);
return submodels;
} finally {
this.aasStore.dispatchLoadingState(false);
}
},

// Function to toggle a Node
Expand Down