Merge pull request #5039 from rtibbles/hotfixes_into_unstable

Hotfixes into unstable

Author: rtibbles

Makefile

@@ -38,7 +38,7 @@ migrate:
 # 4) Remove the management command from this `deploy-migrate` recipe
 # 5) Repeat!
 deploy-migrate:
-	python contentcuration/manage.py rectify_incorrect_contentnode_source_fields
+	echo "Nothing to do here!"
 
 contentnodegc:
 	python contentcuration/manage.py garbage_collect

contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUpload.spec.js

@@ -66,8 +66,12 @@ describe('fileUpload', () => {
   });
   describe('computed', () => {
     it('should map the files to the correct presets', () => {
-      expect(wrapper.vm.primaryFileMapping[0].file.id).toBe('file-3');
-      expect(wrapper.vm.primaryFileMapping[1].file.id).toBe('file-1');
+      expect(wrapper.vm.primaryFileMapping.find(m => m.preset.id === 'epub').file.id).toBe(
+        'file-3',
+      );
+      expect(wrapper.vm.primaryFileMapping.find(m => m.preset.id === 'document').file.id).toBe(
+        'file-1',
+      );
       expect(wrapper.vm.primaryFileMapping).toHaveLength(2);
     });
     it('should disallow file removal if there is only one primary file', () => {

contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js

@@ -173,7 +173,7 @@ const FormatPresetsMap = new Map([
       order: 3,
       kind_id: 'exercise',
       allowed_formats: ['png', 'jpg', 'jpeg', 'gif', 'svg'],
-      associated_mimetypes: ['image/jpeg', 'image/svg', 'image/gif', 'image/png'],
+      associated_mimetypes: ['image/jpeg', 'image/gif', 'image/png', 'image/svg'],
     },
   ],
   [
@@ -304,6 +304,22 @@ const FormatPresetsMap = new Map([
       associated_mimetypes: ['.zip'],
     },
   ],
+  [
+    'kpub',
+    {
+      id: 'kpub',
+      readable_name: 'Kolibri HTML5 Article',
+      multi_language: false,
+      supplementary: false,
+      thumbnail: false,
+      subtitle: false,
+      display: true,
+      order: 1,
+      kind_id: 'document',
+      allowed_formats: ['kpub'],
+      associated_mimetypes: ['application/kpub+zip'],
+    },
+  ],
   [
     'low_res_video',
     {
@@ -522,6 +538,7 @@ export const FormatPresetsNames = {
   HTML5_THUMBNAIL: 'html5_thumbnail',
   HTML5_ZIP: 'html5_zip',
   IMSCP_ZIP: 'imscp_zip',
+  KPUB: 'kpub',
   LOW_RES_VIDEO: 'low_res_video',
   QTI: 'qti',
   QTI_THUMBNAIL: 'qti_thumbnail',