Outsourcing smNotFound

eclipse-basyx · Oct 30, 2024 · c6d51be · c6d51be
1 parent 0d55468
commit c6d51be
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 76 deletions.
diff --git a/aas-web-ui/src/components/AASTreeview.vue b/aas-web-ui/src/components/AASTreeview.vue
@@ -251,47 +251,19 @@
                                         }
                                         return submodel;
                                     } else {
-                                        let submodel = {
-                                            id: submodelId,
-                                            idShort: 'Submodel not found',
-                                            modelType: 'Submodel',
-                                            semanticId: null,
-                                            description: [],
-                                            displayName: [],
-                                            submodelElements: [],
-                                            isActive: false,
-                                            path: path,
-                                        };
-                                        this.navigationStore.dispatchSnackbar({
-                                            status: true,
-                                            timeout: 60000,
-                                            color: 'error',
-                                            btnColor: 'buttonText',
-                                            text: "Submodel '" + submodelId + "' not found in SubmodelRepository",
-                                        });
-                                        return submodel;
+                                        return this.smNotFound(
+                                            submodelId,
+                                            path,
+                                            "Submodel '" + submodelId + "' not found in SubmodelRepository"
+                                        );
                                     }
                                 });
                             } else {
-                                let submodel = {
-                                    id: submodelId,
-                                    idShort: 'Submodel not found',
-                                    modelType: 'Submodel',
-                                    semanticId: null,
-                                    description: [],
-                                    displayName: [],
-                                    submodelElements: [],
-                                    isActive: false,
-                                    path: path,
-                                };
-                                this.navigationStore.dispatchSnackbar({
-                                    status: true,
-                                    timeout: 60000,
-                                    color: 'error',
-                                    btnColor: 'buttonText',
-                                    text: "Submodel '" + submodelId + "' not found in SubmodelRegistry",
-                                });
-                                return submodel;
+                                return this.smNotFound(
+                                    submodelId,
+                                    path,
+                                    "Submodel '" + submodelId + "' not found in SubmodelRegistry"
+                                );
                             }
                         }
                     });

diff --git a/aas-web-ui/src/components/SubmodelList.vue b/aas-web-ui/src/components/SubmodelList.vue
@@ -259,47 +259,19 @@
                                         submodel.path = path;
                                         return submodel;
                                     } else {
-                                        let submodel = {
-                                            id: submodelId,
-                                            idShort: 'Submodel not found',
-                                            modelType: 'Submodel',
-                                            semanticId: null,
-                                            description: [],
-                                            displayName: [],
-                                            submodelElements: [],
-                                            isActive: false,
-                                            path: path,
-                                        };
-                                        this.navigationStore.dispatchSnackbar({
-                                            status: true,
-                                            timeout: 60000,
-                                            color: 'error',
-                                            btnColor: 'buttonText',
-                                            text: "Submodel '" + submodelId + "' not found in SubmodelRepository",
-                                        });
-                                        return submodel;
+                                        return this.smNotFound(
+                                            submodelId,
+                                            path,
+                                            "Submodel '" + submodelId + "' not found in SubmodelRepository"
+                                        );
                                     }
                                 });
                             } else {
-                                let submodel = {
-                                    id: submodelId,
-                                    idShort: 'Submodel not found',
-                                    modelType: 'Submodel',
-                                    semanticId: null,
-                                    description: [],
-                                    displayName: [],
-                                    submodelElements: [],
-                                    isActive: false,
-                                    path: path,
-                                };
-                                this.navigationStore.dispatchSnackbar({
-                                    status: true,
-                                    timeout: 60000,
-                                    color: 'error',
-                                    btnColor: 'buttonText',
-                                    text: "Submodel '" + submodelId + "' not found in SubmodelRegistry",
-                                });
-                                return submodel;
+                                return this.smNotFound(
+                                    submodelId,
+                                    path,
+                                    "Submodel '" + submodelId + "' not found in SubmodelRegistry"
+                                );
                             }
                         }
                     });

diff --git a/aas-web-ui/src/mixins/SubmodelElementHandling.ts b/aas-web-ui/src/mixins/SubmodelElementHandling.ts
@@ -646,5 +646,29 @@ export default defineComponent({
             });
             return endpoint?.protocolInformation?.href ? endpoint.protocolInformation.href : '';
         },
+
+        smNotFound(submodelId: string, path: string, text: string) {
+            if (text.trim().length > 0) {
+                this.navigationStore.dispatchSnackbar({
+                    status: true,
+                    timeout: 60000,
+                    color: 'error',
+                    btnColor: 'buttonText',
+                    text: text,
+                });
+            }
+            const submodel = {
+                id: submodelId,
+                idShort: 'Submodel not found',
+                modelType: 'Submodel',
+                semanticId: null,
+                description: [],
+                displayName: [],
+                submodelElements: [],
+                isActive: false,
+                path: path,
+            };
+            return submodel;
+        },
     },
 });