delete all version_notes and language for publish_next

Author: taoerman

contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js

@@ -258,16 +258,14 @@ describe('Change Types', () => {
       key: '1',
       table: TABLE_NAMES.CHANNEL,
       use_staging_tree: false,
-      version_notes: 'Test version notes',
-      language: 'en',
       source: CLIENTID,
     });
     const rev = await change.saveChange();
     const persistedChange = await db[CHANGES_TABLE].get(rev);
     expect(persistedChange).toEqual({
       rev,
       channel_id: change.key,
-      ...pick(change, ['type', 'key', 'table', 'use_staging_tree', 'version_notes', 'language', 'source']),
+      ...pick(change, ['type', 'key', 'table', 'use_staging_tree', 'source']),
     });
   });
 

contentcuration/contentcuration/frontend/shared/data/changes.js

@@ -439,7 +439,7 @@ export class PublishedChange extends Change {
 }
 
 export class PublishedNextChange extends Change {
-  constructor({ use_staging_tree, version_notes, language, ...fields }) {
+  constructor({ use_staging_tree, ...fields }) {
     fields.type = CHANGE_TYPES.PUBLISHED_NEXT;
     super(fields);
     if (this.table !== TABLE_NAMES.CHANNEL) {

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

@@ -1237,15 +1237,11 @@ export const Channel = new CreateModelResource({
   publishDraft(id, opts={}) {
     const {
       use_staging_tree = false,
-      version_notes = '',
-      language = currentLanguage,
     } = opts;
 
     const change = new PublishedNextChange({
       key: id,
       use_staging_tree,
-      version_notes,
-      language,
       table: this.tableName,
       source: CLIENTID,
     });

contentcuration/contentcuration/frontend/shared/data/serverSync.js

@@ -36,7 +36,7 @@ const ChangeTypeMapFields = {
     'excluded_descendants',
   ]),
   [CHANGE_TYPES.PUBLISHED]: commonFields.concat(['version_notes', 'language']),
-  [CHANGE_TYPES.PUBLISHED_NEXT]: commonFields.concat(['use_staging_tree', 'version_notes', 'language']),
+  [CHANGE_TYPES.PUBLISHED_NEXT]: commonFields.concat(['use_staging_tree']),
   [CHANGE_TYPES.SYNCED]: commonFields.concat([
     'titles_and_descriptions',
     'resource_details',

contentcuration/contentcuration/tests/test_exportchannel.py

@@ -879,12 +879,10 @@ def run_publish_channel(self):
         publish_channel(
             self.admin_user.id,
             self.content_channel.id,
-            version_notes="",
             force=False,
             force_exercises=False,
             send_email=False,
             progress_tracker=None,
-            language="fr",
             is_draft_version=True,
             use_staging_tree=True,
         )
@@ -990,12 +988,10 @@ def run_publish_channel(self):
         publish_channel(
             self.admin_user.id,
             self.content_channel.id,
-            version_notes="",
             force=False,
             force_exercises=False,
             send_email=False,
             progress_tracker=None,
-            language="fr",
             is_draft_version=True,
             use_staging_tree=False,
         )

contentcuration/contentcuration/viewsets/channel.py

@@ -620,8 +620,6 @@ def publish_next_from_changes(self, changes):
             try:
                 self.publish_next(
                     publish["key"],
-                    # version_notes=publish.get("version_notes"),
-                    # language=publish.get("language"),
                     use_staging_tree=publish.get("use_staging_tree", False), 
                 )
             except Exception as e:

contentcuration/contentcuration/viewsets/sync/utils.py

@@ -98,10 +98,8 @@ def generate_update_descendants_event(key, mods, channel_id=None, user_id=None):
     return event
 
 
-def generate_publish_next_event(key, version_notes="", language=None, use_staging_tree=False):
+def generate_publish_next_event(key, use_staging_tree=False):
     event = _generate_event(key, CHANNEL, PUBLISHED_NEXT, key, None)
-    event["version_notes"] = version_notes
-    event["language"] = language
     event["use_staging_tree"] = use_staging_tree
     return event