Release v2023.09.27

.github/workflows/deploytest.yml

@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
@@ -51,7 +51,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
       uses: actions/setup-python@v4
       with:

.github/workflows/frontendlint.yml

@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:

.github/workflows/frontendtest.yml

@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:

.github/workflows/pythontest.yml

@@ -61,7 +61,7 @@ jobs:
           # Maps port 6379 on service container to the host
           - 6379:6379
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up minio
       run: |
         docker run -d -p 9000:9000 --name minio \

Makefile

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

contentcuration/automation/admin.py

@@ -0,0 +1,3 @@
+# from django.contrib import admin
+
+# Register your models here.

contentcuration/automation/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AutomationConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'automation'

contentcuration/automation/models.py

@@ -0,0 +1,3 @@
+# from django.db import models
+
+# Create your models here.

contentcuration/automation/tests.py

@@ -0,0 +1,3 @@
+# from django.test import TestCase
+
+# Create your tests here.

contentcuration/automation/views.py

@@ -0,0 +1,3 @@
+# from django.shortcuts import render
+
+# Create your views here.

contentcuration/contentcuration/db/models/manager.py

@@ -487,6 +487,7 @@ def _copy_tags(self, source_copy_id_map):
                 tag_id_map[tag.id] = new_tag.id
                 tags_to_create.append(new_tag)
 
+        # TODO: Can cleanup the above and change the below to use ignore_conflicts=True
         ContentTag.objects.bulk_create(tags_to_create)
 
         mappings_to_create = [
@@ -499,7 +500,10 @@ def _copy_tags(self, source_copy_id_map):
             for mapping in node_tags_mappings
         ]
 
-        self.model.tags.through.objects.bulk_create(mappings_to_create)
+        # In the case that we are copying a node that is in the weird state of having a tag
+        # that is duplicated (with a channel tag and a null channel tag) this can cause an error
+        # so we ignore conflicts here to ignore the duplicate tags.
+        self.model.tags.through.objects.bulk_create(mappings_to_create, ignore_conflicts=True)
 
     def _copy_assessment_items(self, source_copy_id_map):
         from contentcuration.models import File

contentcuration/contentcuration/dev_settings.py

@@ -5,4 +5,4 @@
 
 ROOT_URLCONF = "contentcuration.dev_urls"
 
-INSTALLED_APPS += ("drf_yasg",)
+INSTALLED_APPS += ("drf_yasg", "automation")

contentcuration/contentcuration/frontend/administration/mixins.js

@@ -160,7 +160,7 @@ export const tableMixin = {
         ...this.$route.query,
       };
       if (params.sortBy) {
-        params.ordering = (params.descending ? '-' : '') + params.sortBy;
+        params.ordering = (String(params.descending) === 'true' ? '-' : '') + params.sortBy;
         delete params.sortBy;
         delete params.descending;
       }

contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

@@ -146,6 +146,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      name() {
+        return this.channel.name;
+      },
       searchChannelEditorsLink() {
         return {
           name: RouteNames.USERS,

contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

@@ -19,7 +19,7 @@
     </template>
     <LoadingText v-if="loading" absolute />
     <VCardText v-else>
-      <Banner error :value="channel.deleted" class="mb-4">
+      <Banner error :value="isDeleted" class="mb-4">
         This channel has been deleted
       </Banner>
       <VTabsItems v-model="tab">
@@ -102,6 +102,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      isDeleted() {
+        return this.channel && Boolean(this.channel?.deleted);
+      },
       channelWithDetails() {
         if (!this.channel || !this.details) {
           return {};

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue

@@ -12,6 +12,7 @@
       <transition-group name="list-complete" tag="div">
         <VCard
           v-for="(item, idx) in sortedItems"
+          ref="questionCardRef"
           :key="`question-${item.assessment_id}`"
           pa-1
           class="elevation-4 list-complete-item"
@@ -333,6 +334,17 @@
         this.$analytics.trackAction('exercise_editor', 'Add', {
           eventLabel: 'Question',
         });
+        this.$nextTick(() => {
+          const questionCards = this.$refs['questionCardRef'];
+          if (questionCards?.length >= 1) {
+            const lastQuestionCard = questionCards[questionCards.length - 1].$el;
+            const editorDiv = document.getElementById('editViewId');
+            editorDiv.scrollTo({
+              top: lastQuestionCard.offsetTop,
+              behavior: 'smooth',
+            });
+          }
+        });
       },
       async deleteItem(itemToDelete) {
         if (this.isItemActive(itemToDelete)) {

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue

@@ -285,13 +285,6 @@
       if (!this.question) {
         this.openQuestion();
       }
-      // Assessments are nested inside of a scrolling panel.
-      // Instead of propagating an event all the way back to
-      // the scrolling panel, just use scrollIntoView
-      // (supported by most major browsers)
-      if (this.$el.scrollIntoView) {
-        this.$el.scrollIntoView({ behaviour: 'smooth' });
-      }
     },
     methods: {
       updateItem(payload) {

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue

@@ -15,7 +15,7 @@
             v-on="on"
             @click="clickItem(action)"
           >
-            <Icon :color="iconColor(action)">
+            <Icon v-if="config[action] && config[action].icon" :color="iconColor(action)">
               {{ config[action].icon }}
             </Icon>
           </VBtn>

contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue

@@ -64,6 +64,22 @@
           </VListTileAction>
         </template>
 
+        <template #copy-fail-retry-action>
+          <span v-if="hasCopyingErrored">
+            <ActionLink class="copy-retry-btn" :text="$tr('retryCopy')" @click="retryFailedCopy" />
+          </span>
+        </template>
+
+        <template #copy-fail-remove-action>
+          <IconButton
+            v-if="hasCopyingErrored"
+            icon="close"
+            :text="$tr('removeNode')"
+            size="small"
+            @click="removeFailedCopyNode"
+          />
+        </template>
+
         <template #context-menu="{ showContextMenu, positionX, positionY }">
           <ContentNodeContextMenu
             :show="showContextMenu"
@@ -81,17 +97,19 @@
 
 <script>
 
-  import { mapGetters } from 'vuex';
+  import { mapGetters, mapActions } from 'vuex';
 
   import ContentNodeListItem from './ContentNodeListItem';
   import ContentNodeOptions from './ContentNodeOptions';
   import ContentNodeContextMenu from './ContentNodeContextMenu';
   import Checkbox from 'shared/views/form/Checkbox';
   import IconButton from 'shared/views/IconButton';
   import DraggableItem from 'shared/views/draggable/DraggableItem';
-  import { COPYING_FLAG } from 'shared/data/constants';
+  import { ContentNode } from 'shared/data/resources';
   import { DragEffect, DropEffect, EffectAllowed } from 'shared/mixins/draggable/constants';
   import { DraggableRegions } from 'frontend/channelEdit/constants';
+  import { withChangeTracker } from 'shared/data/changes';
+  import { COPYING_STATUS, COPYING_STATUS_VALUES } from 'shared/data/constants';
 
   export default {
     name: 'ContentNodeEditListItem',
@@ -141,7 +159,11 @@
     },
     computed: {
       ...mapGetters('currentChannel', ['canEdit']),
-      ...mapGetters('contentNode', ['getContentNode']),
+      ...mapGetters('contentNode', [
+        'getContentNode',
+        'isNodeInCopyingState',
+        'hasNodeCopyingErrored',
+      ]),
       ...mapGetters('draggable', ['activeDraggableRegionId']),
       selected: {
         get() {
@@ -163,7 +185,10 @@
         return !this.copying;
       },
       copying() {
-        return this.contentNode[COPYING_FLAG];
+        return this.isNodeInCopyingState(this.nodeId);
+      },
+      hasCopyingErrored() {
+        return this.hasNodeCopyingErrored(this.nodeId);
       },
       dragEffect() {
         return DragEffect.SORT;
@@ -206,18 +231,57 @@
         this.selected = false;
       }
     },
+    methods: {
+      ...mapActions(['showSnackbar', 'clearSnackbar']),
+      ...mapActions('contentNode', [
+        'updateContentNode',
+        'waitForCopyingStatus',
+        'deleteContentNode',
+      ]),
+      retryFailedCopy: withChangeTracker(function(changeTracker) {
+        this.updateContentNode({
+          id: this.nodeId,
+          [COPYING_STATUS]: COPYING_STATUS_VALUES.COPYING,
+        });
+
+        this.showSnackbar({
+          duration: null,
+          text: this.$tr('creatingCopies'),
+          // TODO: determine how to cancel copying while it's in progress,
+          // TODO: if that's something we want
+          // actionText: this.$tr('cancel'),
+          // actionCallback: () => changeTracker.revert(),
+        });
+
+        ContentNode.retryCopyChange(this.nodeId);
+
+        return this.waitForCopyingStatus({
+          contentNodeId: this.nodeId,
+          startingRev: changeTracker._startingRev,
+        })
+          .then(() => {
+            this.showSnackbar({
+              text: this.$tr('copiedSnackbar'),
+              actionText: this.$tr('undo'),
+              actionCallback: () => changeTracker.revert(),
+            }).then(() => changeTracker.cleanUp());
+          })
+          .catch(() => {
+            this.clearSnackbar();
+            changeTracker.cleanUp();
+          });
+      }),
+      removeFailedCopyNode() {
+        return this.deleteContentNode(this.nodeId);
+      },
+    },
     $trs: {
       optionsTooltip: 'Options',
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      /**
-       * Strings for handling copy failures
-       */
       removeNode: 'Remove',
       retryCopy: 'Retry',
       creatingCopies: 'Copying...',
       copiedSnackbar: 'Copy operation complete',
       undo: 'Undo',
-      /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
 
@@ -298,4 +362,8 @@
     justify-content: center;
   }
 
+  .copy-retry-btn {
+    font-size: inherit;
+  }
+
 </style>

contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.spec.js

@@ -30,7 +30,16 @@ const TOPIC_NODE = {
 
 function mountComponent(opts = {}) {
   return mount(ContentNodeListItem, {
-    store: createStore(),
+    store: createStore({
+      modules: {
+        contentNode: {
+          namespaced: true,
+          getters: {
+            isNodeInCopyingState: () => jest.fn(),
+          },
+        },
+      },
+    }),
     ...opts,
   });
 }