Explorar o código

Modified the code based off the FB

Shunm634-source %!s(int64=3) %!d(string=hai) anos
pai
achega
047166bb92

+ 2 - 2
packages/app/src/server/service/page.ts

@@ -1774,7 +1774,7 @@ class PageService {
     }
     }
 
 
     if (!page.isEmpty && !preventEmitting) {
     if (!page.isEmpty && !preventEmitting) {
-      this.pageEvent.emit('deleteCompletely', page, null, user);
+      this.pageEvent.emit('deleteCompletely', page, user);
     }
     }
 
 
     return;
     return;
@@ -1812,7 +1812,7 @@ class PageService {
         try {
         try {
           count += batch.length;
           count += batch.length;
           await deleteMultipleCompletely(batch, user, options);
           await deleteMultipleCompletely(batch, user, options);
-          pageEvent.emit('deleteCompletely', targetPage, batch, user);
+          pageEvent.emit('deleteCompletely', targetPage, user, batch);
           logger.debug(`Adding pages progressing: (count=${count})`);
           logger.debug(`Adding pages progressing: (count=${count})`);
         }
         }
         catch (err) {
         catch (err) {

+ 1 - 1
packages/app/test/integration/service/page.test.js

@@ -644,7 +644,7 @@ describe('PageService', () => {
       expect(deleteCompletelyOperationSpy).toHaveBeenCalled();
       expect(deleteCompletelyOperationSpy).toHaveBeenCalled();
       expect(deleteCompletelyDescendantsWithStreamSpy).not.toHaveBeenCalled();
       expect(deleteCompletelyDescendantsWithStreamSpy).not.toHaveBeenCalled();
 
 
-      expect(pageEventSpy).toHaveBeenCalledWith('deleteCompletely', parentForDeleteCompletely, null, testUser2);
+      expect(pageEventSpy).toHaveBeenCalledWith('deleteCompletely', parentForDeleteCompletely, testUser2);
     });
     });