Moves toDisplay functions to ReferableUtils

aaronzi · Dec 20, 2024 · 1900912 · 1900912
1 parent e8aa565
commit 1900912
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/aas-web-ui/src/components/AppNavigation/AASList.vue b/aas-web-ui/src/components/AppNavigation/AASList.vue
@@ -170,7 +170,8 @@
     import { useNavigationStore } from '@/store/NavigationStore';
     import { extractEndpointHref } from '@/utils/DescriptorUtils';
     import { URLEncode } from '@/utils/EncodeDecodeUtils';
-    import { downloadFile, nameToDisplay } from '@/utils/generalUtils';
+    import { downloadFile } from '@/utils/generalUtils';
+    import { nameToDisplay } from '@/utils/ReferableUtils';
 
     // Extend the ComponentPublicInstance type to include scrollToIndex
     interface VirtualScrollInstance extends ComponentPublicInstance {

diff --git a/aas-web-ui/src/utils/ReferableUtils.ts b/aas-web-ui/src/utils/ReferableUtils.ts
@@ -0,0 +1,21 @@
+// Function to extract the english display name from a referable
+export function nameToDisplay(referable: any, defaultNameToDisplay = '') {
+    if (referable && referable?.displayName) {
+        const displayNameEn = referable.displayName.find((displayName: any) => {
+            return displayName.language === 'en' && displayName.text !== '';
+        });
+        if (displayNameEn && displayNameEn.text) return displayNameEn.text;
+    }
+    return !defaultNameToDisplay && referable?.idShort ? referable.idShort : defaultNameToDisplay;
+}
+
+// Function to extract the english description from a referable
+export function descriptionToDisplay(referable: any) {
+    if (referable && referable?.description) {
+        const descriptionEn = referable.description.find(
+            (description: any) => description && description.language === 'en' && description.text !== ''
+        );
+        if (descriptionEn && descriptionEn.text) return descriptionEn.text;
+    }
+    return '';
+}
diff --git a/aas-web-ui/src/utils/generalUtils.ts b/aas-web-ui/src/utils/generalUtils.ts
@@ -60,25 +60,3 @@ export function downloadFile(filename: string, fileContent: Blob) {
     link.click();
     document.body.removeChild(link);
 }
-
-// Function to extract the english display name from a referable
-export function nameToDisplay(referable: any, defaultNameToDisplay = '') {
-    if (referable && referable?.displayName) {
-        const displayNameEn = referable.displayName.find((displayName: any) => {
-            return displayName.language === 'en' && displayName.text !== '';
-        });
-        if (displayNameEn && displayNameEn.text) return displayNameEn.text;
-    }
-    return !defaultNameToDisplay && referable?.idShort ? referable.idShort : defaultNameToDisplay;
-}
-
-// Function to extract the english description from a referable
-export function descriptionToDisplay(referable: any) {
-    if (referable && referable?.description) {
-        const descriptionEn = referable.description.find(
-            (description: any) => description && description.language === 'en' && description.text !== ''
-        );
-        if (descriptionEn && descriptionEn.text) return descriptionEn.text;
-    }
-    return '';
-}