Merge branch 'dev' into fix/VCST-2464

VirtoCommerce · Dec 27, 2024 · fea22d3 · fea22d3
2 parents 1f3b0dc + c158eac
commit fea22d3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/client-app/ui-kit/components/atoms/icon/vc-icon.vue b/client-app/ui-kit/components/atoms/icon/vc-icon.vue
@@ -5,6 +5,7 @@
 <script setup lang="ts">
 import DOMPurify from "dompurify";
 import { ref, computed, watch } from "vue";
+import { Logger } from "@/core/utilities";
 
 interface IProps {
   name?: string;
@@ -29,8 +30,17 @@ const style = computed(() =>
 const sizeClass = computed(() => (typeof props.size === "string" ? `vc-icon--size--${props.size}` : ""));
 
 async function loadIcon(name?: string) {
-  const response = (await import(`@/assets/icons/basic/${name}.svg?raw`)) as { default: string };
-  icon.value = DOMPurify.sanitize(response.default);
+  if (name) {
+    try {
+      const response = (await import(`../../../../assets/icons/basic/${name}.svg?raw`)) as { default: string };
+      icon.value = DOMPurify.sanitize(response.default);
+    } catch (error) {
+      Logger.error(`Failed to load icon: ${name}`, error);
+      icon.value = "";
+    }
+  } else {
+    icon.value = "";
+  }
 }
 
 watch(

diff --git a/client-app/ui-kit/components/molecules/shape/vc-shape.vue b/client-app/ui-kit/components/molecules/shape/vc-shape.vue
@@ -8,6 +8,7 @@
 
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
+import { Logger } from "@/core/utilities";
 
 interface IProps {
   size?: number | string;
@@ -33,7 +34,16 @@ const style = computed(() => ({
 }));
 
 function loadIcon(name?: string) {
-  iconUrl.value = new URL(`/client-app/assets/icons/basic/${name}.svg`, import.meta.url).href ?? "";
+  if (name) {
+    try {
+      iconUrl.value = new URL(`../../../../assets/icons/basic/${name}.svg`, import.meta.url).href;
+    } catch (error) {
+      Logger.error(`Failed to load icon: ${name}`, error);
+      iconUrl.value = "";
+    }
+  } else {
+    iconUrl.value = "";
+  }
 }
 
 watch(