Merge branch 'feat/wip-page' into feat/140129-turn-existing-pages-into-wip-pages

apps/app/src/server/models/page.ts

@@ -1060,11 +1060,11 @@ schema.methods.publish = function() {
 
 schema.methods.unpublish = function() {
   this.wip = true;
-  this.wipExpiredAt = new Date();
 };
 
 schema.methods.makeWip = function() {
   this.wip = true;
+  this.wipExpiredAt = new Date();
 };
 
 /*

apps/app/src/server/service/page/index.ts

@@ -3793,7 +3793,7 @@ class PageService implements IPageService {
 
     // Set wip
     if (options.wip) {
-      page.unpublish();
+      page.makeWip();
     }
 
     // Save