|
|
@@ -837,6 +837,7 @@ class PageService {
|
|
|
|
|
|
const renameDescendants = this.renameDescendants.bind(this);
|
|
|
const pageEvent = this.pageEvent;
|
|
|
+ let descendantPages: PageDocument[] = [];
|
|
|
let count = 0;
|
|
|
const writeStream = new Writable({
|
|
|
objectMode: true,
|
|
|
@@ -846,7 +847,9 @@ class PageService {
|
|
|
await renameDescendants(
|
|
|
batch, user, options, pathRegExp, newPagePathPrefix, shouldUseV4Process,
|
|
|
);
|
|
|
- pageEvent.emit('rename', targetPage, user, batch);
|
|
|
+ descendantPages = descendantPages.concat(batch);
|
|
|
+ // pageEvent.emit('rename', targetPage, user, batch);
|
|
|
+ // console.log('What is the type of batch\n', batch);
|
|
|
logger.debug(`Renaming pages progressing: (count=${count})`);
|
|
|
}
|
|
|
catch (err) {
|
|
|
@@ -871,6 +874,7 @@ class PageService {
|
|
|
.pipe(writeStream);
|
|
|
|
|
|
await streamToPromise(writeStream);
|
|
|
+ this.pageEvent.emit('rename', targetPage, user, descendantPages);
|
|
|
}
|
|
|
|
|
|
private async renameDescendantsWithStreamV4(targetPage, newPagePath, user, options = {}) {
|
|
|
@@ -1801,7 +1805,7 @@ class PageService {
|
|
|
let count = 0;
|
|
|
let nDeletedNonEmptyPages = 0; // used for updating descendantCount
|
|
|
|
|
|
- const pageEvent = this.pageEvent;
|
|
|
+ let descendantPages: PageDocument[] = [];
|
|
|
|
|
|
const deleteMultipleCompletely = this.deleteMultipleCompletely.bind(this);
|
|
|
const writeStream = new Writable({
|
|
|
@@ -1812,7 +1816,7 @@ class PageService {
|
|
|
try {
|
|
|
count += batch.length;
|
|
|
await deleteMultipleCompletely(batch, user, options);
|
|
|
- pageEvent.emit('deleteCompletely', targetPage, user, batch);
|
|
|
+ descendantPages = descendantPages.concat(batch);
|
|
|
logger.debug(`Adding pages progressing: (count=${count})`);
|
|
|
}
|
|
|
catch (err) {
|
|
|
@@ -1833,6 +1837,7 @@ class PageService {
|
|
|
.pipe(writeStream);
|
|
|
|
|
|
await streamToPromise(writeStream);
|
|
|
+ this.pageEvent.emit('deleteCompletely', targetPage, user, descendantPages);
|
|
|
|
|
|
return nDeletedNonEmptyPages;
|
|
|
}
|