@webiny/api-headless-cms 5.19.0-beta.2 → 5.19.0-beta.3

package/content/plugins/crud/contentEntry.crud.js

@@ -624,6 +624,83 @@ const createContentEntryCrud = params => {
         });
       }
     },
+    republishEntry: async (model, id) => {
+      await checkEntryPermissions({
+        rwd: "w"
+      });
+      await utils.checkModelAccess(context, model);
+      /**
+       * Fetch the entry from the storage.
+       */
+
+      const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
+        id
+      });
+
+      if (!originalStorageEntry) {
+        throw new _handlerGraphql.NotFoundError(`Entry "${id}" was not found!`);
+      }
+
+      const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
+      /**
+       * We can only process published entries.
+       */
+
+      if (originalEntry.status !== "published") {
+        throw new _error.default("Entry with given ID is not published!", "NOT_PUBLISHED_ERROR", {
+          id,
+          original: originalEntry
+        });
+      }
+
+      const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+        context,
+        model,
+        input: originalEntry.values
+      });
+
+      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
+        savedOn: new Date().toISOString(),
+        webinyVersion: context.WEBINY_VERSION,
+        values
+      });
+
+      const storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
+      /**
+       * First we need to update existing entry.
+       */
+
+      try {
+        await storageOperations.entries.update(model, {
+          originalEntry,
+          originalStorageEntry,
+          entry,
+          storageEntry,
+          input: {}
+        });
+      } catch (ex) {
+        throw new _error.default("Could not update existing entry with new data while re-publishing.", "REPUBLISH_UPDATE_ERROR", {
+          entry
+        });
+      }
+      /**
+       * Then we move onto publishing it again.
+       */
+
+
+      try {
+        return await storageOperations.entries.publish(model, {
+          originalEntry,
+          originalStorageEntry,
+          entry,
+          storageEntry
+        });
+      } catch (ex) {
+        throw new _error.default("Could not publish existing entry while re-publishing.", "REPUBLISH_PUBLISH_ERROR", {
+          entry
+        });
+      }
+    },
     deleteEntryRevision: async (model, revisionId) => {
       const permission = await checkEntryPermissions({
         rwd: "d"

package/content/plugins/schema/createManageResolvers.js

@@ -31,6 +31,8 @@ var _resolveDelete = require("./resolvers/manage/resolveDelete");
 
 var _resolvePublish = require("./resolvers/manage/resolvePublish");
 
+var _resolveRepublish = require("./resolvers/manage/resolveRepublish");
+
 var _resolveUnpublish = require("./resolvers/manage/resolveUnpublish");
 
 var _resolveCreateFrom = require("./resolvers/manage/resolveCreateFrom");
@@ -88,6 +90,9 @@ const createManageResolvers = ({
       [`publish${typeName}`]: (0, _resolvePublish.resolvePublish)({
         model
       }),
+      [`republish${typeName}`]: (0, _resolveRepublish.resolveRepublish)({
+        model
+      }),
       [`unpublish${typeName}`]: (0, _resolveUnpublish.resolveUnpublish)({
         model
       }),

package/content/plugins/schema/createManageSDL.js

@@ -139,6 +139,8 @@ const createManageSDL = ({
             delete${typeName}(revision: ID!): CmsDeleteResponse
 
             publish${typeName}(revision: ID!): ${mTypeName}Response
+        
+            republish${typeName}(revision: ID!): ${mTypeName}Response
 
             unpublish${typeName}(revision: ID!): ${mTypeName}Response
             

package/content/plugins/schema/resolvers/manage/resolveRepublish.d.ts

@@ -0,0 +1,2 @@
+import { CmsEntryResolverFactory as ResolverFactory } from "../../../../../types";
+export declare const resolveRepublish: ResolverFactory;

package/content/plugins/schema/resolvers/manage/resolveRepublish.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveRepublish = void 0;
+
+var _responses = require("@webiny/handler-graphql/responses");
+
+const resolveRepublish = ({
+  model
+}) => async (_, args, context) => {
+  try {
+    const entry = await context.cms.republishEntry(model, args.revision);
+    return new _responses.Response(entry);
+  } catch (e) {
+    return new _responses.ErrorResponse(e);
+  }
+};
+
+exports.resolveRepublish = resolveRepublish;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.19.0-beta.2",
+	"version": "5.19.0-beta.3",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,23 +21,23 @@
 		"@babel/runtime": "7.16.3",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.19.0-beta.2",
-		"@webiny/api-i18n": "5.19.0-beta.2",
-		"@webiny/api-i18n-content": "5.19.0-beta.2",
-		"@webiny/api-i18n-ddb": "5.19.0-beta.2",
-		"@webiny/api-security": "5.19.0-beta.2",
-		"@webiny/api-tenancy": "5.19.0-beta.2",
-		"@webiny/api-upgrade": "5.19.0-beta.2",
-		"@webiny/error": "5.19.0-beta.2",
-		"@webiny/handler": "5.19.0-beta.2",
-		"@webiny/handler-aws": "5.19.0-beta.2",
-		"@webiny/handler-db": "5.19.0-beta.2",
-		"@webiny/handler-graphql": "5.19.0-beta.2",
-		"@webiny/handler-http": "5.19.0-beta.2",
-		"@webiny/plugins": "5.19.0-beta.2",
-		"@webiny/pubsub": "5.19.0-beta.2",
-		"@webiny/utils": "5.19.0-beta.2",
-		"@webiny/validation": "5.19.0-beta.2",
+		"@webiny/api-file-manager": "5.19.0-beta.3",
+		"@webiny/api-i18n": "5.19.0-beta.3",
+		"@webiny/api-i18n-content": "5.19.0-beta.3",
+		"@webiny/api-i18n-ddb": "5.19.0-beta.3",
+		"@webiny/api-security": "5.19.0-beta.3",
+		"@webiny/api-tenancy": "5.19.0-beta.3",
+		"@webiny/api-upgrade": "5.19.0-beta.3",
+		"@webiny/error": "5.19.0-beta.3",
+		"@webiny/handler": "5.19.0-beta.3",
+		"@webiny/handler-aws": "5.19.0-beta.3",
+		"@webiny/handler-db": "5.19.0-beta.3",
+		"@webiny/handler-graphql": "5.19.0-beta.3",
+		"@webiny/handler-http": "5.19.0-beta.3",
+		"@webiny/plugins": "5.19.0-beta.3",
+		"@webiny/pubsub": "5.19.0-beta.3",
+		"@webiny/utils": "5.19.0-beta.3",
+		"@webiny/validation": "5.19.0-beta.3",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
@@ -54,10 +54,10 @@
 		"@babel/core": "^7.5.5",
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-flow": "^7.0.0",
-		"@webiny/api-security-so-ddb": "^5.19.0-beta.2",
-		"@webiny/api-tenancy-so-ddb": "^5.19.0-beta.2",
-		"@webiny/cli": "^5.19.0-beta.2",
-		"@webiny/project-utils": "^5.19.0-beta.2",
+		"@webiny/api-security-so-ddb": "^5.19.0-beta.3",
+		"@webiny/api-tenancy-so-ddb": "^5.19.0-beta.3",
+		"@webiny/cli": "^5.19.0-beta.3",
+		"@webiny/project-utils": "^5.19.0-beta.3",
 		"apollo-graphql": "^0.4.1",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^14.6.0",
@@ -77,5 +77,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "6817702cc537405b7288c1fc63ee5d40531b4122"
+	"gitHead": "a1cca819f83172183b907de16fd5746d07d13ad0"
 }

package/plugins/crud/system.crud.js

@@ -162,17 +162,34 @@ const createSystemCrud = params => {
 
       const upgradePlugins = context.plugins.byType("api-upgrade").filter(pl => pl.app === "headless-cms");
       const installedAppVersion = await this.getSystemVersion();
-      const plugin = (0, _apiUpgrade.getApplicablePlugin)({
-        deployedVersion: context.WEBINY_VERSION,
-        installedAppVersion,
-        upgradePlugins,
-        upgradeToVersion: version
-      });
-      await plugin.apply(context);
+      let plugin;
+
+      try {
+        plugin = (0, _apiUpgrade.getApplicablePlugin)({
+          deployedVersion: context.WEBINY_VERSION,
+          installedAppVersion,
+          upgradePlugins,
+          upgradeToVersion: version
+        });
+      } catch (ex) {
+        /**
+         * We just let the error disappear if is UPGRADE_NOT_AVAILABLE code
+         * and rethrow if is not.
+         * This is because we want upgrade to pass if there is no plugin available.
+         */
+        if (ex.code !== _apiUpgrade.ErrorCode.UPGRADE_NOT_AVAILABLE) {
+          throw ex;
+        }
+      }
+
+      if (plugin) {
+        await plugin.apply(context);
+      }
       /**
        * Store new app version.
        */
 
+
       await setVersion(version);
       return true;
     }

package/types.d.ts

@@ -1525,6 +1525,11 @@ export interface CmsEntryContext {
      * Update existing entry.
      */
     updateEntry: (model: CmsModel, id: string, data?: Record<string, any>) => Promise<CmsEntry>;
+    /**
+     * Method that republishes entry with given identifier.
+     * @internal
+     */
+    republishEntry: (model: CmsModel, id: string) => Promise<CmsEntry>;
     /**
      * Delete only a certain revision of the entry.
      */