From 11bbdd5cbba0bc6afe386d619be24a1e625a9678 Mon Sep 17 00:00:00 2001
From: Tomas Hermanek <tomas.hermanek@gmai.com>
Date: Mon, 29 Jun 2026 13:58:09 +0000
Subject: [PATCH 1/3] add #84735 scope podcast/asset pickers by ext system for
 cross-licence attach

PodcastEpisodeNewDialog passes the asset's ext system to PodcastRemoteAutocomplete; sibling
asset picker offers all readable licences of the ext system (useReadableLicencesByExtSystem).
---
 src/composables/system/currentExtSystem.ts    | 27 ++++++++++++++++++-
 .../podcast/PodcastEpisodeNewDialog.vue       | 20 +++++++++++++-
 .../detail/components/slots/AssetSibling.vue  |  7 ++---
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/composables/system/currentExtSystem.ts b/src/composables/system/currentExtSystem.ts
index 49dce06a..9db3b2a6 100644
--- a/src/composables/system/currentExtSystem.ts
+++ b/src/composables/system/currentExtSystem.ts
@@ -6,6 +6,7 @@ import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import {
   type DamCurrentUserDto,
   type DocId,
+  type IntegerId,
   isDocId,
   isNull,
   isString,
@@ -13,7 +14,7 @@ import {
   useDamConfigStore,
 } from '@anzusystems/common-admin'
 import { storeToRefs } from 'pinia'
-import { readonly, ref } from 'vue'
+import { computed, readonly, ref, toValue, type MaybeRefOrGetter } from 'vue'
 
 const currentExtSystemId = ref(0)
 
@@ -89,3 +90,27 @@ export function useCurrentAssetLicence() {
     currentAssetLicenceId: readonly(currentAssetLicenceId),
   }
 }
+
+/**
+ * Returns the IDs of all asset licences the current user may read for a given ext system.
+ * Used to build the `selectLicences` list for AAssetSelect in cross-licence contexts
+ * (e.g. sibling pairing, episode asset selection) so that assets from TTS or other
+ * licences within the same ext system are visible without triggering a 403 from
+ * CollectionListAwareVoter (which rejects any licence the user cannot read).
+ */
+export function useReadableLicencesByExtSystem(extSystemId: MaybeRefOrGetter<IntegerId>) {
+  const { useCurrentUser } = useAuth()
+  const { currentUser } = useCurrentUser<DamCurrentUserDto>(SYSTEM_DAM)
+
+  const licenceIds = computed<IntegerId[]>(() => {
+    if (!currentUser.value) return []
+    const id = toValue(extSystemId)
+    // resolvedAssetLicences = direct + licence-group grants, matching the backend LicenceVoterTrait;
+    // assetLicencesDto would miss group-granted licences and under-offer assets the user may actually read.
+    return currentUser.value.resolvedAssetLicences
+      .filter((licence) => licence.extSystem === id)
+      .map((licence) => licence.id)
+  })
+
+  return { licenceIds }
+}
diff --git a/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue b/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
index b0bba894..ee4fd703 100644
--- a/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
+++ b/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, watch } from 'vue'
-import type { DocId } from '@anzusystems/common-admin'
+import type { DocId, IntegerIdNullable } from '@anzusystems/common-admin'
 import {
   ADialogToolbar,
   AFormTextarea,
@@ -18,6 +18,10 @@ import { SYSTEM_CORE_DAM } from '@/model/systems'
 import { usePodcastEpisodeValidation } from '@/views/coreDam/podcastEpisode/composables/podcastEpisodeValidation'
 import { useI18n } from 'vue-i18n'
 import PodcastRemoteAutocomplete from '@/views/coreDam/podcast/components/PodcastRemoteAutocomplete.vue'
+import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
+import { useAuth } from '@/composables/auth/auth'
+import { SYSTEM_DAM } from '@/model/systems'
+import type { DamCurrentUserDto } from '@anzusystems/common-admin'
 
 const props = withDefaults(
   defineProps<{
@@ -46,6 +50,19 @@ const { t } = useI18n()
 const { currentExtSystemId } = useCurrentExtSystem()
 const { showValidationError, showRecordWas, showErrorsDefault } = useAlerts()
 
+const assetDetailStore = useAssetDetailStore()
+const { useCurrentUser } = useAuth()
+const { currentUser } = useCurrentUser<DamCurrentUserDto>(SYSTEM_DAM)
+
+// Derive the asset's ext system from its licence via the user's readable licence list.
+// Falls back to the global current ext system when the asset or its licence is not found.
+const assetExtSystemId = computed<IntegerIdNullable>(() => {
+  const licenceId = assetDetailStore.asset?.licence
+  if (!licenceId) return currentExtSystemId.value
+  const match = currentUser.value?.assetLicencesDto.find((l) => l.id === licenceId)
+  return match ? match.extSystem : currentExtSystemId.value
+})
+
 const { createDefault } = usePodcastEpisodeFactory()
 const podcastEpisode = ref<PodcastEpisode>(createDefault(currentExtSystemId.value))
 
@@ -127,6 +144,7 @@ onMounted(async () => {
               required
               data-cy="field-choose-podcast"
               :label="t('coreDam.podcastEpisode.model.podcast')"
+              :ext-system-id="assetExtSystemId"
             />
           </ARow>
           <div
diff --git a/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue b/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue
index cc741b0e..1c69a68f 100644
--- a/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue
+++ b/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue
@@ -10,7 +10,7 @@ import {
 import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import AssetChip from '@/views/coreDam/asset/detail/components/AssetChip.vue'
 import { useI18n } from 'vue-i18n'
-import { useCurrentAssetLicence } from '@/composables/system/currentExtSystem'
+import { useCurrentExtSystem, useReadableLicencesByExtSystem } from '@/composables/system/currentExtSystem'
 import { computed, ref } from 'vue'
 import { useAssetDetailSidebarSlotsAssetSiblingActions } from '@/views/coreDam/asset/detail/composables/assetDetailSidebarSlotsAssetSiblingActions'
 import { storeToRefs } from 'pinia'
@@ -26,7 +26,8 @@ const props = withDefaults(
 
 const assetDetailStore = useAssetDetailStore()
 const { siblingLoader } = storeToRefs(assetDetailStore)
-const { currentAssetLicenceId } = useCurrentAssetLicence()
+const { currentExtSystemId } = useCurrentExtSystem()
+const { licenceIds: siblingSelectLicences } = useReadableLicencesByExtSystem(currentExtSystemId)
 const { t } = useI18n()
 const sort = ref(1)
 
@@ -86,7 +87,7 @@ const pickAssetType = computed(() => {
         <AAssetSelect
           v-if="pickAssetType"
           v-model:sort="sort"
-          :select-licences="[currentAssetLicenceId]"
+          :select-licences="siblingSelectLicences"
           :min-count="1"
           :max-count="1"
           return-type="assetId"

From 41873b63d484a3fab838d2505e6cf38fc409d624 Mon Sep 17 00:00:00 2001
From: Tomas Hermanek <tomas.hermanek@gmai.com>
Date: Tue, 30 Jun 2026 10:10:49 +0000
Subject: [PATCH 2/3] ref #84735 revert cross-licence pickers and export
 licences scoping

Reverts 11bbdd5c (ext-system-scoped podcast/asset pickers via the
useReadableLicencesByExtSystem composable, which broke AAssetSelect with an
empty select-licences list for role-based admins) and 6e0bb204 (public export
create bound to the licences array). Keeps the voice family settings module.
---
 src/composables/system/currentExtSystem.ts    | 27 +------------------
 .../podcast/PodcastEpisodeNewDialog.vue       | 20 +-------------
 .../detail/components/slots/AssetSibling.vue  |  7 +++--
 .../components/PublicExportCreateButton.vue   |  5 ++--
 4 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/src/composables/system/currentExtSystem.ts b/src/composables/system/currentExtSystem.ts
index 9db3b2a6..49dce06a 100644
--- a/src/composables/system/currentExtSystem.ts
+++ b/src/composables/system/currentExtSystem.ts
@@ -6,7 +6,6 @@ import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import {
   type DamCurrentUserDto,
   type DocId,
-  type IntegerId,
   isDocId,
   isNull,
   isString,
@@ -14,7 +13,7 @@ import {
   useDamConfigStore,
 } from '@anzusystems/common-admin'
 import { storeToRefs } from 'pinia'
-import { computed, readonly, ref, toValue, type MaybeRefOrGetter } from 'vue'
+import { readonly, ref } from 'vue'
 
 const currentExtSystemId = ref(0)
 
@@ -90,27 +89,3 @@ export function useCurrentAssetLicence() {
     currentAssetLicenceId: readonly(currentAssetLicenceId),
   }
 }
-
-/**
- * Returns the IDs of all asset licences the current user may read for a given ext system.
- * Used to build the `selectLicences` list for AAssetSelect in cross-licence contexts
- * (e.g. sibling pairing, episode asset selection) so that assets from TTS or other
- * licences within the same ext system are visible without triggering a 403 from
- * CollectionListAwareVoter (which rejects any licence the user cannot read).
- */
-export function useReadableLicencesByExtSystem(extSystemId: MaybeRefOrGetter<IntegerId>) {
-  const { useCurrentUser } = useAuth()
-  const { currentUser } = useCurrentUser<DamCurrentUserDto>(SYSTEM_DAM)
-
-  const licenceIds = computed<IntegerId[]>(() => {
-    if (!currentUser.value) return []
-    const id = toValue(extSystemId)
-    // resolvedAssetLicences = direct + licence-group grants, matching the backend LicenceVoterTrait;
-    // assetLicencesDto would miss group-granted licences and under-offer assets the user may actually read.
-    return currentUser.value.resolvedAssetLicences
-      .filter((licence) => licence.extSystem === id)
-      .map((licence) => licence.id)
-  })
-
-  return { licenceIds }
-}
diff --git a/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue b/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
index ee4fd703..b0bba894 100644
--- a/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
+++ b/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, watch } from 'vue'
-import type { DocId, IntegerIdNullable } from '@anzusystems/common-admin'
+import type { DocId } from '@anzusystems/common-admin'
 import {
   ADialogToolbar,
   AFormTextarea,
@@ -18,10 +18,6 @@ import { SYSTEM_CORE_DAM } from '@/model/systems'
 import { usePodcastEpisodeValidation } from '@/views/coreDam/podcastEpisode/composables/podcastEpisodeValidation'
 import { useI18n } from 'vue-i18n'
 import PodcastRemoteAutocomplete from '@/views/coreDam/podcast/components/PodcastRemoteAutocomplete.vue'
-import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
-import { useAuth } from '@/composables/auth/auth'
-import { SYSTEM_DAM } from '@/model/systems'
-import type { DamCurrentUserDto } from '@anzusystems/common-admin'
 
 const props = withDefaults(
   defineProps<{
@@ -50,19 +46,6 @@ const { t } = useI18n()
 const { currentExtSystemId } = useCurrentExtSystem()
 const { showValidationError, showRecordWas, showErrorsDefault } = useAlerts()
 
-const assetDetailStore = useAssetDetailStore()
-const { useCurrentUser } = useAuth()
-const { currentUser } = useCurrentUser<DamCurrentUserDto>(SYSTEM_DAM)
-
-// Derive the asset's ext system from its licence via the user's readable licence list.
-// Falls back to the global current ext system when the asset or its licence is not found.
-const assetExtSystemId = computed<IntegerIdNullable>(() => {
-  const licenceId = assetDetailStore.asset?.licence
-  if (!licenceId) return currentExtSystemId.value
-  const match = currentUser.value?.assetLicencesDto.find((l) => l.id === licenceId)
-  return match ? match.extSystem : currentExtSystemId.value
-})
-
 const { createDefault } = usePodcastEpisodeFactory()
 const podcastEpisode = ref<PodcastEpisode>(createDefault(currentExtSystemId.value))
 
@@ -144,7 +127,6 @@ onMounted(async () => {
               required
               data-cy="field-choose-podcast"
               :label="t('coreDam.podcastEpisode.model.podcast')"
-              :ext-system-id="assetExtSystemId"
             />
           </ARow>
           <div
diff --git a/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue b/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue
index 1c69a68f..cc741b0e 100644
--- a/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue
+++ b/src/views/coreDam/asset/detail/components/slots/AssetSibling.vue
@@ -10,7 +10,7 @@ import {
 import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import AssetChip from '@/views/coreDam/asset/detail/components/AssetChip.vue'
 import { useI18n } from 'vue-i18n'
-import { useCurrentExtSystem, useReadableLicencesByExtSystem } from '@/composables/system/currentExtSystem'
+import { useCurrentAssetLicence } from '@/composables/system/currentExtSystem'
 import { computed, ref } from 'vue'
 import { useAssetDetailSidebarSlotsAssetSiblingActions } from '@/views/coreDam/asset/detail/composables/assetDetailSidebarSlotsAssetSiblingActions'
 import { storeToRefs } from 'pinia'
@@ -26,8 +26,7 @@ const props = withDefaults(
 
 const assetDetailStore = useAssetDetailStore()
 const { siblingLoader } = storeToRefs(assetDetailStore)
-const { currentExtSystemId } = useCurrentExtSystem()
-const { licenceIds: siblingSelectLicences } = useReadableLicencesByExtSystem(currentExtSystemId)
+const { currentAssetLicenceId } = useCurrentAssetLicence()
 const { t } = useI18n()
 const sort = ref(1)
 
@@ -87,7 +86,7 @@ const pickAssetType = computed(() => {
         <AAssetSelect
           v-if="pickAssetType"
           v-model:sort="sort"
-          :select-licences="siblingSelectLicences"
+          :select-licences="[currentAssetLicenceId]"
           :min-count="1"
           :max-count="1"
           return-type="assetId"
diff --git a/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue b/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue
index fe4afb02..8143a5cd 100644
--- a/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue
+++ b/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue
@@ -91,11 +91,10 @@ const { exportTypeOptions } = useExportTypeTypes()
         </ARow>
         <ARow>
           <DamAssetLicenceRemoteAutocomplete
-            v-model="publicExport.licences"
+            v-model="publicExport.assetLicence"
             :client="damClient"
             :label="t('coreDam.publicExport.model.assetLicence')"
-            multiple
-            data-cy="publicExport-licence"
+            data-cy="user-asset-licences"
           />
         </ARow>
       </ASystemEntityScope>

From bf6274adc5552fbbacacaedd3664307282349922 Mon Sep 17 00:00:00 2001
From: Tomas Hermanek <tomas.hermanek@gmai.com>
Date: Tue, 30 Jun 2026 10:13:44 +0000
Subject: [PATCH 3/3] ref #84735 keep public export create bound to licences
 array

Restores 6e0bb204: the create form binds to publicExport.licences (the model
field used by detail/edit), not the deprecated single assetLicence. This is a
general model-alignment fix, not cross-licence, so it was wrongly reverted.
---
 .../publicExport/components/PublicExportCreateButton.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue b/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue
index 8143a5cd..fe4afb02 100644
--- a/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue
+++ b/src/views/coreDam/publicExport/components/PublicExportCreateButton.vue
@@ -91,10 +91,11 @@ const { exportTypeOptions } = useExportTypeTypes()
         </ARow>
         <ARow>
           <DamAssetLicenceRemoteAutocomplete
-            v-model="publicExport.assetLicence"
+            v-model="publicExport.licences"
             :client="damClient"
             :label="t('coreDam.publicExport.model.assetLicence')"
-            data-cy="user-asset-licences"
+            multiple
+            data-cy="publicExport-licence"
           />
         </ARow>
       </ASystemEntityScope>