@webiny/api-headless-cms 0.0.0-unstable.6e5425ee89 → 0.0.0-unstable.7f63ea0744

package/crud/contentEntry.crud.js

@@ -22,6 +22,7 @@ var _access = require("../utils/access");
 var _ownership = require("../utils/ownership");
 var _entryStorage = require("../utils/entryStorage");
 var _valueKeyStorageConverter = require("../utils/converters/valueKeyStorageConverter");
+var _searchableFields = require("./contentEntry/searchableFields");
 /**
  * Package mdbid does not have types.
  */
@@ -138,10 +139,19 @@ const createEntryMeta = (input, original) => {
   }
   return meta;
 };
-const createEntryId = version => {
-  const entryId = (0, _mdbid.default)();
+const createEntryId = input => {
+  let entryId = (0, _mdbid.default)();
+  if (input.id) {
+    if (input.id.match(/^([a-zA-Z0-9])([a-zA-Z0-9\-]+)([a-zA-Z0-9])$/) === null) {
+      throw new _error.default("The provided ID is not valid. It must be a string which can A-Z, a-z, 0-9, - and it cannot start or end with a -.", "INVALID_ID", {
+        id: input.id
+      });
+    }
+    entryId = input.id;
+  }
+  const version = 1;
   return {
-    entryId,
+    entryId: entryId,
     version,
     id: (0, _utils.createIdentifier)({
       id: entryId,
@@ -168,31 +178,6 @@ const increaseEntryIdVersion = id => {
     })
   };
 };
-const getSearchableFields = params => {
-  const {
-    plugins,
-    model,
-    fields
-  } = params;
-  const fieldPluginMap = plugins.byType("cms-model-field-to-graphql").reduce((collection, field) => {
-    collection[field.fieldType] = field;
-    return collection;
-  }, {});
-  return model.fields.filter(field => {
-    if (!field.fieldId) {
-      return false;
-    }
-    const plugin = fieldPluginMap[field.type];
-    if (!plugin) {
-      return false;
-    } else if (!plugin.fullTextSearch) {
-      return false;
-    } else if (!fields || fields.length === 0) {
-      return true;
-    }
-    return fields.includes(field.fieldId);
-  }).map(field => field.fieldId);
-};
 const allowedEntryStatus = ["draft", "published", "unpublished"];
 const transformEntryStatus = status => {
   return allowedEntryStatus.includes(status) ? status : "draft";
@@ -208,32 +193,51 @@ const createContentEntryCrud = params => {
     plugins
   } = context;
 
-  // create
+  /**
+   * Create
+   */
   const onEntryBeforeCreate = (0, _pubsub.createTopic)("cms.onEntryBeforeCreate");
   const onEntryAfterCreate = (0, _pubsub.createTopic)("cms.onEntryAfterCreate");
   const onEntryCreateError = (0, _pubsub.createTopic)("cms.onEntryCreateError");
 
-  // create revision
+  /**
+   * Create new revision
+   */
   const onEntryBeforeCreateRevision = (0, _pubsub.createTopic)("cms.onEntryBeforeCreateRevision");
   const onEntryRevisionAfterCreate = (0, _pubsub.createTopic)("cms.onEntryRevisionAfterCreate");
   const onEntryCreateRevisionError = (0, _pubsub.createTopic)("cms.onEntryCreateRevisionError");
 
-  // update
+  /**
+   * Update
+   */
   const onEntryBeforeUpdate = (0, _pubsub.createTopic)("cms.onEntryBeforeUpdate");
   const onEntryAfterUpdate = (0, _pubsub.createTopic)("cms.onEntryAfterUpdate");
   const onEntryUpdateError = (0, _pubsub.createTopic)("cms.onEntryUpdateError");
 
-  // publish
+  /**
+   * Publish
+   */
   const onEntryBeforePublish = (0, _pubsub.createTopic)("cms.onEntryBeforePublish");
-  const onEntryAfterPublish = (0, _pubsub.createTopic)("cms.onEntryAfterPublic");
+  const onEntryAfterPublish = (0, _pubsub.createTopic)("cms.onEntryAfterPublish");
   const onEntryPublishError = (0, _pubsub.createTopic)("cms.onEntryPublishError");
 
-  // unpublish
+  /**
+   * Republish
+   */
+  const onEntryBeforeRepublish = (0, _pubsub.createTopic)("cms.onEntryBeforeRepublish");
+  const onEntryAfterRepublish = (0, _pubsub.createTopic)("cms.onEntryAfterRepublish");
+  const onEntryRepublishError = (0, _pubsub.createTopic)("cms.onEntryRepublishError");
+
+  /**
+   * Unpublish
+   */
   const onEntryBeforeUnpublish = (0, _pubsub.createTopic)("cms.onEntryBeforeUnpublish");
   const onEntryAfterUnpublish = (0, _pubsub.createTopic)("cms.onEntryAfterUnpublish");
   const onEntryUnpublishError = (0, _pubsub.createTopic)("cms.onEntryUnpublishError");
 
-  // delete
+  /**
+   * Delete
+   */
   const onEntryBeforeDelete = (0, _pubsub.createTopic)("cms.onEntryBeforeDelete");
   const onEntryAfterDelete = (0, _pubsub.createTopic)("cms.onEntryAfterDelete");
   const onEntryDeleteError = (0, _pubsub.createTopic)("cms.onEntryDeleteError");
@@ -338,25 +342,51 @@ const createContentEntryCrud = params => {
     onBeforeEntryList: onEntryBeforeList,
     /**
      * Released in 5.34.0
+     *
+     * Create
      */
     onEntryBeforeCreate,
     onEntryAfterCreate,
     onEntryCreateError,
+    /**
+     * Create revision
+     */
     onEntryRevisionBeforeCreate: onEntryBeforeCreateRevision,
     onEntryRevisionAfterCreate,
     onEntryRevisionCreateError: onEntryCreateRevisionError,
+    /**
+     * Update
+     */
     onEntryBeforeUpdate,
     onEntryAfterUpdate,
     onEntryUpdateError,
+    /**
+     * Delete whole entry
+     */
     onEntryBeforeDelete,
     onEntryAfterDelete,
     onEntryDeleteError,
+    /**
+     * Delete entry revision
+     */
     onEntryRevisionBeforeDelete,
     onEntryRevisionAfterDelete,
     onEntryRevisionDeleteError,
+    /**
+     * Publish
+     */
     onEntryBeforePublish,
     onEntryAfterPublish,
     onEntryPublishError,
+    /**
+     * Republish
+     */
+    onEntryBeforeRepublish,
+    onEntryAfterRepublish,
+    onEntryRepublishError,
+    /**
+     * Unpublish
+     */
     onEntryBeforeUnpublish,
     onEntryAfterUnpublish,
     onEntryUnpublishError,
@@ -405,7 +435,7 @@ const createContentEntryCrud = params => {
       return entries.filter(entry => (0, _ownership.validateOwnership)(context, permission, entry));
     },
     /**
-     * Get latest revisions by entry IDs.
+     * Get the latest revisions by entry IDs.
      */
     async getLatestEntriesByIds(initialModel, ids) {
       const permission = await checkEntryPermissions({
@@ -476,8 +506,10 @@ const createContentEntryCrud = params => {
         plugins
       });
       const {
-        where: initialWhere
+        where: initialWhere,
+        limit: initialLimit
       } = params;
+      const limit = initialLimit && initialLimit > 0 ? initialLimit : 50;
       /**
        * We always assign tenant and locale because we do not allow one model to have content through multiple tenants.
        */
@@ -503,10 +535,10 @@ const createContentEntryCrud = params => {
           where
         });
       }
-      const fields = getSearchableFields({
-        model,
+      const fields = (0, _searchableFields.getSearchableFields)({
+        fields: model.fields,
         plugins: context.plugins,
-        fields: params.fields || []
+        input: params.fields || []
       });
       try {
         await onEntryBeforeList.publish({
@@ -519,6 +551,7 @@ const createContentEntryCrud = params => {
           cursor,
           items
         } = await storageOperations.entries.list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+          limit,
           where,
           fields
         }));
@@ -597,11 +630,15 @@ const createContentEntryCrud = params => {
         displayName: identity.displayName,
         type: identity.type
       };
+      /**
+       * There is a possibility that user sends an ID in the input, so we will use that one.
+       * There is no check if the ID is unique or not, that is up to the user.
+       */
       const {
         id,
         entryId,
         version
-      } = createEntryId(1);
+      } = createEntryId(inputData);
       const entry = {
         webinyVersion: context.WEBINY_VERSION,
         tenant: getTenant().id,
@@ -746,6 +783,7 @@ const createContentEntryCrud = params => {
       } catch (ex) {
         await onEntryCreateRevisionError.publish({
           entry,
+          original: originalEntry,
           model,
           input,
           error: ex
@@ -851,6 +889,10 @@ const createContentEntryCrud = params => {
         });
       }
     },
+    /**
+     * Method used internally. Not documented and should not be used in users systems.
+     * @internal
+     */
     async republishEntry(initialModel, id) {
       await checkEntryPermissions({
         rwd: "w"
@@ -908,11 +950,26 @@ const createContentEntryCrud = params => {
        * Then we move onto publishing it again.
        */
       try {
-        return await storageOperations.entries.publish(model, {
+        await onEntryBeforeRepublish.publish({
+          entry,
+          model
+        });
+        const result = await storageOperations.entries.publish(model, {
           entry,
           storageEntry
         });
+        await onEntryAfterRepublish.publish({
+          entry,
+          model,
+          storageEntry
+        });
+        return result;
       } catch (ex) {
+        await onEntryRepublishError.publish({
+          entry,
+          model,
+          error: ex
+        });
         throw new _error.default("Could not publish existing entry while re-publishing.", "REPUBLISH_PUBLISH_ERROR", {
           entry
         });