From c53b6e24208589b40aabadfd7fa81827c16feab8 Mon Sep 17 00:00:00 2001
From: Sebastian Eicke <sebastian.eicke@HARTING.com>
Date: Wed, 19 Feb 2025 10:13:39 +0100
Subject: [PATCH 1/6] Improves client functions with provided id

---
 .../src/components/AppNavigation/AASList.vue  |  89 +++++------
 .../AppNavigation/AASListDetails.vue          |  18 +--
 .../components/AppNavigation/UploadAAS.vue    |   4 +-
 .../EditorComponents/DeleteDialog.vue         |   6 +-
 .../EditorComponents/SubmodelForm.vue         |   8 +-
 .../src/components/SubmodelElementView.vue    |  31 +---
 .../SubmodelElements/ReferenceElement.vue     |   4 +-
 .../SubmodelElements/RelationshipElement.vue  |   4 +-
 aas-web-ui/src/components/SubmodelList.vue    |   3 +-
 aas-web-ui/src/components/SubmodelTree.vue    |  19 ++-
 aas-web-ui/src/composables/AAS/AASHandling.ts | 143 +++++++++++++++---
 ...ferenceUtils.ts => ReferenceComposable.ts} |  56 ++-----
 aas-web-ui/src/composables/AAS/SMHandling.ts  | 107 +++++--------
 .../ContactInformation_v1_0Utils.ts           |   5 +-
 .../TechnicalData_v1_2Utils.ts                |   6 +-
 .../composables/Client/AASDiscoveryClient.ts  |   4 +-
 .../composables/Client/AASRegistryClient.ts   |  51 ++-----
 .../composables/Client/AASRepositoryClient.ts | 121 +++++----------
 .../composables/Client/SMRegistryClient.ts    |  47 +-----
 .../composables/Client/SMRepositoryClient.ts  | 102 +++++--------
 aas-web-ui/src/composables/JumpHandling.ts    |  26 ++--
 aas-web-ui/src/utils/AAS/ReferenceUtil.ts     |  29 ++++
 22 files changed, 394 insertions(+), 489 deletions(-)
 rename aas-web-ui/src/composables/AAS/{ReferenceUtils.ts => ReferenceComposable.ts} (81%)
 create mode 100644 aas-web-ui/src/utils/AAS/ReferenceUtil.ts

diff --git a/aas-web-ui/src/components/AppNavigation/AASList.vue b/aas-web-ui/src/components/AppNavigation/AASList.vue
index c576937c..f1eb9d2f 100644
--- a/aas-web-ui/src/components/AppNavigation/AASList.vue
+++ b/aas-web-ui/src/components/AppNavigation/AASList.vue
@@ -30,7 +30,7 @@
                                 hide-details
                                 label="Search for AAS..."
                                 clearable
-                                @update:model-value="filterAasDescriptorList"></v-text-field>
+                                @update:model-value="filterAasList"></v-text-field>
                         </v-col>
                         <!-- Add AAS -->
                         <v-col cols="auto" class="px-0">
@@ -118,11 +118,7 @@
                     </v-list-item>
                 </template>
                 <template v-else>
-                    <v-virtual-scroll
-                        ref="virtualScrollRef"
-                        :items="aasDescriptorList"
-                        :item-height="56"
-                        class="pb-2 bg-card">
+                    <v-virtual-scroll ref="virtualScrollRef" :items="aasList" :item-height="56" class="pb-2 bg-card">
                         <template #default="{ item }">
                             <!-- Single AAS -->
                             <v-list-item
@@ -295,8 +291,8 @@
     const router = useRouter();
 
     // Composables
-    const { downloadAasx, isAvailableByIdInRepo } = useAASRepositoryClient();
-    const { fetchAasDescriptorList } = useAASHandling();
+    const { downloadAasx } = useAASRepositoryClient();
+    const { fetchAasDescriptorList, fetchAasList, aasIsAvailableById } = useAASHandling();
     const { nameToDisplay, descriptionToDisplay } = useReferableUtils();
     const { copyToClipboard } = useClipboardUtil();
 
@@ -309,8 +305,8 @@
     const theme = useTheme();
 
     // Data
-    const aasDescriptorList = ref([] as Array<any>) as Ref<Array<any>>; // Variable to store the AAS Data
-    const aasDescriptorListUnfiltered = ref([] as Array<any>) as Ref<Array<any>>; // Variable to store the AAS Data before filtering
+    const aasList = ref([] as Array<any>) as Ref<Array<any>>; // Variable to store the AAS Data (AAS or AAS Descriptors)
+    const aasListUnfiltered = ref([] as Array<any>) as Ref<Array<any>>; // Variable to store the AAS Data before filtering
     const listLoading = ref(false); // Variable to store if the AAS List is loading
     const deleteDialog = ref(false); // Variable to store if the Delete Dialog should be shown
     const aasToDelete = ref({}); // Variable to store the AAS to be deleted
@@ -354,10 +350,8 @@
     // Watchers
     watch(
         () => aasRegistryURL.value,
-        (newValue) => {
-            if (newValue !== '') {
-                initialize();
-            }
+        () => {
+            initialize();
         }
     );
 
@@ -381,13 +375,13 @@
                     updateStatus();
                 }, statusCheck.value.interval);
             } else {
-                aasDescriptorList.value.forEach((aasDescriptor: any) => {
+                aasList.value.forEach((aasDescriptor: any) => {
                     aasDescriptor.status = 'check disabled';
                 });
 
                 // Reset status icon after 2 seconds
                 setTimeout(() => {
-                    aasDescriptorList.value.forEach((aasDescriptor: any) => {
+                    aasList.value.forEach((aasDescriptor: any) => {
                         aasDescriptor.status = '';
                     });
                 }, 2000);
@@ -434,14 +428,23 @@
     async function initialize(): Promise<void> {
         listLoading.value = true;
 
-        fetchAasDescriptorList().then(async (aasDescriptors: Array<any>) => {
-            let aasDescriptorsSorted = aasDescriptors.sort((a: { [x: string]: number }, b: { [x: string]: number }) =>
-                a['id'] > b['id'] ? 1 : -1
-            );
+        fetchAasDescriptorList().then(async (aasDescriptorList: Array<any>) => {
+            if (aasDescriptorList.length > 0) {
+                let aasDescriptorListSorted = aasDescriptorList.sort(
+                    (a: { [x: string]: number }, b: { [x: string]: number }) => (a['id'] > b['id'] ? 1 : -1)
+                );
+                aasList.value = [...aasDescriptorListSorted];
 
-            aasDescriptorList.value = [...aasDescriptorsSorted];
+                aasListUnfiltered.value = [...aasDescriptorListSorted];
+            } else {
+                const listOfAas = await fetchAasList();
+                let listOfAasSorted = listOfAas.sort((a: { [x: string]: number }, b: { [x: string]: number }) =>
+                    a['id'] > b['id'] ? 1 : -1
+                );
+                aasList.value = [...listOfAasSorted];
 
-            aasDescriptorListUnfiltered.value = [...aasDescriptorsSorted];
+                aasListUnfiltered.value = [...listOfAasSorted];
+            }
 
             scrollToSelectedAAS();
 
@@ -461,37 +464,37 @@
      *                                  based on availability checks.
      */
     function updateStatus(init: boolean = false): void {
-        if (Array.isArray(aasDescriptorList.value) && aasDescriptorList.value.length > 0)
-            aasDescriptorList.value.forEach(async (aasDescriptor: any) => {
-                if (aasDescriptor && Object.keys(aasDescriptor).length > 0) {
+        if (Array.isArray(aasList.value) && aasList.value.length > 0)
+            aasList.value.forEach(async (aasOrAasDescriptor: any) => {
+                if (aasOrAasDescriptor && Object.keys(aasOrAasDescriptor).length > 0) {
                     await new Promise((resolve) => setTimeout(resolve, 600)); // Give the UI the chance to refresh status icons
 
-                    const aasIsAvailable = await isAvailableByIdInRepo(aasDescriptor.id);
+                    const aasIsAvailable = await aasIsAvailableById(aasOrAasDescriptor.id);
 
                     if (aasIsAvailable) {
-                        aasDescriptor.status =
+                        aasOrAasDescriptor.status =
                             statusCheck.value.state === true ? 'online' : init ? '' : 'check disabled';
                     } else {
-                        aasDescriptor.status =
+                        aasOrAasDescriptor.status =
                             statusCheck.value.state === true ? 'offline' : init ? '' : 'check disabled';
                     }
                 }
             });
     }
 
-    function filterAasDescriptorList(value: string): void {
+    function filterAasList(value: string): void {
         if (!value || value.trim() === '') {
-            aasDescriptorList.value = aasDescriptorListUnfiltered.value;
+            aasList.value = aasListUnfiltered.value;
         } else {
             // filter list of AAS Descriptors
-            let aasDescriptorListFiltered = aasDescriptorListUnfiltered.value.filter(
+            let aasListFiltered = aasListUnfiltered.value.filter(
                 (aasDescriptor: any) =>
                     aasDescriptor.id.toLowerCase().includes(value.toLowerCase()) ||
                     aasDescriptor.idShort.toLowerCase().includes(value.toLowerCase()) ||
                     nameToDisplay(aasDescriptor).toLowerCase().includes(value.toLowerCase()) ||
                     descriptionToDisplay(aasDescriptor).toLowerCase().includes(value.toLowerCase())
             );
-            aasDescriptorList.value = aasDescriptorListFiltered;
+            aasList.value = aasListFiltered;
         }
         scrollToSelectedAAS();
     }
@@ -524,24 +527,24 @@
         }
     }
 
-    function isSelected(aas: any): boolean {
+    function isSelected(aasOrAasDescriptor: any): boolean {
         if (
             !selectedAAS.value ||
             Object.keys(selectedAAS.value).length === 0 ||
             !selectedAAS.value.id ||
-            !aas ||
-            Object.keys(aas).length === 0 ||
-            !aas.id
+            !aasOrAasDescriptor ||
+            Object.keys(aasOrAasDescriptor).length === 0 ||
+            !aasOrAasDescriptor.id
         ) {
             return false;
         }
-        return selectedAAS.value.id === aas.id;
+        return selectedAAS.value.id === aasOrAasDescriptor.id;
     }
 
     // Function to scroll to the selected AAS
     function scrollToSelectedAAS(): void {
         // Find the index of the selected item
-        const index = aasDescriptorList.value.findIndex((aasDescriptor: any) => isSelected(aasDescriptor));
+        const index = aasList.value.findIndex((aasOrAasDescriptor: any) => isSelected(aasOrAasDescriptor));
 
         if (index !== -1) {
             const intervalId = setInterval(() => {
@@ -557,16 +560,16 @@
         }
     }
 
-    function openDeleteDialog(AAS: any): void {
+    function openDeleteDialog(aasOrAasDescriptor: any): void {
         deleteDialog.value = true;
-        aasToDelete.value = AAS;
+        aasToDelete.value = aasOrAasDescriptor;
     }
 
-    function openEditDialog(createNew: boolean, aas?: any): void {
+    function openEditDialog(createNew: boolean, aasOrAasDescriptor?: any): void {
         editDialog.value = true;
         newShell.value = createNew;
-        if (createNew === false && aas) {
-            aasToEdit.value = aas;
+        if (createNew === false && aasOrAasDescriptor) {
+            aasToEdit.value = aasOrAasDescriptor;
         }
     }
 </script>
diff --git a/aas-web-ui/src/components/AppNavigation/AASListDetails.vue b/aas-web-ui/src/components/AppNavigation/AASListDetails.vue
index e80c6946..06debc2b 100644
--- a/aas-web-ui/src/components/AppNavigation/AASListDetails.vue
+++ b/aas-web-ui/src/components/AppNavigation/AASListDetails.vue
@@ -146,8 +146,8 @@
     const router = useRouter();
 
     // Composables
-    const { downloadAasx, fetchAssetInformation, isAvailableById: isAvailableByIdInRepo } = useAASRepositoryClient();
-    const { fetchAas } = useAASHandling();
+    const { downloadAasx, fetchAssetInformation } = useAASRepositoryClient();
+    const { aasIsAvailableById, fetchAas } = useAASHandling();
 
     // Stores
     const navigationStore = useNavigationStore();
@@ -187,19 +187,15 @@
     // Watchers
     watch(
         () => aasRegistryURL.value,
-        async (newValue) => {
-            if (newValue !== '') {
-                await initializeView();
-            }
+        async () => {
+            await initializeView();
         }
     );
 
     watch(
         () => aasRepoURL.value,
-        async (newValue) => {
-            if (newValue !== '') {
-                await initializeView();
-            }
+        async () => {
+            await initializeView();
         }
     );
 
@@ -320,7 +316,7 @@
         if (assetAdministrationShellData.value && Object.keys(assetAdministrationShellData.value).length > 0) {
             await new Promise((resolve) => setTimeout(resolve, 600)); // Give the UI the chance to refresh status icons
 
-            const aasIsAvailable = await isAvailableByIdInRepo(assetAdministrationShellData.value.id);
+            const aasIsAvailable = await aasIsAvailableById(assetAdministrationShellData.value.id);
 
             if (aasIsAvailable) {
                 assetAdministrationShellData.value.status =
diff --git a/aas-web-ui/src/components/AppNavigation/UploadAAS.vue b/aas-web-ui/src/components/AppNavigation/UploadAAS.vue
index 348b5651..93cc7f31 100644
--- a/aas-web-ui/src/components/AppNavigation/UploadAAS.vue
+++ b/aas-web-ui/src/components/AppNavigation/UploadAAS.vue
@@ -38,10 +38,10 @@
 
 <script lang="ts" setup>
     import { computed, ref, watch, watchEffect } from 'vue';
+    import { useSMHandling } from '@/composables/AAS/SMHandling';
     import { useAASRegistryClient } from '@/composables/Client/AASRegistryClient';
     import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
     import { useSMRegistryClient } from '@/composables/Client/SMRegistryClient';
-    import { useSMRepositoryClient } from '@/composables/Client/SMRepositoryClient';
     import { useNavigationStore } from '@/store/NavigationStore';
     import { Endpoint, ProtocolInformation, SubmodelDescriptor } from '@/types/Descriptors';
     import { base64Encode } from '@/utils/EncodeDecodeUtils';
@@ -53,7 +53,7 @@
 
     // Composables
     const { fetchAas, uploadAas } = useAASRepositoryClient();
-    const { fetchSm } = useSMRepositoryClient();
+    const { fetchSm } = useSMHandling();
     const { postAasDescriptor, createDescriptorFromAAS } = useAASRegistryClient();
     const { postSubmodelDescriptor, createDescriptorFromSubmodel } = useSMRegistryClient();
 
diff --git a/aas-web-ui/src/components/EditorComponents/DeleteDialog.vue b/aas-web-ui/src/components/EditorComponents/DeleteDialog.vue
index afd34df9..06386963 100644
--- a/aas-web-ui/src/components/EditorComponents/DeleteDialog.vue
+++ b/aas-web-ui/src/components/EditorComponents/DeleteDialog.vue
@@ -33,8 +33,8 @@
     import { computed, ref, watch } from 'vue';
     import { useRouter } from 'vue-router';
     import { useRoute } from 'vue-router';
+    import { useSMHandling } from '@/composables/AAS/SMHandling';
     import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
-    import { useSMRegistryClient } from '@/composables/Client/SMRegistryClient';
     import { useRequestHandling } from '@/composables/RequestHandling';
     import { useAASStore } from '@/store/AASDataStore';
     import { useNavigationStore } from '@/store/NavigationStore';
@@ -47,7 +47,7 @@
     const route = useRoute();
 
     const { deleteRequest } = useRequestHandling();
-    const { fetchSmDescriptorById } = useSMRegistryClient();
+    const { fetchSmDescriptor } = useSMHandling();
     const { deleteSubmodelRef } = useAASRepositoryClient();
 
     const props = defineProps<{
@@ -82,7 +82,7 @@
         deleteLoading.value = true;
         if (props.element.modelType === 'Submodel') {
             // Fetch the submodel from the submodel registry
-            const smDescriptor = await fetchSmDescriptorById(props.element.id);
+            const smDescriptor = await fetchSmDescriptor(props.element.id);
             // extract the submodel endpoint
             const smEndpoint = extractEndpointHref(smDescriptor, 'SUBMODEL-3.0');
             try {
diff --git a/aas-web-ui/src/components/EditorComponents/SubmodelForm.vue b/aas-web-ui/src/components/EditorComponents/SubmodelForm.vue
index 81ddb436..8ed5994b 100644
--- a/aas-web-ui/src/components/EditorComponents/SubmodelForm.vue
+++ b/aas-web-ui/src/components/EditorComponents/SubmodelForm.vue
@@ -69,6 +69,7 @@
     import { jsonization } from '@aas-core-works/aas-core3.0-typescript';
     import { computed, ref, watch } from 'vue';
     import { useRouter } from 'vue-router';
+    import { useSMHandling } from '@/composables/AAS/SMHandling';
     import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
     import { useSMRegistryClient } from '@/composables/Client/SMRegistryClient';
     import { useSMRepositoryClient } from '@/composables/Client/SMRepositoryClient';
@@ -98,8 +99,9 @@
         (event: 'update:modelValue', value: boolean): void;
     }>();
 
-    const { fetchSmById, postSubmodel, putSubmodel } = useSMRepositoryClient();
-    const { putSubmodelDescriptor, createDescriptorFromSubmodel, fetchSmDescriptorById } = useSMRegistryClient();
+    const { postSubmodel, putSubmodel } = useSMRepositoryClient();
+    const { putSubmodelDescriptor, createDescriptorFromSubmodel } = useSMRegistryClient();
+    const { fetchSmById, fetchSmDescriptor } = useSMHandling();
     const { putAas } = useAASRepositoryClient();
 
     const editSMDialog = ref(false);
@@ -294,7 +296,7 @@
             await putSubmodel(submodelObject.value);
             const jsonSubmodel = jsonization.toJsonable(submodelObject.value);
             // Fetch the current desciptor from the registry
-            const fetchedDescriptor = await fetchSmDescriptorById(submodelObject.value.id);
+            const fetchedDescriptor = await fetchSmDescriptor(submodelObject.value.id);
             const descriptor = createDescriptorFromSubmodel(jsonSubmodel, fetchedDescriptor.endpoints);
             // Update AAS Descriptor
             await putSubmodelDescriptor(descriptor);
diff --git a/aas-web-ui/src/components/SubmodelElementView.vue b/aas-web-ui/src/components/SubmodelElementView.vue
index b08572f7..f9c308bc 100644
--- a/aas-web-ui/src/components/SubmodelElementView.vue
+++ b/aas-web-ui/src/components/SubmodelElementView.vue
@@ -189,11 +189,8 @@
     const autoSyncInterval = ref<number | undefined>(undefined); // interval to send requests to the AAS
 
     // Computed Properties
-    const searchParams = computed(() => new URL(window.location.href).searchParams);
-    const aasEndpoint = computed(() => (searchParams.value.get('aas') || '').trim());
-    const smePath = computed(() => (searchParams.value.get('path') || '').trim());
-    const aasRegistryServerURL = computed(() => navigationStore.getAASRegistryURL);
-    const submodelRegistryServerURL = computed(() => navigationStore.getSubmodelRegistryURL);
+    const aasRegistryURL = computed(() => navigationStore.getAASRegistryURL);
+    const submodelRegistryURL = computed(() => navigationStore.getSubmodelRegistryURL);
     const selectedAAS = computed(() => aasStore.getSelectedAAS);
     const selectedNode = computed(() => aasStore.getSelectedNode);
     const autoSync = computed(() => navigationStore.getAutoSync);
@@ -202,27 +199,7 @@
 
     // Watchers
     watch(
-        () => aasRegistryServerURL.value,
-        () => {
-            if (!aasRegistryServerURL.value) {
-                resetLocalData();
-                initialize(selectedNode.value, true);
-            }
-        }
-    );
-
-    watch(
-        () => submodelRegistryServerURL.value,
-        () => {
-            if (!submodelRegistryServerURL.value) {
-                resetLocalData();
-                initialize(selectedNode.value, true);
-            }
-        }
-    );
-
-    watch(
-        () => aasEndpoint.value,
+        () => aasRegistryURL.value,
         () => {
             resetLocalData();
             initialize(selectedNode.value, true);
@@ -230,7 +207,7 @@
     );
 
     watch(
-        () => smePath.value,
+        () => submodelRegistryURL.value,
         () => {
             resetLocalData();
             initialize(selectedNode.value, true);
diff --git a/aas-web-ui/src/components/SubmodelElements/ReferenceElement.vue b/aas-web-ui/src/components/SubmodelElements/ReferenceElement.vue
index b51a1cf7..d29874db 100644
--- a/aas-web-ui/src/components/SubmodelElements/ReferenceElement.vue
+++ b/aas-web-ui/src/components/SubmodelElements/ReferenceElement.vue
@@ -128,7 +128,7 @@
 <script lang="ts">
     import { defineComponent } from 'vue';
     import { useRouter } from 'vue-router';
-    import { useReferenceUtils } from '@/composables/AAS/ReferenceUtils';
+    import { useReferenceComposable } from '@/composables/AAS/ReferenceComposable';
     import { useJumpHandling } from '@/composables/JumpHandling';
     import { useAASStore } from '@/store/AASDataStore';
 
@@ -156,7 +156,7 @@
         setup() {
             const aasStore = useAASStore();
             const router = useRouter();
-            const { checkReference } = useReferenceUtils();
+            const { checkReference } = useReferenceComposable();
             const { jumpToReference } = useJumpHandling();
 
             return {
diff --git a/aas-web-ui/src/components/SubmodelElements/RelationshipElement.vue b/aas-web-ui/src/components/SubmodelElements/RelationshipElement.vue
index a6d46d53..e2754c4d 100644
--- a/aas-web-ui/src/components/SubmodelElements/RelationshipElement.vue
+++ b/aas-web-ui/src/components/SubmodelElements/RelationshipElement.vue
@@ -60,7 +60,7 @@
 <script lang="ts">
     import { defineComponent } from 'vue';
     import { useRouter } from 'vue-router';
-    import { useReferenceUtils } from '@/composables/AAS/ReferenceUtils';
+    import { useReferenceComposable } from '@/composables/AAS/ReferenceComposable';
     import { useJumpHandling } from '@/composables/JumpHandling';
     import { useAASStore } from '@/store/AASDataStore';
     import { capitalizeFirstLetter } from '@/utils/StringUtils';
@@ -77,7 +77,7 @@
         setup() {
             const aasStore = useAASStore();
             const router = useRouter();
-            const { checkReference } = useReferenceUtils();
+            const { checkReference } = useReferenceComposable();
             const { jumpToReference } = useJumpHandling();
 
             return {
diff --git a/aas-web-ui/src/components/SubmodelList.vue b/aas-web-ui/src/components/SubmodelList.vue
index a79b6c6c..f35cfd4c 100644
--- a/aas-web-ui/src/components/SubmodelList.vue
+++ b/aas-web-ui/src/components/SubmodelList.vue
@@ -161,8 +161,7 @@
         () => {
             submodelList.value = [];
             initialize();
-        },
-        { deep: true }
+        }
     );
 
     watch(
diff --git a/aas-web-ui/src/components/SubmodelTree.vue b/aas-web-ui/src/components/SubmodelTree.vue
index 9ad5468a..2ae76e79 100644
--- a/aas-web-ui/src/components/SubmodelTree.vue
+++ b/aas-web-ui/src/components/SubmodelTree.vue
@@ -198,19 +198,28 @@
     const triggerTreeviewReload = computed(() => navigationStore.getTriggerTreeviewReload); // Reload the Treeview
 
     // Watchers
-    watch([aasRegistryURL, submodelRegistryURL], ([newAAS, newSubmodelRegistry]) => {
-        if (isEmptyString(newAAS) || isEmptyString(newSubmodelRegistry)) {
+    watch(
+        () => aasRegistryURL.value,
+        () => {
+            // Resets the Submodel Tree when the AAS Registry changes
             submodelTree.value = [];
         }
-    });
+    );
+
+    watch(
+        () => submodelRegistryURL.value,
+        () => {
+            // Resets the Submodel Tree when the Submodel Registry changes
+            submodelTree.value = [];
+        }
+    );
 
     watch(
         () => selectedAAS.value,
         () => {
             submodelTree.value = [];
             initialize();
-        },
-        { deep: true }
+        }
     );
 
     watch(
diff --git a/aas-web-ui/src/composables/AAS/AASHandling.ts b/aas-web-ui/src/composables/AAS/AASHandling.ts
index e7193db4..fcb34bec 100644
--- a/aas-web-ui/src/composables/AAS/AASHandling.ts
+++ b/aas-web-ui/src/composables/AAS/AASHandling.ts
@@ -1,7 +1,8 @@
-import { useReferenceUtils } from '@/composables/AAS/ReferenceUtils';
 import { useAASRegistryClient } from '@/composables/Client/AASRegistryClient';
 import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
 import { useAASStore } from '@/store/AASDataStore';
+import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
+import { extractId as extractIdFromReference } from '@/utils/AAS/ReferenceUtil';
 import { formatDate } from '@/utils/DateUtils';
 import { useSMHandling } from './SMHandling';
 
@@ -10,16 +11,16 @@ export function useAASHandling() {
     const {
         fetchAasDescriptorById: fetchAasDescriptorByIdFromRegistry,
         fetchAasDescriptorList: fetchAasDescriptorListFromRegistry,
-        getAasEndpoint,
         getAasEndpointById: getAasEndpointByIdFromRegistry,
     } = useAASRegistryClient();
     const {
+        fetchAasList: fetchAasListFromRepo,
         fetchAas: fetchAasFromRepo,
-        fetchAasById: fetchAasByIdFromRepo,
         getAasEndpointById: getAasEndpointByIdFromRepo,
+        aasIsAvailable: aasIsAvailableInRepo,
+        getSubmodelRefs: getSubmodelRefsFromRepo,
     } = useAASRepositoryClient();
-    const { fetchSmById } = useSMHandling();
-    const { extractId } = useReferenceUtils();
+    const { fetchSmDescriptor, fetchSmById } = useSMHandling();
 
     // Stores
     const aasStore = useAASStore();
@@ -86,17 +87,41 @@ export function useAASHandling() {
     async function fetchAasDescriptorList(): Promise<Array<any>> {
         const failResponse = [] as Array<any>;
 
-        let aasDescriptors = await fetchAasDescriptorListFromRegistry();
+        let aasDescriptorList = await fetchAasDescriptorListFromRegistry();
 
-        if (!aasDescriptors || !Array.isArray(aasDescriptors) || aasDescriptors.length === 0) return failResponse;
+        if (!aasDescriptorList || !Array.isArray(aasDescriptorList) || aasDescriptorList.length === 0)
+            return failResponse;
 
-        aasDescriptors = aasDescriptors.map((aasDescriptor: any) => {
+        aasDescriptorList = aasDescriptorList.map((aasDescriptor: any) => {
             aasDescriptor.timestamp = formatDate(new Date());
-            aasDescriptor.path = getAasEndpoint(aasDescriptor);
+            aasDescriptor.path = extractEndpointHref(aasDescriptor, 'AAS-3.0');
             return aasDescriptor;
         });
 
-        return aasDescriptors;
+        return aasDescriptorList;
+    }
+
+    /**
+     * Fetches a list of all available Asset Administration Shell (AAS).
+     *
+     * @async
+     * @returns {Promise<Array<any>>} A promise that resolves to an array of AAS.
+     * An empty array is returned if the request fails or no AAS Descriptors are found.
+     */
+    async function fetchAasList(): Promise<Array<any>> {
+        const failResponse = [] as Array<any>;
+
+        let aasList = await fetchAasListFromRepo();
+
+        if (!aasList || !Array.isArray(aasList) || aasList.length === 0) return failResponse;
+
+        aasList = aasList.map((aas: any) => {
+            aas.timestamp = formatDate(new Date());
+            aas.path = getAasEndpointByIdFromRepo(aas.id);
+            return aas;
+        });
+
+        return aasList;
     }
 
     /**
@@ -123,7 +148,7 @@ export function useAASHandling() {
         }
 
         aasDescriptor.timestamp = formatDate(new Date());
-        aasDescriptor.path = getAasEndpoint(aasDescriptor);
+        aasDescriptor.path = extractEndpointHref(aasDescriptor, 'AAS-3.0');
 
         return aasDescriptor || failResponse;
     }
@@ -173,22 +198,22 @@ export function useAASHandling() {
 
         if (aasId === '') return failResponse;
 
-        const aas = await fetchAasByIdFromRepo(aasId);
+        const aasEndpoint = await getAasEndpointById(aasId);
 
-        if (!aas || Object.keys(aas).length === 0) {
-            console.warn("Fetching AAS (id = '" + aasId + "') failed!");
-            return failResponse;
+        if (aasEndpoint && aasEndpoint.trim() !== '') {
+            return fetchAas(aasEndpoint.trim());
         }
 
-        aas.timestamp = formatDate(new Date());
-        aas.path = getAasEndpointByIdFromRepo(aasId);
-
-        return aas;
+        return failResponse;
     }
 
     /**
      * Retrieves the Asset Administration Shell (AAS) endpoint URL by its ID.
      *
+     * This function attempts to obtain the AAS endpoint using two methods: first by querying
+     * the AAS registry, and if that fails, it tries to obtain it from the AAS repository. If the provided
+     * AAS ID is invalid or empty, the function returns an empty string.
+     *
      * @param {string} aasId - The ID of the AAS to retrieve the endpoint for.
      * @returns {Promise<string>} A promise that resolves to an AAS endpoint.
      */
@@ -204,7 +229,7 @@ export function useAASHandling() {
         // First try to determine AAS endpoint with the help of the registry
         const aasEndpoint = await getAasEndpointByIdFromRegistry(aasId);
 
-        if (aasEndpoint && aasEndpoint.trim() !== '') return aasEndpoint;
+        if (aasEndpoint && aasEndpoint.trim() !== '') return aasEndpoint.trim();
 
         // Second try to determine AAS endpoint with the help of the repo
         return getAasEndpointByIdFromRepo(aasId) || failResponse;
@@ -238,7 +263,7 @@ export function useAASHandling() {
             const submodelRefs = aas.submodels;
 
             const submodelPromises = submodelRefs.map((submodelRef: any) => {
-                return fetchSmById(extractId(submodelRef, 'Submodel'), false, true);
+                return fetchSmById(extractIdFromReference(submodelRef, 'Submodel'), false, true);
             });
 
             return await Promise.all(submodelPromises);
@@ -247,14 +272,88 @@ export function useAASHandling() {
         return failResponse;
     }
 
+    async function aasIsAvailableById(aasId: string): Promise<boolean> {
+        const failResponse = false;
+
+        if (!aasId) return failResponse;
+
+        aasId = aasId.trim();
+
+        if (aasId === '') return failResponse;
+
+        const aasEndpoint = await getAasEndpointById(aasId);
+
+        return await aasIsAvailableInRepo(aasEndpoint);
+    }
+
+    async function getSubmodelRefsById(aasId: string): Promise<Array<any>> {
+        const failResponse = [] as Array<any>;
+
+        if (!aasId) return failResponse;
+
+        aasId = aasId.trim();
+
+        if (aasId === '') return failResponse;
+
+        const aasEndpoint = await getAasEndpointById(aasId);
+
+        if (aasEndpoint && aasEndpoint.trim() !== '') return getSubmodelRefsFromRepo(aasEndpoint.trim());
+
+        return failResponse;
+    }
+
+    /**
+     * Retrieves a Submodel (SM) of an Asset Administration Shell (AAS) SM descriptor.
+     *
+     * @async
+     * @param {string} aasId - The ID of the AAS to retrieve its SM.
+     * @param {string} semanticId - The semantic ID of the SM.
+     * @returns {string} A promise that resolves to a SM.
+     */
+    async function getSmIdOfAasIdBySemanticId(aasId: string, semanticId: string): Promise<string> {
+        const failResponse = '';
+
+        if (!aasId || !semanticId) return failResponse;
+
+        aasId = aasId.trim();
+        semanticId = semanticId.trim();
+
+        if (aasId === '' || semanticId === '') return failResponse;
+
+        const submodelRefs = await getSubmodelRefsById(aasId);
+
+        for (const submodelRef of submodelRefs) {
+            const smId = extractIdFromReference(submodelRef, 'Submodel');
+            const smDescriptor = await fetchSmDescriptor(smId);
+            if (
+                smDescriptor &&
+                Object.keys(smDescriptor).length > 0 &&
+                smDescriptor?.semanticId?.keys &&
+                Array.isArray(smDescriptor.semanticId.keys) &&
+                smDescriptor.semanticId.keys.length > 0
+            ) {
+                const semanticIds = smDescriptor.semanticId.keys.map((key: any) => key.value);
+                if (semanticIds.includes(semanticId)) {
+                    return smId;
+                }
+            }
+        }
+
+        return failResponse;
+    }
+
     return {
+        getAasEndpointById,
+        getSubmodelRefsById,
+        getSmIdOfAasIdBySemanticId,
+        aasIsAvailableById,
         fetchAndDispatchAas,
         fetchAndDispatchAasById,
         fetchAasDescriptorList,
         fetchAasDescriptor,
+        fetchAasList,
         fetchAas,
         fetchAasById,
         fetchAasSmListById,
-        getAasEndpointById,
     };
 }
diff --git a/aas-web-ui/src/composables/AAS/ReferenceUtils.ts b/aas-web-ui/src/composables/AAS/ReferenceComposable.ts
similarity index 81%
rename from aas-web-ui/src/composables/AAS/ReferenceUtils.ts
rename to aas-web-ui/src/composables/AAS/ReferenceComposable.ts
index 820f4160..e1b65eef 100644
--- a/aas-web-ui/src/composables/AAS/ReferenceUtils.ts
+++ b/aas-web-ui/src/composables/AAS/ReferenceComposable.ts
@@ -1,24 +1,21 @@
 import { computed } from 'vue';
+import { useAASHandling } from '@/composables/AAS/AASHandling';
 import { useReferableUtils } from '@/composables/AAS/ReferableUtils';
-import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
-import { useSMRepositoryClient } from '@/composables/Client/SMRepositoryClient';
+import { useSMEHandling } from '@/composables/AAS/SMEHandling';
+import { useSMHandling } from '@/composables/AAS/SMHandling';
 import { useAASStore } from '@/store/AASDataStore';
 import { useNavigationStore } from '@/store/NavigationStore';
-import { keyTypes } from '@/utils/AAS/KeyTypesUtil';
+import { extractId } from '@/utils/AAS/ReferenceUtil';
 
-export function useReferenceUtils() {
+export function useReferenceComposable() {
     // Stores
     const navigationStore = useNavigationStore();
     const aasStore = useAASStore();
 
     // Composables
-    const { isAvailableById: aasIsAvailableById, getAasEndpointById: getAasEndpointByIdFromRepo } =
-        useAASRepositoryClient();
-    const {
-        isAvailableById: smIsAvailableById,
-        fetchSme,
-        getSmEndpointById: getSmEndpointByIdFromRepo,
-    } = useSMRepositoryClient();
+    const { aasIsAvailableById, getAasEndpointById } = useAASHandling();
+    const { smIsAvailableById, getSmEndpointById } = useSMHandling();
+    const { fetchSme } = useSMEHandling();
     const { checkIdShort } = useReferableUtils();
 
     // Computed Properties
@@ -140,10 +137,10 @@ export function useReferenceUtils() {
 
                 if (reference?.keys[0]?.type === 'AssetAdministrationShell') {
                     const aasId = reference?.keys[0].value.trim();
-                    aasEndpoint = getAasEndpointByIdFromRepo(aasId);
+                    aasEndpoint = await getAasEndpointById(aasId);
                     if (reference?.keys[1]?.type === 'Submodel') {
                         const smId = reference?.keys[1].value.trim();
-                        smEndpoint = getSmEndpointByIdFromRepo(smId);
+                        smEndpoint = await getSmEndpointById(smId);
                         referenceKeys = referenceKeys.slice(1);
                     }
                     referenceKeys = referenceKeys.slice(1);
@@ -152,7 +149,7 @@ export function useReferenceUtils() {
                 if (reference?.keys[0]?.type === 'Submodel') {
                     // TODO determine aasEndpoint
                     const smId = reference?.keys[0].value.trim();
-                    smEndpoint = getSmEndpointByIdFromRepo(smId);
+                    smEndpoint = await getSmEndpointById(smId);
                     referenceKeys = referenceKeys.slice(1);
                 }
 
@@ -194,34 +191,5 @@ export function useReferenceUtils() {
         return failResponse;
     }
 
-    /**
-     * Extracts the ID (Key) from a Reference object based on the given Key Type name.
-     *
-     * @param {Object} reference - The Reference object containing ID/Key information.
-     * @param {string} keyType - The Key Type name.
-     * @returns {string} The ID (Key) of the matching Key Type name if found, otherwise an empty string.
-     */
-    function extractId(reference: any, keyType: string): string {
-        const failResponse = '';
-
-        if (!reference.keys || !Array.isArray(reference.keys) || reference.keys.length === 0 || keyType.trim() === '') {
-            return '';
-        }
-
-        keyType = keyType.trim();
-
-        if (!keyTypes.some((keyTypeOfKeyTypes: any) => keyTypeOfKeyTypes.name === keyType)) {
-            return failResponse;
-        }
-
-        const keys = reference.keys;
-        // find the key based on the key type name
-        const key = keys.find((key: any) => {
-            return key?.type === keyType;
-        });
-
-        return key?.value && key.value.trim() !== '' ? key.value.trim() : failResponse;
-    }
-
-    return { referenceTypes, checkReference, getEndpoints, extractId };
+    return { referenceTypes, checkReference, getEndpoints };
 }
diff --git a/aas-web-ui/src/composables/AAS/SMHandling.ts b/aas-web-ui/src/composables/AAS/SMHandling.ts
index 165c689f..8b6192ba 100644
--- a/aas-web-ui/src/composables/AAS/SMHandling.ts
+++ b/aas-web-ui/src/composables/AAS/SMHandling.ts
@@ -1,29 +1,25 @@
 import { useConceptDescriptionHandling } from '@/composables/AAS/ConceptDescriptionHandling';
-import { useReferenceUtils } from '@/composables/AAS/ReferenceUtils';
-import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
 import { useSMRegistryClient } from '@/composables/Client/SMRegistryClient';
 import { useSMRepositoryClient } from '@/composables/Client/SMRepositoryClient';
 import { useIDUtils } from '@/composables/IDUtils';
+import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
 import { formatDate } from '@/utils/DateUtils';
 
 export function useSMHandling() {
     // Composables
-    const { getSubmodelRefsById: getSubmodelRefsByIdFromRepo } = useAASRepositoryClient();
     const {
         fetchSmDescriptorById: fetchSmDescriptorByIdFromRegistry,
         fetchSmDescriptorList: fetchSmDescriptorListFromRegistry,
-        getSmEndpoint,
         getSmEndpointById: getSmEndpointByIdFromRegistry,
     } = useSMRegistryClient();
     const {
         fetchSm: fetchSmFromRepo,
-        fetchSmById: fetchSmByIdFromRepo,
         getSmEndpointById: getSmEndpointByIdFromRepo,
         fetchSme: fetchSmeFromRepo,
+        smIsAvailable: smIsAvailableInRepo,
     } = useSMRepositoryClient();
     const { fetchCds } = useConceptDescriptionHandling();
     const { generateUUID } = useIDUtils();
-    const { extractId: extractIdFromReference } = useReferenceUtils();
 
     /**
      * Fetches a list of all available Submodel (SM) Descriptors.
@@ -41,7 +37,7 @@ export function useSMHandling() {
 
         smDescriptors = smDescriptors.map((smDescriptor: any) => {
             smDescriptor.timestamp = formatDate(new Date());
-            smDescriptor.path = getSmEndpoint(smDescriptor);
+            smDescriptor.path = extractEndpointHref(smDescriptor, 'Submodel-3.0');
             return smDescriptor;
         });
 
@@ -70,7 +66,7 @@ export function useSMHandling() {
         }
 
         smDescriptor.timestamp = formatDate(new Date());
-        smDescriptor.path = getSmEndpoint(smDescriptor);
+        smDescriptor.path = extractEndpointHref(smDescriptor, 'Submodel-3.0');
 
         return smDescriptor;
     }
@@ -82,14 +78,14 @@ export function useSMHandling() {
      * @param {string} smEndpoint - The endpoint URL of the SM to fetch.
      * @param {boolean} withConceptDescriptions - Flag to specify if SM/SME and its Submodel Elements (SME)
      *                                            should be fetched with ConceptDescriptions (CDs)
-     * @param {boolean} setSmeData - Flag to specify if data (`path`, `timestamp`, ìd`) should be set to
+     * @param {boolean} setDataFlag - Flag to specify if data (`path`, `timestamp`, ìd`) should be set to
      *                               Submodel Elements (SME) of SM/SME object
      * @returns {Promise<any>} A promise that resolves to a SM.
      */
     async function fetchSm(
         smEndpoint: string,
         withConceptDescriptions = false,
-        setSmeData: boolean = false
+        setDataFlag: boolean = false
     ): Promise<any> {
         const failResponse = {};
 
@@ -118,7 +114,7 @@ export function useSMHandling() {
         smOrSme.timestamp = formatDate(new Date());
         smOrSme.path = smEndpoint;
 
-        if (setSmeData) {
+        if (setDataFlag) {
             smOrSme = await setData({ ...smOrSme }, smOrSme.path, withConceptDescriptions, smOrSme.timestamp);
         }
 
@@ -138,14 +134,14 @@ export function useSMHandling() {
      * @param {string} smId - The ID of the SM to fetch.
      * @param {boolean} withConceptDescriptions - Flag to specify if SM and its Submodel Elements (SME)
      *                                            should be fetched with ConceptDescriptions (CDs)
-     * @param {boolean} setSmeData - Flag to specify if data (`path`, `timestamp`, ìd`) should be set to
+     * @param {boolean} setDataFlag - Flag to specify if data (`path`, `timestamp`, ìd`) should be set to
      *                               Submodel Elements (SME) of SM object
      * @returns {Promise<any>} A promise that resolves to a SM.
      */
     async function fetchSmById(
         smId: string,
         withConceptDescriptions = false,
-        setDataRecursive: boolean = false
+        setDataFlag: boolean = false
     ): Promise<any> {
         const failResponse = {};
 
@@ -155,31 +151,22 @@ export function useSMHandling() {
 
         if (smId === '') return failResponse;
 
-        let sm = await fetchSmByIdFromRepo(smId);
+        const smEndpoint = await getSmEndpointById(smId);
 
-        if (!sm || Object.keys(sm).length === 0) {
-            console.warn("Fetching SM (id = '" + smId + "') failed!");
-            return failResponse;
+        if (smEndpoint && smEndpoint.trim() !== '') {
+            return fetchSm(smEndpoint.trim(), withConceptDescriptions, setDataFlag);
         }
 
-        sm.timestamp = formatDate(new Date());
-
-        if (setDataRecursive) {
-            sm = await setData({ ...sm }, sm.path, withConceptDescriptions, sm.timestamp);
-        }
-
-        if (withConceptDescriptions) {
-            sm.conceptDescriptions = await fetchCds(sm);
-        } else {
-            sm.conceptDescriptions = [];
-        }
-
-        return sm;
+        return failResponse;
     }
 
     /**
      * Retrieves the Submodel (Sm) endpoint URL by its ID.
      *
+     * This function attempts to obtain the SM endpoint using two methods: first by querying
+     * the SM registry, and if that fails, it tries to obtain it from the SM repository. If the provided
+     * SM ID is invalid or empty, the function returns an empty string.
+     *
      * @async
      * @param {string} smId - The ID of the SM to retrieve the endpoint for.
      * @returns {Promise<string>} A promise that resolves to an SM endpoint.
@@ -196,52 +183,12 @@ export function useSMHandling() {
         // First try to determine SM endpoint with the help of the registry
         const smEndpoint = await getSmEndpointByIdFromRegistry(smId);
 
-        if (smEndpoint && smEndpoint.trim() !== '') return smEndpoint;
+        if (smEndpoint && smEndpoint.trim() !== '') return smEndpoint.trim();
 
         // Second try to determine SM endpoint with the help of the repo
         return getSmEndpointByIdFromRepo(smId) || failResponse;
     }
 
-    /**
-     * Retrieves a Submodel (SM) of an Asset Administration Shell (AAS) SM descriptor.
-     *
-     * @async
-     * @param {string} aasId - The ID of the AAS to retrieve its SM.
-     * @param {string} semanticId - The semantic ID of the SM.
-     * @returns {string} A promise that resolves to a SM.
-     */
-    async function getSmIdOfAasIdBySemanticId(aasId: string, semanticId: string): Promise<string> {
-        const failResponse = '';
-
-        if (!aasId || !semanticId) return failResponse;
-
-        aasId = aasId.trim();
-        semanticId = semanticId.trim();
-
-        if (aasId === '' || semanticId === '') return failResponse;
-
-        const submodelRefs = await getSubmodelRefsByIdFromRepo(aasId);
-
-        for (const submodelRef of submodelRefs) {
-            const smId = extractIdFromReference(submodelRef, 'Submodel');
-            const smDescriptor = await fetchSmDescriptor(smId);
-            if (
-                smDescriptor &&
-                Object.keys(smDescriptor).length > 0 &&
-                smDescriptor?.semanticId?.keys &&
-                Array.isArray(smDescriptor.semanticId.keys) &&
-                smDescriptor.semanticId.keys.length > 0
-            ) {
-                const semanticIds = smDescriptor.semanticId.keys.map((key: any) => key.value);
-                if (semanticIds.includes(semanticId)) {
-                    return smId;
-                }
-            }
-        }
-
-        return failResponse;
-    }
-
     /**
      * Recursively calculates and sets data of SubmodelElements (SMEs) within a given Submodel (SM) or SubmodelElement (SME).
      * The function modifies the SM/SME object by:
@@ -339,11 +286,25 @@ export function useSMHandling() {
         return smOrSme;
     }
 
+    async function smIsAvailableById(smId: string): Promise<boolean> {
+        const failResponse = false;
+
+        if (!smId) return failResponse;
+
+        smId = smId.trim();
+
+        if (smId === '') return failResponse;
+
+        const aasEndpoint = await getSmEndpointById(smId);
+
+        return await smIsAvailableInRepo(aasEndpoint);
+    }
+
     return {
-        getSmIdOfAasIdBySemanticId,
+        getSmEndpointById,
+        smIsAvailableById,
         fetchSm,
         fetchSmById,
-        getSmEndpointById,
         fetchSmDescriptorList,
         fetchSmDescriptor,
         setData,
diff --git a/aas-web-ui/src/composables/AAS/SubmodelTemplates/ContactInformation_v1_0Utils.ts b/aas-web-ui/src/composables/AAS/SubmodelTemplates/ContactInformation_v1_0Utils.ts
index 077536d9..165c0fa8 100644
--- a/aas-web-ui/src/composables/AAS/SubmodelTemplates/ContactInformation_v1_0Utils.ts
+++ b/aas-web-ui/src/composables/AAS/SubmodelTemplates/ContactInformation_v1_0Utils.ts
@@ -5,11 +5,14 @@ import { useSME } from '@/composables/AAS/SubmodelElements/SubmodelElement';
 import { firstLangStringSetText } from '@/utils/AAS/SubmodelElements/MultiLanguagePropertyUtils';
 import { getCountryName } from '@/utils/LocaleUtils';
 import { firstLetterToLowerCase } from '@/utils/StringUtils';
+import { useAASHandling } from '../AASHandling';
 
 export function useContactInformation_v1_0Utils() {
-    const { getSmIdOfAasIdBySemanticId, fetchSmById } = useSMHandling();
+    const { getSmIdOfAasIdBySemanticId } = useAASHandling();
+    const { fetchSmById } = useSMHandling();
     const { checkIdShort, getSubmodelElementByIdShort } = useReferableUtils();
     const { hasValue, valueToDisplay } = useSME();
+
     const { valueUrl } = useSMEFile();
 
     const semanticId = 'https://admin-shell.io/zvei/nameplate/1/0/ContactInformations';
diff --git a/aas-web-ui/src/composables/AAS/SubmodelTemplates/TechnicalData_v1_2Utils.ts b/aas-web-ui/src/composables/AAS/SubmodelTemplates/TechnicalData_v1_2Utils.ts
index 045c9b3b..77821128 100644
--- a/aas-web-ui/src/composables/AAS/SubmodelTemplates/TechnicalData_v1_2Utils.ts
+++ b/aas-web-ui/src/composables/AAS/SubmodelTemplates/TechnicalData_v1_2Utils.ts
@@ -1,12 +1,14 @@
+import { useReferableUtils } from '@/composables/AAS/ReferableUtils';
 import { useSMEHandling } from '@/composables/AAS/SMEHandling';
 import { useSMHandling } from '@/composables/AAS/SMHandling';
 import { useSMEFile } from '@/composables/AAS/SubmodelElements/File';
 import { checkSemanticId } from '@/utils/AAS/SemanticIdUtils';
-import { useReferableUtils } from '../ReferableUtils';
+import { useAASHandling } from '../AASHandling';
 
 export function useTechnicalData_v1_2Utils() {
     // Composables
-    const { getSmIdOfAasIdBySemanticId, fetchSmById, getSmEndpointById } = useSMHandling();
+    const { getSmIdOfAasIdBySemanticId } = useAASHandling();
+    const { fetchSmById, getSmEndpointById } = useSMHandling();
     const { fetchSme } = useSMEHandling();
     const { checkIdShort } = useReferableUtils();
     const { valueUrl: smeFileValueUrl } = useSMEFile();
diff --git a/aas-web-ui/src/composables/Client/AASDiscoveryClient.ts b/aas-web-ui/src/composables/Client/AASDiscoveryClient.ts
index c9b7de5d..20e440ee 100644
--- a/aas-web-ui/src/composables/Client/AASDiscoveryClient.ts
+++ b/aas-web-ui/src/composables/Client/AASDiscoveryClient.ts
@@ -33,8 +33,8 @@ export function useAASDiscoveryClient() {
 
         if (globalAssetId === '') return failResponse;
 
-        let aasDiscUrl = aasDiscoveryUrl.value;
-        if (aasDiscUrl.trim() === '') return failResponse;
+        let aasDiscUrl = aasDiscoveryUrl.value.trim();
+        if (aasDiscUrl === '') return failResponse;
         if (aasDiscUrl.endsWith('/')) aasDiscUrl = stripLastCharacter(aasDiscUrl);
         if (!aasDiscUrl.endsWith(endpointPath)) aasDiscUrl += endpointPath;
 
diff --git a/aas-web-ui/src/composables/Client/AASRegistryClient.ts b/aas-web-ui/src/composables/Client/AASRegistryClient.ts
index fd2e1847..1b3013b0 100644
--- a/aas-web-ui/src/composables/Client/AASRegistryClient.ts
+++ b/aas-web-ui/src/composables/Client/AASRegistryClient.ts
@@ -30,10 +30,8 @@ export function useAASRegistryClient() {
     async function fetchAasDescriptorList(): Promise<Array<any>> {
         const failResponse = [] as Array<any>;
 
-        if (aasRegistryUrl.value.trim() === '') return failResponse;
-
-        let aasRegUrl = aasRegistryUrl.value;
-        if (aasRegUrl.trim() === '') return failResponse;
+        let aasRegUrl = aasRegistryUrl.value.trim();
+        if (aasRegUrl === '') return failResponse;
         if (aasRegUrl.endsWith('/')) aasRegUrl = stripLastCharacter(aasRegUrl);
         if (!aasRegUrl.endsWith(endpointPath)) aasRegUrl += endpointPath;
 
@@ -72,10 +70,8 @@ export function useAASRegistryClient() {
 
         if (aasId === '') return failResponse;
 
-        if (aasRegistryUrl.value.trim() === '') return failResponse;
-
-        let aasRegUrl = aasRegistryUrl.value;
-        if (aasRegUrl.trim() === '') return failResponse;
+        let aasRegUrl = aasRegistryUrl.value.trim();
+        if (aasRegUrl === '') return failResponse;
         if (aasRegUrl.endsWith('/')) aasRegUrl = stripLastCharacter(aasRegUrl);
         if (!aasRegUrl.endsWith(endpointPath)) aasRegUrl += endpointPath;
 
@@ -119,28 +115,6 @@ export function useAASRegistryClient() {
         return aasEndpoint || failResponse;
     }
 
-    /**
-     * Retrieves the Asset Administration Shell (AAS) endpoint URL of an AAS descriptor.
-     *
-     * @param {string} aasDescriptor - The AAS descriptor to retrieve the endpoint for.
-     * @returns {string} A promise that resolves to an AAS endpoint.
-     */
-    function getAasEndpoint(aasDescriptor: any): string {
-        const failResponse = '';
-
-        if (
-            !aasDescriptor ||
-            Object.keys(aasDescriptor).length === 0 ||
-            !aasDescriptor.id ||
-            aasDescriptor.id.trim() === ''
-        )
-            return failResponse;
-
-        const aasEndpoint = extractEndpointHref(aasDescriptor, 'AAS-3.0');
-
-        return aasEndpoint || failResponse;
-    }
-
     /**
      * Checks if Asset Administration Shell (AAS) Descriptor with provided ID is available (in registry).
      *
@@ -148,7 +122,7 @@ export function useAASRegistryClient() {
      * @param {string} aasId - The ID of the AAS to check.
      * @returns {Promise<boolean>} A promise that resolves to `true` if AAS with provided ID is available, otherwise `false`.
      */
-    async function isAvailableById(aasId: string): Promise<boolean> {
+    async function aasDescriptorIsAvailableById(aasId: string): Promise<boolean> {
         const failResponse = false;
 
         if (!aasId) return failResponse;
@@ -169,10 +143,8 @@ export function useAASRegistryClient() {
     async function postAasDescriptor(aasDescriptor: descriptorTypes.AASDescriptor): Promise<boolean> {
         const failResponse = false;
 
-        if (aasRegistryUrl.value.trim() === '') return failResponse;
-
-        let aasRegUrl = aasRegistryUrl.value;
-        if (aasRegUrl.trim() === '') return failResponse;
+        let aasRegUrl = aasRegistryUrl.value.trim();
+        if (aasRegUrl === '') return failResponse;
         if (aasRegUrl.endsWith('/')) aasRegUrl = stripLastCharacter(aasRegUrl);
         if (!aasRegUrl.endsWith(endpointPath)) aasRegUrl += endpointPath;
 
@@ -191,10 +163,8 @@ export function useAASRegistryClient() {
     async function putAasDescriptor(aasDescriptor: descriptorTypes.AASDescriptor): Promise<boolean> {
         const failResponse = false;
 
-        if (aasRegistryUrl.value.trim() === '') return failResponse;
-
-        let aasRegUrl = aasRegistryUrl.value;
-        if (aasRegUrl.trim() === '') return failResponse;
+        let aasRegUrl = aasRegistryUrl.value.trim();
+        if (aasRegUrl === '') return failResponse;
         if (aasRegUrl.endsWith('/')) aasRegUrl = stripLastCharacter(aasRegUrl);
         if (!aasRegUrl.endsWith(endpointPath)) aasRegUrl += endpointPath;
 
@@ -234,11 +204,10 @@ export function useAASRegistryClient() {
 
     return {
         endpointPath,
-        getAasEndpoint,
         getAasEndpointById,
         fetchAasDescriptorList,
         fetchAasDescriptorById,
-        isAvailableById,
+        aasDescriptorIsAvailableById,
         putAasDescriptor,
         postAasDescriptor,
         createDescriptorFromAAS,
diff --git a/aas-web-ui/src/composables/Client/AASRepositoryClient.ts b/aas-web-ui/src/composables/Client/AASRepositoryClient.ts
index 68218cac..a580d230 100644
--- a/aas-web-ui/src/composables/Client/AASRepositoryClient.ts
+++ b/aas-web-ui/src/composables/Client/AASRepositoryClient.ts
@@ -1,11 +1,9 @@
 import { types as aasTypes } from '@aas-core-works/aas-core3.0-typescript';
 import { jsonization } from '@aas-core-works/aas-core3.0-typescript';
 import { computed } from 'vue';
-import { useAASRegistryClient } from '@/composables/Client/AASRegistryClient';
 import { useIDUtils } from '@/composables/IDUtils';
 import { useRequestHandling } from '@/composables/RequestHandling';
 import { useNavigationStore } from '@/store/NavigationStore';
-import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
 import { base64Encode } from '@/utils/EncodeDecodeUtils';
 import { downloadFile } from '@/utils/generalUtils';
 import { stripLastCharacter } from '@/utils/StringUtils';
@@ -16,7 +14,6 @@ export function useAASRepositoryClient() {
 
     // Composables
     const { getRequest, postRequest, putRequest, deleteRequest } = useRequestHandling();
-    const { fetchAasDescriptorById, isAvailableById: isAvailableByIdInRegistry } = useAASRegistryClient();
     const { generateUUIDFromString } = useIDUtils();
 
     const endpointPath = '/shells';
@@ -24,10 +21,8 @@ export function useAASRepositoryClient() {
     // Computed Properties
     const aasRepositoryUrl = computed(() => navigationStore.getAASRepoURL);
     const uploadURL = computed(() => {
-        if (aasRepositoryUrl.value.trim() === '') return '';
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return '';
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return '';
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
 
         // remove '/shells' AAS Repository URL and add '/upload' to construct the upload URL
@@ -39,16 +34,14 @@ export function useAASRepositoryClient() {
      * Fetches a list of all available Asset Administration Shells (AAS).
      *
      * @async
-     * @returns {Promise<Array<any>>} A promise that resolves to an array of Asset Administration Shells.
+     * @returns {Promise<Array<any>>} A promise that resolves to an array of AAS.
      * An empty array is returned if the request fails or no AAS are found.
      */
     async function fetchAasList(): Promise<Array<any>> {
         const failResponse = [] as Array<any>;
 
-        if (aasRepositoryUrl.value.trim() === '') return failResponse;
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return failResponse;
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return failResponse;
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
         if (!aasRepoUrl.endsWith(endpointPath)) aasRepoUrl += endpointPath;
 
@@ -83,16 +76,9 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return failResponse;
 
-        const aasDescriptor = await fetchAasDescriptorById(aasId);
+        const aasEndpoint = getAasEndpointById(aasId);
 
-        if (aasDescriptor && Object.keys(aasDescriptor).length > 0) {
-            // AAS Descriptor found in registry
-            const aasEndpoint = extractEndpointHref(aasDescriptor, 'AAS-3.0');
-            return fetchAas(aasEndpoint);
-        } else if (!aasDescriptor || Object.keys(aasDescriptor).length === 0) {
-            const aasEndpoint = getAasEndpointById(aasId);
-            return fetchAas(aasEndpoint);
-        }
+        if (aasEndpoint && aasEndpoint.trim() !== '') return fetchAas(aasEndpoint.trim());
 
         return failResponse;
     }
@@ -134,37 +120,13 @@ export function useAASRepositoryClient() {
     }
 
     /**
-     * Checks if Asset Administration Shell (AAS) with provided ID is available (in registry or repository).
-     *
-     * @async
-     * @param {string} aasId - The ID of the AAS to check.
-     * @returns {Promise<boolean>} A promise that resolves to `true` if AAS with provided ID is available, otherwise `false`.
-     */
-    async function isAvailableById(aasId: string): Promise<boolean> {
-        const failResponse = false;
-
-        if (!aasId) return failResponse;
-
-        aasId = aasId.trim();
-
-        if (aasId === '') return failResponse;
-
-        // First check the registry
-        if (await isAvailableByIdInRegistry(aasId)) return true;
-        // Second check the repository (e.g. if registry is no available)
-        if (await isAvailableByIdInRepo(aasId)) return true;
-
-        return failResponse;
-    }
-
-    /**
-     * Checks if Asset Administration Shell with provided ID is available (in repository)
+     * Checks if Asset Administration Shell with provided ID is available
      *
      * @async
      * @param {string} aasId - The ID of the AAS to check.
      * @returns {Promise<boolean>} A promise that resolves to `true` if AAS with provided ID is available, otherwise `false`.
      */
-    async function isAvailableByIdInRepo(aasId: string): Promise<boolean> {
+    async function aasIsAvailableById(aasId: string): Promise<boolean> {
         const failResponse = false;
 
         if (!aasId) return failResponse;
@@ -173,21 +135,21 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return failResponse;
 
-        const aas = await fetchAasById(aasId);
+        const aasEndpoint = getAasEndpointById(aasId);
 
-        if (aas && Object.keys(aas).length > 0) return true;
+        if (aasEndpoint && aasEndpoint.trim() !== '') return await aasIsAvailable(aasEndpoint.trim());
 
         return failResponse;
     }
 
     /**
-     * Checks if Asset Administration Shell (AAS) is available (in repository) by the provided AAS endpoint
+     * Checks if Asset Administration Shell (AAS) is available for provided AAS endpoint
      *
      * @async
      * @param {string} aasEndpoint - The endpoint URL of the AAS to check.
      * @returns {Promise<boolean>} A promise that resolves to `true` if AAS with provided ID is available, otherwise `false`.
      */
-    async function isAvailable(aasEndpoint: string): Promise<boolean> {
+    async function aasIsAvailable(aasEndpoint: string): Promise<boolean> {
         const failResponse = false;
 
         if (!aasEndpoint) return failResponse;
@@ -214,6 +176,8 @@ export function useAASRepositoryClient() {
     /**
      * Retrieves the Asset Administration Shell (AAS) endpoint URL by its ID.
      *
+     * Just concats SM repository URL (from the store) with the Base64UrlEncoded provided AAS ID.
+     *
      * @param {string} aasId - The ID of the AAS to retrieve the endpoint for.
      * @returns {string} The AAS endpoint.
      */
@@ -226,10 +190,8 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return failResponse;
 
-        if (aasRepositoryUrl.value.trim() === '') return failResponse;
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return failResponse;
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return failResponse;
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
         if (!aasRepoUrl.endsWith(endpointPath)) aasRepoUrl += endpointPath;
 
@@ -254,13 +216,11 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return failResponse;
 
-        const aasDescriptor = await fetchAasDescriptorById(aasId);
+        const aasEndpoint = getAasEndpointById(aasId);
 
-        if (!aasDescriptor || Object.keys(aasDescriptor).length === 0) return failResponse;
+        if (aasEndpoint && aasEndpoint.trim() !== '') fetchAssetInformation(aasEndpoint.trim());
 
-        const aasEndpoint = extractEndpointHref(aasDescriptor, 'AAS-3.0');
-
-        return fetchAssetInformation(aasEndpoint) || failResponse;
+        return failResponse;
     }
 
     /**
@@ -324,10 +284,8 @@ export function useAASRepositoryClient() {
     async function postAas(aas: aasTypes.AssetAdministrationShell): Promise<boolean> {
         const failResponse = false;
 
-        if (aasRepositoryUrl.value.trim() === '') return failResponse;
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return failResponse;
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return failResponse;
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
         if (!aasRepoUrl.endsWith(endpointPath)) aasRepoUrl += endpointPath;
 
@@ -349,10 +307,8 @@ export function useAASRepositoryClient() {
     async function putAas(aas: aasTypes.AssetAdministrationShell): Promise<boolean> {
         const failResponse = false;
 
-        if (aasRepositoryUrl.value.trim() === '') return failResponse;
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return failResponse;
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return failResponse;
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
         if (!aasRepoUrl.endsWith(endpointPath)) aasRepoUrl += endpointPath;
 
@@ -379,10 +335,8 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return failResponse;
 
-        if (aasRepositoryUrl.value.trim() === '') return failResponse;
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return failResponse;
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return failResponse;
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
         if (!aasRepoUrl.endsWith(endpointPath)) aasRepoUrl += endpointPath;
 
@@ -411,12 +365,11 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return failResponse;
 
-        const aasDescriptor = await fetchAasDescriptorById(aasId);
+        const aasEndpoint = getAasEndpointById(aasId);
 
-        if (!aasDescriptor || Object.keys(aasDescriptor).length === 0) return failResponse;
+        if (aasEndpoint && aasEndpoint.trim() !== '') return getSubmodelRefs(aasEndpoint.trim());
 
-        const aasEndpoint = extractEndpointHref(aasDescriptor, 'AAS-3.0');
-        return getSubmodelRefs(aasEndpoint) || failResponse;
+        return failResponse;
     }
 
     async function getSubmodelRefs(aasEndpoint: string): Promise<Array<any>> {
@@ -454,7 +407,7 @@ export function useAASRepositoryClient() {
     async function deleteSubmodelRef(aasPath: string, submodelId: string): Promise<void> {
         if (aasPath.trim() === '' || submodelId.trim() === '') return;
 
-        const path = aasPath + '/submodel-refs/' + base64Encode(submodelId);
+        const path = aasPath.trim() + '/submodel-refs/' + base64Encode(submodelId.trim());
         const context = 'deleting Submodel Reference';
         const disableMessage = false;
         await deleteRequest(path, context, disableMessage);
@@ -471,10 +424,8 @@ export function useAASRepositoryClient() {
 
         if (aasId === '') return;
 
-        if (aasRepositoryUrl.value.trim() === '') return;
-
-        let aasRepoUrl = aasRepositoryUrl.value;
-        if (aasRepoUrl.trim() === '') return;
+        let aasRepoUrl = aasRepositoryUrl.value.trim();
+        if (aasRepoUrl === '') return;
         if (aasRepoUrl.endsWith('/')) aasRepoUrl = stripLastCharacter(aasRepoUrl);
 
         const submodelRefList = await getSubmodelRefsById(aasId);
@@ -509,7 +460,8 @@ export function useAASRepositoryClient() {
                 const aasIdShort = aas?.idShort;
 
                 const filename =
-                    (aasIdShort && aasIdShort.trim() !== '' ? aasIdShort : generateUUIDFromString(aas.id)) + '.aasx';
+                    (aasIdShort && aasIdShort.trim() !== '' ? aasIdShort.trim() : generateUUIDFromString(aas.id)) +
+                    '.aasx';
 
                 downloadFile(filename, aasSerialization);
             }
@@ -549,9 +501,8 @@ export function useAASRepositoryClient() {
         fetchAasList,
         fetchAasById,
         fetchAas,
-        isAvailableById,
-        isAvailableByIdInRepo,
-        isAvailable,
+        aasIsAvailableById,
+        aasIsAvailable,
         getAasEndpointById,
         fetchAssetInformation,
         fetchAssetInformationById,
diff --git a/aas-web-ui/src/composables/Client/SMRegistryClient.ts b/aas-web-ui/src/composables/Client/SMRegistryClient.ts
index 6863e66a..11a317f1 100644
--- a/aas-web-ui/src/composables/Client/SMRegistryClient.ts
+++ b/aas-web-ui/src/composables/Client/SMRegistryClient.ts
@@ -30,10 +30,8 @@ export function useSMRegistryClient() {
     async function fetchSmDescriptorList(): Promise<Array<any>> {
         const failResponse = [] as Array<any>;
 
-        if (submodelRegistryUrl.value.trim() === '') return failResponse;
-
-        let smRegistryUrl = submodelRegistryUrl.value;
-        if (smRegistryUrl.trim() === '') return failResponse;
+        let smRegistryUrl = submodelRegistryUrl.value.trim();
+        if (smRegistryUrl === '') return failResponse;
         if (smRegistryUrl.endsWith('/')) smRegistryUrl = stripLastCharacter(smRegistryUrl);
         if (!smRegistryUrl.endsWith(endpointPath)) smRegistryUrl += endpointPath;
 
@@ -71,10 +69,8 @@ export function useSMRegistryClient() {
 
         if (smId === '') return failResponse;
 
-        if (submodelRegistryUrl.value.trim() === '') return failResponse;
-
-        let smRegistryUrl = submodelRegistryUrl.value;
-        if (smRegistryUrl.trim() === '') return failResponse;
+        let smRegistryUrl = submodelRegistryUrl.value.trim();
+        if (smRegistryUrl === '') return failResponse;
         if (smRegistryUrl.endsWith('/')) smRegistryUrl = stripLastCharacter(smRegistryUrl);
         if (!smRegistryUrl.endsWith(endpointPath)) smRegistryUrl += endpointPath;
 
@@ -118,28 +114,6 @@ export function useSMRegistryClient() {
         return aasEndpoint || failResponse;
     }
 
-    /**
-     * Retrieves the Submodel (SM) endpoint URL of an SM descriptor.
-     *
-     * @param {string} smDescriptor - The SM descriptor to retrieve the endpoint for.
-     * @returns {string} A promise that resolves to an SM endpoint.
-     */
-    function getSmEndpoint(smDescriptor: any): string {
-        const failResponse = '';
-
-        if (
-            !smDescriptor ||
-            Object.keys(smDescriptor).length === 0 ||
-            !smDescriptor.id ||
-            smDescriptor.id.trim() === ''
-        )
-            return failResponse;
-
-        const smEndpoint = extractEndpointHref(smDescriptor, 'Submodel-3.0');
-
-        return smEndpoint || failResponse;
-    }
-
     /**
      * Checks if Submodel (SM) Descriptor with provided ID is available (in registry).
      *
@@ -168,10 +142,8 @@ export function useSMRegistryClient() {
     async function postSubmodelDescriptor(submodelDescriptor: descriptorTypes.SubmodelDescriptor): Promise<boolean> {
         const failResponse = false;
 
-        if (submodelRegistryUrl.value.trim() === '') return failResponse;
-
-        let smRegistryUrl = submodelRegistryUrl.value;
-        if (smRegistryUrl.trim() === '') return failResponse;
+        let smRegistryUrl = submodelRegistryUrl.value.trim();
+        if (smRegistryUrl === '') return failResponse;
         if (smRegistryUrl.endsWith('/')) smRegistryUrl = stripLastCharacter(smRegistryUrl);
         if (!smRegistryUrl.endsWith(endpointPath)) smRegistryUrl += endpointPath;
 
@@ -190,10 +162,8 @@ export function useSMRegistryClient() {
     async function putSubmodelDescriptor(submodelDescriptor: descriptorTypes.SubmodelDescriptor): Promise<boolean> {
         const failResponse = false;
 
-        if (submodelRegistryUrl.value.trim() === '') return failResponse;
-
-        let smRegistryUrl = submodelRegistryUrl.value;
-        if (smRegistryUrl.trim() === '') return failResponse;
+        let smRegistryUrl = submodelRegistryUrl.value.trim();
+        if (smRegistryUrl === '') return failResponse;
         if (smRegistryUrl.endsWith('/')) smRegistryUrl = stripLastCharacter(smRegistryUrl);
         if (!smRegistryUrl.endsWith(endpointPath)) smRegistryUrl += endpointPath;
 
@@ -230,7 +200,6 @@ export function useSMRegistryClient() {
 
     return {
         endpointPath,
-        getSmEndpoint,
         getSmEndpointById,
         fetchSmDescriptorList,
         fetchSmDescriptorById,
diff --git a/aas-web-ui/src/composables/Client/SMRepositoryClient.ts b/aas-web-ui/src/composables/Client/SMRepositoryClient.ts
index ed903ad3..ff2db4be 100644
--- a/aas-web-ui/src/composables/Client/SMRepositoryClient.ts
+++ b/aas-web-ui/src/composables/Client/SMRepositoryClient.ts
@@ -1,10 +1,8 @@
 import { types as aasTypes } from '@aas-core-works/aas-core3.0-typescript';
 import { jsonization } from '@aas-core-works/aas-core3.0-typescript';
 import { computed } from 'vue';
-import { useSMRegistryClient } from '@/composables/Client/SMRegistryClient';
 import { useRequestHandling } from '@/composables/RequestHandling';
 import { useNavigationStore } from '@/store/NavigationStore';
-import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
 import { base64Encode } from '@/utils/EncodeDecodeUtils';
 import { stripLastCharacter } from '@/utils/StringUtils';
 
@@ -14,7 +12,6 @@ export function useSMRepositoryClient() {
 
     // Composables
     const { getRequest, postRequest, putRequest, deleteRequest } = useRequestHandling();
-    const { fetchSmDescriptorById, isAvailableById: isAvailableByIdInRegistry } = useSMRegistryClient();
 
     const endpointPath = '/submodels';
 
@@ -31,10 +28,8 @@ export function useSMRepositoryClient() {
     async function fetchSmList(): Promise<Array<any>> {
         const failResponse = [] as Array<any>;
 
-        if (submodelRepoUrl.value.trim() === '') return failResponse;
-
-        let smRepoUrl = submodelRepoUrl.value;
-        if (smRepoUrl.trim() === '') return failResponse;
+        let smRepoUrl = submodelRepoUrl.value.trim();
+        if (smRepoUrl === '') return failResponse;
         if (smRepoUrl.endsWith('/')) smRepoUrl = stripLastCharacter(smRepoUrl);
         if (!smRepoUrl.endsWith(endpointPath)) smRepoUrl += endpointPath;
 
@@ -69,18 +64,9 @@ export function useSMRepositoryClient() {
 
         if (smId === '') return failResponse;
 
-        const smDescriptor = await fetchSmDescriptorById(smId);
-
-        if (smDescriptor && Object.keys(smDescriptor).length > 0) {
-            // SM Descriptor found in registry
-            const smEndpoint = extractEndpointHref(smDescriptor, 'SUBMODEL-3.0');
-            const sm = await fetchSm(smEndpoint);
-            sm.path = smEndpoint;
-            return sm;
-        } else if (!smDescriptor || Object.keys(smDescriptor).length === 0) {
-            const smEndpoint = getSmEndpointById(smId);
-            return fetchSm(smEndpoint);
-        }
+        const smEndpoint = getSmEndpointById(smId);
+
+        if (smEndpoint && smEndpoint.trim() !== '') return fetchSm(smEndpoint.trim());
 
         return failResponse;
     }
@@ -163,30 +149,6 @@ export function useSMRepositoryClient() {
         return failResponse;
     }
 
-    /**
-     * Checks if Submodel with provided ID is available (in registry or repository).
-     *
-     * @async
-     * @param {string} smId - The ID of the SM to check.
-     * @returns {Promise<boolean>} A promise that resolves to `true` if SM with provided ID is available, otherwise `false`.
-     */
-    async function isAvailableById(smId: string): Promise<boolean> {
-        const failResponse = false;
-
-        if (!smId) return failResponse;
-
-        smId = smId.trim();
-
-        if (smId === '') return failResponse;
-
-        // First check the registry
-        if (await isAvailableByIdInRegistry(smId)) return true;
-        // Second check the repository (e.g. if registry is no available)
-        if (await isAvailableByIdInRepo(smId)) return true;
-
-        return failResponse;
-    }
-
     /**
      * Checks if Submodel with provided ID is available (in repository)
      *
@@ -194,7 +156,7 @@ export function useSMRepositoryClient() {
      * @param {string} smId - The ID of the SM to check.
      * @returns {Promise<boolean>} A promise that resolves to `true` if SM with provided ID is available, otherwise `false`.
      */
-    async function isAvailableByIdInRepo(smId: string): Promise<boolean> {
+    async function smIsAvailableById(smId: string): Promise<boolean> {
         const failResponse = false;
 
         if (!smId) return failResponse;
@@ -203,21 +165,21 @@ export function useSMRepositoryClient() {
 
         if (smId === '') return failResponse;
 
-        const sm = await fetchSmById(smId);
+        const smEndpoint = getSmEndpointById(smId);
 
-        if (sm && Object.keys(sm).length > 0) return true;
+        if (smEndpoint && smEndpoint.trim() !== '') return await smIsAvailable(smEndpoint.trim());
 
         return failResponse;
     }
 
     /**
-     * Checks if Submodel (SM) is available (in repository) by the provided SM endpoint
+     * Checks if Submodel (SM) is available for provided SM endpoint
      *
      * @async
      * @param {string} smEndpopint - The endpoint URL of the SM to check.
-     * @returns {Promise<boolean>} A promise that resolves to `true` if SM with provided ID is available, otherwise `false`.
+     * @returns {Promise<boolean>} A promise that resolves to `true` if SM with provided endpoint is available, otherwise `false`.
      */
-    async function isAvailable(smEndpopint: string): Promise<boolean> {
+    async function smIsAvailable(smEndpopint: string): Promise<boolean> {
         const failResponse = false;
 
         if (!smEndpopint) return failResponse;
@@ -242,9 +204,22 @@ export function useSMRepositoryClient() {
         return failResponse;
     }
 
+    /**
+     * Checks if Submodel Element (SME) is available for provided SME path
+     *
+     * @async
+     * @param {string} smePath - The path of the SME to check.
+     * @returns {Promise<boolean>} A promise that resolves to `true` if SME with provided path is available, otherwise `false`.
+     */
+    async function smeIsAvailable(smePath: string): Promise<boolean> {
+        return smIsAvailable(smePath);
+    }
+
     /**
      * Retrieves the Submodel (SM) endpoint URL by its ID.
      *
+     * Just concats SM repository URL (from the store) with the Base64UrlEncoded provided SM ID.
+     *
      * @param {string} smId - The ID of the SM to retrieve the endpoint for.
      * @returns {string} The SM endpoint.
      */
@@ -257,11 +232,8 @@ export function useSMRepositoryClient() {
 
         if (smId === '') return failResponse;
 
-        // AAS Descriptor not found in registry or registry not available
-        if (submodelRepoUrl.value.trim() === '') return failResponse;
-
-        let smRepoUrl = submodelRepoUrl.value;
-        if (smRepoUrl.trim() === '') return failResponse;
+        let smRepoUrl = submodelRepoUrl.value.trim();
+        if (smRepoUrl === '') return failResponse;
         if (smRepoUrl.endsWith('/')) smRepoUrl = stripLastCharacter(smRepoUrl);
         if (!smRepoUrl.endsWith(endpointPath)) smRepoUrl += endpointPath;
 
@@ -273,10 +245,8 @@ export function useSMRepositoryClient() {
     async function postSubmodel(submodel: aasTypes.Submodel): Promise<boolean> {
         const failResponse = false;
 
-        if (submodelRepoUrl.value.trim() === '') return failResponse;
-
-        let smRepoUrl = submodelRepoUrl.value;
-        if (smRepoUrl.trim() === '') return failResponse;
+        let smRepoUrl = submodelRepoUrl.value.trim();
+        if (smRepoUrl === '') return failResponse;
         if (smRepoUrl.endsWith('/')) smRepoUrl = stripLastCharacter(smRepoUrl);
         if (!smRepoUrl.endsWith(endpointPath)) smRepoUrl += endpointPath;
 
@@ -298,10 +268,8 @@ export function useSMRepositoryClient() {
     async function putSubmodel(submodel: aasTypes.Submodel): Promise<boolean> {
         const failResponse = false;
 
-        if (submodelRepoUrl.value.trim() === '') return failResponse;
-
-        let smRepoUrl = submodelRepoUrl.value;
-        if (smRepoUrl.trim() === '') return failResponse;
+        let smRepoUrl = submodelRepoUrl.value.trim();
+        if (smRepoUrl === '') return failResponse;
         if (smRepoUrl.endsWith('/')) smRepoUrl = stripLastCharacter(smRepoUrl);
         if (!smRepoUrl.endsWith(endpointPath)) smRepoUrl += endpointPath;
 
@@ -323,10 +291,8 @@ export function useSMRepositoryClient() {
     async function deleteSubmodel(submodelId: string): Promise<boolean> {
         const failResponse = false;
 
-        if (submodelRepoUrl.value.trim() === '') return failResponse;
-
         let smRepoUrl = submodelRepoUrl.value;
-        if (smRepoUrl.trim() === '') return failResponse;
+        if (smRepoUrl === '') return failResponse;
         if (smRepoUrl.endsWith('/')) smRepoUrl = stripLastCharacter(smRepoUrl);
         if (!smRepoUrl.endsWith(endpointPath)) smRepoUrl += endpointPath;
 
@@ -391,9 +357,9 @@ export function useSMRepositoryClient() {
         fetchSmById,
         fetchSm,
         fetchSme,
-        isAvailableById,
-        isAvailableByIdInRepo,
-        isAvailable,
+        smIsAvailableById,
+        smIsAvailable,
+        smeIsAvailable,
         getSmEndpointById,
         postSubmodel,
         putSubmodel,
diff --git a/aas-web-ui/src/composables/JumpHandling.ts b/aas-web-ui/src/composables/JumpHandling.ts
index d5006a12..79768139 100644
--- a/aas-web-ui/src/composables/JumpHandling.ts
+++ b/aas-web-ui/src/composables/JumpHandling.ts
@@ -1,9 +1,11 @@
 import { useRouter } from 'vue-router';
-import { useReferenceUtils } from '@/composables//AAS/ReferenceUtils';
+import { useAASHandling } from '@/composables/AAS/AASHandling';
+import { useReferenceComposable } from '@/composables/AAS/ReferenceComposable';
+import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
 import { useNavigationStore } from '@/store/NavigationStore';
-import { useAASRegistryClient } from './Client/AASRegistryClient';
-import { useAASRepositoryClient } from './Client/AASRepositoryClient';
-import { useSMRepositoryClient } from './Client/SMRepositoryClient';
+import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
+import { extractId as extractIdFromReference } from '@/utils/AAS/ReferenceUtil';
+import { useSMHandling } from './AAS/SMHandling';
 
 export function useJumpHandling() {
     // Stores
@@ -13,10 +15,10 @@ export function useJumpHandling() {
     const router = useRouter();
 
     // Composables
-    const { getAasEndpoint } = useAASRegistryClient();
-    const { getAasEndpointById: getAasEndpointByIdFromRepo, fetchAasList } = useAASRepositoryClient();
-    const { fetchSm } = useSMRepositoryClient();
-    const { referenceTypes, checkReference, getEndpoints, extractId } = useReferenceUtils();
+    const { fetchAasList } = useAASRepositoryClient();
+    const { fetchSm } = useSMHandling();
+    const { getAasEndpointById } = useAASHandling();
+    const { referenceTypes, checkReference, getEndpoints } = useReferenceComposable();
 
     async function jumpToReference(reference: any): Promise<void> {
         if (await checkReference(reference)) {
@@ -35,7 +37,7 @@ export function useJumpHandling() {
                         const aasList = await fetchAasList();
                         if (aasList && Array.isArray(aasList) && aasList.length > 0) {
                             for (const aas of aasList) {
-                                const aasEndpoint = getAasEndpointByIdFromRepo(aas.id);
+                                const aasEndpoint = await getAasEndpointById(aas.id);
                                 const submodelRefs = aas.submodels;
                                 if (
                                     aasEndpoint.trim() !== '' &&
@@ -44,7 +46,7 @@ export function useJumpHandling() {
                                     submodelRefs.length > 0
                                 ) {
                                     for (const submodelRef of submodelRefs) {
-                                        if (smId === extractId(submodelRef, 'Submodel')) {
+                                        if (smId === extractIdFromReference(submodelRef, 'Submodel')) {
                                             jumpToAas(aasEndpoint, smePath);
                                             return;
                                         }
@@ -83,7 +85,7 @@ export function useJumpHandling() {
 
         if (aasId === '') return;
 
-        const aasEndpoint = getAasEndpointByIdFromRepo(aasId);
+        const aasEndpoint = await getAasEndpointById(aasId);
 
         jumpToAas(aasEndpoint);
     }
@@ -101,7 +103,7 @@ export function useJumpHandling() {
     async function jumpToAasByAasDescriptor(aasDescriptor: any): Promise<void> {
         if (!aasDescriptor || Object.keys(aasDescriptor).length === 0) return;
 
-        const aasEndpoint = getAasEndpoint(aasDescriptor);
+        const aasEndpoint = extractEndpointHref(aasDescriptor, 'AAS-3.0');
 
         jumpToAas(aasEndpoint);
     }
diff --git a/aas-web-ui/src/utils/AAS/ReferenceUtil.ts b/aas-web-ui/src/utils/AAS/ReferenceUtil.ts
new file mode 100644
index 00000000..6733bef0
--- /dev/null
+++ b/aas-web-ui/src/utils/AAS/ReferenceUtil.ts
@@ -0,0 +1,29 @@
+import { keyTypes } from '@/utils/AAS/KeyTypesUtil';
+/**
+ * Extracts the ID (Key) from a Reference object based on the given Key Type name.
+ *
+ * @param {Object} reference - The Reference object containing ID/Key information.
+ * @param {string} keyType - The Key Type name.
+ * @returns {string} The ID (Key) of the matching Key Type name if found, otherwise an empty string.
+ */
+export function extractId(reference: any, keyType: string): string {
+    const failResponse = '';
+
+    if (!reference.keys || !Array.isArray(reference.keys) || reference.keys.length === 0 || keyType.trim() === '') {
+        return '';
+    }
+
+    keyType = keyType.trim();
+
+    if (!keyTypes.some((keyTypeOfKeyTypes: any) => keyTypeOfKeyTypes.name === keyType)) {
+        return failResponse;
+    }
+
+    const keys = reference.keys;
+    // find the key based on the key type name
+    const key = keys.find((key: any) => {
+        return key?.type === keyType;
+    });
+
+    return key?.value && key.value.trim() !== '' ? key.value.trim() : failResponse;
+}

From d43858e1907fac26b90ef3631e4aa56aee4bce2e Mon Sep 17 00:00:00 2001
From: Sebastian Eicke <sebastian.eicke@HARTING.com>
Date: Wed, 19 Feb 2025 10:23:51 +0100
Subject: [PATCH 2/6] Improves watchers

---
 .../src/components/AppNavigation/AASListDetails.vue      | 8 ++++----
 aas-web-ui/src/components/ComponentVisualization.vue     | 9 +++------
 aas-web-ui/src/components/SubmodelList.vue               | 2 --
 aas-web-ui/src/components/SubmodelTree.vue               | 2 --
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/aas-web-ui/src/components/AppNavigation/AASListDetails.vue b/aas-web-ui/src/components/AppNavigation/AASListDetails.vue
index 06debc2b..0d43c230 100644
--- a/aas-web-ui/src/components/AppNavigation/AASListDetails.vue
+++ b/aas-web-ui/src/components/AppNavigation/AASListDetails.vue
@@ -188,14 +188,14 @@
     watch(
         () => aasRegistryURL.value,
         async () => {
-            await initializeView();
+            initializeView();
         }
     );
 
     watch(
         () => aasRepoURL.value,
         async () => {
-            await initializeView();
+            initializeView();
         }
     );
 
@@ -224,7 +224,7 @@
                 }
             }
 
-            await initializeView();
+            initializeView();
         },
         { deep: true }
     );
@@ -291,7 +291,7 @@
             }, statusCheck.value.interval);
         }
 
-        await initializeView(true);
+        initializeView(true);
     });
 
     onBeforeUnmount(() => {
diff --git a/aas-web-ui/src/components/ComponentVisualization.vue b/aas-web-ui/src/components/ComponentVisualization.vue
index 27c2eb4b..4728d3d3 100644
--- a/aas-web-ui/src/components/ComponentVisualization.vue
+++ b/aas-web-ui/src/components/ComponentVisualization.vue
@@ -129,7 +129,7 @@
 
     // Computed Properties
     const aasRegistryURL = computed(() => navigationStore.getAASRegistryURL);
-    const submodelRegistryServerURL = computed(() => navigationStore.getSubmodelRegistryURL);
+    const submodelRegistryURL = computed(() => navigationStore.getSubmodelRegistryURL);
     const selectedAAS = computed(() => aasStore.getSelectedAAS);
     const selectedNode = computed(() => aasStore.getSelectedNode);
     const isMobile = computed(() => navigationStore.getIsMobile);
@@ -202,23 +202,20 @@
     );
 
     watch(
-        () => submodelRegistryServerURL.value,
+        () => submodelRegistryURL.value,
         () => {
             resetLocalData();
         }
     );
 
-    // Resets the SubmodelElementView when the AAS changes
     watch(
         () => selectedAAS.value,
         () => {
             resetLocalData();
             initialize();
-        },
-        { deep: true }
+        }
     );
 
-    // Watch for changes in the selected Node and (re-)initialize the Component
     watch(
         () => selectedNode.value,
         () => {
diff --git a/aas-web-ui/src/components/SubmodelList.vue b/aas-web-ui/src/components/SubmodelList.vue
index f35cfd4c..17f9952a 100644
--- a/aas-web-ui/src/components/SubmodelList.vue
+++ b/aas-web-ui/src/components/SubmodelList.vue
@@ -143,7 +143,6 @@
     watch(
         () => aasRegistryURL.value,
         () => {
-            // Resets the Submodel List when the AAS Registry changes
             submodelList.value = [];
         }
     );
@@ -151,7 +150,6 @@
     watch(
         () => submodelRegistryURL.value,
         () => {
-            // Resets the Submodel List when the Submodel Registry changes
             submodelList.value = [];
         }
     );
diff --git a/aas-web-ui/src/components/SubmodelTree.vue b/aas-web-ui/src/components/SubmodelTree.vue
index 2ae76e79..9204fa8f 100644
--- a/aas-web-ui/src/components/SubmodelTree.vue
+++ b/aas-web-ui/src/components/SubmodelTree.vue
@@ -201,7 +201,6 @@
     watch(
         () => aasRegistryURL.value,
         () => {
-            // Resets the Submodel Tree when the AAS Registry changes
             submodelTree.value = [];
         }
     );
@@ -209,7 +208,6 @@
     watch(
         () => submodelRegistryURL.value,
         () => {
-            // Resets the Submodel Tree when the Submodel Registry changes
             submodelTree.value = [];
         }
     );

From c831115f8f1491319417cba71915cec292008df9 Mon Sep 17 00:00:00 2001
From: Sebastian Eicke <sebastian.eicke@HARTING.com>
Date: Tue, 25 Feb 2025 11:12:10 +0100
Subject: [PATCH 3/6] Ruggedizes extractEndpointHref()

---
 aas-web-ui/src/utils/AAS/DescriptorUtils.ts | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/aas-web-ui/src/utils/AAS/DescriptorUtils.ts b/aas-web-ui/src/utils/AAS/DescriptorUtils.ts
index ebb59929..2f53faa8 100644
--- a/aas-web-ui/src/utils/AAS/DescriptorUtils.ts
+++ b/aas-web-ui/src/utils/AAS/DescriptorUtils.ts
@@ -6,6 +6,8 @@
  * @returns {string} The href of the matching endpoint's protocol information if found, otherwise an empty string.
  */
 export function extractEndpointHref(descriptor: any, interfaceShortName: string): string {
+    const failResponse = '';
+
     const interfaceShortNames = [
         'AAS',
         'SUBMODEL',
@@ -19,16 +21,26 @@ export function extractEndpointHref(descriptor: any, interfaceShortName: string)
         'CD-REPOSITORY',
         'AAS-DISCOVERY',
     ];
-    if (!interfaceShortNames.some((iShortName) => interfaceShortName.startsWith(`${iShortName}-`))) {
-        return '';
+
+    if (!interfaceShortName || interfaceShortName.trim() === '') return failResponse;
+
+    interfaceShortName = interfaceShortName.trim();
+    interfaceShortName = interfaceShortName.toUpperCase();
+
+    if (!interfaceShortNames.some((iShortName: string) => interfaceShortName.startsWith(`${iShortName}-`))) {
+        return failResponse;
     }
-    if (!Array.isArray(descriptor?.endpoints) || descriptor?.endpoints.length === 0 || interfaceShortName === '') {
-        return '';
+
+    if (!descriptor.endpoints || !Array.isArray(descriptor.endpoints) || descriptor.endpoints.length === 0) {
+        return failResponse;
     }
+
     const endpoints = descriptor.endpoints;
+
     // find the right endpoint based on the interfaceShortName (has to match endpoint.interface)
     const endpoint = endpoints.find((endpoint: any) => {
         return endpoint?.interface === interfaceShortName;
     });
+
     return endpoint?.protocolInformation?.href ? endpoint.protocolInformation.href : '';
 }

From 4de35e091c0cb4903f4944e3535fac8d8dd16e8e Mon Sep 17 00:00:00 2001
From: Sebastian Eicke <sebastian.eicke@HARTING.com>
Date: Tue, 25 Feb 2025 11:13:26 +0100
Subject: [PATCH 4/6] Fix

---
 aas-web-ui/src/composables/AAS/AASHandling.ts         |  3 ++-
 aas-web-ui/src/composables/AAS/SMHandling.ts          | 10 ++++++----
 aas-web-ui/src/composables/Client/SMRegistryClient.ts |  6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/aas-web-ui/src/composables/AAS/AASHandling.ts b/aas-web-ui/src/composables/AAS/AASHandling.ts
index fcb34bec..99325a09 100644
--- a/aas-web-ui/src/composables/AAS/AASHandling.ts
+++ b/aas-web-ui/src/composables/AAS/AASHandling.ts
@@ -263,7 +263,8 @@ export function useAASHandling() {
             const submodelRefs = aas.submodels;
 
             const submodelPromises = submodelRefs.map((submodelRef: any) => {
-                return fetchSmById(extractIdFromReference(submodelRef, 'Submodel'), false, true);
+                const smId = extractIdFromReference(submodelRef, 'Submodel');
+                return fetchSmById(smId, false, true);
             });
 
             return await Promise.all(submodelPromises);
diff --git a/aas-web-ui/src/composables/AAS/SMHandling.ts b/aas-web-ui/src/composables/AAS/SMHandling.ts
index 8b6192ba..744449dc 100644
--- a/aas-web-ui/src/composables/AAS/SMHandling.ts
+++ b/aas-web-ui/src/composables/AAS/SMHandling.ts
@@ -37,7 +37,7 @@ export function useSMHandling() {
 
         smDescriptors = smDescriptors.map((smDescriptor: any) => {
             smDescriptor.timestamp = formatDate(new Date());
-            smDescriptor.path = extractEndpointHref(smDescriptor, 'Submodel-3.0');
+            smDescriptor.path = extractEndpointHref(smDescriptor, 'SUBMODEL-3.0');
             return smDescriptor;
         });
 
@@ -66,7 +66,7 @@ export function useSMHandling() {
         }
 
         smDescriptor.timestamp = formatDate(new Date());
-        smDescriptor.path = extractEndpointHref(smDescriptor, 'Submodel-3.0');
+        smDescriptor.path = extractEndpointHref(smDescriptor, 'SUBMODEL-3.0');
 
         return smDescriptor;
     }
@@ -181,12 +181,14 @@ export function useSMHandling() {
         if (smId === '') return failResponse;
 
         // First try to determine SM endpoint with the help of the registry
-        const smEndpoint = await getSmEndpointByIdFromRegistry(smId);
+        let smEndpoint = await getSmEndpointByIdFromRegistry(smId);
 
         if (smEndpoint && smEndpoint.trim() !== '') return smEndpoint.trim();
 
         // Second try to determine SM endpoint with the help of the repo
-        return getSmEndpointByIdFromRepo(smId) || failResponse;
+        smEndpoint = getSmEndpointByIdFromRepo(smId);
+
+        return smEndpoint.trim() || failResponse;
     }
 
     /**
diff --git a/aas-web-ui/src/composables/Client/SMRegistryClient.ts b/aas-web-ui/src/composables/Client/SMRegistryClient.ts
index 11a317f1..55cf1416 100644
--- a/aas-web-ui/src/composables/Client/SMRegistryClient.ts
+++ b/aas-web-ui/src/composables/Client/SMRegistryClient.ts
@@ -108,10 +108,10 @@ export function useSMRegistryClient() {
 
         if (smId === '') return failResponse;
 
-        const aasDescriptor = await fetchSmDescriptorById(smId);
-        const aasEndpoint = extractEndpointHref(aasDescriptor, 'Submodel-3.0');
+        const smDescriptor = await fetchSmDescriptorById(smId);
+        const smEndpoint = extractEndpointHref(smDescriptor, 'SUBMODEL-3.0');
 
-        return aasEndpoint || failResponse;
+        return smEndpoint || failResponse;
     }
 
     /**

From df963586add4e99863d654f0e1f59711fbfea71e Mon Sep 17 00:00:00 2001
From: Sebastian Eicke <sebastian.eicke@HARTING.com>
Date: Tue, 25 Feb 2025 11:20:14 +0100
Subject: [PATCH 5/6] Fixes extractEndpointHref()

---
 aas-web-ui/src/utils/AAS/DescriptorUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aas-web-ui/src/utils/AAS/DescriptorUtils.ts b/aas-web-ui/src/utils/AAS/DescriptorUtils.ts
index 2f53faa8..2afad31e 100644
--- a/aas-web-ui/src/utils/AAS/DescriptorUtils.ts
+++ b/aas-web-ui/src/utils/AAS/DescriptorUtils.ts
@@ -31,7 +31,7 @@ export function extractEndpointHref(descriptor: any, interfaceShortName: string)
         return failResponse;
     }
 
-    if (!descriptor.endpoints || !Array.isArray(descriptor.endpoints) || descriptor.endpoints.length === 0) {
+    if (!Array.isArray(descriptor?.endpoints) || descriptor?.endpoints.length === 0) {
         return failResponse;
     }
 

From a2d03e5928f759785ca4fbbd1cbf8682b9cc9f33 Mon Sep 17 00:00:00 2001
From: Sebastian Eicke <sebastian.eicke@HARTING.com>
Date: Wed, 26 Feb 2025 08:51:17 +0100
Subject: [PATCH 6/6] Improves JumpHandling

---
 aas-web-ui/src/composables/JumpHandling.ts | 50 ++++++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/aas-web-ui/src/composables/JumpHandling.ts b/aas-web-ui/src/composables/JumpHandling.ts
index 79768139..27f1c3ea 100644
--- a/aas-web-ui/src/composables/JumpHandling.ts
+++ b/aas-web-ui/src/composables/JumpHandling.ts
@@ -1,7 +1,6 @@
 import { useRouter } from 'vue-router';
 import { useAASHandling } from '@/composables/AAS/AASHandling';
 import { useReferenceComposable } from '@/composables/AAS/ReferenceComposable';
-import { useAASRepositoryClient } from '@/composables/Client/AASRepositoryClient';
 import { useNavigationStore } from '@/store/NavigationStore';
 import { extractEndpointHref } from '@/utils/AAS/DescriptorUtils';
 import { extractId as extractIdFromReference } from '@/utils/AAS/ReferenceUtil';
@@ -15,9 +14,8 @@ export function useJumpHandling() {
     const router = useRouter();
 
     // Composables
-    const { fetchAasList } = useAASRepositoryClient();
+    const { fetchAasDescriptorList, fetchAasList, fetchAas, getAasEndpointById } = useAASHandling();
     const { fetchSm } = useSMHandling();
-    const { getAasEndpointById } = useAASHandling();
     const { referenceTypes, checkReference, getEndpoints } = useReferenceComposable();
 
     async function jumpToReference(reference: any): Promise<void> {
@@ -30,10 +28,30 @@ export function useJumpHandling() {
                     jumpToAas(aasEndpoint, smePath);
                     return;
                 } else if (aasEndpoint.trim() === '' && smEndpoint.trim() !== '') {
-                    // Find first AAS which includes the SM of the SM endpoint
+                    // Determine (first) AAS which includes the SM of the SM endpoint via SM ID
                     const sm = await fetchSm(smEndpoint);
                     if (sm && Object.keys(sm).length > 0) {
                         const smId = sm.id;
+
+                        // (1) With specified AAS Registry: Check if SM ID exists in SM Descriptors in one of the AAS Descriptors
+                        const aasDescriptors = await fetchAasDescriptorList();
+                        if (aasDescriptors && Array.isArray(aasDescriptors) && aasDescriptors.length > 0) {
+                            for (const aasDescriptor of aasDescriptors) {
+                                const smDescriptors = aasDescriptor.submodelDescriptors;
+                                if (smDescriptors && Array.isArray(smDescriptors) && smDescriptors.length > 0) {
+                                    for (const smDescriptor of smDescriptors) {
+                                        if (smDescriptor && Object.keys(smDescriptor).length > 0) {
+                                            if (smId === smDescriptor.id) {
+                                                jumpToAas(aasEndpoint, smePath);
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        // (2) With specified AAS Repository: Check if SM ID exists in SM Refs in one of the AAS
                         const aasList = await fetchAasList();
                         if (aasList && Array.isArray(aasList) && aasList.length > 0) {
                             for (const aas of aasList) {
@@ -54,6 +72,30 @@ export function useJumpHandling() {
                                 }
                             }
                         }
+
+                        // (3) Special case for using BaSyx components without specified AAS Repository:
+                        // Determine AAS Endpoint using AAS Descriptors and fetch AAS
+                        // Check if SM ID exists in SM Refs in one of the AAS
+                        if (aasDescriptors && Array.isArray(aasDescriptors) && aasDescriptors.length > 0) {
+                            for (const aasDescriptor of aasDescriptors) {
+                                const aasEndpoint = extractEndpointHref(aasDescriptor, 'AAS-3.0');
+                                const aas = await fetchAas(aasEndpoint);
+                                const submodelRefs = aas.submodels;
+                                if (
+                                    aasEndpoint.trim() !== '' &&
+                                    submodelRefs &&
+                                    Array.isArray(submodelRefs) &&
+                                    submodelRefs.length > 0
+                                ) {
+                                    for (const submodelRef of submodelRefs) {
+                                        if (smId === extractIdFromReference(submodelRef, 'Submodel')) {
+                                            jumpToAas(aasEndpoint, smePath);
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             } else if (reference.type === 'ExternalReference') {