Properly handle metadata inheritance for non uploaded nodes in edit m…

…odal.
rtibbles · Sep 27, 2024 · 5827048 · 5827048
1 parent 6f6daf2
commit 5827048
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -534,11 +534,17 @@
           return newNodeId;
         });
       },
+      resetInheritMetadataModal() {
+        this.$refs.inheritModal?.checkInheritance();
+      },
       createTopic() {
         this.createNode('topic', {
           title: '',
         }).then(newNodeId => {
           this.selected = [newNodeId];
+          this.$nextTick(() => {
+            this.resetInheritMetadataModal();
+          });
         });
       },
       async createNodesFromUploads(fileUploads) {
@@ -569,7 +575,7 @@
           })
         );
         this.creatingNodes = false;
-        this.$refs.inheritModal?.resetClosed();
+        this.resetInheritMetadataModal();
       },
       updateTitleForPage() {
         this.updateTabTitle(this.$store.getters.appendChannelName(this.modalTitle));
@@ -580,8 +586,13 @@
         });
       },
       inheritMetadata(metadata) {
+        if (!this.createMode) {
+          // This shouldn't happen, but prevent this just in case.
+          return;
+        }
         const setMetadata = () => {
-          for (const nodeId of this.newNodeIds) {
+          const nodeIds = this.uploadMode ? this.newNodeIds : this.selected;
+          for (const nodeId of nodeIds) {
             this.updateContentNode({
               id: nodeId,
               ...metadata,

diff --git a/...ion/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue b/...ion/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue
@@ -192,6 +192,19 @@
     },
     methods: {
       ...mapActions('contentNode', ['updateContentNode']),
+      /**
+       * @public
+       */
+      checkInheritance() {
+        if (this.allFieldsDesignatedByParent || !this.parentHasInheritableMetadata) {
+          // If all fields have been designated by the parent, or there is nothing to inherit,
+          // automatically continue
+          this.handleContinue();
+        } else {
+          // Wait for the data to be updated before showing the dialog
+          this.closed = false;
+        }
+      },
       resetData() {
         if (this.parent) {
           this.dontShowAgain = false;
@@ -242,14 +255,7 @@
               };
             }, {});
             this.$nextTick(() => {
-              if (this.allFieldsDesignatedByParent || !this.parentHasInheritableMetadata) {
-                // If all fields have been designated by the parent, or there is nothing to inherit,
-                // automatically continue
-                this.handleContinue();
-              } else {
-                // Wait for the data to be updated before showing the dialog
-                this.closed = false;
-              }
+              this.checkInheritance();
             });
           });
         }