@webiny/api-apw 0.0.0-unstable.fcdad0bc61 → 0.0.0-unstable.fdd9228b5d

package/crud/utils.js

@@ -1,35 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = void 0;
 exports.checkValidDateTime = checkValidDateTime;
 exports.getPendingRequiredSteps = exports.filterContentReviewsByRequiresMyAttention = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _dayjs = _interopRequireDefault(require("dayjs"));
-
 var _utc = _interopRequireDefault(require("dayjs/plugin/utc"));
-
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-
 var _set = _interopRequireDefault(require("lodash/set"));
-
 var _types = require("../types");
-
 _dayjs.default.extend(_utc.default);
-
 function checkValidDateTime(datetime) {
   if (typeof datetime !== "string") {
     return;
   }
-
   if (!(0, _dayjs.default)(datetime).isValid()) {
     throw new _error.default({
       message: `Invalid input "datetime" should be an ISO string.`,
@@ -39,9 +26,7 @@ function checkValidDateTime(datetime) {
       }
     });
   }
-
   const today = _dayjs.default.utc();
-
   if ((0, _dayjs.default)(datetime).isBefore(today)) {
     throw new _error.default({
       message: `Cannot schedule for a past "datetime".`,
@@ -52,27 +37,21 @@ function checkValidDateTime(datetime) {
     });
   }
 }
-
 const getPendingRequiredSteps = (steps, predicate) => {
   return steps.filter(step => {
     const isRequiredStep = [_types.ApwWorkflowStepTypes.MANDATORY_BLOCKING, _types.ApwWorkflowStepTypes.MANDATORY_NON_BLOCKING].includes(step.type);
-
     if (!isRequiredStep) {
       return false;
     }
-
     return predicate(step);
   });
 };
-
 exports.getPendingRequiredSteps = getPendingRequiredSteps;
-const INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = {
+const INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = exports.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = {
   scheduledOn: null,
   scheduledBy: null,
   scheduledActionId: null
 };
-exports.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META;
-
 /**
  * Filter "content reviews" that are "underReview" and current user is a reviewer for the active step.
  * That is the user is able to provide sign-off or comment.
@@ -87,25 +66,20 @@ const filterContentReviewsByRequiresMyAttention = async params => {
   /**
    * Get all "content reviews" with status "underReview"
    */
-
-  const newListParams = (0, _set.default)((0, _cloneDeep.default)(listParams), "where.reviewStatus", _types.ApwContentReviewStatus.UNDER_REVIEW);
+  const newListParams = (0, _set.default)(structuredClone(listParams), "where.reviewStatus", _types.ApwContentReviewStatus.UNDER_REVIEW);
   const [contentReviews, meta] = await listContentReviews(newListParams);
   const identity = getIdentity();
   const filteredItems = [];
   /**
    * Filter items where current user is a reviewer for the active step.
    */
-
   for (let i = 0; i < contentReviews.length; i++) {
     const contentReview = contentReviews[i];
     const activeStep = contentReview.steps.find(step => step.status === _types.ApwContentReviewStepStatus.ACTIVE);
-
     if (!activeStep) {
       continue;
     }
-
     let requiresMyAttention = false;
-
     for (let j = 0; j < activeStep.reviewers.length; j++) {
       const {
         id
@@ -113,26 +87,24 @@ const filterContentReviewsByRequiresMyAttention = async params => {
       /**
        * Load reviewer
        */
-
       const reviewer = await getReviewer(id);
       /**
        * Check if the current logged in user is the reviewer.
        */
-
       if (reviewer.identityId === identity.id) {
         requiresMyAttention = true;
         break;
       }
     }
-
     if (requiresMyAttention) {
       filteredItems.push(contentReview);
     }
   }
-
-  return [filteredItems, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, meta), {}, {
+  return [filteredItems, {
+    ...meta,
     totalCount: filteredItems.length
-  })];
+  }];
 };
+exports.filterContentReviewsByRequiresMyAttention = filterContentReviewsByRequiresMyAttention;
 
-exports.filterContentReviewsByRequiresMyAttention = filterContentReviewsByRequiresMyAttention;
+//# sourceMappingURL=utils.js.map

package/crud/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["dayjs","extend","utc","checkValidDateTime","datetime","isValid","Error","message","code","data","today","isBefore","getPendingRequiredSteps","steps","predicate","filter","step","isRequiredStep","ApwWorkflowStepTypes","MANDATORY_BLOCKING","MANDATORY_NON_BLOCKING","includes","type","INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META","scheduledOn","scheduledBy","scheduledActionId","filterContentReviewsByRequiresMyAttention","params","listContentReviews","listParams","getIdentity","getReviewer","newListParams","set","cloneDeep","ApwContentReviewStatus","UNDER_REVIEW","contentReviews","meta","identity","filteredItems","i","length","contentReview","activeStep","find","status","ApwContentReviewStepStatus","ACTIVE","requiresMyAttention","j","reviewers","id","reviewer","identityId","push","totalCount"],"sources":["utils.ts"],"sourcesContent":["import Error from \"@webiny/error\";\nimport dayjs from \"dayjs\";\nimport utc from \"dayjs/plugin/utc\";\nimport cloneDeep from \"lodash/cloneDeep\";\nimport set from \"lodash/set\";\nimport {\n    ApwContentReview,\n    ApwContentReviewListParams,\n    ApwContentReviewStatus,\n    ApwContentReviewStep,\n    ApwContentReviewStepStatus,\n    ApwWorkflowStepTypes,\n    ListMeta\n} from \"~/types\";\nimport { CreateContentReviewMethodsParams } from \"./createContentReviewMethods\";\n\ndayjs.extend(utc);\n\nexport function checkValidDateTime(datetime: string | undefined): void {\n    if (typeof datetime !== \"string\") {\n        return;\n    }\n\n    if (!dayjs(datetime).isValid()) {\n        throw new Error({\n            message: `Invalid input \"datetime\" should be an ISO string.`,\n            code: \"INVALID_DATETIME_FORMAT\",\n            data: {\n                datetime\n            }\n        });\n    }\n    const today = dayjs.utc();\n\n    if (dayjs(datetime).isBefore(today)) {\n        throw new Error({\n            message: `Cannot schedule for a past \"datetime\".`,\n            code: \"PAST_DATETIME\",\n            data: {\n                datetime\n            }\n        });\n    }\n}\n\nexport interface GetPendingRequiredSteps {\n    (\n        steps: ApwContentReviewStep[],\n        predicate: (step: ApwContentReviewStep) => boolean\n    ): ApwContentReviewStep[];\n}\n\nexport const getPendingRequiredSteps: GetPendingRequiredSteps = (steps, predicate) => {\n    return steps.filter(step => {\n        const isRequiredStep = [\n            ApwWorkflowStepTypes.MANDATORY_BLOCKING,\n            ApwWorkflowStepTypes.MANDATORY_NON_BLOCKING\n        ].includes(step.type);\n\n        if (!isRequiredStep) {\n            return false;\n        }\n\n        return predicate(step);\n    });\n};\n\nexport const INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = {\n    scheduledOn: null,\n    scheduledBy: null,\n    scheduledActionId: null\n};\n\nexport interface FilterContentReviewsParams\n    extends Pick<CreateContentReviewMethodsParams, \"getReviewer\" | \"getIdentity\"> {\n    listParams: ApwContentReviewListParams;\n    listContentReviews: CreateContentReviewMethodsParams[\"storageOperations\"][\"listContentReviews\"];\n}\n\n/**\n * Filter \"content reviews\" that are \"underReview\" and current user is a reviewer for the active step.\n * That is the user is able to provide sign-off or comment.\n */\nexport const filterContentReviewsByRequiresMyAttention = async (\n    params: FilterContentReviewsParams\n): Promise<[ApwContentReview[], ListMeta]> => {\n    const { listContentReviews, listParams, getIdentity, getReviewer } = params;\n    /**\n     * Get all \"content reviews\" with status \"underReview\"\n     */\n    const newListParams = set(\n        cloneDeep(listParams),\n        \"where.reviewStatus\",\n        ApwContentReviewStatus.UNDER_REVIEW\n    );\n    const [contentReviews, meta] = await listContentReviews(newListParams);\n\n    const identity = getIdentity();\n    const filteredItems = [];\n    /**\n     * Filter items where current user is a reviewer for the active step.\n     */\n    for (let i = 0; i < contentReviews.length; i++) {\n        const contentReview = contentReviews[i];\n\n        const activeStep = contentReview.steps.find(\n            step => step.status === ApwContentReviewStepStatus.ACTIVE\n        );\n\n        if (!activeStep) {\n            continue;\n        }\n\n        let requiresMyAttention = false;\n\n        for (let j = 0; j < activeStep.reviewers.length; j++) {\n            const { id } = activeStep.reviewers[j];\n            /**\n             * Load reviewer\n             */\n            const reviewer = await getReviewer(id);\n            /**\n             * Check if the current logged in user is the reviewer.\n             */\n            if (reviewer.identityId === identity.id) {\n                requiresMyAttention = true;\n                break;\n            }\n        }\n\n        if (requiresMyAttention) {\n            filteredItems.push(contentReview);\n        }\n    }\n\n    return [\n        filteredItems,\n        {\n            ...meta,\n            totalCount: filteredItems.length\n        }\n    ];\n};\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_dayjs","_utc","_set","_types","dayjs","extend","utc","checkValidDateTime","datetime","isValid","Error","message","code","data","today","isBefore","getPendingRequiredSteps","steps","predicate","filter","step","isRequiredStep","ApwWorkflowStepTypes","MANDATORY_BLOCKING","MANDATORY_NON_BLOCKING","includes","type","exports","INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META","scheduledOn","scheduledBy","scheduledActionId","filterContentReviewsByRequiresMyAttention","params","listContentReviews","listParams","getIdentity","getReviewer","newListParams","set","structuredClone","ApwContentReviewStatus","UNDER_REVIEW","contentReviews","meta","identity","filteredItems","i","length","contentReview","activeStep","find","status","ApwContentReviewStepStatus","ACTIVE","requiresMyAttention","j","reviewers","id","reviewer","identityId","push","totalCount"],"sources":["utils.ts"],"sourcesContent":["import Error from \"@webiny/error\";\nimport dayjs from \"dayjs\";\nimport utc from \"dayjs/plugin/utc\";\nimport set from \"lodash/set\";\nimport type {\n    ApwContentReview,\n    ApwContentReviewListParams,\n    ApwContentReviewStep,\n    ListMeta\n} from \"~/types\";\nimport { ApwContentReviewStatus, ApwContentReviewStepStatus, ApwWorkflowStepTypes } from \"~/types\";\nimport type { CreateContentReviewMethodsParams } from \"./createContentReviewMethods\";\n\ndayjs.extend(utc);\n\nexport function checkValidDateTime(datetime: string | undefined): void {\n    if (typeof datetime !== \"string\") {\n        return;\n    }\n\n    if (!dayjs(datetime).isValid()) {\n        throw new Error({\n            message: `Invalid input \"datetime\" should be an ISO string.`,\n            code: \"INVALID_DATETIME_FORMAT\",\n            data: {\n                datetime\n            }\n        });\n    }\n    const today = dayjs.utc();\n\n    if (dayjs(datetime).isBefore(today)) {\n        throw new Error({\n            message: `Cannot schedule for a past \"datetime\".`,\n            code: \"PAST_DATETIME\",\n            data: {\n                datetime\n            }\n        });\n    }\n}\n\nexport interface GetPendingRequiredSteps {\n    (\n        steps: ApwContentReviewStep[],\n        predicate: (step: ApwContentReviewStep) => boolean\n    ): ApwContentReviewStep[];\n}\n\nexport const getPendingRequiredSteps: GetPendingRequiredSteps = (steps, predicate) => {\n    return steps.filter(step => {\n        const isRequiredStep = [\n            ApwWorkflowStepTypes.MANDATORY_BLOCKING,\n            ApwWorkflowStepTypes.MANDATORY_NON_BLOCKING\n        ].includes(step.type);\n\n        if (!isRequiredStep) {\n            return false;\n        }\n\n        return predicate(step);\n    });\n};\n\nexport const INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META = {\n    scheduledOn: null,\n    scheduledBy: null,\n    scheduledActionId: null\n};\n\nexport interface FilterContentReviewsParams\n    extends Pick<CreateContentReviewMethodsParams, \"getReviewer\" | \"getIdentity\"> {\n    listParams: ApwContentReviewListParams;\n    listContentReviews: CreateContentReviewMethodsParams[\"storageOperations\"][\"listContentReviews\"];\n}\n\n/**\n * Filter \"content reviews\" that are \"underReview\" and current user is a reviewer for the active step.\n * That is the user is able to provide sign-off or comment.\n */\nexport const filterContentReviewsByRequiresMyAttention = async (\n    params: FilterContentReviewsParams\n): Promise<[ApwContentReview[], ListMeta]> => {\n    const { listContentReviews, listParams, getIdentity, getReviewer } = params;\n    /**\n     * Get all \"content reviews\" with status \"underReview\"\n     */\n    const newListParams = set(\n        structuredClone(listParams),\n        \"where.reviewStatus\",\n        ApwContentReviewStatus.UNDER_REVIEW\n    );\n    const [contentReviews, meta] = await listContentReviews(newListParams);\n\n    const identity = getIdentity();\n    const filteredItems = [];\n    /**\n     * Filter items where current user is a reviewer for the active step.\n     */\n    for (let i = 0; i < contentReviews.length; i++) {\n        const contentReview = contentReviews[i];\n\n        const activeStep = contentReview.steps.find(\n            step => step.status === ApwContentReviewStepStatus.ACTIVE\n        );\n\n        if (!activeStep) {\n            continue;\n        }\n\n        let requiresMyAttention = false;\n\n        for (let j = 0; j < activeStep.reviewers.length; j++) {\n            const { id } = activeStep.reviewers[j];\n            /**\n             * Load reviewer\n             */\n            const reviewer = await getReviewer(id);\n            /**\n             * Check if the current logged in user is the reviewer.\n             */\n            if (reviewer.identityId === identity.id) {\n                requiresMyAttention = true;\n                break;\n            }\n        }\n\n        if (requiresMyAttention) {\n            filteredItems.push(contentReview);\n        }\n    }\n\n    return [\n        filteredItems,\n        {\n            ...meta,\n            totalCount: filteredItems.length\n        }\n    ];\n};\n"],"mappings":";;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,IAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,IAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAOA,IAAAI,MAAA,GAAAJ,OAAA;AAGAK,cAAK,CAACC,MAAM,CAACC,YAAG,CAAC;AAEV,SAASC,kBAAkBA,CAACC,QAA4B,EAAQ;EACnE,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IAC9B;EACJ;EAEA,IAAI,CAAC,IAAAJ,cAAK,EAACI,QAAQ,CAAC,CAACC,OAAO,CAAC,CAAC,EAAE;IAC5B,MAAM,IAAIC,cAAK,CAAC;MACZC,OAAO,EAAE,mDAAmD;MAC5DC,IAAI,EAAE,yBAAyB;MAC/BC,IAAI,EAAE;QACFL;MACJ;IACJ,CAAC,CAAC;EACN;EACA,MAAMM,KAAK,GAAGV,cAAK,CAACE,GAAG,CAAC,CAAC;EAEzB,IAAI,IAAAF,cAAK,EAACI,QAAQ,CAAC,CAACO,QAAQ,CAACD,KAAK,CAAC,EAAE;IACjC,MAAM,IAAIJ,cAAK,CAAC;MACZC,OAAO,EAAE,wCAAwC;MACjDC,IAAI,EAAE,eAAe;MACrBC,IAAI,EAAE;QACFL;MACJ;IACJ,CAAC,CAAC;EACN;AACJ;AASO,MAAMQ,uBAAgD,GAAGA,CAACC,KAAK,EAAEC,SAAS,KAAK;EAClF,OAAOD,KAAK,CAACE,MAAM,CAACC,IAAI,IAAI;IACxB,MAAMC,cAAc,GAAG,CACnBC,2BAAoB,CAACC,kBAAkB,EACvCD,2BAAoB,CAACE,sBAAsB,CAC9C,CAACC,QAAQ,CAACL,IAAI,CAACM,IAAI,CAAC;IAErB,IAAI,CAACL,cAAc,EAAE;MACjB,OAAO,KAAK;IAChB;IAEA,OAAOH,SAAS,CAACE,IAAI,CAAC;EAC1B,CAAC,CAAC;AACN,CAAC;AAACO,OAAA,CAAAX,uBAAA,GAAAA,uBAAA;AAEK,MAAMY,4CAA4C,GAAAD,OAAA,CAAAC,4CAAA,GAAG;EACxDC,WAAW,EAAE,IAAI;EACjBC,WAAW,EAAE,IAAI;EACjBC,iBAAiB,EAAE;AACvB,CAAC;AAQD;AACA;AACA;AACA;AACO,MAAMC,yCAAyC,GAAG,MACrDC,MAAkC,IACQ;EAC1C,MAAM;IAAEC,kBAAkB;IAAEC,UAAU;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAGJ,MAAM;EAC3E;AACJ;AACA;EACI,MAAMK,aAAa,GAAG,IAAAC,YAAG,EACrBC,eAAe,CAACL,UAAU,CAAC,EAC3B,oBAAoB,EACpBM,6BAAsB,CAACC,YAC3B,CAAC;EACD,MAAM,CAACC,cAAc,EAAEC,IAAI,CAAC,GAAG,MAAMV,kBAAkB,CAACI,aAAa,CAAC;EAEtE,MAAMO,QAAQ,GAAGT,WAAW,CAAC,CAAC;EAC9B,MAAMU,aAAa,GAAG,EAAE;EACxB;AACJ;AACA;EACI,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,cAAc,CAACK,MAAM,EAAED,CAAC,EAAE,EAAE;IAC5C,MAAME,aAAa,GAAGN,cAAc,CAACI,CAAC,CAAC;IAEvC,MAAMG,UAAU,GAAGD,aAAa,CAAChC,KAAK,CAACkC,IAAI,CACvC/B,IAAI,IAAIA,IAAI,CAACgC,MAAM,KAAKC,iCAA0B,CAACC,MACvD,CAAC;IAED,IAAI,CAACJ,UAAU,EAAE;MACb;IACJ;IAEA,IAAIK,mBAAmB,GAAG,KAAK;IAE/B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGN,UAAU,CAACO,SAAS,CAACT,MAAM,EAAEQ,CAAC,EAAE,EAAE;MAClD,MAAM;QAAEE;MAAG,CAAC,GAAGR,UAAU,CAACO,SAAS,CAACD,CAAC,CAAC;MACtC;AACZ;AACA;MACY,MAAMG,QAAQ,GAAG,MAAMtB,WAAW,CAACqB,EAAE,CAAC;MACtC;AACZ;AACA;MACY,IAAIC,QAAQ,CAACC,UAAU,KAAKf,QAAQ,CAACa,EAAE,EAAE;QACrCH,mBAAmB,GAAG,IAAI;QAC1B;MACJ;IACJ;IAEA,IAAIA,mBAAmB,EAAE;MACrBT,aAAa,CAACe,IAAI,CAACZ,aAAa,CAAC;IACrC;EACJ;EAEA,OAAO,CACHH,aAAa,EACb;IACI,GAAGF,IAAI;IACPkB,UAAU,EAAEhB,aAAa,CAACE;EAC9B,CAAC,CACJ;AACL,CAAC;AAACrB,OAAA,CAAAK,yCAAA,GAAAA,yCAAA","ignoreList":[]}

package/index.d.ts

@@ -1,4 +1,3 @@
-import { CreateApwContextParams } from "./scheduler/types";
-export declare const createApwHeadlessCmsContext: (params: CreateApwContextParams) => (import("@webiny/api").ContextPlugin<import("./types").ApwContext> | import("@webiny/plugins/types").Plugin<Record<string, any>> | import("@webiny/plugins/types").PluginCollection)[];
-export declare const createApwPageBuilderContext: (params: CreateApwContextParams) => (import("@webiny/api").ContextPlugin<import("./types").ApwContext> | import("@webiny/plugins/types").Plugin<Record<string, any>> | import("@webiny/plugins/types").PluginCollection | import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("@webiny/api-mailer/types").MailerContext>)[];
+import type { CreateApwContextParams } from "./scheduler/types";
+export declare const createApwContext: (params: CreateApwContextParams) => (import("@webiny/plugins/types").Plugin<Record<string, any>> | import("@webiny/plugins/types").PluginFactory | import("@webiny/plugins/types").PluginCollection | import("@webiny/api").ContextPlugin<import("./types").ApwContext> | import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("@webiny/api-mailer/types").MailerContext>)[];
 export declare const createApwGraphQL: () => import("@webiny/api").ContextPlugin<import("./types").ApwContext>[];

package/index.js

@@ -1,38 +1,25 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createApwPageBuilderContext = exports.createApwHeadlessCmsContext = exports.createApwGraphQL = void 0;
-
+exports.createApwGraphQL = exports.createApwContext = void 0;
 var _graphql = _interopRequireDefault(require("./plugins/graphql"));
-
 var _context = require("./plugins/context");
-
 var _apiMailer = require("@webiny/api-mailer");
-
-var _apiAdminSettings = require("@webiny/api-admin-settings");
-
 /**
  * We have separated context and GraphQL creation so user can initialize only context if required.
  * GraphQL will not work without context, but context will without GraphQL.
  */
-const createApwHeadlessCmsContext = params => {
-  return [...(0, _apiAdminSettings.createAdminSettingsContext)(), ...(0, _apiMailer.createMailerContext)(), (0, _context.createApwHeadlessCmsContext)(params)];
-};
-
-exports.createApwHeadlessCmsContext = createApwHeadlessCmsContext;
 
-const createApwPageBuilderContext = params => {
-  return [...(0, _apiAdminSettings.createAdminSettingsContext)(), ...(0, _apiMailer.createMailerContext)(), ...(0, _apiMailer.createMailerGraphQL)(), (0, _context.createApwPageBuilderContext)(params)];
+const createApwContext = params => {
+  return [...(0, _apiMailer.createMailerContext)(), ...(0, _apiMailer.createMailerGraphQL)(), (0, _context.createApwContext)(params)];
 };
-
-exports.createApwPageBuilderContext = createApwPageBuilderContext;
-
+exports.createApwContext = createApwContext;
 const createApwGraphQL = () => {
   return [(0, _graphql.default)()];
 };
+exports.createApwGraphQL = createApwGraphQL;
 
-exports.createApwGraphQL = createApwGraphQL;
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createApwHeadlessCmsContext","params","createAdminSettingsContext","createMailerContext","createHeadlessCms","createApwPageBuilderContext","createMailerGraphQL","createPageBuilder","createApwGraphQL","graphql"],"sources":["index.ts"],"sourcesContent":["/**\n * We have separated context and GraphQL creation so user can initialize only context if required.\n * GraphQL will not work without context, but context will without GraphQL.\n */\nimport graphql from \"~/plugins/graphql\";\nimport {\n    createApwHeadlessCmsContext as createHeadlessCms,\n    createApwPageBuilderContext as createPageBuilder\n} from \"./plugins/context\";\nimport { CreateApwContextParams } from \"./scheduler/types\";\nimport { createMailerContext, createMailerGraphQL } from \"@webiny/api-mailer\";\nimport { createAdminSettingsContext } from \"@webiny/api-admin-settings\";\n\nexport const createApwHeadlessCmsContext = (params: CreateApwContextParams) => {\n    return [...createAdminSettingsContext(), ...createMailerContext(), createHeadlessCms(params)];\n};\n\nexport const createApwPageBuilderContext = (params: CreateApwContextParams) => {\n    return [\n        ...createAdminSettingsContext(),\n        ...createMailerContext(),\n        ...createMailerGraphQL(),\n        createPageBuilder(params)\n    ];\n};\n\nexport const createApwGraphQL = () => {\n    return [graphql()];\n};\n"],"mappings":";;;;;;;;;AAIA;;AACA;;AAKA;;AACA;;AAXA;AACA;AACA;AACA;AAUO,MAAMA,2BAA2B,GAAIC,MAAD,IAAoC;EAC3E,OAAO,CAAC,GAAG,IAAAC,4CAAA,GAAJ,EAAkC,GAAG,IAAAC,8BAAA,GAArC,EAA4D,IAAAC,oCAAA,EAAkBH,MAAlB,CAA5D,CAAP;AACH,CAFM;;;;AAIA,MAAMI,2BAA2B,GAAIJ,MAAD,IAAoC;EAC3E,OAAO,CACH,GAAG,IAAAC,4CAAA,GADA,EAEH,GAAG,IAAAC,8BAAA,GAFA,EAGH,GAAG,IAAAG,8BAAA,GAHA,EAIH,IAAAC,oCAAA,EAAkBN,MAAlB,CAJG,CAAP;AAMH,CAPM;;;;AASA,MAAMO,gBAAgB,GAAG,MAAM;EAClC,OAAO,CAAC,IAAAC,gBAAA,GAAD,CAAP;AACH,CAFM"}
+{"version":3,"names":["_graphql","_interopRequireDefault","require","_context","_apiMailer","createApwContext","params","createMailerContext","createMailerGraphQL","createBaseApwContext","exports","createApwGraphQL","graphql"],"sources":["index.ts"],"sourcesContent":["/**\n * We have separated context and GraphQL creation so user can initialize only context if required.\n * GraphQL will not work without context, but context will without GraphQL.\n */\nimport graphql from \"~/plugins/graphql\";\nimport { createApwContext as createBaseApwContext } from \"./plugins/context\";\nimport type { CreateApwContextParams } from \"./scheduler/types\";\nimport { createMailerContext, createMailerGraphQL } from \"@webiny/api-mailer\";\n\nexport const createApwContext = (params: CreateApwContextParams) => {\n    return [...createMailerContext(), ...createMailerGraphQL(), createBaseApwContext(params)];\n};\n\nexport const createApwGraphQL = () => {\n    return [graphql()];\n};\n"],"mappings":";;;;;;;AAIA,IAAAA,QAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AAPA;AACA;AACA;AACA;;AAMO,MAAMG,gBAAgB,GAAIC,MAA8B,IAAK;EAChE,OAAO,CAAC,GAAG,IAAAC,8BAAmB,EAAC,CAAC,EAAE,GAAG,IAAAC,8BAAmB,EAAC,CAAC,EAAE,IAAAC,yBAAoB,EAACH,MAAM,CAAC,CAAC;AAC7F,CAAC;AAACI,OAAA,CAAAL,gBAAA,GAAAA,gBAAA;AAEK,MAAMM,gBAAgB,GAAGA,CAAA,KAAM;EAClC,OAAO,CAAC,IAAAC,gBAAO,EAAC,CAAC,CAAC;AACtB,CAAC;AAACF,OAAA,CAAAC,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-apw",
-	"version": "0.0.0-unstable.fcdad0bc61",
+	"version": "0.0.0-unstable.fdd9228b5d",
 	"keywords": [
 		"apw:base"
 	],
@@ -14,63 +14,45 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@aws-sdk/client-cloudwatch-events": "3.186.0",
-		"@babel/runtime": "7.19.0",
-		"@commodo/fields": "1.1.2-beta.20",
-		"@webiny/api": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-admin-settings": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-headless-cms": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-i18n": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-i18n-ddb": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-mailer": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-page-builder": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-security": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-tenancy": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-wcp": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/db-dynamodb": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/error": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/handler": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/handler-client": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/handler-db": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/handler-graphql": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/handler-logs": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/plugins": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/pubsub": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/utils": "0.0.0-unstable.fcdad0bc61",
-		"@webiny/validation": "0.0.0-unstable.fcdad0bc61",
-		"dayjs": "1.11.5",
+		"@webiny/api": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/api-headless-cms": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/api-i18n": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/api-mailer": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/api-security": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/api-tenancy": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/api-wcp": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/aws-sdk": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/db-dynamodb": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/error": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/handler": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/handler-client": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/handler-db": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/handler-graphql": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/plugins": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/pubsub": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/utils": "0.0.0-unstable.fdd9228b5d",
+		"dayjs": "1.11.13",
 		"lodash": "4.17.21",
-		"mdbid": "1.0.0"
+		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
-		"@babel/preset-env": "^7.19.4",
-		"@webiny/api-headless-cms-ddb": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-page-builder-so-ddb": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-security-so-ddb": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/cli": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/handler-aws": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/project-utils": "^0.0.0-unstable.fcdad0bc61",
-		"@webiny/wcp": "^0.0.0-unstable.fcdad0bc61",
-		"get-yarn-workspaces": "^1.0.2",
-		"graphql": "^15.7.2",
-		"jest": "^28.1.0",
-		"mdbid": "^1.0.0",
-		"prettier": "^2.3.2",
-		"rimraf": "^3.0.2",
-		"sinon": "^9.0.2",
-		"ttypescript": "^1.5.12",
-		"typescript": "4.7.4"
+		"@webiny/api-page-builder": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/handler-aws": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/project-utils": "0.0.0-unstable.fdd9228b5d",
+		"@webiny/wcp": "0.0.0-unstable.fdd9228b5d",
+		"graphql": "15.9.0",
+		"jest": "29.7.0",
+		"prettier": "2.8.8",
+		"rimraf": "6.0.1",
+		"typescript": "5.3.3"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
 	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
+		"build": "node ../cli/bin.js run build",
+		"watch": "node ../cli/bin.js run watch"
 	},
-	"gitHead": "40d639c3665e384a5e2d26674d43ce26f3295e8c"
+	"gitHead": "fdd9228b5d2636463e8a34b6e0d26eea1e29c01d"
 }

package/plugins/cms/CmsEntryApwSettingsGetterPlugin.d.ts

@@ -1,5 +1,5 @@
 import { ContentApwSettingsPlugin } from "../../ContentApwSettingsPlugin";
-import { CmsEntry } from "@webiny/api-headless-cms/types";
+import type { CmsEntry } from "@webiny/api-headless-cms/types";
 import { ApwContentTypes } from "../../types";
 export declare class CmsEntryApwSettingsGetterPlugin extends ContentApwSettingsPlugin {
     canUse(type: ApwContentTypes): boolean;

package/plugins/cms/CmsEntryApwSettingsGetterPlugin.js

@@ -1,51 +1,36 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CmsEntryApwSettingsGetterPlugin = void 0;
-
 var _ContentApwSettingsPlugin = require("../../ContentApwSettingsPlugin");
-
 var _types = require("../../types");
-
 var _set = _interopRequireDefault(require("lodash/set"));
-
 class CmsEntryApwSettingsGetterPlugin extends _ContentApwSettingsPlugin.ContentApwSettingsPlugin {
   canUse(type) {
     return type === _types.ApwContentTypes.CMS_ENTRY;
   }
-
   setWorkflowId(entry, id) {
     entry.meta = (0, _set.default)(entry.meta || {}, "apw.workflowId", id);
   }
-
   getWorkflowId(entry) {
-    var _entry$meta$apw;
-
     if (!entry.meta) {
       return null;
     }
-
-    return ((_entry$meta$apw = entry.meta.apw) === null || _entry$meta$apw === void 0 ? void 0 : _entry$meta$apw.workflowId) || null;
+    return entry.meta.apw?.workflowId || null;
   }
-
   setContentReviewId(entry, id) {
     entry.meta = (0, _set.default)(entry.meta || {}, "apw.contentReviewId", id);
   }
-
   getContentReviewId(entry) {
-    var _entry$meta$apw2;
-
     if (!entry.meta) {
       return null;
     }
-
-    return ((_entry$meta$apw2 = entry.meta.apw) === null || _entry$meta$apw2 === void 0 ? void 0 : _entry$meta$apw2.contentReviewId) || null;
+    return entry.meta.apw?.contentReviewId || null;
   }
-
 }
+exports.CmsEntryApwSettingsGetterPlugin = CmsEntryApwSettingsGetterPlugin;
 
-exports.CmsEntryApwSettingsGetterPlugin = CmsEntryApwSettingsGetterPlugin;
+//# sourceMappingURL=CmsEntryApwSettingsGetterPlugin.js.map

package/plugins/cms/CmsEntryApwSettingsGetterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["CmsEntryApwSettingsGetterPlugin","ContentApwSettingsPlugin","canUse","type","ApwContentTypes","CMS_ENTRY","setWorkflowId","entry","id","meta","set","getWorkflowId","apw","workflowId","setContentReviewId","getContentReviewId","contentReviewId"],"sources":["CmsEntryApwSettingsGetterPlugin.ts"],"sourcesContent":["import { ContentApwSettingsPlugin } from \"~/ContentApwSettingsPlugin\";\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { ApwContentTypes } from \"~/types\";\nimport set from \"lodash/set\";\n\nexport class CmsEntryApwSettingsGetterPlugin extends ContentApwSettingsPlugin {\n    public override canUse(type: ApwContentTypes): boolean {\n        return type === ApwContentTypes.CMS_ENTRY;\n    }\n\n    public override setWorkflowId(entry: CmsEntry, id: string | null) {\n        entry.meta = set(entry.meta || {}, \"apw.workflowId\", id);\n    }\n\n    public override getWorkflowId(entry: CmsEntry): string | null {\n        if (!entry.meta) {\n            return null;\n        }\n        return entry.meta.apw?.workflowId || null;\n    }\n\n    public override setContentReviewId(entry: CmsEntry, id: string | null) {\n        entry.meta = set(entry.meta || {}, \"apw.contentReviewId\", id);\n    }\n    public override getContentReviewId(entry: CmsEntry): string | null {\n        if (!entry.meta) {\n            return null;\n        }\n        return entry.meta.apw?.contentReviewId || null;\n    }\n}\n"],"mappings":";;;;;;;;;AAAA;;AAEA;;AACA;;AAEO,MAAMA,+BAAN,SAA8CC,kDAA9C,CAAuE;EAC1DC,MAAM,CAACC,IAAD,EAAiC;IACnD,OAAOA,IAAI,KAAKC,sBAAA,CAAgBC,SAAhC;EACH;;EAEeC,aAAa,CAACC,KAAD,EAAkBC,EAAlB,EAAqC;IAC9DD,KAAK,CAACE,IAAN,GAAa,IAAAC,YAAA,EAAIH,KAAK,CAACE,IAAN,IAAc,EAAlB,EAAsB,gBAAtB,EAAwCD,EAAxC,CAAb;EACH;;EAEeG,aAAa,CAACJ,KAAD,EAAiC;IAAA;;IAC1D,IAAI,CAACA,KAAK,CAACE,IAAX,EAAiB;MACb,OAAO,IAAP;IACH;;IACD,OAAO,oBAAAF,KAAK,CAACE,IAAN,CAAWG,GAAX,oEAAgBC,UAAhB,KAA8B,IAArC;EACH;;EAEeC,kBAAkB,CAACP,KAAD,EAAkBC,EAAlB,EAAqC;IACnED,KAAK,CAACE,IAAN,GAAa,IAAAC,YAAA,EAAIH,KAAK,CAACE,IAAN,IAAc,EAAlB,EAAsB,qBAAtB,EAA6CD,EAA7C,CAAb;EACH;;EACeO,kBAAkB,CAACR,KAAD,EAAiC;IAAA;;IAC/D,IAAI,CAACA,KAAK,CAACE,IAAX,EAAiB;MACb,OAAO,IAAP;IACH;;IACD,OAAO,qBAAAF,KAAK,CAACE,IAAN,CAAWG,GAAX,sEAAgBI,eAAhB,KAAmC,IAA1C;EACH;;AAxByE"}
+{"version":3,"names":["_ContentApwSettingsPlugin","require","_types","_set","_interopRequireDefault","CmsEntryApwSettingsGetterPlugin","ContentApwSettingsPlugin","canUse","type","ApwContentTypes","CMS_ENTRY","setWorkflowId","entry","id","meta","set","getWorkflowId","apw","workflowId","setContentReviewId","getContentReviewId","contentReviewId","exports"],"sources":["CmsEntryApwSettingsGetterPlugin.ts"],"sourcesContent":["import { ContentApwSettingsPlugin } from \"~/ContentApwSettingsPlugin\";\nimport type { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { ApwContentTypes } from \"~/types\";\nimport set from \"lodash/set\";\n\nexport class CmsEntryApwSettingsGetterPlugin extends ContentApwSettingsPlugin {\n    public override canUse(type: ApwContentTypes): boolean {\n        return type === ApwContentTypes.CMS_ENTRY;\n    }\n\n    public override setWorkflowId(entry: CmsEntry, id: string | null) {\n        entry.meta = set(entry.meta || {}, \"apw.workflowId\", id);\n    }\n\n    public override getWorkflowId(entry: CmsEntry): string | null {\n        if (!entry.meta) {\n            return null;\n        }\n        return entry.meta.apw?.workflowId || null;\n    }\n\n    public override setContentReviewId(entry: CmsEntry, id: string | null) {\n        entry.meta = set(entry.meta || {}, \"apw.contentReviewId\", id);\n    }\n    public override getContentReviewId(entry: CmsEntry): string | null {\n        if (!entry.meta) {\n            return null;\n        }\n        return entry.meta.apw?.contentReviewId || null;\n    }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,yBAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEO,MAAMI,+BAA+B,SAASC,kDAAwB,CAAC;EAC1DC,MAAMA,CAACC,IAAqB,EAAW;IACnD,OAAOA,IAAI,KAAKC,sBAAe,CAACC,SAAS;EAC7C;EAEgBC,aAAaA,CAACC,KAAe,EAAEC,EAAiB,EAAE;IAC9DD,KAAK,CAACE,IAAI,GAAG,IAAAC,YAAG,EAACH,KAAK,CAACE,IAAI,IAAI,CAAC,CAAC,EAAE,gBAAgB,EAAED,EAAE,CAAC;EAC5D;EAEgBG,aAAaA,CAACJ,KAAe,EAAiB;IAC1D,IAAI,CAACA,KAAK,CAACE,IAAI,EAAE;MACb,OAAO,IAAI;IACf;IACA,OAAOF,KAAK,CAACE,IAAI,CAACG,GAAG,EAAEC,UAAU,IAAI,IAAI;EAC7C;EAEgBC,kBAAkBA,CAACP,KAAe,EAAEC,EAAiB,EAAE;IACnED,KAAK,CAACE,IAAI,GAAG,IAAAC,YAAG,EAACH,KAAK,CAACE,IAAI,IAAI,CAAC,CAAC,EAAE,qBAAqB,EAAED,EAAE,CAAC;EACjE;EACgBO,kBAAkBA,CAACR,KAAe,EAAiB;IAC/D,IAAI,CAACA,KAAK,CAACE,IAAI,EAAE;MACb,OAAO,IAAI;IACf;IACA,OAAOF,KAAK,CAACE,IAAI,CAACG,GAAG,EAAEI,eAAe,IAAI,IAAI;EAClD;AACJ;AAACC,OAAA,CAAAjB,+BAAA,GAAAA,+BAAA","ignoreList":[]}

package/plugins/cms/apwEntryPlugins.d.ts

@@ -1,5 +1,5 @@
-import { AdvancedPublishingWorkflow } from "../../types";
-import { HeadlessCms } from "@webiny/api-headless-cms/types";
+import type { AdvancedPublishingWorkflow } from "../../types";
+import type { HeadlessCms } from "@webiny/api-headless-cms/types";
 interface ApwEntryPlugins {
     apw: AdvancedPublishingWorkflow;
     cms: HeadlessCms;

package/plugins/cms/apwEntryPlugins.js

@@ -1,18 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.apwEntryPlugins = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _types = require("../../types");
-
 var _utils = require("./utils");
-
 const apwEntryPlugins = params => {
   const {
     cms,
@@ -20,16 +13,26 @@ const apwEntryPlugins = params => {
   } = params;
   apw.addContentGetter(_types.ApwContentTypes.CMS_ENTRY, async (id, settings) => {
     const model = await (0, _utils.fetchModel)(cms, id, settings);
-    const item = await cms.getEntryById(model, id);
-
+    const item = await cms.getEntry(model, {
+      where: {
+        OR: [{
+          id
+        }, {
+          entryId: id
+        }],
+        latest: true
+      }
+    });
     if (!item) {
       return null;
     }
-
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-      meta: (0, _objectSpread2.default)({}, item.meta || {}),
+    return {
+      ...item,
+      meta: {
+        ...(item.meta || {})
+      },
       title: (0, _utils.getEntryTitle)(model, item)
-    });
+    };
   });
   apw.addContentPublisher(_types.ApwContentTypes.CMS_ENTRY, async (id, settings) => {
     const model = await (0, _utils.fetchModel)(cms, id, settings);
@@ -42,5 +45,6 @@ const apwEntryPlugins = params => {
     return true;
   });
 };
+exports.apwEntryPlugins = apwEntryPlugins;
 
-exports.apwEntryPlugins = apwEntryPlugins;
+//# sourceMappingURL=apwEntryPlugins.js.map

package/plugins/cms/apwEntryPlugins.js.map

@@ -1 +1 @@
-{"version":3,"names":["apwEntryPlugins","params","cms","apw","addContentGetter","ApwContentTypes","CMS_ENTRY","id","settings","model","fetchModel","item","getEntryById","meta","title","getEntryTitle","addContentPublisher","publishEntry","addContentUnPublisher","unpublishEntry"],"sources":["apwEntryPlugins.ts"],"sourcesContent":["import { AdvancedPublishingWorkflow, ApwContentTypes } from \"~/types\";\nimport { fetchModel, getEntryTitle } from \"./utils\";\nimport { HeadlessCms } from \"@webiny/api-headless-cms/types\";\n\ninterface ApwEntryPlugins {\n    apw: AdvancedPublishingWorkflow;\n    cms: HeadlessCms;\n}\nexport const apwEntryPlugins = (params: ApwEntryPlugins) => {\n    const { cms, apw } = params;\n\n    apw.addContentGetter(ApwContentTypes.CMS_ENTRY, async (id, settings) => {\n        const model = await fetchModel(cms, id, settings);\n\n        const item = await cms.getEntryById(model, id);\n\n        if (!item) {\n            return null;\n        }\n\n        return {\n            ...item,\n            meta: {\n                ...(item.meta || {})\n            },\n            title: getEntryTitle(model, item)\n        };\n    });\n\n    apw.addContentPublisher(ApwContentTypes.CMS_ENTRY, async (id, settings) => {\n        const model = await fetchModel(cms, id, settings);\n        await cms.publishEntry(model, id);\n        return true;\n    });\n\n    apw.addContentUnPublisher(ApwContentTypes.CMS_ENTRY, async (id, settings) => {\n        const model = await fetchModel(cms, id, settings);\n        await cms.unpublishEntry(model, id);\n        return true;\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAOO,MAAMA,eAAe,GAAIC,MAAD,IAA6B;EACxD,MAAM;IAAEC,GAAF;IAAOC;EAAP,IAAeF,MAArB;EAEAE,GAAG,CAACC,gBAAJ,CAAqBC,sBAAA,CAAgBC,SAArC,EAAgD,OAAOC,EAAP,EAAWC,QAAX,KAAwB;IACpE,MAAMC,KAAK,GAAG,MAAM,IAAAC,iBAAA,EAAWR,GAAX,EAAgBK,EAAhB,EAAoBC,QAApB,CAApB;IAEA,MAAMG,IAAI,GAAG,MAAMT,GAAG,CAACU,YAAJ,CAAiBH,KAAjB,EAAwBF,EAAxB,CAAnB;;IAEA,IAAI,CAACI,IAAL,EAAW;MACP,OAAO,IAAP;IACH;;IAED,mEACOA,IADP;MAEIE,IAAI,kCACIF,IAAI,CAACE,IAAL,IAAa,EADjB,CAFR;MAKIC,KAAK,EAAE,IAAAC,oBAAA,EAAcN,KAAd,EAAqBE,IAArB;IALX;EAOH,CAhBD;EAkBAR,GAAG,CAACa,mBAAJ,CAAwBX,sBAAA,CAAgBC,SAAxC,EAAmD,OAAOC,EAAP,EAAWC,QAAX,KAAwB;IACvE,MAAMC,KAAK,GAAG,MAAM,IAAAC,iBAAA,EAAWR,GAAX,EAAgBK,EAAhB,EAAoBC,QAApB,CAApB;IACA,MAAMN,GAAG,CAACe,YAAJ,CAAiBR,KAAjB,EAAwBF,EAAxB,CAAN;IACA,OAAO,IAAP;EACH,CAJD;EAMAJ,GAAG,CAACe,qBAAJ,CAA0Bb,sBAAA,CAAgBC,SAA1C,EAAqD,OAAOC,EAAP,EAAWC,QAAX,KAAwB;IACzE,MAAMC,KAAK,GAAG,MAAM,IAAAC,iBAAA,EAAWR,GAAX,EAAgBK,EAAhB,EAAoBC,QAApB,CAApB;IACA,MAAMN,GAAG,CAACiB,cAAJ,CAAmBV,KAAnB,EAA0BF,EAA1B,CAAN;IACA,OAAO,IAAP;EACH,CAJD;AAKH,CAhCM"}
+{"version":3,"names":["_types","require","_utils","apwEntryPlugins","params","cms","apw","addContentGetter","ApwContentTypes","CMS_ENTRY","id","settings","model","fetchModel","item","getEntry","where","OR","entryId","latest","meta","title","getEntryTitle","addContentPublisher","publishEntry","addContentUnPublisher","unpublishEntry","exports"],"sources":["apwEntryPlugins.ts"],"sourcesContent":["import type { AdvancedPublishingWorkflow } from \"~/types\";\nimport { ApwContentTypes } from \"~/types\";\nimport { fetchModel, getEntryTitle } from \"./utils\";\nimport type { HeadlessCms } from \"@webiny/api-headless-cms/types\";\n\ninterface ApwEntryPlugins {\n    apw: AdvancedPublishingWorkflow;\n    cms: HeadlessCms;\n}\nexport const apwEntryPlugins = (params: ApwEntryPlugins) => {\n    const { cms, apw } = params;\n\n    apw.addContentGetter(ApwContentTypes.CMS_ENTRY, async (id, settings) => {\n        const model = await fetchModel(cms, id, settings);\n\n        const item = await cms.getEntry(model, {\n            where: { OR: [{ id }, { entryId: id }], latest: true }\n        });\n\n        if (!item) {\n            return null;\n        }\n\n        return {\n            ...item,\n            meta: {\n                ...(item.meta || {})\n            },\n            title: getEntryTitle(model, item)\n        };\n    });\n\n    apw.addContentPublisher(ApwContentTypes.CMS_ENTRY, async (id, settings) => {\n        const model = await fetchModel(cms, id, settings);\n        await cms.publishEntry(model, id);\n        return true;\n    });\n\n    apw.addContentUnPublisher(ApwContentTypes.CMS_ENTRY, async (id, settings) => {\n        const model = await fetchModel(cms, id, settings);\n        await cms.unpublishEntry(model, id);\n        return true;\n    });\n};\n"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAOO,MAAME,eAAe,GAAIC,MAAuB,IAAK;EACxD,MAAM;IAAEC,GAAG;IAAEC;EAAI,CAAC,GAAGF,MAAM;EAE3BE,GAAG,CAACC,gBAAgB,CAACC,sBAAe,CAACC,SAAS,EAAE,OAAOC,EAAE,EAAEC,QAAQ,KAAK;IACpE,MAAMC,KAAK,GAAG,MAAM,IAAAC,iBAAU,EAACR,GAAG,EAAEK,EAAE,EAAEC,QAAQ,CAAC;IAEjD,MAAMG,IAAI,GAAG,MAAMT,GAAG,CAACU,QAAQ,CAACH,KAAK,EAAE;MACnCI,KAAK,EAAE;QAAEC,EAAE,EAAE,CAAC;UAAEP;QAAG,CAAC,EAAE;UAAEQ,OAAO,EAAER;QAAG,CAAC,CAAC;QAAES,MAAM,EAAE;MAAK;IACzD,CAAC,CAAC;IAEF,IAAI,CAACL,IAAI,EAAE;MACP,OAAO,IAAI;IACf;IAEA,OAAO;MACH,GAAGA,IAAI;MACPM,IAAI,EAAE;QACF,IAAIN,IAAI,CAACM,IAAI,IAAI,CAAC,CAAC;MACvB,CAAC;MACDC,KAAK,EAAE,IAAAC,oBAAa,EAACV,KAAK,EAAEE,IAAI;IACpC,CAAC;EACL,CAAC,CAAC;EAEFR,GAAG,CAACiB,mBAAmB,CAACf,sBAAe,CAACC,SAAS,EAAE,OAAOC,EAAE,EAAEC,QAAQ,KAAK;IACvE,MAAMC,KAAK,GAAG,MAAM,IAAAC,iBAAU,EAACR,GAAG,EAAEK,EAAE,EAAEC,QAAQ,CAAC;IACjD,MAAMN,GAAG,CAACmB,YAAY,CAACZ,KAAK,EAAEF,EAAE,CAAC;IACjC,OAAO,IAAI;EACf,CAAC,CAAC;EAEFJ,GAAG,CAACmB,qBAAqB,CAACjB,sBAAe,CAACC,SAAS,EAAE,OAAOC,EAAE,EAAEC,QAAQ,KAAK;IACzE,MAAMC,KAAK,GAAG,MAAM,IAAAC,iBAAU,EAACR,GAAG,EAAEK,EAAE,EAAEC,QAAQ,CAAC;IACjD,MAAMN,GAAG,CAACqB,cAAc,CAACd,KAAK,EAAEF,EAAE,CAAC;IACnC,OAAO,IAAI;EACf,CAAC,CAAC;AACN,CAAC;AAACiB,OAAA,CAAAxB,eAAA,GAAAA,eAAA","ignoreList":[]}

package/plugins/cms/index.d.ts

@@ -1,7 +1,7 @@
-import { AdvancedPublishingWorkflow } from "../../types";
-import { HeadlessCms } from "@webiny/api-headless-cms/types";
-import { Security } from "@webiny/api-security/types";
-import { PluginsContainer } from "@webiny/plugins";
+import type { AdvancedPublishingWorkflow } from "../../types";
+import type { HeadlessCms } from "@webiny/api-headless-cms/types";
+import type { Security } from "@webiny/api-security/types";
+import type { PluginsContainer } from "@webiny/plugins";
 interface ApwCmsHooksParams {
     apw: AdvancedPublishingWorkflow;
     cms: HeadlessCms;

package/plugins/cms/index.js

@@ -4,27 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.apwCmsHooks = void 0;
-
 var _apwEntryPlugins = require("./apwEntryPlugins");
-
 var _linkContentReviewToEntry = require("./linkContentReviewToEntry");
-
 var _linkWorkflowToEntry = require("./linkWorkflowToEntry");
-
 var _triggerContentReview = require("./triggerContentReview");
-
 var _updateContentReviewStatus = require("./updateContentReviewStatus");
-
 var _CmsEntryApwSettingsGetterPlugin = require("./CmsEntryApwSettingsGetterPlugin");
-
 var _commentNotification = require("./notifications/commentNotification");
-
 var _contentUrl = require("./notifications/contentUrl");
-
 var _changeRequestNotification = require("./notifications/changeRequestNotification");
-
 var _contentReviewNotification = require("./notifications/contentReviewNotification");
-
 const apwCmsHooks = params => {
   /**
    * We do not need to assign anything if no apw or cms in the context.
@@ -33,7 +22,6 @@ const apwCmsHooks = params => {
   if (!params.apw || !params.cms) {
     return;
   }
-
   params.plugins.register([new _CmsEntryApwSettingsGetterPlugin.CmsEntryApwSettingsGetterPlugin(), (0, _commentNotification.createCommentNotification)(), (0, _changeRequestNotification.createChangeRequestNotification)(), (0, _contentUrl.createContentUrlPlugin)(), (0, _contentReviewNotification.createContentReviewNotification)()]);
   (0, _apwEntryPlugins.apwEntryPlugins)(params);
   (0, _linkContentReviewToEntry.linkContentReviewToEntry)(params);
@@ -41,5 +29,6 @@ const apwCmsHooks = params => {
   (0, _triggerContentReview.triggerContentReview)(params);
   (0, _updateContentReviewStatus.updateContentReviewStatus)(params);
 };
+exports.apwCmsHooks = apwCmsHooks;
 
-exports.apwCmsHooks = apwCmsHooks;
+//# sourceMappingURL=index.js.map

package/plugins/cms/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["apwCmsHooks","params","apw","cms","plugins","register","CmsEntryApwSettingsGetterPlugin","createCommentNotification","createChangeRequestNotification","createContentUrlPlugin","createContentReviewNotification","apwEntryPlugins","linkContentReviewToEntry","linkWorkflowToEntry","triggerContentReview","updateContentReviewStatus"],"sources":["index.ts"],"sourcesContent":["import { AdvancedPublishingWorkflow } from \"~/types\";\nimport { apwEntryPlugins } from \"./apwEntryPlugins\";\nimport { linkContentReviewToEntry } from \"./linkContentReviewToEntry\";\nimport { linkWorkflowToEntry } from \"./linkWorkflowToEntry\";\nimport { triggerContentReview } from \"./triggerContentReview\";\nimport { updateContentReviewStatus } from \"./updateContentReviewStatus\";\nimport { HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { Security } from \"@webiny/api-security/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryApwSettingsGetterPlugin } from \"./CmsEntryApwSettingsGetterPlugin\";\nimport { createCommentNotification } from \"./notifications/commentNotification\";\nimport { createContentUrlPlugin } from \"./notifications/contentUrl\";\nimport { createChangeRequestNotification } from \"./notifications/changeRequestNotification\";\nimport { createContentReviewNotification } from \"./notifications/contentReviewNotification\";\n\ninterface ApwCmsHooksParams {\n    apw: AdvancedPublishingWorkflow;\n    cms: HeadlessCms;\n    plugins: PluginsContainer;\n    security: Security;\n}\nexport const apwCmsHooks = (params: ApwCmsHooksParams) => {\n    /**\n     * We do not need to assign anything if no apw or cms in the context.\n     * This might happen on options request.\n     */\n    if (!params.apw || !params.cms) {\n        return;\n    }\n\n    params.plugins.register([\n        new CmsEntryApwSettingsGetterPlugin(),\n        createCommentNotification(),\n        createChangeRequestNotification(),\n        createContentUrlPlugin(),\n        createContentReviewNotification()\n    ]);\n\n    apwEntryPlugins(params);\n\n    linkContentReviewToEntry(params);\n\n    linkWorkflowToEntry(params);\n\n    triggerContentReview(params);\n\n    updateContentReviewStatus(params);\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAIA;;AACA;;AACA;;AACA;;AACA;;AAQO,MAAMA,WAAW,GAAIC,MAAD,IAA+B;EACtD;AACJ;AACA;AACA;EACI,IAAI,CAACA,MAAM,CAACC,GAAR,IAAe,CAACD,MAAM,CAACE,GAA3B,EAAgC;IAC5B;EACH;;EAEDF,MAAM,CAACG,OAAP,CAAeC,QAAf,CAAwB,CACpB,IAAIC,gEAAJ,EADoB,EAEpB,IAAAC,8CAAA,GAFoB,EAGpB,IAAAC,0DAAA,GAHoB,EAIpB,IAAAC,kCAAA,GAJoB,EAKpB,IAAAC,0DAAA,GALoB,CAAxB;EAQA,IAAAC,gCAAA,EAAgBV,MAAhB;EAEA,IAAAW,kDAAA,EAAyBX,MAAzB;EAEA,IAAAY,wCAAA,EAAoBZ,MAApB;EAEA,IAAAa,0CAAA,EAAqBb,MAArB;EAEA,IAAAc,oDAAA,EAA0Bd,MAA1B;AACH,CA1BM"}
+{"version":3,"names":["_apwEntryPlugins","require","_linkContentReviewToEntry","_linkWorkflowToEntry","_triggerContentReview","_updateContentReviewStatus","_CmsEntryApwSettingsGetterPlugin","_commentNotification","_contentUrl","_changeRequestNotification","_contentReviewNotification","apwCmsHooks","params","apw","cms","plugins","register","CmsEntryApwSettingsGetterPlugin","createCommentNotification","createChangeRequestNotification","createContentUrlPlugin","createContentReviewNotification","apwEntryPlugins","linkContentReviewToEntry","linkWorkflowToEntry","triggerContentReview","updateContentReviewStatus","exports"],"sources":["index.ts"],"sourcesContent":["import type { AdvancedPublishingWorkflow } from \"~/types\";\nimport { apwEntryPlugins } from \"./apwEntryPlugins\";\nimport { linkContentReviewToEntry } from \"./linkContentReviewToEntry\";\nimport { linkWorkflowToEntry } from \"./linkWorkflowToEntry\";\nimport { triggerContentReview } from \"./triggerContentReview\";\nimport { updateContentReviewStatus } from \"./updateContentReviewStatus\";\nimport type { HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport type { Security } from \"@webiny/api-security/types\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryApwSettingsGetterPlugin } from \"./CmsEntryApwSettingsGetterPlugin\";\nimport { createCommentNotification } from \"./notifications/commentNotification\";\nimport { createContentUrlPlugin } from \"./notifications/contentUrl\";\nimport { createChangeRequestNotification } from \"./notifications/changeRequestNotification\";\nimport { createContentReviewNotification } from \"./notifications/contentReviewNotification\";\n\ninterface ApwCmsHooksParams {\n    apw: AdvancedPublishingWorkflow;\n    cms: HeadlessCms;\n    plugins: PluginsContainer;\n    security: Security;\n}\nexport const apwCmsHooks = (params: ApwCmsHooksParams) => {\n    /**\n     * We do not need to assign anything if no apw or cms in the context.\n     * This might happen on options request.\n     */\n    if (!params.apw || !params.cms) {\n        return;\n    }\n\n    params.plugins.register([\n        new CmsEntryApwSettingsGetterPlugin(),\n        createCommentNotification(),\n        createChangeRequestNotification(),\n        createContentUrlPlugin(),\n        createContentReviewNotification()\n    ]);\n\n    apwEntryPlugins(params);\n\n    linkContentReviewToEntry(params);\n\n    linkWorkflowToEntry(params);\n\n    triggerContentReview(params);\n\n    updateContentReviewStatus(params);\n};\n"],"mappings":";;;;;;AACA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,yBAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,qBAAA,GAAAH,OAAA;AACA,IAAAI,0BAAA,GAAAJ,OAAA;AAIA,IAAAK,gCAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AACA,IAAAO,WAAA,GAAAP,OAAA;AACA,IAAAQ,0BAAA,GAAAR,OAAA;AACA,IAAAS,0BAAA,GAAAT,OAAA;AAQO,MAAMU,WAAW,GAAIC,MAAyB,IAAK;EACtD;AACJ;AACA;AACA;EACI,IAAI,CAACA,MAAM,CAACC,GAAG,IAAI,CAACD,MAAM,CAACE,GAAG,EAAE;IAC5B;EACJ;EAEAF,MAAM,CAACG,OAAO,CAACC,QAAQ,CAAC,CACpB,IAAIC,gEAA+B,CAAC,CAAC,EACrC,IAAAC,8CAAyB,EAAC,CAAC,EAC3B,IAAAC,0DAA+B,EAAC,CAAC,EACjC,IAAAC,kCAAsB,EAAC,CAAC,EACxB,IAAAC,0DAA+B,EAAC,CAAC,CACpC,CAAC;EAEF,IAAAC,gCAAe,EAACV,MAAM,CAAC;EAEvB,IAAAW,kDAAwB,EAACX,MAAM,CAAC;EAEhC,IAAAY,wCAAmB,EAACZ,MAAM,CAAC;EAE3B,IAAAa,0CAAoB,EAACb,MAAM,CAAC;EAE5B,IAAAc,oDAAyB,EAACd,MAAM,CAAC;AACrC,CAAC;AAACe,OAAA,CAAAhB,WAAA,GAAAA,WAAA","ignoreList":[]}

package/plugins/cms/linkContentReviewToEntry.d.ts

@@ -1,5 +1,5 @@
-import { AdvancedPublishingWorkflow } from "../../types";
-import { HeadlessCms } from "@webiny/api-headless-cms/types";
+import type { AdvancedPublishingWorkflow } from "../../types";
+import type { HeadlessCms } from "@webiny/api-headless-cms/types";
 interface LinkContentReviewToEntryParams {
     apw: AdvancedPublishingWorkflow;
     cms: HeadlessCms;