@webiny/api-apw 0.0.0-unstable.e3f4727c56 → 0.0.0-unstable.eb196ccd2f

package/plugins/cms/updateContentReviewStatus.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateContentReviewStatus = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _types = require("../../types");
 var _utils = require("../../crud/utils");
 var _utils2 = require("./utils");
@@ -19,11 +17,10 @@ const updateContentReviewStatus = params => {
     entry,
     model
   }) => {
-    var _entry$meta, _entry$meta$apw;
-    if ((0, _utils2.isAwpModel)(model)) {
+    if ((0, _utils2.isApwDisabledOnModel)(model)) {
       return;
     }
-    const contentReviewId = (_entry$meta = entry.meta) === null || _entry$meta === void 0 ? void 0 : (_entry$meta$apw = _entry$meta.apw) === null || _entry$meta$apw === void 0 ? void 0 : _entry$meta$apw.contentReviewId;
+    const contentReviewId = entry.meta?.apw?.contentReviewId;
     /**
      * Bail out if there is no "content review" linked.
      */
@@ -40,20 +37,21 @@ const updateContentReviewStatus = params => {
     }
     await apw.contentReview.update(contentReviewId, {
       reviewStatus: _types.ApwContentReviewStatus.PUBLISHED,
-      content: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, contentReview.content), _utils.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META), {}, {
+      content: {
+        ...contentReview.content,
+        ..._utils.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META,
         publishedBy: identity.id
-      })
+      }
     });
   });
   cms.onEntryAfterUnpublish.subscribe(async ({
     entry,
     model
   }) => {
-    var _entry$meta2, _entry$meta2$apw;
-    if ((0, _utils2.isAwpModel)(model)) {
+    if ((0, _utils2.isApwDisabledOnModel)(model)) {
       return;
     }
-    const contentReviewId = (_entry$meta2 = entry.meta) === null || _entry$meta2 === void 0 ? void 0 : (_entry$meta2$apw = _entry$meta2.apw) === null || _entry$meta2$apw === void 0 ? void 0 : _entry$meta2$apw.contentReviewId;
+    const contentReviewId = entry.meta?.apw?.contentReviewId;
     /**
      * Bail out if there is no "content review" linked.
      */
@@ -70,10 +68,14 @@ const updateContentReviewStatus = params => {
     }
     await apw.contentReview.update(contentReviewId, {
       reviewStatus: _types.ApwContentReviewStatus.READY_TO_BE_PUBLISHED,
-      content: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, contentReview.content), _utils.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META), {}, {
+      content: {
+        ...contentReview.content,
+        ..._utils.INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META,
         publishedBy: null
-      })
+      }
     });
   });
 };
-exports.updateContentReviewStatus = updateContentReviewStatus;
+exports.updateContentReviewStatus = updateContentReviewStatus;
+
+//# sourceMappingURL=updateContentReviewStatus.js.map

package/plugins/cms/updateContentReviewStatus.js.map

@@ -1 +1 @@
-{"version":3,"names":["updateContentReviewStatus","params","apw","cms","security","onEntryAfterPublish","subscribe","entry","model","isAwpModel","contentReviewId","meta","contentReview","get","identity","getIdentity","reviewStatus","ApwContentReviewStatus","READY_TO_BE_PUBLISHED","update","PUBLISHED","content","INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META","publishedBy","id","onEntryAfterUnpublish"],"sources":["updateContentReviewStatus.ts"],"sourcesContent":["import {\n    AdvancedPublishingWorkflow,\n    ApwContentReviewStatus,\n    OnCmsEntryAfterPublishTopicParams,\n    OnCmsEntryAfterUnpublishTopicParams\n} from \"~/types\";\nimport { INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META } from \"~/crud/utils\";\nimport { HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { Security } from \"@webiny/api-security/types\";\nimport { isAwpModel } from \"~/plugins/cms/utils\";\n\ninterface UpdateContentReviewStatusParams {\n    apw: AdvancedPublishingWorkflow;\n    cms: HeadlessCms;\n    security: Security;\n}\n\nexport const updateContentReviewStatus = (params: UpdateContentReviewStatusParams) => {\n    const { apw, cms, security } = params;\n\n    cms.onEntryAfterPublish.subscribe<OnCmsEntryAfterPublishTopicParams>(\n        async ({ entry, model }) => {\n            if (isAwpModel(model)) {\n                return;\n            }\n            const contentReviewId = entry.meta?.apw?.contentReviewId;\n            /**\n             * Bail out if there is no \"content review\" linked.\n             */\n            if (!contentReviewId) {\n                return;\n            }\n\n            const contentReview = await apw.contentReview.get(contentReviewId);\n            const identity = security.getIdentity();\n            /**\n             * If content review is \"readyToBePublished set its status as \"published\" after page publish.\n             */\n            if (contentReview.reviewStatus !== ApwContentReviewStatus.READY_TO_BE_PUBLISHED) {\n                return;\n            }\n            await apw.contentReview.update(contentReviewId, {\n                reviewStatus: ApwContentReviewStatus.PUBLISHED,\n                content: {\n                    ...contentReview.content,\n                    ...INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META,\n                    publishedBy: identity.id\n                }\n            });\n        }\n    );\n    cms.onEntryAfterUnpublish.subscribe<OnCmsEntryAfterUnpublishTopicParams>(\n        async ({ entry, model }) => {\n            if (isAwpModel(model)) {\n                return;\n            }\n            const contentReviewId = entry.meta?.apw?.contentReviewId;\n            /**\n             * Bail out if there is no \"content review\" linked.\n             */\n            if (!contentReviewId) {\n                return;\n            }\n\n            const contentReview = await apw.contentReview.get(contentReviewId);\n            /**\n             * If content review is \"published set its status as \"readyToBePublished\" after page unpublish.\n             */\n\n            if (contentReview.reviewStatus !== ApwContentReviewStatus.PUBLISHED) {\n                return;\n            }\n            await apw.contentReview.update(contentReviewId, {\n                reviewStatus: ApwContentReviewStatus.READY_TO_BE_PUBLISHED,\n                content: {\n                    ...contentReview.content,\n                    ...INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META,\n                    publishedBy: null\n                }\n            });\n        }\n    );\n};\n"],"mappings":";;;;;;;;AAAA;AAMA;AAGA;AAQO,MAAMA,yBAAyB,GAAIC,MAAuC,IAAK;EAClF,MAAM;IAAEC,GAAG;IAAEC,GAAG;IAAEC;EAAS,CAAC,GAAGH,MAAM;EAErCE,GAAG,CAACE,mBAAmB,CAACC,SAAS,CAC7B,OAAO;IAAEC,KAAK;IAAEC;EAAM,CAAC,KAAK;IAAA;IACxB,IAAI,IAAAC,kBAAU,EAACD,KAAK,CAAC,EAAE;MACnB;IACJ;IACA,MAAME,eAAe,kBAAGH,KAAK,CAACI,IAAI,mEAAV,YAAYT,GAAG,oDAAf,gBAAiBQ,eAAe;IACxD;AACZ;AACA;IACY,IAAI,CAACA,eAAe,EAAE;MAClB;IACJ;IAEA,MAAME,aAAa,GAAG,MAAMV,GAAG,CAACU,aAAa,CAACC,GAAG,CAACH,eAAe,CAAC;IAClE,MAAMI,QAAQ,GAAGV,QAAQ,CAACW,WAAW,EAAE;IACvC;AACZ;AACA;IACY,IAAIH,aAAa,CAACI,YAAY,KAAKC,6BAAsB,CAACC,qBAAqB,EAAE;MAC7E;IACJ;IACA,MAAMhB,GAAG,CAACU,aAAa,CAACO,MAAM,CAACT,eAAe,EAAE;MAC5CM,YAAY,EAAEC,6BAAsB,CAACG,SAAS;MAC9CC,OAAO,0FACAT,aAAa,CAACS,OAAO,GACrBC,mDAA4C;QAC/CC,WAAW,EAAET,QAAQ,CAACU;MAAE;IAEhC,CAAC,CAAC;EACN,CAAC,CACJ;EACDrB,GAAG,CAACsB,qBAAqB,CAACnB,SAAS,CAC/B,OAAO;IAAEC,KAAK;IAAEC;EAAM,CAAC,KAAK;IAAA;IACxB,IAAI,IAAAC,kBAAU,EAACD,KAAK,CAAC,EAAE;MACnB;IACJ;IACA,MAAME,eAAe,mBAAGH,KAAK,CAACI,IAAI,qEAAV,aAAYT,GAAG,qDAAf,iBAAiBQ,eAAe;IACxD;AACZ;AACA;IACY,IAAI,CAACA,eAAe,EAAE;MAClB;IACJ;IAEA,MAAME,aAAa,GAAG,MAAMV,GAAG,CAACU,aAAa,CAACC,GAAG,CAACH,eAAe,CAAC;IAClE;AACZ;AACA;;IAEY,IAAIE,aAAa,CAACI,YAAY,KAAKC,6BAAsB,CAACG,SAAS,EAAE;MACjE;IACJ;IACA,MAAMlB,GAAG,CAACU,aAAa,CAACO,MAAM,CAACT,eAAe,EAAE;MAC5CM,YAAY,EAAEC,6BAAsB,CAACC,qBAAqB;MAC1DG,OAAO,0FACAT,aAAa,CAACS,OAAO,GACrBC,mDAA4C;QAC/CC,WAAW,EAAE;MAAI;IAEzB,CAAC,CAAC;EACN,CAAC,CACJ;AACL,CAAC;AAAC"}
+{"version":3,"names":["_types","require","_utils","_utils2","updateContentReviewStatus","params","apw","cms","security","onEntryAfterPublish","subscribe","entry","model","isApwDisabledOnModel","contentReviewId","meta","contentReview","get","identity","getIdentity","reviewStatus","ApwContentReviewStatus","READY_TO_BE_PUBLISHED","update","PUBLISHED","content","INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META","publishedBy","id","onEntryAfterUnpublish","exports"],"sources":["updateContentReviewStatus.ts"],"sourcesContent":["import type {\n    AdvancedPublishingWorkflow,\n    OnCmsEntryAfterPublishTopicParams,\n    OnCmsEntryAfterUnpublishTopicParams\n} from \"~/types\";\nimport { ApwContentReviewStatus } from \"~/types\";\nimport { INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META } from \"~/crud/utils\";\nimport type { HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport type { Security } from \"@webiny/api-security/types\";\nimport { isApwDisabledOnModel } from \"~/plugins/cms/utils\";\n\ninterface UpdateContentReviewStatusParams {\n    apw: AdvancedPublishingWorkflow;\n    cms: HeadlessCms;\n    security: Security;\n}\n\nexport const updateContentReviewStatus = (params: UpdateContentReviewStatusParams) => {\n    const { apw, cms, security } = params;\n\n    cms.onEntryAfterPublish.subscribe<OnCmsEntryAfterPublishTopicParams>(\n        async ({ entry, model }) => {\n            if (isApwDisabledOnModel(model)) {\n                return;\n            }\n            const contentReviewId = entry.meta?.apw?.contentReviewId;\n            /**\n             * Bail out if there is no \"content review\" linked.\n             */\n            if (!contentReviewId) {\n                return;\n            }\n\n            const contentReview = await apw.contentReview.get(contentReviewId);\n            const identity = security.getIdentity();\n            /**\n             * If content review is \"readyToBePublished set its status as \"published\" after page publish.\n             */\n            if (contentReview.reviewStatus !== ApwContentReviewStatus.READY_TO_BE_PUBLISHED) {\n                return;\n            }\n            await apw.contentReview.update(contentReviewId, {\n                reviewStatus: ApwContentReviewStatus.PUBLISHED,\n                content: {\n                    ...contentReview.content,\n                    ...INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META,\n                    publishedBy: identity.id\n                }\n            });\n        }\n    );\n    cms.onEntryAfterUnpublish.subscribe<OnCmsEntryAfterUnpublishTopicParams>(\n        async ({ entry, model }) => {\n            if (isApwDisabledOnModel(model)) {\n                return;\n            }\n            const contentReviewId = entry.meta?.apw?.contentReviewId;\n            /**\n             * Bail out if there is no \"content review\" linked.\n             */\n            if (!contentReviewId) {\n                return;\n            }\n\n            const contentReview = await apw.contentReview.get(contentReviewId);\n            /**\n             * If content review is \"published set its status as \"readyToBePublished\" after page unpublish.\n             */\n\n            if (contentReview.reviewStatus !== ApwContentReviewStatus.PUBLISHED) {\n                return;\n            }\n            await apw.contentReview.update(contentReviewId, {\n                reviewStatus: ApwContentReviewStatus.READY_TO_BE_PUBLISHED,\n                content: {\n                    ...contentReview.content,\n                    ...INITIAL_CONTENT_REVIEW_CONTENT_SCHEDULE_META,\n                    publishedBy: null\n                }\n            });\n        }\n    );\n};\n"],"mappings":";;;;;;AAKA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAGA,IAAAE,OAAA,GAAAF,OAAA;AAQO,MAAMG,yBAAyB,GAAIC,MAAuC,IAAK;EAClF,MAAM;IAAEC,GAAG;IAAEC,GAAG;IAAEC;EAAS,CAAC,GAAGH,MAAM;EAErCE,GAAG,CAACE,mBAAmB,CAACC,SAAS,CAC7B,OAAO;IAAEC,KAAK;IAAEC;EAAM,CAAC,KAAK;IACxB,IAAI,IAAAC,4BAAoB,EAACD,KAAK,CAAC,EAAE;MAC7B;IACJ;IACA,MAAME,eAAe,GAAGH,KAAK,CAACI,IAAI,EAAET,GAAG,EAAEQ,eAAe;IACxD;AACZ;AACA;IACY,IAAI,CAACA,eAAe,EAAE;MAClB;IACJ;IAEA,MAAME,aAAa,GAAG,MAAMV,GAAG,CAACU,aAAa,CAACC,GAAG,CAACH,eAAe,CAAC;IAClE,MAAMI,QAAQ,GAAGV,QAAQ,CAACW,WAAW,CAAC,CAAC;IACvC;AACZ;AACA;IACY,IAAIH,aAAa,CAACI,YAAY,KAAKC,6BAAsB,CAACC,qBAAqB,EAAE;MAC7E;IACJ;IACA,MAAMhB,GAAG,CAACU,aAAa,CAACO,MAAM,CAACT,eAAe,EAAE;MAC5CM,YAAY,EAAEC,6BAAsB,CAACG,SAAS;MAC9CC,OAAO,EAAE;QACL,GAAGT,aAAa,CAACS,OAAO;QACxB,GAAGC,mDAA4C;QAC/CC,WAAW,EAAET,QAAQ,CAACU;MAC1B;IACJ,CAAC,CAAC;EACN,CACJ,CAAC;EACDrB,GAAG,CAACsB,qBAAqB,CAACnB,SAAS,CAC/B,OAAO;IAAEC,KAAK;IAAEC;EAAM,CAAC,KAAK;IACxB,IAAI,IAAAC,4BAAoB,EAACD,KAAK,CAAC,EAAE;MAC7B;IACJ;IACA,MAAME,eAAe,GAAGH,KAAK,CAACI,IAAI,EAAET,GAAG,EAAEQ,eAAe;IACxD;AACZ;AACA;IACY,IAAI,CAACA,eAAe,EAAE;MAClB;IACJ;IAEA,MAAME,aAAa,GAAG,MAAMV,GAAG,CAACU,aAAa,CAACC,GAAG,CAACH,eAAe,CAAC;IAClE;AACZ;AACA;;IAEY,IAAIE,aAAa,CAACI,YAAY,KAAKC,6BAAsB,CAACG,SAAS,EAAE;MACjE;IACJ;IACA,MAAMlB,GAAG,CAACU,aAAa,CAACO,MAAM,CAACT,eAAe,EAAE;MAC5CM,YAAY,EAAEC,6BAAsB,CAACC,qBAAqB;MAC1DG,OAAO,EAAE;QACL,GAAGT,aAAa,CAACS,OAAO;QACxB,GAAGC,mDAA4C;QAC/CC,WAAW,EAAE;MACjB;IACJ,CAAC,CAAC;EACN,CACJ,CAAC;AACL,CAAC;AAACG,OAAA,CAAA1B,yBAAA,GAAAA,yBAAA","ignoreList":[]}

package/plugins/cms/utils.d.ts

@@ -1,5 +1,5 @@
-import { CmsEntry, CmsModel, HeadlessCms } from "@webiny/api-headless-cms/types";
-import { AdvancedPublishingWorkflow, ApwWorkflow } from "../../types";
+import type { CmsEntry, CmsModel, HeadlessCms } from "@webiny/api-headless-cms/types";
+import type { AdvancedPublishingWorkflow, ApwWorkflow } from "../../types";
 export declare const fetchModel: (cms: HeadlessCms, id: string, settings?: {
     modelId?: string;
 } | null) => Promise<CmsModel>;
@@ -20,8 +20,9 @@ export declare const updateEntryMeta: (params: UpdateEntryMetaParams) => Promise
 interface AssignWorkflowToEntryParams {
     apw: AdvancedPublishingWorkflow;
     entry: CmsEntry;
+    model: CmsModel;
 }
 export declare const assignWorkflowToEntry: (params: AssignWorkflowToEntryParams) => Promise<void>;
-export declare const hasEntries: (workflow: ApwWorkflow) => Boolean;
-export declare const isAwpModel: (model: CmsModel) => boolean;
+export declare const hasEntries: (workflow: ApwWorkflow) => boolean;
+export declare const isApwDisabledOnModel: (model: Pick<CmsModel, "modelId" | "isPrivate">) => boolean;
 export {};

package/plugins/cms/utils.js

@@ -4,8 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateEntryMeta = exports.isAwpModel = exports.hasEntries = exports.getLatestEntryRevision = exports.getEntryTitle = exports.fetchModel = exports.assignWorkflowToEntry = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+exports.updateEntryMeta = exports.isApwDisabledOnModel = exports.hasEntries = exports.getLatestEntryRevision = exports.getEntryTitle = exports.fetchModel = exports.assignWorkflowToEntry = void 0;
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _types = require("../../types");
 var _utils = require("../utils");
@@ -51,11 +50,11 @@ const getLatestEntryRevision = async params => {
     model,
     entryId
   } = params;
-  const items = await cms.getLatestEntriesByIds(model, [entryId]);
-  const item = items.shift();
+  const [item] = await cms.getLatestEntriesByIds(model, [entryId]);
   if (!item) {
     throw new _error.default("There is no entry with given ID.", "ENTRY_NOT_FOUND", {
-      entryId
+      entryId,
+      model: model.modelId
     });
   }
   return item;
@@ -85,12 +84,11 @@ const isWorkflowApplicable = (entry, workflow) => {
   if (scopeType === _types.WorkflowScopeTypes.DEFAULT) {
     return true;
   } else if (scopeType === _types.WorkflowScopeTypes.CUSTOM) {
-    var _workflow$scope$data, _workflow$scope$data2;
-    const models = (_workflow$scope$data = workflow.scope.data) === null || _workflow$scope$data === void 0 ? void 0 : _workflow$scope$data.models;
+    const models = workflow.scope.data?.models;
     if (Array.isArray(models) && models.includes(entry.modelId)) {
       return true;
     }
-    const entries = ((_workflow$scope$data2 = workflow.scope.data) === null || _workflow$scope$data2 === void 0 ? void 0 : _workflow$scope$data2.entries) || [];
+    const entries = workflow.scope.data?.entries || [];
     if (Array.isArray(entries) && entries.some(value => value.id === entry.entryId)) {
       return true;
     }
@@ -117,7 +115,6 @@ const assignWorkflowToEntry = async params => {
         app: _types.ApwWorkflowApplications.CMS
       }
     });
-    console.log(`Found ${entries.length} workflows.`);
 
     /*
      *  Re-order them based on workflow scope and pre-defined rule i.e.
@@ -135,12 +132,13 @@ const assignWorkflowToEntry = async params => {
         console.log(`Not applying workflow ${workflow.id} to entry ${entry.id}.`);
         continue;
       }
-      entry.meta = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry.meta || {}), {}, {
+      entry.meta = {
+        ...(entry.meta || {}),
         apw: {
           workflowId: workflow.id,
           contentReviewId: null
         }
-      });
+      };
       return;
     }
   } catch (ex) {
@@ -156,7 +154,15 @@ const hasEntries = workflow => {
   return app === _types.ApwWorkflowApplications.CMS && scope.type === _types.WorkflowScopeTypes.CUSTOM && scope.data && Array.isArray(scope.data.entries);
 };
 exports.hasEntries = hasEntries;
-const isAwpModel = model => {
+const isApwDisabledOnModel = model => {
+  /**
+   * We should not run APW on private models as well.
+   */
+  if (model.isPrivate) {
+    return true;
+  }
   return [_changeRequest.CHANGE_REQUEST_MODEL_ID, _comment.COMMENT_MODEL_ID, _contentReview.CONTENT_REVIEW_MODEL_ID, _reviewer.REVIEWER_MODEL_ID, _workflow.WORKFLOW_MODEL_ID].includes(model.modelId);
 };
-exports.isAwpModel = isAwpModel;
+exports.isApwDisabledOnModel = isApwDisabledOnModel;
+
+//# sourceMappingURL=utils.js.map

package/plugins/cms/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["fetchModel","cms","id","settings","WebinyError","modelId","model","getModel","getEntryTitle","entry","titleFieldId","values","getLatestEntryRevision","params","entryId","items","getLatestEntriesByIds","item","shift","updateEntryMeta","meta","updateEntry","isWorkflowApplicable","workflow","application","app","ApwWorkflowApplications","CMS","scopeType","scope","type","WorkflowScopeTypes","DEFAULT","CUSTOM","models","data","Array","isArray","includes","entries","some","value","assignWorkflowToEntry","apw","list","where","console","log","length","sortedWorkflows","sort","workflowByPrecedenceDesc","workflowByCreatedOnDesc","workflowId","contentReviewId","ex","code","hasEntries","isAwpModel","CHANGE_REQUEST_MODEL_ID","COMMENT_MODEL_ID","CONTENT_REVIEW_MODEL_ID","REVIEWER_MODEL_ID","WORKFLOW_MODEL_ID"],"sources":["utils.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport {\n    AdvancedPublishingWorkflow,\n    ApwWorkflow,\n    ApwWorkflowApplications,\n    WorkflowScopeTypes\n} from \"~/types\";\nimport { workflowByCreatedOnDesc, workflowByPrecedenceDesc } from \"~/plugins/utils\";\nimport { CHANGE_REQUEST_MODEL_ID } from \"~/storageOperations/models/changeRequest.model\";\nimport { COMMENT_MODEL_ID } from \"~/storageOperations/models/comment.model\";\nimport { CONTENT_REVIEW_MODEL_ID } from \"~/storageOperations/models/contentReview.model\";\nimport { REVIEWER_MODEL_ID } from \"~/storageOperations/models/reviewer.model\";\nimport { WORKFLOW_MODEL_ID } from \"~/storageOperations/models/workflow.model\";\n\nexport const fetchModel = async (\n    cms: HeadlessCms,\n    id: string,\n    settings?: { modelId?: string } | null\n): Promise<CmsModel> => {\n    if (!settings) {\n        throw new WebinyError(\"Missing settings.\", \"SETTINGS_ERROR\", {\n            id\n        });\n    }\n    const modelId = settings.modelId;\n    if (!modelId) {\n        throw new WebinyError(\"Missing modelId in settings.\", \"MODEL_ID_ERROR\", {\n            id,\n            settings\n        });\n    }\n    const model = await cms.getModel(modelId);\n    if (model) {\n        return model;\n    }\n    throw new WebinyError(\"There is no requested model in the system.\", \"MODEL_NOT_EXISTS\", {\n        id,\n        settings\n    });\n};\n\nexport const getEntryTitle = (model: CmsModel, entry: CmsEntry): string => {\n    const titleFieldId = model.titleFieldId;\n    if (!titleFieldId || !entry.values[titleFieldId]) {\n        return entry.id;\n    }\n    return entry.values[titleFieldId];\n};\n\ninterface GetLatestEntryRevisionParams {\n    cms: HeadlessCms;\n    model: CmsModel;\n    entryId: string;\n}\nexport const getLatestEntryRevision = async (\n    params: GetLatestEntryRevisionParams\n): Promise<CmsEntry> => {\n    const { cms, model, entryId } = params;\n    const items = await cms.getLatestEntriesByIds(model, [entryId]);\n\n    const item = items.shift();\n    if (!item) {\n        throw new WebinyError(\"There is no entry with given ID.\", \"ENTRY_NOT_FOUND\", {\n            entryId\n        });\n    }\n    return item;\n};\n\ninterface UpdateEntryMetaParams {\n    meta: Record<string, any>;\n    entryId: string;\n    cms: HeadlessCms;\n    model: CmsModel;\n}\nexport const updateEntryMeta = async (params: UpdateEntryMetaParams): Promise<void> => {\n    const { entryId, cms, model, meta } = params;\n\n    const entry = await getLatestEntryRevision({\n        cms,\n        model,\n        entryId\n    });\n\n    await cms.updateEntry(model, entry.id, {}, meta);\n};\n\nconst isWorkflowApplicable = (entry: CmsEntry, workflow: ApwWorkflow): boolean => {\n    const application = workflow.app;\n    if (application !== ApwWorkflowApplications.CMS) {\n        return false;\n    }\n\n    const scopeType = workflow.scope.type;\n\n    if (scopeType === WorkflowScopeTypes.DEFAULT) {\n        return true;\n    } else if (scopeType === WorkflowScopeTypes.CUSTOM) {\n        const models = workflow.scope.data?.models;\n\n        if (Array.isArray(models) && models.includes(entry.modelId)) {\n            return true;\n        }\n\n        const entries = workflow.scope.data?.entries || [];\n        if (Array.isArray(entries) && entries.some(value => value.id === entry.entryId)) {\n            return true;\n        }\n        return false;\n    }\n    throw new WebinyError(`Unknown scope type \"${scopeType}\".`, \"UNKNOWN_SCOPE_TYPE\", {\n        workflow\n    });\n};\n\ninterface AssignWorkflowToEntryParams {\n    apw: AdvancedPublishingWorkflow;\n    entry: CmsEntry;\n}\nexport const assignWorkflowToEntry = async (params: AssignWorkflowToEntryParams): Promise<void> => {\n    const { apw, entry } = params;\n    /**\n     * Lookup and assign \"workflowId\".\n     */\n    try {\n        /*\n         * List all workflows for app cms\n         */\n        const [entries] = await apw.workflow.list({\n            where: {\n                app: ApwWorkflowApplications.CMS\n            }\n        });\n\n        console.log(`Found ${entries.length} workflows.`);\n\n        /*\n         *  Re-order them based on workflow scope and pre-defined rule i.e.\n         *  \"specific\" entry -> entry for a \"category\" -> \"default\".\n         *  There can be more than one workflow with same \"scope\" and \"app\".\n         *  Therefore, we are also sorting the workflows by `createdOn` to get the latest workflow.\n         */\n        const sortedWorkflows = entries\n            .sort(workflowByPrecedenceDesc)\n            .sort(workflowByCreatedOnDesc);\n\n        /**\n         * Assign the first applicable workflow to the page and exit.\n         */\n        for (const workflow of sortedWorkflows) {\n            if (isWorkflowApplicable(entry, workflow) === false) {\n                console.log(`Not applying workflow ${workflow.id} to entry ${entry.id}.`);\n                continue;\n            }\n            entry.meta = {\n                ...(entry.meta || {}),\n                apw: {\n                    workflowId: workflow.id,\n                    contentReviewId: null\n                }\n            };\n            return;\n        }\n    } catch (ex) {\n        throw new WebinyError(\n            `Failed to assign workflow to CMS entry \"${entry.id}\".`,\n            ex.code,\n            ex.data\n        );\n    }\n};\n\nexport const hasEntries = (workflow: ApwWorkflow): Boolean => {\n    const { app, scope } = workflow;\n    return (\n        app === ApwWorkflowApplications.CMS &&\n        scope.type === WorkflowScopeTypes.CUSTOM &&\n        scope.data &&\n        Array.isArray(scope.data.entries)\n    );\n};\n\nexport const isAwpModel = (model: CmsModel): boolean => {\n    return [\n        CHANGE_REQUEST_MODEL_ID,\n        COMMENT_MODEL_ID,\n        CONTENT_REVIEW_MODEL_ID,\n        REVIEWER_MODEL_ID,\n        WORKFLOW_MODEL_ID\n    ].includes(model.modelId);\n};\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_types","_utils","_changeRequest","_comment","_contentReview","_reviewer","_workflow","fetchModel","cms","id","settings","WebinyError","modelId","model","getModel","exports","getEntryTitle","entry","titleFieldId","values","getLatestEntryRevision","params","entryId","item","getLatestEntriesByIds","updateEntryMeta","meta","updateEntry","isWorkflowApplicable","workflow","application","app","ApwWorkflowApplications","CMS","scopeType","scope","type","WorkflowScopeTypes","DEFAULT","CUSTOM","models","data","Array","isArray","includes","entries","some","value","assignWorkflowToEntry","apw","list","where","sortedWorkflows","sort","workflowByPrecedenceDesc","workflowByCreatedOnDesc","console","log","workflowId","contentReviewId","ex","code","hasEntries","isApwDisabledOnModel","isPrivate","CHANGE_REQUEST_MODEL_ID","COMMENT_MODEL_ID","CONTENT_REVIEW_MODEL_ID","REVIEWER_MODEL_ID","WORKFLOW_MODEL_ID"],"sources":["utils.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntry, CmsModel, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport type { AdvancedPublishingWorkflow, ApwWorkflow } from \"~/types\";\nimport { ApwWorkflowApplications, WorkflowScopeTypes } from \"~/types\";\nimport { workflowByCreatedOnDesc, workflowByPrecedenceDesc } from \"~/plugins/utils\";\nimport { CHANGE_REQUEST_MODEL_ID } from \"~/storageOperations/models/changeRequest.model\";\nimport { COMMENT_MODEL_ID } from \"~/storageOperations/models/comment.model\";\nimport { CONTENT_REVIEW_MODEL_ID } from \"~/storageOperations/models/contentReview.model\";\nimport { REVIEWER_MODEL_ID } from \"~/storageOperations/models/reviewer.model\";\nimport { WORKFLOW_MODEL_ID } from \"~/storageOperations/models/workflow.model\";\n\nexport const fetchModel = async (\n    cms: HeadlessCms,\n    id: string,\n    settings?: { modelId?: string } | null\n): Promise<CmsModel> => {\n    if (!settings) {\n        throw new WebinyError(\"Missing settings.\", \"SETTINGS_ERROR\", {\n            id\n        });\n    }\n    const modelId = settings.modelId;\n    if (!modelId) {\n        throw new WebinyError(\"Missing modelId in settings.\", \"MODEL_ID_ERROR\", {\n            id,\n            settings\n        });\n    }\n    const model = await cms.getModel(modelId);\n    if (model) {\n        return model;\n    }\n    throw new WebinyError(\"There is no requested model in the system.\", \"MODEL_NOT_EXISTS\", {\n        id,\n        settings\n    });\n};\n\nexport const getEntryTitle = (model: CmsModel, entry: CmsEntry): string => {\n    const titleFieldId = model.titleFieldId;\n    if (!titleFieldId || !entry.values[titleFieldId]) {\n        return entry.id;\n    }\n    return entry.values[titleFieldId];\n};\n\ninterface GetLatestEntryRevisionParams {\n    cms: HeadlessCms;\n    model: CmsModel;\n    entryId: string;\n}\n\nexport const getLatestEntryRevision = async (\n    params: GetLatestEntryRevisionParams\n): Promise<CmsEntry> => {\n    const { cms, model, entryId } = params;\n    const [item] = await cms.getLatestEntriesByIds(model, [entryId]);\n\n    if (!item) {\n        throw new WebinyError(\"There is no entry with given ID.\", \"ENTRY_NOT_FOUND\", {\n            entryId,\n            model: model.modelId\n        });\n    }\n    return item;\n};\n\ninterface UpdateEntryMetaParams {\n    meta: Record<string, any>;\n    entryId: string;\n    cms: HeadlessCms;\n    model: CmsModel;\n}\n\nexport const updateEntryMeta = async (params: UpdateEntryMetaParams): Promise<void> => {\n    const { entryId, cms, model, meta } = params;\n\n    const entry = await getLatestEntryRevision({\n        cms,\n        model,\n        entryId\n    });\n\n    await cms.updateEntry(model, entry.id, {}, meta);\n};\n\nconst isWorkflowApplicable = (entry: CmsEntry, workflow: ApwWorkflow): boolean => {\n    const application = workflow.app;\n    if (application !== ApwWorkflowApplications.CMS) {\n        return false;\n    }\n\n    const scopeType = workflow.scope.type;\n\n    if (scopeType === WorkflowScopeTypes.DEFAULT) {\n        return true;\n    } else if (scopeType === WorkflowScopeTypes.CUSTOM) {\n        const models = workflow.scope.data?.models;\n\n        if (Array.isArray(models) && models.includes(entry.modelId)) {\n            return true;\n        }\n\n        const entries = workflow.scope.data?.entries || [];\n        if (Array.isArray(entries) && entries.some(value => value.id === entry.entryId)) {\n            return true;\n        }\n        return false;\n    }\n    throw new WebinyError(`Unknown scope type \"${scopeType}\".`, \"UNKNOWN_SCOPE_TYPE\", {\n        workflow\n    });\n};\n\ninterface AssignWorkflowToEntryParams {\n    apw: AdvancedPublishingWorkflow;\n    entry: CmsEntry;\n    model: CmsModel;\n}\n\nexport const assignWorkflowToEntry = async (params: AssignWorkflowToEntryParams): Promise<void> => {\n    const { apw, entry } = params;\n    /**\n     * Lookup and assign \"workflowId\".\n     */\n    try {\n        /*\n         * List all workflows for app cms\n         */\n        const [entries] = await apw.workflow.list({\n            where: {\n                app: ApwWorkflowApplications.CMS\n            }\n        });\n\n        /*\n         *  Re-order them based on workflow scope and pre-defined rule i.e.\n         *  \"specific\" entry -> entry for a \"category\" -> \"default\".\n         *  There can be more than one workflow with same \"scope\" and \"app\".\n         *  Therefore, we are also sorting the workflows by `createdOn` to get the latest workflow.\n         */\n        const sortedWorkflows = entries\n            .sort(workflowByPrecedenceDesc)\n            .sort(workflowByCreatedOnDesc);\n\n        /**\n         * Assign the first applicable workflow to the page and exit.\n         */\n        for (const workflow of sortedWorkflows) {\n            if (isWorkflowApplicable(entry, workflow) === false) {\n                console.log(`Not applying workflow ${workflow.id} to entry ${entry.id}.`);\n                continue;\n            }\n            entry.meta = {\n                ...(entry.meta || {}),\n                apw: {\n                    workflowId: workflow.id,\n                    contentReviewId: null\n                }\n            };\n            return;\n        }\n    } catch (ex) {\n        throw new WebinyError(\n            `Failed to assign workflow to CMS entry \"${entry.id}\".`,\n            ex.code,\n            ex.data\n        );\n    }\n};\n\nexport const hasEntries = (workflow: ApwWorkflow): boolean => {\n    const { app, scope } = workflow;\n    return (\n        app === ApwWorkflowApplications.CMS &&\n        scope.type === WorkflowScopeTypes.CUSTOM &&\n        scope.data &&\n        Array.isArray(scope.data.entries)\n    );\n};\n\nexport const isApwDisabledOnModel = (model: Pick<CmsModel, \"modelId\" | \"isPrivate\">): boolean => {\n    /**\n     * We should not run APW on private models as well.\n     */\n    if (model.isPrivate) {\n        return true;\n    }\n    return [\n        CHANGE_REQUEST_MODEL_ID,\n        COMMENT_MODEL_ID,\n        CONTENT_REVIEW_MODEL_ID,\n        REVIEWER_MODEL_ID,\n        WORKFLOW_MODEL_ID\n    ].includes(model.modelId);\n};\n"],"mappings":"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","ignoreList":[]}

package/plugins/context.d.ts

@@ -1,4 +1,4 @@
 import { ContextPlugin } from "@webiny/api";
-import { ApwContext } from "../types";
-import { CreateApwContextParams } from "../scheduler/types";
-export declare const createApwPageBuilderContext: (params: CreateApwContextParams) => ContextPlugin<ApwContext>;
+import type { ApwContext } from "../types";
+import type { CreateApwContextParams } from "../scheduler/types";
+export declare const createApwContext: (params: CreateApwContextParams) => ContextPlugin<ApwContext>;

package/plugins/context.js

@@ -4,18 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createApwPageBuilderContext = void 0;
+exports.createApwContext = void 0;
 var _hooks = require("./hooks");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _api = require("@webiny/api");
 var _crud = require("../crud");
-var _pageBuilder = require("./pageBuilder");
 var _storageOperations = require("../storageOperations");
 var _scheduler = require("../scheduler");
 var _security = require("../scheduler/handlers/executeAction/security");
 var _utils = require("./utils");
-var _extendPbPageSettingsSchema = require("./pageBuilder/extendPbPageSettingsSchema");
-var _apwContentPagePlugins = require("./pageBuilder/apwContentPagePlugins");
 var _cms = require("./cms");
 const setupApwContext = params => new _api.ContextPlugin(async context => {
   const {
@@ -72,17 +69,12 @@ const setupApwContext = params => new _api.ContextPlugin(async context => {
     plugins: context.plugins
   });
 });
-const setupApwPageBuilder = () => {
-  return new _api.ContextPlugin(async context => {
-    (0, _pageBuilder.apwPageBuilderHooks)(context);
-  });
-};
 const setupApwHeadlessCms = () => {
   return new _api.ContextPlugin(async context => {
     (0, _cms.apwCmsHooks)(context);
   });
 };
-const createApwPageBuilderContext = params => {
+const createApwContext = params => {
   return new _api.ContextPlugin(async context => {
     if (!context.wcp.canUseFeature("advancedPublishingWorkflow")) {
       return;
@@ -90,12 +82,11 @@ const createApwPageBuilderContext = params => {
       return;
     }
     await setupApwContext(params).apply(context);
-    await setupApwPageBuilder().apply(context);
     await setupApwHeadlessCms().apply(context);
-    await (0, _apwContentPagePlugins.apwContentPagePlugins)().apply(context);
     await (0, _hooks.attachApwHooks)().apply(context);
     await (0, _security.createCustomAuth)(params).apply(context);
-    context.plugins.register((0, _extendPbPageSettingsSchema.extendPbPageSettingsSchema)());
   });
 };
-exports.createApwPageBuilderContext = createApwPageBuilderContext;
+exports.createApwContext = createApwContext;
+
+//# sourceMappingURL=context.js.map

package/plugins/context.js.map

@@ -1 +1 @@
-{"version":3,"names":["setupApwContext","params","ContextPlugin","context","tenancy","security","i18n","handlerClient","isInstallationPending","getLocale","locale","getContentLocale","WebinyError","getTenant","getCurrentTenant","getPermission","name","getIdentity","scheduler","createScheduler","storageOperations","apw","createApw","createStorageOperations","cms","getCmsContext","plugins","setupApwPageBuilder","apwPageBuilderHooks","setupApwHeadlessCms","apwCmsHooks","createApwPageBuilderContext","wcp","canUseFeature","apply","apwContentPagePlugins","attachApwHooks","createCustomAuth","register","extendPbPageSettingsSchema"],"sources":["context.ts"],"sourcesContent":["import { attachApwHooks } from \"./hooks\";\nimport WebinyError from \"@webiny/error\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { ApwContext } from \"~/types\";\nimport { createApw } from \"~/crud\";\nimport { apwPageBuilderHooks } from \"./pageBuilder\";\nimport { createStorageOperations } from \"~/storageOperations\";\nimport { SecurityPermission } from \"@webiny/api-security/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { CreateApwContextParams } from \"~/scheduler/types\";\nimport { createScheduler } from \"~/scheduler\";\nimport { createCustomAuth } from \"~/scheduler/handlers/executeAction/security\";\nimport { isInstallationPending } from \"./utils\";\nimport { extendPbPageSettingsSchema } from \"~/plugins/pageBuilder/extendPbPageSettingsSchema\";\nimport { apwContentPagePlugins } from \"~/plugins/pageBuilder/apwContentPagePlugins\";\nimport { apwCmsHooks } from \"~/plugins/cms\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\n\nconst setupApwContext = (params: CreateApwContextParams) =>\n    new ContextPlugin<ApwContext>(async context => {\n        const { tenancy, security, i18n, handlerClient } = context;\n\n        if (isInstallationPending({ tenancy, i18n })) {\n            return;\n        }\n\n        const getLocale = (): I18NLocale => {\n            const locale = i18n.getContentLocale();\n            if (!locale) {\n                throw new WebinyError(\n                    \"Missing content locale in api-apw/plugins/context.ts\",\n                    \"LOCALE_ERROR\"\n                );\n            }\n\n            return locale;\n        };\n\n        const getTenant = (): Tenant => {\n            return tenancy.getCurrentTenant();\n        };\n\n        const getPermission = async (name: string): Promise<SecurityPermission | null> => {\n            return security.getPermission(name);\n        };\n        const getIdentity = () => security.getIdentity();\n\n        const scheduler = createScheduler({\n            getLocale,\n            getIdentity,\n            getTenant,\n            getPermission,\n            storageOperations: params.storageOperations\n        });\n\n        context.apw = createApw({\n            getLocale,\n            getIdentity,\n            getTenant,\n            getPermission,\n            storageOperations: createStorageOperations({\n                /**\n                 * TODO: We need to figure out a way to pass \"cms\" from outside (e.g. apps/api/graphql)\n                 */\n                cms: context.cms,\n                /**\n                 * TODO: This is required for \"entryFieldFromStorageTransform\" which access plugins from context.\n                 */\n                getCmsContext: () => context,\n                security\n            }),\n            scheduler,\n            handlerClient,\n            plugins: context.plugins\n        });\n    });\n\nconst setupApwPageBuilder = () => {\n    return new ContextPlugin<ApwContext>(async context => {\n        apwPageBuilderHooks(context);\n    });\n};\n\nconst setupApwHeadlessCms = () => {\n    return new ContextPlugin<ApwContext>(async context => {\n        apwCmsHooks(context);\n    });\n};\n\nexport const createApwPageBuilderContext = (params: CreateApwContextParams) => {\n    return new ContextPlugin<ApwContext>(async context => {\n        if (!context.wcp.canUseFeature(\"advancedPublishingWorkflow\")) {\n            return;\n        } else if (isInstallationPending(context)) {\n            return;\n        }\n\n        await setupApwContext(params).apply(context);\n        await setupApwPageBuilder().apply(context);\n        await setupApwHeadlessCms().apply(context);\n        await apwContentPagePlugins().apply(context);\n        await attachApwHooks().apply(context);\n        await createCustomAuth(params).apply(context);\n\n        context.plugins.register(extendPbPageSettingsSchema());\n    });\n};\n"],"mappings":"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"}
+{"version":3,"names":["_hooks","require","_error","_interopRequireDefault","_api","_crud","_storageOperations","_scheduler","_security","_utils","_cms","setupApwContext","params","ContextPlugin","context","tenancy","security","i18n","handlerClient","isInstallationPending","getLocale","locale","getContentLocale","WebinyError","getTenant","getCurrentTenant","getPermission","name","getIdentity","scheduler","createScheduler","storageOperations","apw","createApw","createStorageOperations","cms","getCmsContext","plugins","setupApwHeadlessCms","apwCmsHooks","createApwContext","wcp","canUseFeature","apply","attachApwHooks","createCustomAuth","exports"],"sources":["context.ts"],"sourcesContent":["import { attachApwHooks } from \"./hooks\";\nimport WebinyError from \"@webiny/error\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport type { ApwContext } from \"~/types\";\nimport { createApw } from \"~/crud\";\nimport { createStorageOperations } from \"~/storageOperations\";\nimport type { SecurityPermission } from \"@webiny/api-security/types\";\nimport type { Tenant } from \"@webiny/api-tenancy/types\";\nimport type { CreateApwContextParams } from \"~/scheduler/types\";\nimport { createScheduler } from \"~/scheduler\";\nimport { createCustomAuth } from \"~/scheduler/handlers/executeAction/security\";\nimport { isInstallationPending } from \"./utils\";\nimport { apwCmsHooks } from \"~/plugins/cms\";\nimport type { I18NLocale } from \"@webiny/api-i18n/types\";\n\nconst setupApwContext = (params: CreateApwContextParams) =>\n    new ContextPlugin<ApwContext>(async context => {\n        const { tenancy, security, i18n, handlerClient } = context;\n\n        if (isInstallationPending({ tenancy, i18n })) {\n            return;\n        }\n\n        const getLocale = (): I18NLocale => {\n            const locale = i18n.getContentLocale();\n            if (!locale) {\n                throw new WebinyError(\n                    \"Missing content locale in api-apw/plugins/context.ts\",\n                    \"LOCALE_ERROR\"\n                );\n            }\n\n            return locale;\n        };\n\n        const getTenant = (): Tenant => {\n            return tenancy.getCurrentTenant();\n        };\n\n        const getPermission = async (name: string): Promise<SecurityPermission | null> => {\n            return security.getPermission(name);\n        };\n        const getIdentity = () => security.getIdentity();\n\n        const scheduler = createScheduler({\n            getLocale,\n            getIdentity,\n            getTenant,\n            getPermission,\n            storageOperations: params.storageOperations\n        });\n\n        context.apw = createApw({\n            getLocale,\n            getIdentity,\n            getTenant,\n            getPermission,\n            storageOperations: createStorageOperations({\n                /**\n                 * TODO: We need to figure out a way to pass \"cms\" from outside (e.g. apps/api/graphql)\n                 */\n                cms: context.cms,\n                /**\n                 * TODO: This is required for \"entryFieldFromStorageTransform\" which access plugins from context.\n                 */\n                getCmsContext: () => context,\n                security\n            }),\n            scheduler,\n            handlerClient,\n            plugins: context.plugins\n        });\n    });\n\nconst setupApwHeadlessCms = () => {\n    return new ContextPlugin<ApwContext>(async context => {\n        apwCmsHooks(context);\n    });\n};\n\nexport const createApwContext = (params: CreateApwContextParams) => {\n    return new ContextPlugin<ApwContext>(async context => {\n        if (!context.wcp.canUseFeature(\"advancedPublishingWorkflow\")) {\n            return;\n        } else if (isInstallationPending(context)) {\n            return;\n        }\n\n        await setupApwContext(params).apply(context);\n        await setupApwHeadlessCms().apply(context);\n        await attachApwHooks().apply(context);\n        await createCustomAuth(params).apply(context);\n    });\n};\n"],"mappings":"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","ignoreList":[]}

package/plugins/graphql/changeRequest.gql.d.ts

@@ -1,4 +1,4 @@
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins";
-import { ApwContext } from "../../types";
+import type { ApwContext } from "../../types";
 declare const workflowSchema: GraphQLSchemaPlugin<ApwContext>;
 export default workflowSchema;

package/plugins/graphql/changeRequest.gql.js

@@ -8,14 +8,16 @@ exports.default = void 0;
 var _plugins = require("@webiny/handler-graphql/plugins");
 var _handlerGraphql = require("@webiny/handler-graphql");
 var _resolve = _interopRequireDefault(require("../../utils/resolve"));
+var _utils = require("./utils");
 const workflowSchema = new _plugins.GraphQLSchemaPlugin({
-  typeDefs: /* GraphQL */`
+  // Had to remove /* GraphQL */ because prettier would not format the code correctly.
+  typeDefs: `
         type ApwChangeRequestListItem {
             # System generated fields
             id: ID
-            savedOn: DateTime
-            createdOn: DateTime
-            createdBy: ApwCreatedBy
+            
+            ${_utils.onByFields}
+        
             # ChangeRequest specific fields
             step: String!
             title: String!
@@ -33,9 +35,9 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
         type ApwChangeRequest {
             # System generated fields
             id: ID
-            savedOn: DateTime
-            createdOn: DateTime
-            createdBy: ApwCreatedBy
+            
+            ${_utils.onByFields}
+            
             # ChangeRequest specific fields
             step: String!
             title: String!
@@ -57,12 +59,12 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
         enum ApwListChangeRequestSort {
             id_ASC
             id_DESC
-            savedOn_ASC
-            savedOn_DESC
-            createdOn_ASC
-            createdOn_DESC
+            
+            ${_utils.dateTimeFieldsSorters}
+            
             publishedOn_ASC
             publishedOn_DESC
+            
             title_ASC
             title_DESC
         }
@@ -144,5 +146,6 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
     }
   }
 });
-var _default = workflowSchema;
-exports.default = _default;
+var _default = exports.default = workflowSchema;
+
+//# sourceMappingURL=changeRequest.gql.js.map

package/plugins/graphql/changeRequest.gql.js.map

@@ -1 +1 @@
-{"version":3,"names":["workflowSchema","GraphQLSchemaPlugin","typeDefs","resolvers","ApwQuery","getChangeRequest","_","args","context","resolve","apw","changeRequest","get","id","listChangeRequests","entries","meta","list","ListResponse","e","ErrorResponse","ApwMutation","createChangeRequest","create","data","updateChangeRequest","update","deleteChangeRequest","delete"],"sources":["changeRequest.gql.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins\";\nimport { ErrorResponse, ListResponse } from \"@webiny/handler-graphql\";\nimport { ApwChangeRequestListParams, ApwContext } from \"~/types\";\nimport resolve from \"~/utils/resolve\";\n\nconst workflowSchema = new GraphQLSchemaPlugin<ApwContext>({\n    typeDefs: /* GraphQL */ `\n        type ApwChangeRequestListItem {\n            # System generated fields\n            id: ID\n            savedOn: DateTime\n            createdOn: DateTime\n            createdBy: ApwCreatedBy\n            # ChangeRequest specific fields\n            step: String!\n            title: String!\n            body: JSON!\n            resolved: Boolean\n            media: JSON\n        }\n\n        type ApwListChangeRequestsResponse {\n            data: [ApwChangeRequestListItem]\n            error: ApwError\n            meta: ApwMeta\n        }\n\n        type ApwChangeRequest {\n            # System generated fields\n            id: ID\n            savedOn: DateTime\n            createdOn: DateTime\n            createdBy: ApwCreatedBy\n            # ChangeRequest specific fields\n            step: String!\n            title: String!\n            body: JSON!\n            resolved: Boolean\n            media: JSON\n        }\n\n        type ApwChangeRequestResponse {\n            data: ApwChangeRequest\n            error: ApwError\n        }\n\n        type ApwDeleteChangeRequestResponse {\n            data: Boolean\n            error: ApwError\n        }\n\n        enum ApwListChangeRequestSort {\n            id_ASC\n            id_DESC\n            savedOn_ASC\n            savedOn_DESC\n            createdOn_ASC\n            createdOn_DESC\n            publishedOn_ASC\n            publishedOn_DESC\n            title_ASC\n            title_DESC\n        }\n\n        input ApwCreateChangeRequestInput {\n            step: String!\n            title: String!\n            body: JSON!\n            resolved: Boolean\n            media: JSON\n        }\n\n        input ApwUpdateChangeRequestInput {\n            title: String\n            body: JSON\n            resolved: Boolean\n            media: JSON\n        }\n\n        input ApwListChangeRequestWhereInput {\n            id: ID\n            step: String\n        }\n\n        input ApwListChangeRequestSearchInput {\n            query: String\n        }\n\n        extend type ApwQuery {\n            getChangeRequest(id: ID!): ApwChangeRequestResponse\n\n            listChangeRequests(\n                where: ApwListChangeRequestWhereInput\n                limit: Int\n                after: String\n                sort: [ApwListChangeRequestSort!]\n                search: ApwListChangeRequestSearchInput\n            ): ApwListChangeRequestsResponse\n        }\n\n        extend type ApwMutation {\n            createChangeRequest(data: ApwCreateChangeRequestInput!): ApwChangeRequestResponse\n\n            updateChangeRequest(\n                id: ID!\n                data: ApwUpdateChangeRequestInput!\n            ): ApwChangeRequestResponse\n\n            deleteChangeRequest(id: ID!): ApwDeleteChangeRequestResponse\n        }\n    `,\n    resolvers: {\n        ApwQuery: {\n            getChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.get(args.id));\n            },\n            listChangeRequests: async (_, args: any, context) => {\n                try {\n                    /**\n                     * We know that args is ApwChangeRequestListParams.\n                     */\n                    const [entries, meta] = await context.apw.changeRequest.list(\n                        args as unknown as ApwChangeRequestListParams\n                    );\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        ApwMutation: {\n            createChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.create(args.data));\n            },\n            updateChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.update(args.id, args.data));\n            },\n            deleteChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.delete(args.id));\n            }\n        }\n    }\n});\n\nexport default workflowSchema;\n"],"mappings":";;;;;;;AAAA;AACA;AAEA;AAEA,MAAMA,cAAc,GAAG,IAAIC,4BAAmB,CAAa;EACvDC,QAAQ,EAAE,aAAe;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;EACDC,SAAS,EAAE;IACPC,QAAQ,EAAE;MACNC,gBAAgB,EAAE,OAAOC,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAC/C,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACC,GAAG,CAACL,IAAI,CAACM,EAAE,CAAC,CAAC;MAChE,CAAC;MACDC,kBAAkB,EAAE,OAAOR,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QACjD,IAAI;UACA;AACpB;AACA;UACoB,MAAM,CAACO,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMR,OAAO,CAACE,GAAG,CAACC,aAAa,CAACM,IAAI,CACxDV,IAAI,CACP;UACD,OAAO,IAAIW,4BAAY,CAACH,OAAO,EAAEC,IAAI,CAAC;QAC1C,CAAC,CAAC,OAAOG,CAAC,EAAE;UACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;QAC/B;MACJ;IACJ,CAAC;IACDE,WAAW,EAAE;MACTC,mBAAmB,EAAE,OAAOhB,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAClD,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACY,MAAM,CAAChB,IAAI,CAACiB,IAAI,CAAC,CAAC;MACrE,CAAC;MACDC,mBAAmB,EAAE,OAAOnB,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAClD,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACe,MAAM,CAACnB,IAAI,CAACM,EAAE,EAAEN,IAAI,CAACiB,IAAI,CAAC,CAAC;MAC9E,CAAC;MACDG,mBAAmB,EAAE,OAAOrB,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAClD,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACiB,MAAM,CAACrB,IAAI,CAACM,EAAE,CAAC,CAAC;MACnE;IACJ;EACJ;AACJ,CAAC,CAAC;AAAC,eAEYb,cAAc;AAAA"}
+{"version":3,"names":["_plugins","require","_handlerGraphql","_resolve","_interopRequireDefault","_utils","workflowSchema","GraphQLSchemaPlugin","typeDefs","onByFields","dateTimeFieldsSorters","resolvers","ApwQuery","getChangeRequest","_","args","context","resolve","apw","changeRequest","get","id","listChangeRequests","entries","meta","list","ListResponse","e","ErrorResponse","ApwMutation","createChangeRequest","create","data","updateChangeRequest","update","deleteChangeRequest","delete","_default","exports","default"],"sources":["changeRequest.gql.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins\";\nimport { ErrorResponse, ListResponse } from \"@webiny/handler-graphql\";\nimport type { ApwChangeRequestListParams, ApwContext } from \"~/types\";\nimport resolve from \"~/utils/resolve\";\nimport { onByFields, dateTimeFieldsSorters } from \"./utils\";\n\nconst workflowSchema = new GraphQLSchemaPlugin<ApwContext>({\n    // Had to remove /* GraphQL */ because prettier would not format the code correctly.\n    typeDefs: `\n        type ApwChangeRequestListItem {\n            # System generated fields\n            id: ID\n            \n            ${onByFields}\n        \n            # ChangeRequest specific fields\n            step: String!\n            title: String!\n            body: JSON!\n            resolved: Boolean\n            media: JSON\n        }\n\n        type ApwListChangeRequestsResponse {\n            data: [ApwChangeRequestListItem]\n            error: ApwError\n            meta: ApwMeta\n        }\n\n        type ApwChangeRequest {\n            # System generated fields\n            id: ID\n            \n            ${onByFields}\n            \n            # ChangeRequest specific fields\n            step: String!\n            title: String!\n            body: JSON!\n            resolved: Boolean\n            media: JSON\n        }\n\n        type ApwChangeRequestResponse {\n            data: ApwChangeRequest\n            error: ApwError\n        }\n\n        type ApwDeleteChangeRequestResponse {\n            data: Boolean\n            error: ApwError\n        }\n\n        enum ApwListChangeRequestSort {\n            id_ASC\n            id_DESC\n            \n            ${dateTimeFieldsSorters}\n            \n            publishedOn_ASC\n            publishedOn_DESC\n            \n            title_ASC\n            title_DESC\n        }\n\n        input ApwCreateChangeRequestInput {\n            step: String!\n            title: String!\n            body: JSON!\n            resolved: Boolean\n            media: JSON\n        }\n\n        input ApwUpdateChangeRequestInput {\n            title: String\n            body: JSON\n            resolved: Boolean\n            media: JSON\n        }\n\n        input ApwListChangeRequestWhereInput {\n            id: ID\n            step: String\n        }\n\n        input ApwListChangeRequestSearchInput {\n            query: String\n        }\n\n        extend type ApwQuery {\n            getChangeRequest(id: ID!): ApwChangeRequestResponse\n\n            listChangeRequests(\n                where: ApwListChangeRequestWhereInput\n                limit: Int\n                after: String\n                sort: [ApwListChangeRequestSort!]\n                search: ApwListChangeRequestSearchInput\n            ): ApwListChangeRequestsResponse\n        }\n\n        extend type ApwMutation {\n            createChangeRequest(data: ApwCreateChangeRequestInput!): ApwChangeRequestResponse\n\n            updateChangeRequest(\n                id: ID!\n                data: ApwUpdateChangeRequestInput!\n            ): ApwChangeRequestResponse\n\n            deleteChangeRequest(id: ID!): ApwDeleteChangeRequestResponse\n        }\n    `,\n    resolvers: {\n        ApwQuery: {\n            getChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.get(args.id));\n            },\n            listChangeRequests: async (_, args: any, context) => {\n                try {\n                    /**\n                     * We know that args is ApwChangeRequestListParams.\n                     */\n                    const [entries, meta] = await context.apw.changeRequest.list(\n                        args as unknown as ApwChangeRequestListParams\n                    );\n                    return new ListResponse(entries, meta);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        ApwMutation: {\n            createChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.create(args.data));\n            },\n            updateChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.update(args.id, args.data));\n            },\n            deleteChangeRequest: async (_, args: any, context) => {\n                return resolve(() => context.apw.changeRequest.delete(args.id));\n            }\n        }\n    }\n});\n\nexport default workflowSchema;\n"],"mappings":";;;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AAEA,MAAMK,cAAc,GAAG,IAAIC,4BAAmB,CAAa;EACvD;EACAC,QAAQ,EAAE;AACd;AACA;AACA;AACA;AACA,cAAcC,iBAAU;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcA,iBAAU;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcC,4BAAqB;AACnC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;EACDC,SAAS,EAAE;IACPC,QAAQ,EAAE;MACNC,gBAAgB,EAAE,MAAAA,CAAOC,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAC/C,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACC,GAAG,CAACL,IAAI,CAACM,EAAE,CAAC,CAAC;MAChE,CAAC;MACDC,kBAAkB,EAAE,MAAAA,CAAOR,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QACjD,IAAI;UACA;AACpB;AACA;UACoB,MAAM,CAACO,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMR,OAAO,CAACE,GAAG,CAACC,aAAa,CAACM,IAAI,CACxDV,IACJ,CAAC;UACD,OAAO,IAAIW,4BAAY,CAACH,OAAO,EAAEC,IAAI,CAAC;QAC1C,CAAC,CAAC,OAAOG,CAAC,EAAE;UACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;QAC/B;MACJ;IACJ,CAAC;IACDE,WAAW,EAAE;MACTC,mBAAmB,EAAE,MAAAA,CAAOhB,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAClD,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACY,MAAM,CAAChB,IAAI,CAACiB,IAAI,CAAC,CAAC;MACrE,CAAC;MACDC,mBAAmB,EAAE,MAAAA,CAAOnB,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAClD,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACe,MAAM,CAACnB,IAAI,CAACM,EAAE,EAAEN,IAAI,CAACiB,IAAI,CAAC,CAAC;MAC9E,CAAC;MACDG,mBAAmB,EAAE,MAAAA,CAAOrB,CAAC,EAAEC,IAAS,EAAEC,OAAO,KAAK;QAClD,OAAO,IAAAC,gBAAO,EAAC,MAAMD,OAAO,CAACE,GAAG,CAACC,aAAa,CAACiB,MAAM,CAACrB,IAAI,CAACM,EAAE,CAAC,CAAC;MACnE;IACJ;EACJ;AACJ,CAAC,CAAC;AAAC,IAAAgB,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEYjC,cAAc","ignoreList":[]}

package/plugins/graphql/comment.gql.d.ts

@@ -1,4 +1,4 @@
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins";
-import { ApwContext } from "../../types";
+import type { ApwContext } from "../../types";
 declare const workflowSchema: GraphQLSchemaPlugin<ApwContext>;
 export default workflowSchema;

package/plugins/graphql/comment.gql.js

@@ -8,14 +8,37 @@ exports.default = void 0;
 var _plugins = require("@webiny/handler-graphql/plugins");
 var _handlerGraphql = require("@webiny/handler-graphql");
 var _resolve = _interopRequireDefault(require("../../utils/resolve"));
+var _utils = require("./utils");
 const workflowSchema = new _plugins.GraphQLSchemaPlugin({
-  typeDefs: /* GraphQL */`
+  // Had to remove /* GraphQL */ because prettier would not format the code correctly.
+  typeDefs: () => {
+    const metaFieldsBaseNames = ["created", "modified", "saved"];
+    const dateTimeWhereFields = metaFieldsBaseNames.map(name => {
+      return `
+                ${name}On: DateTime
+                ${name}On_gt: DateTime
+                ${name}On_gte: DateTime
+                ${name}On_lt: DateTime
+                ${name}On_lte: DateTime
+                ${name}On_between: [DateTime!]
+                ${name}On_not_between: [DateTime!]
+            `;
+    }).join("\n");
+    const identityWhereFields = metaFieldsBaseNames.map(name => {
+      return `
+                ${name}By: ID
+                ${name}By_not: ID
+                ${name}By_in: [ID!]
+                ${name}By_not_in: [ID!]
+            `;
+    }).join("\n");
+    return [`
         type ApwCommentListItem {
             # System generated fields
             id: ID
-            savedOn: DateTime
-            createdOn: DateTime
-            createdBy: ApwCreatedBy
+            
+            ${_utils.onByFields}
+            
             # Comment specific fields
             body: JSON
             changeRequest: ID
@@ -32,9 +55,9 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
         type ApwComment {
             # System generated fields
             id: ID
-            savedOn: DateTime
-            createdOn: DateTime
-            createdBy: ApwCreatedBy
+            
+            ${_utils.onByFields}
+            
             # Comment specific fields
             body: JSON
             changeRequest: ID
@@ -54,10 +77,8 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
         enum ApwListCommentsSort {
             id_ASC
             id_DESC
-            savedOn_ASC
-            savedOn_DESC
-            createdOn_ASC
-            createdOn_DESC
+            
+            ${_utils.dateTimeFieldsSorters}
         }
 
         input ApwCreateCommentInput {
@@ -75,28 +96,10 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
             id_not: ID
             id_in: [ID!]
             id_not_in: [ID!]
-            createdOn: DateTime
-            createdOn_gt: DateTime
-            createdOn_gte: DateTime
-            createdOn_lt: DateTime
-            createdOn_lte: DateTime
-            createdOn_between: [DateTime!]
-            createdOn_not_between: [DateTime!]
-            savedOn: DateTime
-            savedOn_gt: DateTime
-            savedOn_gte: DateTime
-            savedOn_lt: DateTime
-            savedOn_lte: DateTime
-            savedOn_between: [DateTime!]
-            savedOn_not_between: [DateTime!]
-            createdBy: String
-            createdBy_not: String
-            createdBy_in: [String!]
-            createdBy_not_in: [String!]
-            ownedBy: String
-            ownedBy_not: String
-            ownedBy_in: [String!]
-            ownedBy_not_in: [String!]
+            
+            ${dateTimeWhereFields}
+            ${identityWhereFields}
+            
             changeRequest: ApwRefFieldWhereInput
         }
 
@@ -118,7 +121,8 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
 
             deleteComment(id: ID!): ApwDeleteCommentResponse
         }
-    `,
+    `];
+  },
   resolvers: {
     ApwQuery: {
       getComment: async (_, args, context) => {
@@ -149,5 +153,6 @@ const workflowSchema = new _plugins.GraphQLSchemaPlugin({
     }
   }
 });
-var _default = workflowSchema;
-exports.default = _default;
+var _default = exports.default = workflowSchema;
+
+//# sourceMappingURL=comment.gql.js.map