Merge branch 'feat/140129-turn-existing-pages-into-wip-pages' into feat/140683-publish-wip-pages-from-the-view-screen

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/routes/apiv3/page/unpublish-page.ts

@@ -49,7 +49,7 @@ export const unpublishPageHandlersFactory: UnpublishPageHandlersFactory = (crowi
           return res.apiv3Err(new ErrorV3(`Page ${pageId} is not exist.`), 404);
         }
 
-        page.makeWip();
+        page.unpublish();
         const updatedPage = await page.save();
 
         return res.apiv3(updatedPage);

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
@@ -4108,8 +4108,9 @@ class PageService implements IPageService {
     const clonedPageData = Page.hydrate(pageData.toObject());
     const newPageData = pageData;
 
-    // Do not consider it for automatic deletion if updated at least once
-    newPageData.wipExpiredAt = undefined;
+    // If updated at least once, publish
+    pageData.publish();
+
 
     // use the previous data if absent
     const grant = options.grant ?? clonedPageData.grant;