Merge remote-tracking branch 'upstream/unstable' into remove-vuetify-5597

Author: vtushar06

.github/workflows/call-pull-request-target.yml

@@ -1,7 +1,7 @@
 name: Handle pull request events
 on:
   pull_request_target:
-    types: [review_requested, labeled]
+    types: [opened, review_requested, labeled]
 jobs:
   call-workflow:
     name: Call shared workflow

.github/workflows/deploytest.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Use pnpm
-      uses: pnpm/action-setup@v5
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6
       with:
@@ -59,7 +59,7 @@ jobs:
         # Use uv to install dependencies directly from requirements files
         uv pip sync requirements.txt
     - name: Use pnpm
-      uses: pnpm/action-setup@v5
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6
       with:

.github/workflows/frontendtest.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Use pnpm
-      uses: pnpm/action-setup@v5
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6
       with:

.github/workflows/i18n-download.yml

@@ -22,7 +22,7 @@ jobs:
         run: uv pip sync requirements.txt
 
       - name: Use pnpm
-        uses: pnpm/action-setup@v5
+        uses: pnpm/action-setup@v6.0.3
 
       - name: Use Node.js
         uses: actions/setup-node@v6

.github/workflows/i18n-upload.yml

@@ -22,7 +22,7 @@ jobs:
         run: uv pip sync requirements.txt
 
       - name: Use pnpm
-        uses: pnpm/action-setup@v5
+        uses: pnpm/action-setup@v6.0.3
 
       - name: Use Node.js
         uses: actions/setup-node@v6

.github/workflows/pre-commit.yml

@@ -38,7 +38,7 @@ jobs:
         python-version: '3.10'
         ignore-nothing-to-cache: 'true'
     - name: Use pnpm
-      uses: pnpm/action-setup@v5
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6
       with:

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
         exclude: '^.+?\.ttf$'
       - id: debug-statements
       - id: end-of-file-fixer
-        exclude: '^.+?\.json.+?\.yml$'
+        exclude: '^.+?(\.json|\.po)$'
   - repo: https://github.com/PyCQA/flake8
     rev: 7.1.2
     hooks:

Makefile

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

contentcuration/contentcuration/db/models/manager.py

@@ -9,6 +9,7 @@
 from django.db.utils import OperationalError
 from django_cte import CTEQuerySet
 from le_utils.constants import content_kinds
+from le_utils.constants import modalities
 from mptt.managers import TreeManager
 from mptt.signals import node_moved
 
@@ -359,6 +360,15 @@ def _recurse_to_create_tree(
                 )
             )
         source_copy_id_map[source.id] = copy["id"]
+
+        if self._is_unit_topic(source.kind_id, copy.get("extra_fields")):
+            copy["extra_fields"] = {
+                **copy["extra_fields"],
+                "options": self._remap_unit_options(
+                    copy["extra_fields"]["options"], source_copy_id_map
+                ),
+            }
+
         return copy
 
     def _all_nodes_to_copy(self, node, excluded_descendants):
@@ -394,7 +404,7 @@ def copy_node(
         if progress_tracker:
             progress_tracker.set_total(total_nodes)
 
-        return self._copy(
+        nodes, _ = self._copy(
             node,
             target,
             position,
@@ -406,6 +416,7 @@ def copy_node(
             batch_size,
             progress_tracker=progress_tracker,
         )
+        return nodes
 
     def _copy(
         self,
@@ -424,7 +435,7 @@ def _copy(
         :type progress_tracker: contentcuration.utils.celery.ProgressTracker|None
         """
         if node.rght - node.lft < batch_size:
-            copied_nodes = self._deep_copy(
+            copied_nodes, node_map = self._deep_copy(
                 node,
                 target,
                 position,
@@ -436,7 +447,7 @@ def _copy(
             )
             if progress_tracker:
                 progress_tracker.increment(len(copied_nodes))
-            return copied_nodes
+            return copied_nodes, node_map
         node_copy = self._shallow_copy(
             node,
             target,
@@ -451,8 +462,9 @@ def _copy(
         children = node.get_children().order_by("lft")
         if excluded_descendants:
             children = children.exclude(node_id__in=excluded_descendants.keys())
+        combined_map = {node.id: node_copy.id}
         for child in children:
-            self._copy(
+            _, child_map = self._copy(
                 child,
                 node_copy,
                 "last-child",
@@ -464,7 +476,19 @@ def _copy(
                 batch_size,
                 progress_tracker=progress_tracker,
             )
-        return [node_copy]
+            combined_map.update(child_map)
+
+        if self._is_unit_topic(node.kind_id, node.extra_fields):
+            remapped_extra_fields = {
+                **node_copy.extra_fields,
+                "options": self._remap_unit_options(
+                    node.extra_fields["options"], combined_map
+                ),
+            }
+            self.filter(pk=node_copy.pk).update(extra_fields=remapped_extra_fields)
+            node_copy.extra_fields = remapped_extra_fields
+
+        return [node_copy], combined_map
 
     def _copy_tags(self, source_copy_id_map):
         from contentcuration.models import ContentTag
@@ -582,6 +606,27 @@ def _copy_associated_objects(self, source_copy_id_map):
 
         self._copy_tags(source_copy_id_map)
 
+    @staticmethod
+    def _is_unit_topic(kind_id, extra_fields):
+        return (
+            kind_id == content_kinds.TOPIC
+            and isinstance(extra_fields, dict)
+            and extra_fields.get("options", {}).get("modality") == modalities.UNIT
+        )
+
+    @staticmethod
+    def _remap_unit_options(options, source_copy_id_map):
+        remapped = dict(options)
+
+        if "lesson_objectives" in remapped:
+            remapped["lesson_objectives"] = {
+                source_copy_id_map[old_id]: objectives
+                for old_id, objectives in remapped["lesson_objectives"].items()
+                if old_id in source_copy_id_map
+            }
+
+        return remapped
+
     def _shallow_copy(
         self,
         node,
@@ -665,4 +710,4 @@ def _deep_copy(
 
         self._copy_associated_objects(source_copy_id_map)
 
-        return new_nodes
+        return new_nodes, source_copy_id_map

contentcuration/contentcuration/frontend/accounts/components/form/StudioEmailField.vue

@@ -0,0 +1,64 @@
+<template>
+
+  <KTextbox
+    :value="value"
+    type="email"
+    :label="label || $tr('emailLabel')"
+    :maxlength="maxlength"
+    :disabled="disabled"
+    :invalid="hasError"
+    :invalidText="errorText"
+    :showInvalidText="hasError"
+    v-bind="$attrs"
+    @input="handleInput"
+    @blur="$emit('blur')"
+  />
+
+</template>
+
+
+<script>
+
+  export default {
+    name: 'StudioEmailField',
+    props: {
+      value: {
+        type: String,
+        default: '',
+      },
+      label: {
+        type: String,
+        default: null,
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      errorMessages: {
+        type: Array,
+        default: () => [],
+      },
+      maxlength: {
+        type: [String, Number],
+        default: null,
+      },
+    },
+    computed: {
+      hasError() {
+        return this.errorMessages && this.errorMessages.length > 0;
+      },
+      errorText() {
+        return this.hasError ? this.errorMessages[0] : '';
+      },
+    },
+    methods: {
+      handleInput(value) {
+        this.$emit('input', value.trim());
+      },
+    },
+    $trs: {
+      emailLabel: 'Email address',
+    },
+  };
+
+</script>