[Draft] 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/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/views/trash/TrashModal.vue

@@ -281,19 +281,24 @@
         'moveContentNodes',
         'loadContentNodes',
         'loadAncestors',
+        'removeContentNodes',
       ]),
       loadNodes() {
         this.loading = true;
+        this.more = null;
+        this.moreLoading = false;
         if (!this.trashId) {
           this.loading = false;
           return;
         }
-        this.loadChildren({ parent: this.trashId, ordering: '-modified' }).then(
-          childrenResponse => {
-            this.loading = false;
-            this.more = childrenResponse.more || null;
-          },
-        );
+        this.removeContentNodes({ parentId: this.trashId }).then(() => {
+          this.loadChildren({ parent: this.trashId, ordering: '-modified' }).then(
+            childrenResponse => {
+              this.loading = false;
+              this.more = childrenResponse.more || null;
+            },
+          );
+        });
       },
       moveNodes(target) {
         return this.moveContentNodes({

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

@@ -574,8 +574,12 @@ describe('ContentNode methods', () => {
 
     it('should update the node with the payload', async () => {
       node.parent = parent.id;
-      await expect(ContentNode.tableMove({ node, parent, payload, change })).resolves.toBe(payload);
-      expect(table.update).toHaveBeenCalledWith(node.id, payload);
+      const result = await ContentNode.tableMove({ node, parent, payload, change });
+      expect(result).toMatchObject({ ...payload, modified: expect.any(String) });
+      expect(table.update).toHaveBeenCalledTimes(1);
+      const [updateId, updatePayload] = table.update.mock.calls[0];
+      expect(updateId).toBe(node.id);
+      expect(updatePayload).toBe(result);
       expect(table.put).not.toBeCalled();
       expect(table.update).not.toHaveBeenCalledWith(node.parent, { changed: true });
     });
@@ -584,19 +588,23 @@ describe('ContentNode methods', () => {
       node.parent = parent.id;
       updated = false;
       const newPayload = { ...payload, root_id: parent.root_id };
-      await expect(ContentNode.tableMove({ node, parent, payload, change })).resolves.toMatchObject(
-        newPayload,
+      const result = await ContentNode.tableMove({ node, parent, payload, change });
+      expect(result).toMatchObject({ ...newPayload, modified: expect.any(String) });
+      expect(table.update).toHaveBeenCalledWith(
+        node.id,
+        expect.objectContaining({ ...payload, modified: expect.any(String) }),
       );
-      expect(table.update).toHaveBeenCalledWith(node.id, payload);
-      expect(table.put).toHaveBeenCalledWith(newPayload);
+      expect(table.put).toHaveBeenCalledWith(result);
       expect(table.update).not.toHaveBeenCalledWith(node.parent, { changed: true });
     });
 
     it('should mark the old parent as changed', async () => {
-      await expect(ContentNode.tableMove({ node, parent, payload, change })).resolves.toMatchObject(
-        payload,
+      const result = await ContentNode.tableMove({ node, parent, payload, change });
+      expect(result).toMatchObject({ ...payload, modified: expect.any(String) });
+      expect(table.update).toHaveBeenCalledWith(
+        node.id,
+        expect.objectContaining({ ...payload, modified: expect.any(String) }),
       );
-      expect(table.update).toHaveBeenCalledWith(node.id, payload);
       expect(table.put).not.toBeCalled();
       expect(table.update).toHaveBeenCalledWith(node.parent, { changed: true });
     });

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

@@ -1687,6 +1687,10 @@ export const ContentNode = new TreeResource({
   async tableMove({ node, parent, payload }) {
     // Do direct table writes here rather than using add/update methods to avoid
     // creating unnecessary additional change events.
+    payload = {
+      ...payload,
+      modified: new Date().toISOString(),
+    };
     const updated = await this.table.update(node.id, payload);
     // Update didn't succeed, this node probably doesn't exist, do a put instead,
     // but need to add in other parent info.