Compute license audit task results during publish workflow (#5665)

* Compute license audit task results during publish workflow

* [pre-commit.ci lite] apply automatic fixes

* fix linting

* fix code

* fix code

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

Author: taoerman

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

@@ -6,7 +6,6 @@ import SubmitToCommunityLibrarySidePanel from '../';
 import Box from '../Box.vue';
 
 import { useVersionDetail } from '../composables/useVersionDetail';
-import { useLicenseAudit } from '../composables/useLicenseAudit';
 import { useLatestCommunityLibrarySubmission } from 'shared/composables/useLatestCommunityLibrarySubmission';
 import CommunityLibraryStatusChip from 'shared/views/communityLibrary/CommunityLibraryStatusChip.vue';
 import { Categories, CommunityLibraryStatus } from 'shared/constants';
@@ -15,7 +14,6 @@ import { CommunityLibrarySubmission } from 'shared/data/resources';
 import CountryField from 'shared/views/form/CountryField.vue';
 
 jest.mock('../composables/useVersionDetail');
-jest.mock('../composables/useLicenseAudit');
 jest.mock('shared/composables/useLatestCommunityLibrarySubmission');
 jest.mock('shared/data/resources', () => ({
   CommunityLibrarySubmission: {
@@ -58,16 +56,6 @@ async function makeWrapper({ channel, publishedData, latestSubmission }) {
     fetchData: fetchLatestSubmission,
   });
 
-  useLicenseAudit.mockReturnValue({
-    isLoading: computed(() => false),
-    isFinished: computed(() => true),
-    isAuditing: ref(false),
-    invalidLicenses: ref([]),
-    includedLicenses: ref([]),
-    hasAuditData: computed(() => true),
-    checkAndTriggerAudit: jest.fn(),
-  });
-
   const wrapper = mount(SubmitToCommunityLibrarySidePanel, {
     store,
     propsData: {

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

@@ -138,30 +138,16 @@
                 </LoadingText>
               </div>
             </div>
-            <div
-              v-if="licenseAuditIsLoading"
-              class="license-audit-loader"
-            >
-              <KCircularLoader disableDefaultTransition />
-              <div class="audit-text-wrapper">
-                <div class="audit-text-primary">
-                  {{ checkingChannelCompatibility$() }}
-                </div>
-                <div class="audit-text-secondary">
-                  {{ checkingChannelCompatibilitySecondary$() }}
-                </div>
-              </div>
-            </div>
             <InvalidLicensesNotice
-              v-if="licenseAuditIsFinished && invalidLicenses.length"
+              v-if="versionDetailIsFinished && invalidLicenses.length"
               :invalid-licenses="invalidLicenses"
             />
             <CompatibleLicensesNotice
-              v-else-if="licenseAuditIsFinished"
+              v-else-if="versionDetailIsFinished"
               :licenses="includedLicenses"
             />
             <SpecialPermissionsList
-              v-if="licenseAuditIsFinished && channelVersionId"
+              v-if="versionDetailIsFinished && channelVersionId"
               v-model="checkedSpecialPermissions"
               :channel-version-id="channelVersionId"
               @update:allChecked="allSpecialPermissionsChecked = $event"
@@ -244,7 +230,6 @@
 
   import Box from './Box';
   import LoadingText from './LoadingText';
-  import { useLicenseAudit } from './composables/useLicenseAudit';
   import { useVersionDetail } from './composables/useVersionDetail';
 
   import InvalidLicensesNotice from './licenseCheck/InvalidLicensesNotice.vue';
@@ -310,8 +295,6 @@
         submittingSnackbar$,
         publishingMessage$,
         confirmReplacementText$,
-        checkingChannelCompatibility$,
-        checkingChannelCompatibilitySecondary$,
       } = communityChannelsStrings;
 
       const annotationColor = computed(() => tokensTheme.annotation);
@@ -429,13 +412,13 @@
         return versionDetail.value?.id;
       });
 
-      const {
-        isLoading: licenseAuditIsLoading,
-        isFinished: licenseAuditIsFinished,
-        invalidLicenses,
-        includedLicenses,
-        checkAndTriggerAudit: checkAndTriggerLicenseAudit,
-      } = useLicenseAudit(props.channel, currentChannelVersion);
+      const invalidLicenses = computed(() => {
+        return versionDetail.value?.non_distributable_licenses_included || [];
+      });
+
+      const includedLicenses = computed(() => {
+        return versionDetail.value?.included_licenses || [];
+      });
 
       const allSpecialPermissionsChecked = ref(false);
 
@@ -448,7 +431,7 @@
           allSpecialPermissionsChecked.value,
           !isPublishing.value,
           !hasInvalidLicenses.value,
-          licenseAuditIsFinished.value,
+          versionDetailIsFinished.value,
           canBeEdited.value,
           versionDetailIsFinished.value,
           description.value.length >= 1,
@@ -461,11 +444,10 @@
         return conditions.every(condition => condition);
       });
 
-      // Watch for when publishing completes - fetch publishedData to get the new version's data
+      // Watch for when publishing completes - fetch version detail to get the new version's data
       watch(isPublishing, async (newIsPublishing, oldIsPublishing) => {
         if (oldIsPublishing === true && newIsPublishing === false) {
           await fetchVersionDetail();
-          await checkAndTriggerLicenseAudit();
         }
       });
 
@@ -474,7 +456,6 @@
 
         if (!isPublishing.value) {
           await fetchVersionDetail();
-          await checkAndTriggerLicenseAudit();
         }
       });
 
@@ -581,8 +562,6 @@
         versionDetailIsFinished,
         detectedLanguages,
         detectedCategories,
-        licenseAuditIsLoading,
-        licenseAuditIsFinished,
         invalidLicenses,
         includedLicenses,
         onSubmit,
@@ -606,8 +585,6 @@
         isPublishing,
         publishingMessage$,
         confirmReplacementText$,
-        checkingChannelCompatibility$,
-        checkingChannelCompatibilitySecondary$,
         checkedSpecialPermissions,
         allSpecialPermissionsChecked,
       };
@@ -720,35 +697,6 @@
     color: v-bind('infoTextColor');
   }
 
-  .license-audit-loader {
-    display: flex;
-    flex-direction: row;
-    gap: 12px;
-    align-items: flex-start;
-    width: 100%;
-    padding: 16px 0;
-  }
-
-  .audit-text-wrapper {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    gap: 4px;
-  }
-
-  .audit-text-primary {
-    font-size: 14px;
-    line-height: 140%;
-    color: v-bind('infoTextColor');
-  }
-
-  .audit-text-secondary {
-    font-size: 14px;
-    line-height: 140%;
-    color: v-bind('infoTextColor');
-    opacity: 0.7;
-  }
-
   .info-section {
     display: flex;
     flex-direction: column;

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

@@ -1416,10 +1416,6 @@ export const Channel = new CreateModelResource({
     const response = await client.get(window.Urls.channel_version_detail(id));
     return response.data;
   },
-  async auditLicenses(id) {
-    const response = await client.post(window.Urls.channel_audit_licenses(id));
-    return response.data;
-  },
 });
 
 function getChannelFromChannelScope() {

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

@@ -241,16 +241,6 @@ export const communityChannelsStrings = createTranslator('CommunityChannelsStrin
     message: 'Dismiss',
     context: 'Action in the resubmit modal to dismiss the modal',
   },
-  checkingChannelCompatibility: {
-    message: 'Checking channel compatibility for submission...',
-    context:
-      'Message shown in the "Submit to Community Library" panel while the license audit is in progress',
-  },
-  checkingChannelCompatibilitySecondary: {
-    message: 'This usually takes a few seconds...',
-    context:
-      'Secondary message shown below the main checking message to indicate the expected duration',
-  },
   licenseCheckPassed: {
     message: 'License check passed',
     context: 'Title shown when license audit passes (no invalid licenses found)',

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

@@ -16,7 +16,6 @@
 from contentcuration.models import Change
 from contentcuration.models import ContentNode
 from contentcuration.models import User
-from contentcuration.utils.audit_channel_licenses import audit_channel_licenses
 from contentcuration.utils.csv_writer import write_user_csv
 from contentcuration.utils.nodes import calculate_resource_size
 from contentcuration.utils.nodes import generate_diff
@@ -166,8 +165,3 @@ def sendcustomemails_task(subject, message, query):
 @app.task(name="ensure_versioned_database_exists_task")
 def ensure_versioned_database_exists_task(channel_id, channel_version):
     ensure_versioned_database_exists(channel_id, channel_version)
-
-
-@app.task(name="audit-channel-licenses")
-def audit_channel_licenses_task(channel_id, user_id):
-    audit_channel_licenses(channel_id, user_id)