Skip to content

making WRC delete app remove empty parents #226

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
merged 1 commit into from
Mar 23, 2023
Merged

making WRC delete app remove empty parents #226

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
32 changes: 23 additions & 9 deletions webui/src/js/utils/wdt-archive-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ define(['knockout', 'models/wkt-project', 'utils/wkt-logger'],
return result ? result.archiveUpdatePath : result;
};

this.removeFromArchive = (archivePath) => {
this.removeFromArchive = (archivePath, deleteEmptyParents = false) => {
if (archivePath) {
this._removeFromArchiveModel(archivePath, this.project.wdtModel.archiveRoots);
this._removeFromArchiveModel(archivePath, this.project.wdtModel.archiveRoots, deleteEmptyParents);
this._removeArchiveUpdate(archivePath);
}
};
Expand Down Expand Up @@ -159,20 +159,34 @@ define(['knockout', 'models/wkt-project', 'utils/wkt-logger'],
}
};

this._removeFromArchiveModel = (archivePath, nodesObservable) => {
this._removeFromArchiveModel = (archivePath, nodesObservable, deleteEmptyParents) => {
for (const node of nodesObservable()) {
wktLogger.debug('node id = %s, deleteEmptyParents = %s', node.id, deleteEmptyParents);
if (node.id === archivePath) {
nodesObservable.remove(node);

// this shouldn't be required, but resolves tree view problems with emptied lists
nodesObservable.sort();
break;
wktLogger.debug('removing matching node %s', node.id);
this._removeNodeFromNodesObservable(nodesObservable, node);
return true;
}

if (node.children) {
this._removeFromArchiveModel(archivePath, node.children);
const result = this._removeFromArchiveModel(archivePath, node.children, deleteEmptyParents);
wktLogger.debug('nested call from node %s returned %s', node.id, result);
wktLogger.debug('XXX node %s children length = %s', node.id, node.children().length);
if (deleteEmptyParents && result && node.children().length === 0) {
wktLogger.debug('removing node %s from parent children list', node.id);
this._removeNodeFromNodesObservable(nodesObservable, node);
}
return result;
}
}
return false;
};

this._removeNodeFromNodesObservable = (nodesObservable, node) => {
nodesObservable.remove(node);

// this shouldn't be required, but resolves tree view problems with emptied lists
nodesObservable.sort();
};
}

Expand Down
2 changes: 1 addition & 1 deletion webui/src/js/utils/wrc-wdt-archive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ define(['models/wkt-project', 'utils/i18n', 'utils/wdt-archive-helper', 'utils/w
const updatedArchivePath = this._convertWrcArchivePath(archivePath);

wktLogger.debug('calling archiveHelper.removeFromArchive(%s)', updatedArchivePath);
archiveHelper.removeFromArchive(updatedArchivePath);
archiveHelper.removeFromArchive(updatedArchivePath, true);
resolve();
} catch (err) {
const errorMessage = window.api.utils.getErrorMessage(err);
Expand Down