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

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

@@ -29,6 +29,10 @@ var _utils2 = require("@webiny/utils");
 
 var _entryStorage = require("../utils/entryStorage");
 
+var _afterDelete = require("./contentEntry/afterDelete");
+
+var _referenceFieldsMapping = require("./contentEntry/referenceFieldsMapping");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -79,20 +83,23 @@ const createEntryId = version => {
 };
 
 const increaseEntryIdVersion = id => {
-  if (id.includes("#") === false) {
+  const {
+    id: entryId,
+    version
+  } = (0, _utils2.parseIdentifier)(id);
+
+  if (!version) {
     throw new _error.default("Cannot increase version on the ID without the version part.", "WRONG_ID", {
       id
     });
   }
 
-  const [entryId, version] = id.split("#");
-  const ver = parseInt(version) + 1;
   return {
     entryId,
-    version: ver,
+    version: version + 1,
     id: (0, _utils2.createIdentifier)({
       id: entryId,
-      version: ver
+      version: version + 1
     })
   };
 };
@@ -101,8 +108,6 @@ const createContentEntryCrud = params => {
   const {
     storageOperations,
     context,
-    getTenant,
-    getLocale,
     getIdentity
   } = params;
   const onBeforeCreate = (0, _pubsub.createTopic)();
@@ -137,6 +142,10 @@ const createContentEntryCrud = params => {
     context,
     onBeforeUpdate
   });
+  (0, _afterDelete.assignAfterEntryDelete)({
+    context,
+    onAfterDelete
+  });
 
   const checkEntryPermissions = check => {
     return utils.checkPermissions(context, "cms.contentEntry", check);
@@ -183,8 +192,6 @@ const createContentEntryCrud = params => {
     });
     await utils.checkModelAccess(context, model);
     const entries = await storageOperations.entries.getByIds(model, {
-      tenant: getTenant().id,
-      locale: getLocale().code,
       ids
     });
     return entries.filter(entry => utils.validateOwnership(context, permission, entry));
@@ -246,8 +253,6 @@ const createContentEntryCrud = params => {
       });
       await utils.checkModelAccess(context, model);
       const entries = await storageOperations.entries.getPublishedByIds(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         ids
       });
       return entries.filter(entry => utils.validateOwnership(context, permission, entry));
@@ -262,16 +267,12 @@ const createContentEntryCrud = params => {
       });
       await utils.checkModelAccess(context, model);
       const entries = await storageOperations.entries.getLatestByIds(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         ids
       });
       return entries.filter(entry => utils.validateOwnership(context, permission, entry));
     },
     getEntryRevisions: async (model, entryId) => {
       return storageOperations.entries.getRevisions(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: entryId
       });
     },
@@ -313,8 +314,8 @@ const createContentEntryCrud = params => {
       const ownedBy = permission.own ? getIdentity().id : where.ownedBy;
 
       const listWhere = _objectSpread(_objectSpread({}, where), {}, {
-        tenant: where.tenant || getTenant().id,
-        locale: where.locale || getLocale().code
+        tenant: model.tenant,
+        locale: model.locale
       });
 
       if (ownedBy !== undefined) {
@@ -374,8 +375,13 @@ const createContentEntryCrud = params => {
        * Make sure we only work with fields that are defined in the model.
        */
 
-      const input = cleanInputData(model, inputData);
-      await (0, _entryDataValidation.validateModelEntryData)(context, model, input);
+      const initialInput = cleanInputData(model, inputData);
+      await (0, _entryDataValidation.validateModelEntryData)(context, model, initialInput);
+      const input = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+        context,
+        model,
+        input: initialInput
+      });
       const identity = context.security.getIdentity();
       const locale = context.cms.getLocale();
       const owner = {
@@ -448,15 +454,13 @@ const createContentEntryCrud = params => {
        * Entries are identified by a common parent ID + Revision number.
        */
 
-      const [uniqueId] = sourceId.split("#");
+      const {
+        id: uniqueId
+      } = (0, _utils2.parseIdentifier)(sourceId);
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: sourceId
       });
       const latestStorageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: uniqueId
       });
 
@@ -470,9 +474,14 @@ const createContentEntryCrud = params => {
 
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
 
-      const values = _objectSpread(_objectSpread({}, originalEntry.values), input);
+      const initialValues = _objectSpread(_objectSpread({}, originalEntry.values), input);
 
-      await (0, _entryDataValidation.validateModelEntryData)(context, model, values);
+      await (0, _entryDataValidation.validateModelEntryData)(context, model, initialValues);
+      const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+        context,
+        model,
+        input: initialValues
+      });
       utils.checkOwnership(context, permission, originalEntry);
       const latestEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, latestStorageEntry);
       const identity = context.security.getIdentity();
@@ -550,8 +559,6 @@ const createContentEntryCrud = params => {
        */
 
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id
       });
 
@@ -565,13 +572,21 @@ const createContentEntryCrud = params => {
 
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
       utils.checkOwnership(context, permission, originalEntry);
+
+      const initialValues = _objectSpread(_objectSpread({}, originalEntry.values), input);
+
+      const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+        context,
+        model,
+        input: initialValues
+      });
       /**
        * We always send the full entry to the hooks and storage operations update.
        */
 
       const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
         savedOn: new Date().toISOString(),
-        values: _objectSpread(_objectSpread({}, originalEntry.values), input)
+        values
       });
 
       let storageEntry = undefined;
@@ -609,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"
@@ -619,18 +711,12 @@ const createContentEntryCrud = params => {
         version
       } = (0, _utils2.parseIdentifier)(revisionId);
       const storageEntryToDelete = await storageOperations.entries.getRevisionById(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: revisionId
       });
       const latestStorageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: entryId
       });
       const previousStorageEntry = await storageOperations.entries.getPreviousRevision(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         entryId,
         version
       });
@@ -698,8 +784,6 @@ const createContentEntryCrud = params => {
       });
       await utils.checkModelAccess(context, model);
       const storageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: entryId
       });
 
@@ -720,11 +804,7 @@ const createContentEntryCrud = params => {
         pw: "p"
       });
       await utils.checkModelAccess(context, model);
-      const tenant = getTenant().id;
-      const locale = getLocale().code;
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        tenant,
-        locale,
         id
       });
 
@@ -778,8 +858,6 @@ const createContentEntryCrud = params => {
         pw: "c"
       });
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id
       });
 
@@ -836,15 +914,13 @@ const createContentEntryCrud = params => {
       const permission = await checkEntryPermissions({
         pw: "r"
       });
-      const [entryId] = id.split("#");
+      const {
+        id: entryId
+      } = (0, _utils2.parseIdentifier)(id);
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id
       });
       const latestEntryRevision = await storageOperations.entries.getLatestRevisionByEntryId(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: entryId
       });
 
@@ -900,10 +976,10 @@ const createContentEntryCrud = params => {
       const permission = await checkEntryPermissions({
         pw: "u"
       });
-      const [entryId] = id.split("#");
+      const {
+        id: entryId
+      } = (0, _utils2.parseIdentifier)(id);
       const originalStorageEntry = await storageOperations.entries.getPublishedRevisionByEntryId(model, {
-        tenant: getTenant().id,
-        locale: getLocale().code,
         id: entryId
       });
 

package/content/plugins/crud/contentModel/beforeCreate.js

@@ -21,7 +21,7 @@ const disallowedModelIdList = ["contentModel", "contentModels", "contentModelGro
  * Add more if required.
  */
 
-const disallowedModelIdEndingList = ["Response", "List", "Meta", "Input", "Sorter"];
+const disallowedModelIdEndingList = ["Response", "List", "Meta", "Input", "Sorter", "RefType"];
 /**
  * Checks for the uniqueness of provided modelId, against the provided list of models.
  * It also takes plural / singular forms of the provided modelId into account.

package/content/plugins/crud/index.js

@@ -25,6 +25,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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; }
 
+const debug = process.env.DEBUG === "true";
+
 const createContentCruds = params => {
   const {
     storageOperations
@@ -35,7 +37,7 @@ const createContentCruds = params => {
      * It is to make sure that we load setup context before the CRUD init in our internal code.
      */
     if (!context.cms) {
-      console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Content CRUDs.`);
+      debug && console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Content CRUDs.`);
       return;
     }
 
@@ -55,7 +57,9 @@ const createContentCruds = params => {
       context.plugins.register(storageOperations.plugins);
     }
 
-    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), (0, _system.createSystemCrud)({
+    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), {}, {
+      storageOperations
+    }, (0, _system.createSystemCrud)({
       context,
       getTenant,
       getIdentity,
@@ -79,8 +83,6 @@ const createContentCruds = params => {
       storageOperations
     })), (0, _contentEntry.createContentEntryCrud)({
       context,
-      getLocale,
-      getTenant,
       getIdentity,
       storageOperations
     }));

package/content/plugins/graphqlFields/ref.js

@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _createTypeName = require("../utils/createTypeName");
 
+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; }
@@ -23,17 +25,30 @@ const createListFilters = ({
   field
 }) => {
   return `
-        ${field.fieldId}: String
-        ${field.fieldId}_in: [String!]
-        ${field.fieldId}_not: String
-        ${field.fieldId}_not_in: [String!]
+        ${field.fieldId}: RefFieldWhereInput
+    `;
+};
+
+const createFilteringTypeDef = () => {
+  return `
+        input RefFieldWhereInput {
+            id: String
+            id_not: String
+            id_in: [String!]
+            id_not_in: [String]
+            entryId: String
+            entryId_not: String
+            entryId_in: [String!]
+            entryId_not_in: [String!]
+        }
     `;
 };
 
 const appendTypename = (entries, typename) => {
   return entries.map(item => {
-    item["__typename"] = typename;
-    return item;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      __typename: typename
+    });
   });
 };
 
@@ -77,26 +92,27 @@ const plugin = {
             return [];
           }
 
-          const entriesByModel = value.map((ref, index) => {
-            return {
-              entryId: ref.entryId,
-              modelId: ref.modelId,
-              index
-            };
-          });
-          const getters = entriesByModel.map(async ({
-            modelId,
-            entryId
-          }) => {
-            // Get model manager, to get access to CRUD methods
+          const entriesByModel = value.reduce((collection, ref) => {
+            if (!collection[ref.modelId]) {
+              collection[ref.modelId] = [];
+            } else if (collection[ref.modelId].includes(ref.entryId) === true) {
+              return collection;
+            }
+
+            collection[ref.modelId].push(ref.entryId);
+            return collection;
+          }, {});
+          const getters = Object.keys(entriesByModel).map(async modelId => {
+            const idList = entriesByModel[modelId]; // Get model manager, to get access to CRUD methods
+
             const model = await cms.getModelManager(modelId);
             let entries; // `read` API works with `published` data
 
             if (cms.READ) {
-              entries = await model.getPublishedByIds([entryId]);
+              entries = await model.getPublishedByIds(idList);
             } // `preview` and `manage` with `latest` data
             else {
-              entries = await model.getLatestByIds([entryId]);
+              entries = await model.getLatestByIds(idList);
             }
 
             return appendTypename(entries, modelIdToTypeName.get(modelId));
@@ -143,17 +159,19 @@ const plugin = {
         }));
       }
 
-      if (!unionFields.length) {
-        return null;
-      }
-
+      const unionFieldsTypeDef = unionFields.map(({
+        field,
+        typeName
+      }) => `union ${typeName} = ${field.settings.models.map(({
+        modelId
+      }) => (0, _createTypeName.createReadTypeName)(modelId)).join(" | ")}`).join("\n");
+      const filteringTypeDef = `
+                ${createFilteringTypeDef()}
+                
+                ${unionFieldsTypeDef}
+            `;
       return {
-        typeDefs: unionFields.map(({
-          field,
-          typeName
-        }) => `union ${typeName} = ${field.settings.models.map(({
-          modelId
-        }) => (0, _createTypeName.createReadTypeName)(modelId)).join(" | ")}`).join("\n"),
+        typeDefs: filteringTypeDef,
         resolvers: {}
       };
     },
@@ -162,19 +180,37 @@ const plugin = {
   },
   manage: {
     createSchema() {
+      /**
+       * entryId in RefFieldInput is deprecated but cannot mark it as GraphQL does not allow marking input fields as deprecated
+       */
       return {
         typeDefs: `
                     type RefField {
                         modelId: String!
                         entryId: ID!
+                        id: ID!
                     }
                     
                     input RefFieldInput {
                         modelId: String!
-                        entryId: ID!
+                        id: ID!
                     }
+                    
+                    ${createFilteringTypeDef()}
                 `,
-        resolvers: {}
+        resolvers: {
+          RefField: {
+            entryId: parent => {
+              const {
+                id
+              } = (0, _utils.parseIdentifier)(parent.entryId || parent.id);
+              return id;
+            },
+            id: parent => {
+              return parent.id || parent.entryId;
+            }
+          }
+        }
       };
     },
 
@@ -182,7 +218,7 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return `${field.fieldId}: [RefField]`;
+        return `${field.fieldId}: [RefField!]`;
       }
 
       return `${field.fieldId}: RefField`;
@@ -192,7 +228,7 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [RefFieldInput]";
+        return field.fieldId + ": [RefFieldInput!]";
       }
 
       return field.fieldId + ": RefFieldInput";

package/content/plugins/modelManager/DefaultCmsModelManager.js

@@ -9,6 +9,8 @@ exports.DefaultCmsModelManager = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _utils = require("@webiny/utils");
+
 class DefaultCmsModelManager {
   constructor(context, model) {
     (0, _defineProperty2.default)(this, "_context", void 0);
@@ -22,7 +24,11 @@ class DefaultCmsModelManager {
   }
 
   async delete(id) {
-    if (id.includes("#")) {
+    const {
+      version
+    } = (0, _utils.parseIdentifier)(id);
+
+    if (version) {
       return this._context.cms.deleteEntryRevision(this._model, id);
     }