From d9a6321db009048d5bc128262b07f26e7c85da96 Mon Sep 17 00:00:00 2001
From: Tomas Hermanek <tomas.hermanek@petitpress.sk>
Date: Wed, 10 Dec 2025 09:50:40 +0100
Subject: [PATCH 1/2] Fixed potential null reference in selected options
 computation.

---
 .../components/DistributionCategorySelectedOptionChip.vue     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue b/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue
index 1b2e0056..94792dd6 100644
--- a/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue
+++ b/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue
@@ -11,7 +11,9 @@ const props = withDefaults(
 )
 
 const selectedOption = computed(() =>
-  props.distributionCategory.selectedOptionsDetail.find((select) => select.serviceSlug === props.serviceSlug)
+  props.distributionCategory?.selectedOptionsDetail?.find(
+    (select) => select.serviceSlug === props.serviceSlug
+  )
 )
 </script>
 

From 33eeb74ccf0fa51da4f1e46c2f224f62cd29ad53 Mon Sep 17 00:00:00 2001
From: Tomas Hermanek <tomas.hermanek@petitpress.sk>
Date: Wed, 10 Dec 2025 10:11:02 +0100
Subject: [PATCH 2/2] Refactor selected options computation and fix datatable
 prop type.

---
 .../components/DistributionCategoryDatatable.vue              | 2 +-
 .../components/DistributionCategorySelectedOptionChip.vue     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/coreDam/distributionCategory/components/DistributionCategoryDatatable.vue b/src/views/coreDam/distributionCategory/components/DistributionCategoryDatatable.vue
index a9e31918..754c7d68 100644
--- a/src/views/coreDam/distributionCategory/components/DistributionCategoryDatatable.vue
+++ b/src/views/coreDam/distributionCategory/components/DistributionCategoryDatatable.vue
@@ -117,7 +117,7 @@ const dynamicDistributionServiceSlugSlot = (distributionServiceSlug: string) =>
           #[dynamicDistributionServiceSlugSlot(distributionServiceSlug)]="{ item }: { item: DatatableItem }"
         >
           <DistributionCategorySelectedOptionChip
-            :distribution-category="item.raw as any"
+            :distribution-category="item"
             :service-slug="distributionServiceSlug"
           />
         </template>
diff --git a/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue b/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue
index 94792dd6..1b2e0056 100644
--- a/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue
+++ b/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectedOptionChip.vue
@@ -11,9 +11,7 @@ const props = withDefaults(
 )
 
 const selectedOption = computed(() =>
-  props.distributionCategory?.selectedOptionsDetail?.find(
-    (select) => select.serviceSlug === props.serviceSlug
-  )
+  props.distributionCategory.selectedOptionsDetail.find((select) => select.serviceSlug === props.serviceSlug)
 )
 </script>