Skip to content

Fixes undo of copying #4244

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
bjester merged 1 commit into from
Jul 25, 2023
Merged

Fixes undo of copying #4244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions contentcuration/contentcuration/frontend/shared/data/changes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,8 @@ export class ChangeTracker {
change.type === CHANGE_TYPES.COPIED ||
(change.type === CHANGE_TYPES.MOVED && !change.oldObj)
) {
// Get the primary key's field name off the table to make sure we delete by
// the change key
return resource.table
.where(resource.table.schema.primKey.keyPath)
.equals(change.key)
.delete();
// Use resource's delete method to propogate sync object to backend.
return resource.delete(change.key);
} else if (change.type === CHANGE_TYPES.UPDATED || change.type === CHANGE_TYPES.DELETED) {
// If we updated or deleted it, we just want the old stuff back
return resource.table.put(change.oldObj);
Expand Down
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default function IndexedDBPlugin(db, listeners = []) {
}
// omit the last fetched attribute used only in resource layer
const mods = omit(obj, [LAST_FETCHED]);
if (Object.keys(mods).length === 0) {
if (Object.keys(mods).length === 0 && change.type === CHANGE_TYPES.UPDATED) {
return;
}
events.emit(getEventName(change.table, change.type), {
Expand Down