Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

#158 fix error handling and move back on failing reorder #154

Merged
merged 3 commits into from
Jul 31, 2017
Merged

#158 fix error handling and move back on failing reorder #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff3562f
#158 fix error handling and move back on failing reorder
ElectricMaxxx Jul 31, 2017
4c14104
#153 reorder only, when not over
ElectricMaxxx Jul 31, 2017
a92309d
#153 set position localy to not load complete collection for parent
ElectricMaxxx Jul 31, 2017
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
71 changes: 57 additions & 14 deletions src/Resources/assets/js/adapter/fancytree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,32 +265,75 @@ export class FancytreeAdapter {
let parenPath = parentNode.data.refPath;
let targetPath = parenPath + '/' + dropNodePath.substr(1 + dropNodePath.lastIndexOf('/'));

dropedNode.icon = 'fa fa-spinner fa-spin';
dropedNode.renderTitle();
let formerIcon = dropedNode.icon;

let moveNodeInTree = (responseData) => {
dropedNode.remove();
if (positionBefore) {
parentNode.children.forEach((node) => {
if (node.data.position >= responseData.descriptors.position) {
node.data.position++;
}
});
}
parentNode.addChildren(requestNodeToFancytreeNode(responseData));
};
let onError = (jqxhr, textStatus, errorThrown) => {
node._error = { message: 'Failed to move the node.', details: errorThrown };
node.renderStatus();
console.error(errorThrown);

setTimeout(function () {
node._error = null;
node.renderStatus();
}, 1000);

let setIcon = (nodeToSetOn, icon) => {
nodeToSetOn.icon = icon;
dropedNode.renderTitle();
};

setIcon(dropedNode, 'fa fa-spinner fa-spin')

let onError = (jqxhr) => {
let message = 'Failed to move node';
let formerLabel = dropedNode.title;
if (jqxhr.hasOwnProperty('responseJSON') && jqxhr.responseJSON.hasOwnProperty('message')) {
message += ': ' + jqxhr.responseJSON.message;
}
let details = null;
if (jqxhr.hasOwnProperty('responseJSON')) {
details = jqxhr.responseJSON;
}
dropedNode._error = { message: message, details: details};
dropedNode.renderStatus();

dropedNode.title += '[' + message + ']';
dropedNode.renderTitle();

console.error(message);
setIcon(dropedNode, formerIcon);

setTimeout(function () {
dropedNode._error = null;
dropedNode.title = formerLabel;
dropedNode.renderTitle();
dropedNode.renderStatus();
}, 1000);
};
this.requestData.move(dropNodePath, targetPath).done((responseData) => {
if (this.dndOptions.reorder) {
if (positionBefore && this.dndOptions.reorder) {
this.requestData.reorder(parenPath, dropedAtPath, targetPath, data.hitMode).done((responseData) => {
moveNodeInTree(responseData);
if (fancytreeOptions.hasOwnProperty('sortChildren')) {
parentNode.sortChildren(fancytreeOptions.sortChildren, true);
parentNode.sortChildren(fancytreeOptions.sortChildren, true);
}
}).fail(onError);
setIcon(dropedNode, formerIcon);
}).fail( (jqxhr) => {
onError(jqxhr);
setTimeout(() => {
this.requestData.move(targetPath, dropNodePath).done((responseData) => {
if (fancytreeOptions.hasOwnProperty('sortChildren')) {
parentNode.sortChildren(fancytreeOptions.sortChildren, true);
}
setIcon(dropedNode, formerIcon);
});
}, 1000);

});
} else {
dropedNode.icon = formerIcon;
moveNodeInTree(responseData);
}
}).fail(onError);
Expand Down
Loading