Skip to content

Inheritance modal release blocking fixes #4758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akolson merged 4 commits into from
Sep 26, 2024
Merged

Inheritance modal release blocking fixes #4758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8136e74
Explicitly check undefined when the desired value can be `false`.
rtibbles Sep 25, 2024
51eaa8f
Defer metadata setting if nodes are still being created from uploads.
rtibbles Sep 25, 2024
89ef2c3
Emit empty inheritance payload on cancel to ensure consistent behaviour.
rtibbles Sep 25, 2024
87c6fd1
Add some defensive programming checks.
rtibbles Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@
<VBtn v-if="addTopicsMode" color="greyBackground" @click="createTopic">
{{ $tr('addTopic') }}
</VBtn>
<VBtn v-else-if="uploadMode" color="greyBackground" @click="openFileDialog">
<VBtn
v-else-if="uploadMode"
:disabled="creatingNodes"
color="greyBackground"
@click="openFileDialog"
>
{{ $tr('uploadButton') }}
</VBtn>
</ToolBar>
Expand Down Expand Up @@ -256,6 +261,7 @@
openTime: null,
isInheritModalOpen: false,
newNodeIds: [],
creatingNodes: false,
};
},
computed: {
Expand Down Expand Up @@ -532,6 +538,7 @@
});
},
async createNodesFromUploads(fileUploads) {
this.creatingNodes = true;
this.newNodeIds = await Promise.all(
fileUploads.map(async (file, index) => {
let title;
Expand All @@ -557,6 +564,7 @@
return newNodeId;
})
);
this.creatingNodes = false;
this.$refs.inheritModal?.resetClosed();
},
updateTitleForPage() {
Expand All @@ -568,8 +576,21 @@
});
},
inheritMetadata(metadata) {
for (const nodeId of this.currentSelectedNodes) {
this.updateContentNode({ id: nodeId, ...metadata, mergeMapFields: true });
const setMetadata = () => {
for (const nodeId of this.newNodeIds) {
this.updateContentNode({ id: nodeId, ...metadata, mergeMapFields: true });
}
this.newNodeIds = [];
};
if (!this.creatingNodes) {
setMetadata();
} else {
const unwatch = this.$watch('creatingNodes', creatingNodes => {
if (!creatingNodes) {
unwatch();
setMetadata();
}
});
}
},
},
Expand Down
14 changes: 11 additions & 3 deletions ...ion/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:submitText="$tr('continueAction')"
:cancelText="$tr('cancelAction')"
@submit="handleContinue"
@cancel="closed = true"
@cancel="handleCancel"
>
<div>
<div>
Expand Down Expand Up @@ -201,10 +201,14 @@
}
this.checks = checks;
ContentNode.getAncestors(this.parent.id).then(ancestors => {
if (!this.parent) {
// If the parent has been removed before the data is fetched, return
return;
}
for (const field of inheritableFields) {
if (
this.parent.extra_fields.inherited_metadata &&
this.parent.extra_fields.inherited_metadata[field]
this.parent.extra_fields?.inherited_metadata &&
!isUndefined(this.parent.extra_fields.inherited_metadata[field])
) {
this.checks[field] = this.parent.extra_fields.inherited_metadata[field];
}
Expand Down Expand Up @@ -291,6 +295,10 @@
}
this.closed = true;
},
handleCancel() {
this.closed = true;
this.$emit('inherit', {});
},
/**
* @public
*/
Expand Down