Create ChannelVersion model with token support

contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js

@@ -98,16 +98,10 @@ const nonPublishedChannel = {
 };
 
 const publishedData = {
-  2: {
-    included_languages: ['en', null],
-    included_licenses: [1],
-    included_categories: [Categories.SCHOOL],
-  },
-  1: {
-    included_languages: ['en', null],
-    included_licenses: [1],
-    included_categories: [Categories.SCHOOL],
-  },
+  version: 2,
+  included_languages: ['en', null],
+  included_licenses: [1],
+  included_categories: [Categories.SCHOOL],
 };
 
 const submittedLatestSubmission = { channel_version: 2, status: CommunityLibraryStatus.PENDING };
@@ -149,7 +143,7 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
     it('when channel is not published', async () => {
       const wrapper = await makeWrapper({
         channel: nonPublishedChannel,
-        publishedData: {},
+        publishedData: null,
         latestSubmission: null,
       });
 
@@ -301,12 +295,10 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
 
       const channel = { ...publishedNonPublicChannel, publishing: true };
       const publishedDataWithVersion3 = {
-        ...publishedData,
-        3: {
-          included_languages: ['en', null],
-          included_licenses: [1],
-          included_categories: [Categories.SCHOOL],
-        },
+        version: 3,
+        included_languages: ['en', null],
+        included_licenses: [1],
+        included_categories: [Categories.SCHOOL],
       };
       const wrapper = await makeWrapper({
         channel,
@@ -434,7 +426,7 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
     it('when channel is not published', async () => {
       const wrapper = await makeWrapper({
         channel: nonPublishedChannel,
-        publishedData: {},
+        publishedData: null,
         latestSubmission: null,
       });
 
@@ -470,7 +462,7 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
       it('when channel is not published', async () => {
         const wrapper = await makeWrapper({
           channel: nonPublishedChannel,
-          publishedData: {},
+          publishedData: null,
           latestSubmission: null,
         });
 

contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/composables/useLicenseAudit.js

@@ -36,19 +36,19 @@ export function useLicenseAudit(channelRef, channelVersionRef) {
     }
 
     return (
-      'community_library_invalid_licenses' in versionData &&
-      'community_library_special_permissions' in versionData
+      'non_distributable_licenses_included' in versionData &&
+      'special_permissions_included' in versionData
     );
   });
 
   const invalidLicenses = computed(() => {
     const versionData = currentVersionData.value;
-    return versionData?.community_library_invalid_licenses || [];
+    return versionData?.non_distributable_licenses_included || [];
   });
 
   const specialPermissions = computed(() => {
     const versionData = currentVersionData.value;
-    return versionData?.community_library_special_permissions || [];
+    return versionData?.special_permissions_included || [];
   });
 
   const includedLicenses = computed(() => {
@@ -123,5 +123,6 @@ export function useLicenseAudit(channelRef, channelVersionRef) {
     checkAndTriggerAudit,
     triggerAudit,
     fetchPublishedData,
+    currentVersionData,
   };
 }

contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/composables/usePublishedData.js

@@ -2,5 +2,5 @@ import { useFetch } from '../../../../composables/useFetch';
 import { Channel } from 'shared/data/resources';
 
 export function usePublishedData(channelId) {
-  return useFetch({ asyncFetchFunc: () => Channel.getPublishedData(channelId) });
+  return useFetch({ asyncFetchFunc: () => Channel.getVersionDetail(channelId) });
 }

contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/composables/useSpecialPermissions.js

@@ -23,7 +23,7 @@ const ITEMS_PER_PAGE = 3;
  *   Reactive state for the fetched, flattened permissions and pagination
  *   helpers used by `SpecialPermissionsList.vue`.
  */
-export function useSpecialPermissions(permissionIds) {
+export function useSpecialPermissions(channelVersionId, permissionIds) {
   const permissions = ref([]);
   const isLoading = ref(false);
   const error = ref(null);
@@ -39,20 +39,24 @@ export function useSpecialPermissions(permissionIds) {
     return permissions.value.slice(start, end);
   });
 
-  async function fetchPermissions(ids) {
-    if (!ids || ids.length === 0) {
-      permissions.value = [];
-      return;
-    }
-
+  async function fetchPermissions(versionId, ids) {
     isLoading.value = true;
     error.value = null;
+    permissions.value = [];
 
     try {
-      const response = await AuditedSpecialPermissionsLicense.fetchCollection({
-        by_ids: ids.join(','),
-        distributable: false,
-      });
+      let response = [];
+      if (versionId) {
+        response = await AuditedSpecialPermissionsLicense.fetchCollection({
+          channel_version: versionId,
+          distributable: false,
+        });
+      } else if (ids && ids.length > 0) {
+        response = await AuditedSpecialPermissionsLicense.fetchCollection({
+          by_ids: ids.join(','),
+          distributable: false,
+        });
+      }
 
       permissions.value = response.map(permission => ({
         id: permission.id,
@@ -79,18 +83,10 @@ export function useSpecialPermissions(permissionIds) {
     }
   }
 
-  const resolvedPermissionIds = computed(() => {
-    const ids = unref(permissionIds);
-    if (!ids || ids.length === 0) {
-      return [];
-    }
-    return ids;
-  });
-
   watch(
-    resolvedPermissionIds,
-    ids => {
-      fetchPermissions(ids);
+    [() => unref(channelVersionId), () => unref(permissionIds)],
+    ([versionId, ids]) => {
+      fetchPermissions(versionId, ids);
     },
     { immediate: true },
   );

contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue

@@ -163,7 +163,8 @@
             <SpecialPermissionsList
               v-if="licenseAuditIsFinished && specialPermissions.length > 0"
               v-model="checkedSpecialPermissions"
-              :permissionIds="specialPermissions"
+              :channel-version-id="versionDetail && versionDetail.id"
+              :permission-ids="specialPermissions"
               @update:allChecked="allSpecialPermissionsChecked = $event"
             />
             <div class="country-area">
@@ -417,17 +418,15 @@
       const {
         isLoading: publishedDataIsLoading,
         isFinished: publishedDataIsFinished,
-        data: publishedData,
+        data: versionDetail,
         fetchData: fetchPublishedData,
       } = usePublishedData(props.channel.id);
 
-      // Use the latest version available from either channel or publishedData
+      // Use the latest version available from either channel or versionDetail
       const displayedVersion = computed(() => {
         const channelVersion = currentChannelVersion.value || 0;
-        if (publishedData.value && Object.keys(publishedData.value).length > 0) {
-          const publishedVersions = Object.keys(publishedData.value).map(v => parseInt(v, 10));
-          const maxPublishedVersion = Math.max(...publishedVersions);
-          return Math.max(channelVersion, maxPublishedVersion);
+        if (versionDetail.value && versionDetail.value.version) {
+          return Math.max(channelVersion, versionDetail.value.version);
         }
         return channelVersion;
       });
@@ -465,11 +464,6 @@
         return conditions.every(condition => condition);
       });
 
-      const latestPublishedData = computed(() => {
-        if (!publishedData.value || !displayedVersion.value) return undefined;
-        return publishedData.value[displayedVersion.value];
-      });
-
       // Watch for when publishing completes - fetch publishedData to get the new version's data
       watch(isPublishing, async (newIsPublishing, oldIsPublishing) => {
         if (oldIsPublishing === true && newIsPublishing === false) {
@@ -488,11 +482,7 @@
       });
 
       const detectedLanguages = computed(() => {
-        // We need to filter out null values due to a backend bug
-        // causing null values to sometimes be included in the list
-        const languageCodes = latestPublishedData.value?.included_languages.filter(
-          code => code !== null,
-        );
+        const languageCodes = versionDetail.value?.included_languages;
 
         // We distinguish here between "not loaded yet" (undefined)
         // and "loaded and none present" (null). This distinction is
@@ -502,7 +492,7 @@
         if (!languageCodes) return undefined;
         if (languageCodes.length === 0) return null;
 
-        return languageCodes.map(code => LanguagesMap.get(code).readable_name).join(', ');
+        return languageCodes.map(code => LanguagesMap.get(code)?.readable_name || code).join(', ');
       });
 
       function categoryIdToName(categoryId) {
@@ -515,10 +505,10 @@
         // not used in the UI and is mostly intended to convey the
         // state more accurately to the developer in case of debugging.
         // UI code should rely on XXXIsLoading and XXXIsFinished instead.
-        if (!latestPublishedData.value?.included_categories) return undefined;
-        if (latestPublishedData.value.included_categories.length === 0) return null;
+        if (!versionDetail.value?.included_categories) return undefined;
+        if (versionDetail.value.included_categories.length === 0) return null;
 
-        return latestPublishedData.value.included_categories
+        return versionDetail.value.included_categories
           .map(categoryId => categoryIdToName(categoryId))
           .join(', ');
       });
@@ -544,7 +534,7 @@
             description: description.value,
             channel: props.channel.id,
             countries: countries.value.map(country => countriesUtil.getAlpha2Code(country, 'en')),
-            categories: latestPublishedData.value.included_categories,
+            categories: versionDetail.value.included_categories,
           })
             .then(() => {
               showSnackbar({ text: submittedSnackbar$() });

contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/licenseCheck/SpecialPermissionsList.vue

@@ -87,7 +87,7 @@
         totalPages,
         nextPage,
         previousPage,
-      } = useSpecialPermissions(props.permissionIds);
+      } = useSpecialPermissions(props.channelVersionId, props.permissionIds);
 
       function togglePermission(permissionId) {
         const currentChecked = [...props.value];
@@ -128,6 +128,11 @@
       };
     },
     props: {
+      channelVersionId: {
+        type: String,
+        required: false,
+        default: null,
+      },
       permissionIds: {
         type: Array,
         required: false,

contentcuration/contentcuration/frontend/shared/data/resources.js

@@ -1412,8 +1412,8 @@ export const Channel = new CreateModelResource({
       .then(response => response.data.languages);
     return uniq(compact(localLanguages.concat(remoteLanguages)));
   },
-  async getPublishedData(id) {
-    const response = await client.get(window.Urls.channel_published_data(id));
+  async getVersionDetail(id) {
+    const response = await client.get(window.Urls.channel_version_detail(id));
     return response.data;
   },
   async auditLicenses(id) {