Studio Release v2026.01.21

.github/workflows/containerbuild.yml

@@ -79,7 +79,7 @@ jobs:
         with:
           skip_after_successful_duplicate: false
           github_token: ${{ github.token }}
-          paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'
+          paths: '["docker/Dockerfile.nginx.prod", "docker/nginx/*", ".github/workflows/containerbuild.yml"]'
 
   build_nginx:
     name: nginx - test build of nginx Docker image
@@ -100,6 +100,6 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ./
-        file: ./k8s/images/nginx/Dockerfile
+        file: ./docker/Dockerfile.nginx.prod
         platforms: linux/amd64
         push: false

Makefile

@@ -171,11 +171,7 @@ dcbuild:
 	$(DOCKER_COMPOSE) build
 
 dcup: .docker/minio .docker/postgres
-	# run all services except for cloudprober
-	$(DOCKER_COMPOSE) up studio-app celery-worker
-
-dcup-cloudprober: .docker/minio .docker/postgres
-	# run all services including cloudprober
+	# run all services
 	$(DOCKER_COMPOSE) up
 
 dcdown:

contentcuration/contentcuration/constants/completion_criteria.py

@@ -3,7 +3,9 @@
 from jsonschema.validators import validator_for
 from le_utils.constants import completion_criteria
 from le_utils.constants import content_kinds
+from le_utils.constants import exercises
 from le_utils.constants import mastery_criteria
+from le_utils.constants import modalities
 
 
 def _build_validator():
@@ -52,10 +54,11 @@ def _build_validator():
         completion_criteria.APPROX_TIME,
         completion_criteria.REFERENCE,
     },
+    content_kinds.TOPIC: {completion_criteria.MASTERY},
 }
 
 
-def check_model_for_kind(data, kind):
+def check_model_for_kind(data, kind, modality=None):
     model = data.get("model")
     if kind is None or model is None or kind not in ALLOWED_MODELS_PER_KIND:
         return
@@ -68,11 +71,37 @@ def check_model_for_kind(data, kind):
             )
         )
 
+    if kind == content_kinds.TOPIC:
+        check_topic_completion_criteria(data, modality)
 
-def validate(data, kind=None):
+
+def check_topic_completion_criteria(data, modality):
+    """
+    Validates topic-specific completion criteria rules:
+    - Topics can only have completion criteria if modality is UNIT
+    - Topics can only use PRE_POST_TEST mastery model
+    """
+    # Topics can only have completion criteria with UNIT modality
+    if modality != modalities.UNIT:
+        raise ValidationError(
+            "Topics can only have completion criteria with UNIT modality"
+        )
+
+    # Topics can only use PRE_POST_TEST mastery model
+    threshold = data.get("threshold", {})
+    mastery_model = threshold.get("mastery_model")
+    if mastery_model is not None and mastery_model != exercises.PRE_POST_TEST:
+        raise ValidationError(
+            "mastery_model '{}' is invalid for topic content kind; "
+            "only '{}' is allowed".format(mastery_model, exercises.PRE_POST_TEST)
+        )
+
+
+def validate(data, kind=None, modality=None):
     """
     :param data: Dictionary of data to validate
     :param kind: A str of the node content kind
+    :param modality: A str of the node modality (required for topics with completion criteria)
     :raises: ValidationError: When invalid
     """
     # empty dicts are okay
@@ -104,4 +133,4 @@ def validate(data, kind=None):
         e.error_list.extend(error_descriptions)
         raise e
 
-    check_model_for_kind(data, kind)
+    check_model_for_kind(data, kind, modality)

contentcuration/contentcuration/frontend/accounts/pages/Create.vue

@@ -213,9 +213,10 @@
         <KButton
           primary
           class="mt-5"
-          :disabled="offline"
+          :disabled="offline || submitting"
           :text="$tr('finishButton')"
           type="submit"
+          data-test="submit-button"
         />
       </VForm>
     </VLayout>
@@ -260,6 +261,7 @@
       return {
         valid: true,
         registrationFailed: false,
+        submitting: false,
         form: {
           first_name: '',
           last_name: '',
@@ -482,6 +484,12 @@
         // We need to check the "acceptedAgreement" here explicitly because it is not a
         // Vuetify form field and does not trigger the form validation.
         if (this.$refs.form.validate() && this.acceptedAgreement) {
+          // Prevent double submission
+          if (this.submitting) {
+            return Promise.resolve();
+          }
+
+          this.submitting = true;
           const cleanedData = this.clean(this.form);
           return this.register(cleanedData)
             .then(() => {
@@ -517,6 +525,9 @@
                 this.registrationFailed = true;
                 this.valid = false;
               }
+            })
+            .finally(() => {
+              this.submitting = false;
             });
         } else if (this.$refs.top.scrollIntoView) {
           this.$refs.top.scrollIntoView({ behavior: 'smooth' });

contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js

@@ -179,4 +179,19 @@ describe('create', () => {
       expect(wrapper.vm.registrationFailed).toBe(true);
     });
   });
+  describe('double-submit prevention', () => {
+    it('should prevent multiple API calls on rapid clicks', async () => {
+      const [wrapper, mocks] = await makeWrapper();
+
+      // Click submit multiple times
+      const p1 = wrapper.vm.submit();
+      const p2 = wrapper.vm.submit();
+      const p3 = wrapper.vm.submit();
+
+      await Promise.all([p1, p2, p3]);
+
+      // Only 1 API call should be made
+      expect(mocks.register).toHaveBeenCalledTimes(1);
+    });
+  });
 });

contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue

@@ -227,6 +227,7 @@
             </VBtn>
 
             <VBtn
+              v-if="false"
               color="primary"
               data-test="display-publish-draft-dialog-btn"
               @click="displayPublishDraftDialog = true"