Skip to content

Disables "Move here" button in copy workflow once it has been clicked #4009

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
marcellamaki merged 2 commits into from
Apr 17, 2023
Merged

Disables "Move here" button in copy workflow once it has been clicked #4009

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b90b921
Adds additional logic to disable the Move Here button after a move ha…
marcellamaki Mar 30, 2023
302f4a6
Reset moving state, and add additional check for loading state display
marcellamaki Apr 13, 2023
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
14 changes: 13 additions & 1 deletion contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,14 @@
<!-- footer buttons -->
<template #bottom>
<VSpacer />
<KCircularLoader v-if="moveHereButtonDisabled && moveNodesInProgress" :size="20" />
<VBtn flat exact data-test="cancel" @click="dialog = false">
{{ $tr("cancel") }}
</VBtn>
<VBtn
color="primary"
data-test="move"
:disabled="!movingFromTrash && currentLocationId === targetNodeId"
:disabled="moveHereButtonDisabled"
@click="moveNodes"
>
{{ $tr("moveHere") }}
Expand Down Expand Up @@ -179,6 +180,7 @@
return {
showNewTopicModal: false,
loading: false,
moveNodesInProgress: false,
targetNodeId: null,
previewNodeId: null,
};
Expand All @@ -202,6 +204,14 @@
moveHeader() {
return this.$tr('moveItems', this.getTopicAndResourceCounts(this.moveNodeIds));
},
moveHereButtonDisabled() {
if (this.moveNodesInProgress) {
return true;
} else if (!this.movingFromTrash && this.currentLocationId === this.targetNodeId) {
return true;
}
return false;
},
currentLocationId() {
// If opening modal from inside TrashModal, begin navigation at root node
if (this.movingFromTrash) {
Expand Down Expand Up @@ -271,6 +281,7 @@
});
},
moveNodes() {
this.moveNodesInProgress = true;
this.$emit('target', this.targetNodeId);
},
/*
Expand All @@ -284,6 +295,7 @@
actionText: this.$tr('goToLocationButton'),
actionCallback: this.goToLocation,
});
this.moveNodesInProgress = false;
},
},
$trs: {
Expand Down