@webiny/api-headless-cms 5.19.0-beta.1 → 5.19.0-beta.5

package/content/plugins/crud/contentEntry/referenceFieldsMapping.d.ts

@@ -7,6 +7,7 @@ interface Params {
     context: CmsContext;
     model: CmsModel;
     input: Record<string, ReferenceObject | ReferenceObject[]>;
+    validateEntries?: boolean;
 }
 export declare const referenceFieldsMapping: (params: Params) => Promise<Record<string, any>>;
 export {};

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

@@ -13,6 +13,8 @@ var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _dotProp = _interopRequireDefault(require("dot-prop"));
 
+var _utils = require("@webiny/utils");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -116,11 +118,26 @@ const buildReferenceFieldPaths = params => {
   }, []);
 };
 
+const getReferenceFieldValue = ref => {
+  if (!ref) {
+    return {
+      id: null,
+      modelId: null
+    };
+  }
+
+  return {
+    id: (ref.id || ref.entryId || "").trim() || null,
+    modelId: (ref.modelId || "").trim() || null
+  };
+};
+
 const referenceFieldsMapping = async params => {
   const {
     context,
     model,
-    input
+    input,
+    validateEntries = false
   } = params;
 
   let output = _objectSpread({}, input);
@@ -141,21 +158,26 @@ const referenceFieldsMapping = async params => {
   for (const path of referenceFieldPaths) {
     const ref = _dotProp.default.get(output, path);
 
-    if (!ref || !ref.id || !ref.modelId) {
+    const {
+      id,
+      modelId
+    } = getReferenceFieldValue(ref);
+
+    if (!id || !modelId) {
       continue;
     }
 
-    if (!referencesByModel[ref.modelId]) {
-      referencesByModel[ref.modelId] = [];
+    if (!referencesByModel[modelId]) {
+      referencesByModel[modelId] = [];
     }
 
-    referencesByModel[ref.modelId].push(ref.id);
+    referencesByModel[modelId].push(id);
 
-    if (!pathsByReferenceId[ref.id]) {
-      pathsByReferenceId[ref.id] = [];
+    if (!pathsByReferenceId[id]) {
+      pathsByReferenceId[id] = [];
     }
 
-    pathsByReferenceId[ref.id].push(path);
+    pathsByReferenceId[id].push(path);
   }
   /**
    * Again, no point in going further.
@@ -197,7 +219,11 @@ const referenceFieldsMapping = async params => {
   const results = await Promise.all(promises);
   const records = results.reduce((collection, entries) => {
     for (const entry of entries) {
-      collection[entry.id] = entry;
+      collection[entry.id] = {
+        id: entry.id,
+        entryId: entry.entryId,
+        modelId: entry.modelId
+      };
     }
 
     return collection;
@@ -209,15 +235,24 @@ const referenceFieldsMapping = async params => {
   for (const modelId in referencesByModel) {
     const entries = referencesByModel[modelId];
 
-    for (const entry of entries) {
-      if (records[entry]) {
+    for (const id of entries) {
+      if (records[id]) {
         continue;
+      } else if (validateEntries === true) {
+        throw new _error.default(`Missing referenced entry with id "${id}" in model "${modelId}".`, "ENTRY_NOT_FOUND", {
+          id,
+          model: modelId
+        });
       }
 
-      throw new _error.default(`Missing referenced entry with id "${entry}" in model "${modelId}".`, "ENTRY_NOT_FOUND", {
-        entry,
-        model: modelId
-      });
+      const {
+        id: entryId
+      } = (0, _utils.parseIdentifier)(id);
+      records[id] = {
+        id,
+        entryId,
+        modelId
+      };
     }
   }
   /**
@@ -230,10 +265,14 @@ const referenceFieldsMapping = async params => {
     const paths = pathsByReferenceId[id];
 
     if (!entry) {
-      throw new _error.default("Missing entry in records.", "ENTRY_ERROR", {
-        id,
-        paths
-      });
+      if (validateEntries === true) {
+        throw new _error.default("Missing entry in records.", "ENTRY_ERROR", {
+          id,
+          paths
+        });
+      }
+
+      continue;
     }
 
     for (const path of paths) {

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

@@ -380,7 +380,8 @@ const createContentEntryCrud = params => {
       const input = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: initialInput
+        input: initialInput,
+        validateEntries: true
       });
       const identity = context.security.getIdentity();
       const locale = context.cms.getLocale();
@@ -480,7 +481,8 @@ const createContentEntryCrud = params => {
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: initialValues
+        input: initialValues,
+        validateEntries: false
       });
       utils.checkOwnership(context, permission, originalEntry);
       const latestEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, latestStorageEntry);
@@ -578,7 +580,8 @@ const createContentEntryCrud = params => {
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: initialValues
+        input: initialValues,
+        validateEntries: false
       });
       /**
        * We always send the full entry to the hooks and storage operations update.
@@ -624,6 +627,84 @@ 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,
+        validateEntries: false
+      });
+
+      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/crud/contentModel/beforeDelete.js

@@ -35,7 +35,8 @@ const assignBeforeModelDelete = params => {
       const result = await storageOperations.entries.list(model, {
         where: {
           tenant: model.tenant,
-          locale: model.locale
+          locale: model.locale,
+          latest: true
         },
         limit: 1
       });

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.1",
+	"version": "5.19.0-beta.5",
 	"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.1",
-		"@webiny/api-i18n": "5.19.0-beta.1",
-		"@webiny/api-i18n-content": "5.19.0-beta.1",
-		"@webiny/api-i18n-ddb": "5.19.0-beta.1",
-		"@webiny/api-security": "5.19.0-beta.1",
-		"@webiny/api-tenancy": "5.19.0-beta.1",
-		"@webiny/api-upgrade": "5.19.0-beta.1",
-		"@webiny/error": "5.19.0-beta.1",
-		"@webiny/handler": "5.19.0-beta.1",
-		"@webiny/handler-aws": "5.19.0-beta.1",
-		"@webiny/handler-db": "5.19.0-beta.1",
-		"@webiny/handler-graphql": "5.19.0-beta.1",
-		"@webiny/handler-http": "5.19.0-beta.1",
-		"@webiny/plugins": "5.19.0-beta.1",
-		"@webiny/pubsub": "5.19.0-beta.1",
-		"@webiny/utils": "5.19.0-beta.1",
-		"@webiny/validation": "5.19.0-beta.1",
+		"@webiny/api-file-manager": "5.19.0-beta.5",
+		"@webiny/api-i18n": "5.19.0-beta.5",
+		"@webiny/api-i18n-content": "5.19.0-beta.5",
+		"@webiny/api-i18n-ddb": "5.19.0-beta.5",
+		"@webiny/api-security": "5.19.0-beta.5",
+		"@webiny/api-tenancy": "5.19.0-beta.5",
+		"@webiny/api-upgrade": "5.19.0-beta.5",
+		"@webiny/error": "5.19.0-beta.5",
+		"@webiny/handler": "5.19.0-beta.5",
+		"@webiny/handler-aws": "5.19.0-beta.5",
+		"@webiny/handler-db": "5.19.0-beta.5",
+		"@webiny/handler-graphql": "5.19.0-beta.5",
+		"@webiny/handler-http": "5.19.0-beta.5",
+		"@webiny/plugins": "5.19.0-beta.5",
+		"@webiny/pubsub": "5.19.0-beta.5",
+		"@webiny/utils": "5.19.0-beta.5",
+		"@webiny/validation": "5.19.0-beta.5",
 		"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.1",
-		"@webiny/api-tenancy-so-ddb": "^5.19.0-beta.1",
-		"@webiny/cli": "^5.19.0-beta.1",
-		"@webiny/project-utils": "^5.19.0-beta.1",
+		"@webiny/api-security-so-ddb": "^5.19.0-beta.5",
+		"@webiny/api-tenancy-so-ddb": "^5.19.0-beta.5",
+		"@webiny/cli": "^5.19.0-beta.5",
+		"@webiny/project-utils": "^5.19.0-beta.5",
 		"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": "dd406fbad0620ecce47063e9afbff40c502c3844"
+	"gitHead": "839188911bbaee4a596724c729c0a78f681fa614"
 }

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.
      */