fix code

Author: taoerman

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/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">
@@ -424,10 +425,8 @@
       // Use the latest version available from either channel or versionDetail
       const displayedVersion = computed(() => {
         const channelVersion = currentChannelVersion.value || 0;
-        if (versionDetail.value && Object.keys(versionDetail.value).length > 0) {
-          const publishedVersions = Object.keys(versionDetail.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;
       });
@@ -439,6 +438,7 @@
         specialPermissions,
         includedLicenses,
         checkAndTriggerAudit: checkAndTriggerLicenseAudit,
+        currentVersionData,
       } = useLicenseAudit(props.channel, currentChannelVersion);
 
       const allSpecialPermissionsChecked = ref(true);
@@ -465,11 +465,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) {
@@ -483,14 +478,15 @@
 
         if (!isPublishing.value) {
           await fetchPublishedData();
+          console.log('versionDetail:', versionDetail.value);
           await checkAndTriggerLicenseAudit();
+          console.log('specialPermissions:', specialPermissions.value);
+          console.log('currentVersionData:', currentVersionData.value);
         }
       });
 
       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 = versionDetail.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

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/tests/utils/test_publish.py

@@ -104,11 +104,7 @@ class IncrementChannelVersionTestCase(StudioTestCase):
     def setUp(self):
         super().setUp()
         self.channel = testdata.channel()
-        self.channel.version = 1
-        self.channel.save()
-
-        ChannelVersion.objects.filter(channel=self.channel).delete()
-        self.channel.version_info = None
+        self.channel.version = 0
         self.channel.save()
 
     def test_increment_published_version(self):
@@ -155,12 +151,12 @@ def test_multiple_published_versions(self):
 
         self.channel.refresh_from_db()
 
-        self.assertEqual(self.channel.version, 4)
+        self.assertEqual(self.channel.version, 3)
 
-        self.assertEqual(self.channel.channel_versions.count(), 4)
+        self.assertEqual(self.channel.channel_versions.count(), 3)
 
         self.assertIsNotNone(self.channel.version_info)
-        self.assertEqual(self.channel.version_info.version, 4)
+        self.assertEqual(self.channel.version_info.version, 3)
 
     def test_mixed_draft_and_published_versions(self):
         """Test creating mix of draft and published versions."""
@@ -170,14 +166,14 @@ def test_mixed_draft_and_published_versions(self):
 
         self.channel.refresh_from_db()
 
-        self.assertEqual(self.channel.version, 2)
+        self.assertEqual(self.channel.version, 1)
 
-        self.assertEqual(self.channel.channel_versions.count(), 3)
+        self.assertEqual(self.channel.channel_versions.count(), 2)
         self.assertEqual(uuid.UUID(str(draft1.id)), uuid.UUID(str(draft2.id)))
 
         self.assertIsNotNone(draft1.secret_token)
         self.assertIsNotNone(draft2.secret_token)
 
         self.assertIsNotNone(self.channel.version_info)
-        self.assertEqual(self.channel.version_info.version, 2)
+        self.assertEqual(self.channel.version_info.version, 1)
         self.assertIsNone(self.channel.version_info.secret_token)

contentcuration/contentcuration/urls.py

@@ -39,7 +39,6 @@
 )
 from contentcuration.viewsets.bookmark import BookmarkViewSet
 from contentcuration.viewsets.channel import AdminChannelViewSet
-from contentcuration.viewsets.channel import AuditedSpecialPermissionsLicenseViewSet
 from contentcuration.viewsets.channel import CatalogViewSet
 from contentcuration.viewsets.channel import ChannelViewSet
 from contentcuration.viewsets.channelset import ChannelSetViewSet
@@ -73,11 +72,6 @@ def get_redirect_url(self, *args, **kwargs):
 
 
 router = routers.DefaultRouter(trailing_slash=False)
-router.register(
-    r"audited_special_permissions_license",
-    AuditedSpecialPermissionsLicenseViewSet,
-    basename="audited-special-permissions-license",
-)
 router.register(r"bookmark", BookmarkViewSet, basename="bookmark")
 router.register(r"channel", ChannelViewSet)
 router.register(r"channelset", ChannelSetViewSet)

contentcuration/contentcuration/viewsets/audited_special_permissions_license.py

@@ -1,6 +1,7 @@
 from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.rest_framework import FilterSet
+from django_filters.rest_framework import UUIDFilter
 from rest_framework.permissions import IsAuthenticated
 
 from contentcuration.models import AuditedSpecialPermissionsLicense
@@ -11,15 +12,19 @@
 class AuditedSpecialPermissionsLicenseFilter(FilterSet):
     """
     Filter for AuditedSpecialPermissionsLicense viewset.
-    Supports filtering by IDs and distributable status.
+    Supports filtering by IDs, distributable status, and channelVersion.
     """
 
     by_ids = UUIDInFilter(field_name="id")
     distributable = BooleanFilter()
+    channel_version = UUIDFilter(
+        field_name="channel_versions__id",
+        help_text="Filter by ChannelVersion ID",
+    )
 
     class Meta:
         model = None
-        fields = ("by_ids", "distributable")
+        fields = ("by_ids", "distributable", "channel_version")
 
     def __init__(self, *args, **kwargs):
 
@@ -30,7 +35,7 @@ def __init__(self, *args, **kwargs):
 class AuditedSpecialPermissionsLicenseViewSet(ReadOnlyValuesViewset):
     """
     Read-only viewset for AuditedSpecialPermissionsLicense.
-    Allows filtering by IDs and distributable status.
+    Allows filtering by IDs, distributable status, and channelVersion.
     """
 
     permission_classes = [IsAuthenticated]

contentcuration/contentcuration/viewsets/channel.py

@@ -22,9 +22,6 @@
 from django_cte import With
 from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import CharFilter
-from django_filters.rest_framework import DjangoFilterBackend
-from django_filters.rest_framework import FilterSet
-from django_filters.rest_framework import UUIDFilter
 from kolibri_public.utils.export_channel_to_kolibri_public import (
     export_channel_to_kolibri_public,
 )
@@ -50,7 +47,6 @@
     community_library_submission as community_library_submission_constants,
 )
 from contentcuration.decorators import cache_no_user_data
-from contentcuration.models import AuditedSpecialPermissionsLicense
 from contentcuration.models import Change
 from contentcuration.models import Channel
 from contentcuration.models import ChannelVersion
@@ -1330,36 +1326,3 @@ class Meta:
         model = Channel
         fields = ("id", "name", "editor_count", "public")
         read_only_fields = ("id", "name", "editor_count", "public")
-
-
-class AuditedSpecialPermissionsLicenseFilter(FilterSet):
-    """Filter for AuditedSpecialPermissionsLicense by channelVersion."""
-
-    channel_version = UUIDFilter(
-        field_name="channel_versions__id",
-        help_text="Filter by ChannelVersion ID",
-    )
-
-    class Meta:
-        model = AuditedSpecialPermissionsLicense
-        fields = ["channel_version"]
-
-
-class AuditedSpecialPermissionsLicenseViewSet(ReadOnlyValuesViewset):
-    """
-    ViewSet for retrieving AuditedSpecialPermissionsLicense objects.
-    Supports filtering by channelVersion to get licenses for a specific channel version.
-    """
-
-    queryset = AuditedSpecialPermissionsLicense.objects.all()
-    permission_classes = [IsAuthenticated]
-    filter_backends = [DjangoFilterBackend]
-    filterset_class = AuditedSpecialPermissionsLicenseFilter
-
-    values = ("id", "description", "distributable")
-
-    field_map = {
-        "id": "id",
-        "description": "description",
-        "distributable": "distributable",
-    }