@webiny/api-apw 0.0.0-unstable.99666aeb00 → 0.0.0-unstable.9bd236cf5e

package/storageOperations/reviewerStorageOperations.js

@@ -5,17 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createReviewerStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _error = _interopRequireDefault(require("@webiny/error"));
 const createReviewerStorageOperations = ({
-  cms,
-  security
+  cms
 }) => {
   const getReviewerModel = async () => {
-    const model = await security.withoutAuthorization(async () => {
-      return cms.getModel("apwReviewerModelDefinition");
-    });
+    const model = await cms.getModel("apwReviewerModelDefinition");
     if (!model) {
       throw new _error.default("Could not find `apwReviewerModelDefinition` model.", "MODEL_NOT_FOUND_ERROR");
     }
@@ -25,29 +21,26 @@ const createReviewerStorageOperations = ({
     id
   }) => {
     const model = await getReviewerModel();
-    const entry = await security.withoutAuthorization(async () => {
-      return cms.getEntryById(model, id);
-    });
-    return (0, _index.getFieldValues)(entry, _index.baseFields);
+    const entry = await cms.getEntryById(model, id);
+    return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
   };
   return {
     getReviewerModel,
     getReviewer,
     async listReviewers(params) {
       const model = await getReviewerModel();
-      const [entries, meta] = await security.withoutAuthorization(async () => {
-        return cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-          where: (0, _objectSpread2.default)({}, params.where)
-        }));
+      const [entries, meta] = await cms.listLatestEntries(model, {
+        ...params,
+        where: {
+          ...params.where
+        }
       });
-      return [entries.map(entry => (0, _index.getFieldValues)(entry, _index.baseFields)), meta];
+      return [entries.map(_pickEntryFieldValues.pickEntryFieldValues), meta];
     },
     async createReviewer(params) {
       const model = await getReviewerModel();
-      const entry = await security.withoutAuthorization(async () => {
-        return cms.createEntry(model, params.data);
-      });
-      return (0, _index.getFieldValues)(entry, _index.baseFields);
+      const entry = await cms.createEntry(model, params.data);
+      return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
     },
     async updateReviewer(params) {
       const model = await getReviewerModel();
@@ -58,18 +51,20 @@ const createReviewerStorageOperations = ({
       const existingEntry = await getReviewer({
         id: params.id
       });
-      const entry = await security.withoutAuthorization(async () => {
-        return cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data));
+      const entry = await cms.updateEntry(model, params.id, {
+        ...existingEntry,
+        ...params.data,
+        savedOn: new Date()
       });
-      return (0, _index.getFieldValues)(entry, _index.baseFields);
+      return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
     },
     async deleteReviewer(params) {
       const model = await getReviewerModel();
-      await security.withoutAuthorization(async () => {
-        return cms.deleteEntry(model, params.id);
-      });
+      await cms.deleteEntry(model, params.id);
       return true;
     }
   };
 };
-exports.createReviewerStorageOperations = createReviewerStorageOperations;
+exports.createReviewerStorageOperations = createReviewerStorageOperations;
+
+//# sourceMappingURL=reviewerStorageOperations.js.map

package/storageOperations/reviewerStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["createReviewerStorageOperations","cms","security","getReviewerModel","model","withoutAuthorization","getModel","WebinyError","getReviewer","id","entry","getEntryById","getFieldValues","baseFields","listReviewers","params","entries","meta","listLatestEntries","where","map","createReviewer","createEntry","data","updateReviewer","existingEntry","updateEntry","deleteReviewer","deleteEntry"],"sources":["reviewerStorageOperations.ts"],"sourcesContent":["import { ApwReviewerStorageOperations } from \"./types\";\nimport {\n    baseFields,\n    CreateApwStorageOperationsParams,\n    getFieldValues\n} from \"~/storageOperations/index\";\nimport WebinyError from \"@webiny/error\";\n\nexport const createReviewerStorageOperations = ({\n    cms,\n    security\n}: CreateApwStorageOperationsParams): ApwReviewerStorageOperations => {\n    const getReviewerModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(\"apwReviewerModelDefinition\");\n        });\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwReviewerModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getReviewer: ApwReviewerStorageOperations[\"getReviewer\"] = async ({ id }) => {\n        const model = await getReviewerModel();\n\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n        return getFieldValues(entry, baseFields);\n    };\n    return {\n        getReviewerModel,\n        getReviewer,\n        async listReviewers(params) {\n            const model = await getReviewerModel();\n\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, {\n                    ...params,\n                    where: {\n                        ...params.where\n                    }\n                });\n            });\n            return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n        },\n        async createReviewer(params) {\n            const model = await getReviewerModel();\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, params.data);\n            });\n            return getFieldValues(entry, baseFields);\n        },\n        async updateReviewer(params) {\n            const model = await getReviewerModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getReviewer({ id: params.id });\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data\n                });\n            });\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteReviewer(params) {\n            const model = await getReviewerModel();\n\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;;AACA;AAKA;AAEO,MAAMA,+BAA+B,GAAG,CAAC;EAC5CC,GAAG;EACHC;AAC8B,CAAC,KAAmC;EAClE,MAAMC,gBAAgB,GAAG,YAAY;IACjC,MAAMC,KAAK,GAAG,MAAMF,QAAQ,CAACG,oBAAoB,CAAC,YAAY;MAC1D,OAAOJ,GAAG,CAACK,QAAQ,CAAC,4BAA4B,CAAC;IACrD,CAAC,CAAC;IACF,IAAI,CAACF,KAAK,EAAE;MACR,MAAM,IAAIG,cAAW,CACjB,oDAAoD,EACpD,uBAAuB,CAC1B;IACL;IACA,OAAOH,KAAK;EAChB,CAAC;EACD,MAAMI,WAAwD,GAAG,OAAO;IAAEC;EAAG,CAAC,KAAK;IAC/E,MAAML,KAAK,GAAG,MAAMD,gBAAgB,EAAE;IAEtC,MAAMO,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;MAC1D,OAAOJ,GAAG,CAACU,YAAY,CAACP,KAAK,EAAEK,EAAE,CAAC;IACtC,CAAC,CAAC;IACF,OAAO,IAAAG,qBAAc,EAACF,KAAK,EAAEG,iBAAU,CAAC;EAC5C,CAAC;EACD,OAAO;IACHV,gBAAgB;IAChBK,WAAW;IACX,MAAMM,aAAa,CAACC,MAAM,EAAE;MACxB,MAAMX,KAAK,GAAG,MAAMD,gBAAgB,EAAE;MAEtC,MAAM,CAACa,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMf,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QACpE,OAAOJ,GAAG,CAACiB,iBAAiB,CAACd,KAAK,8DAC3BW,MAAM;UACTI,KAAK,kCACEJ,MAAM,CAACI,KAAK;QAClB,GACH;MACN,CAAC,CAAC;MACF,OAAO,CAACH,OAAO,CAACI,GAAG,CAACV,KAAK,IAAI,IAAAE,qBAAc,EAACF,KAAK,EAAEG,iBAAU,CAAC,CAAC,EAAEI,IAAI,CAAC;IAC1E,CAAC;IACD,MAAMI,cAAc,CAACN,MAAM,EAAE;MACzB,MAAMX,KAAK,GAAG,MAAMD,gBAAgB,EAAE;MACtC,MAAMO,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC1D,OAAOJ,GAAG,CAACqB,WAAW,CAAClB,KAAK,EAAEW,MAAM,CAACQ,IAAI,CAAC;MAC9C,CAAC,CAAC;MACF,OAAO,IAAAX,qBAAc,EAACF,KAAK,EAAEG,iBAAU,CAAC;IAC5C,CAAC;IACD,MAAMW,cAAc,CAACT,MAAM,EAAE;MACzB,MAAMX,KAAK,GAAG,MAAMD,gBAAgB,EAAE;MACtC;AACZ;AACA;AACA;MACY,MAAMsB,aAAa,GAAG,MAAMjB,WAAW,CAAC;QAAEC,EAAE,EAAEM,MAAM,CAACN;MAAG,CAAC,CAAC;MAE1D,MAAMC,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC1D,OAAOJ,GAAG,CAACyB,WAAW,CAACtB,KAAK,EAAEW,MAAM,CAACN,EAAE,8DAChCgB,aAAa,GACbV,MAAM,CAACQ,IAAI,EAChB;MACN,CAAC,CAAC;MACF,OAAO,IAAAX,qBAAc,EAACF,KAAK,EAAEG,iBAAU,CAAC;IAC5C,CAAC;IACD,MAAMc,cAAc,CAACZ,MAAM,EAAE;MACzB,MAAMX,KAAK,GAAG,MAAMD,gBAAgB,EAAE;MAEtC,MAAMD,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC5C,OAAOJ,GAAG,CAAC2B,WAAW,CAACxB,KAAK,EAAEW,MAAM,CAACN,EAAE,CAAC;MAC5C,CAAC,CAAC;MACF,OAAO,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["_pickEntryFieldValues","require","_error","_interopRequireDefault","createReviewerStorageOperations","cms","getReviewerModel","model","getModel","WebinyError","getReviewer","id","entry","getEntryById","pickEntryFieldValues","listReviewers","params","entries","meta","listLatestEntries","where","map","createReviewer","createEntry","data","updateReviewer","existingEntry","updateEntry","savedOn","Date","deleteReviewer","deleteEntry","exports"],"sources":["reviewerStorageOperations.ts"],"sourcesContent":["import type { ApwReviewerStorageOperations } from \"./types\";\nimport type { CreateApwStorageOperationsParams } from \"~/storageOperations\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues\";\nimport WebinyError from \"@webiny/error\";\nimport type { ApwReviewer } from \"~/types\";\n\nexport const createReviewerStorageOperations = ({\n    cms\n}: CreateApwStorageOperationsParams): ApwReviewerStorageOperations => {\n    const getReviewerModel = async () => {\n        const model = await cms.getModel(\"apwReviewerModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwReviewerModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getReviewer: ApwReviewerStorageOperations[\"getReviewer\"] = async ({ id }) => {\n        const model = await getReviewerModel();\n\n        const entry = await cms.getEntryById(model, id);\n        return pickEntryFieldValues(entry);\n    };\n    return {\n        getReviewerModel,\n        getReviewer,\n        async listReviewers(params) {\n            const model = await getReviewerModel();\n\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where\n                }\n            });\n            return [entries.map(pickEntryFieldValues<ApwReviewer>), meta];\n        },\n        async createReviewer(params) {\n            const model = await getReviewerModel();\n            const entry = await cms.createEntry(model, params.data);\n            return pickEntryFieldValues(entry);\n        },\n        async updateReviewer(params) {\n            const model = await getReviewerModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getReviewer({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data,\n                savedOn: new Date()\n            });\n            return pickEntryFieldValues(entry);\n        },\n        async deleteReviewer(params) {\n            const model = await getReviewerModel();\n\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;AAEA,IAAAA,qBAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AAGO,MAAMG,+BAA+B,GAAGA,CAAC;EAC5CC;AAC8B,CAAC,KAAmC;EAClE,MAAMC,gBAAgB,GAAG,MAAAA,CAAA,KAAY;IACjC,MAAMC,KAAK,GAAG,MAAMF,GAAG,CAACG,QAAQ,CAAC,4BAA4B,CAAC;IAC9D,IAAI,CAACD,KAAK,EAAE;MACR,MAAM,IAAIE,cAAW,CACjB,oDAAoD,EACpD,uBACJ,CAAC;IACL;IACA,OAAOF,KAAK;EAChB,CAAC;EACD,MAAMG,WAAwD,GAAG,MAAAA,CAAO;IAAEC;EAAG,CAAC,KAAK;IAC/E,MAAMJ,KAAK,GAAG,MAAMD,gBAAgB,CAAC,CAAC;IAEtC,MAAMM,KAAK,GAAG,MAAMP,GAAG,CAACQ,YAAY,CAACN,KAAK,EAAEI,EAAE,CAAC;IAC/C,OAAO,IAAAG,0CAAoB,EAACF,KAAK,CAAC;EACtC,CAAC;EACD,OAAO;IACHN,gBAAgB;IAChBI,WAAW;IACX,MAAMK,aAAaA,CAACC,MAAM,EAAE;MACxB,MAAMT,KAAK,GAAG,MAAMD,gBAAgB,CAAC,CAAC;MAEtC,MAAM,CAACW,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMb,GAAG,CAACc,iBAAiB,CAACZ,KAAK,EAAE;QACvD,GAAGS,MAAM;QACTI,KAAK,EAAE;UACH,GAAGJ,MAAM,CAACI;QACd;MACJ,CAAC,CAAC;MACF,OAAO,CAACH,OAAO,CAACI,GAAG,CAACP,0CAAiC,CAAC,EAAEI,IAAI,CAAC;IACjE,CAAC;IACD,MAAMI,cAAcA,CAACN,MAAM,EAAE;MACzB,MAAMT,KAAK,GAAG,MAAMD,gBAAgB,CAAC,CAAC;MACtC,MAAMM,KAAK,GAAG,MAAMP,GAAG,CAACkB,WAAW,CAAChB,KAAK,EAAES,MAAM,CAACQ,IAAI,CAAC;MACvD,OAAO,IAAAV,0CAAoB,EAACF,KAAK,CAAC;IACtC,CAAC;IACD,MAAMa,cAAcA,CAACT,MAAM,EAAE;MACzB,MAAMT,KAAK,GAAG,MAAMD,gBAAgB,CAAC,CAAC;MACtC;AACZ;AACA;AACA;MACY,MAAMoB,aAAa,GAAG,MAAMhB,WAAW,CAAC;QAAEC,EAAE,EAAEK,MAAM,CAACL;MAAG,CAAC,CAAC;MAE1D,MAAMC,KAAK,GAAG,MAAMP,GAAG,CAACsB,WAAW,CAACpB,KAAK,EAAES,MAAM,CAACL,EAAE,EAAE;QAClD,GAAGe,aAAa;QAChB,GAAGV,MAAM,CAACQ,IAAI;QACdI,OAAO,EAAE,IAAIC,IAAI,CAAC;MACtB,CAAC,CAAC;MACF,OAAO,IAAAf,0CAAoB,EAACF,KAAK,CAAC;IACtC,CAAC;IACD,MAAMkB,cAAcA,CAACd,MAAM,EAAE;MACzB,MAAMT,KAAK,GAAG,MAAMD,gBAAgB,CAAC,CAAC;MAEtC,MAAMD,GAAG,CAAC0B,WAAW,CAACxB,KAAK,EAAES,MAAM,CAACL,EAAE,CAAC;MACvC,OAAO,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAACqB,OAAA,CAAA5B,+BAAA,GAAAA,+BAAA","ignoreList":[]}

package/storageOperations/types.d.ts

@@ -1,5 +1,5 @@
-import { CmsModel } from "@webiny/api-headless-cms/types";
-import { ApwReviewerStorageOperations as BaseApwReviewerStorageOperations, ApwWorkflowStorageOperations as BaseApwWorkflowStorageOperations, ApwContentReviewStorageOperations as BaseApwContentReviewStorageOperations, ApwChangeRequestStorageOperations as BaseApwChangeRequestStorageOperations, ApwCommentStorageOperations as BaseApwCommentStorageOperations } from "../types";
+import type { CmsModel } from "@webiny/api-headless-cms/types";
+import type { ApwReviewerStorageOperations as BaseApwReviewerStorageOperations, ApwWorkflowStorageOperations as BaseApwWorkflowStorageOperations, ApwContentReviewStorageOperations as BaseApwContentReviewStorageOperations, ApwChangeRequestStorageOperations as BaseApwChangeRequestStorageOperations, ApwCommentStorageOperations as BaseApwCommentStorageOperations } from "../types";
 export interface ApwCommentStorageOperations extends BaseApwCommentStorageOperations {
     /**
      * @internal

package/storageOperations/types.js

@@ -2,4 +2,6 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+
+//# sourceMappingURL=types.js.map

package/storageOperations/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport {\n    ApwReviewerStorageOperations as BaseApwReviewerStorageOperations,\n    ApwWorkflowStorageOperations as BaseApwWorkflowStorageOperations,\n    ApwContentReviewStorageOperations as BaseApwContentReviewStorageOperations,\n    ApwChangeRequestStorageOperations as BaseApwChangeRequestStorageOperations,\n    ApwCommentStorageOperations as BaseApwCommentStorageOperations\n} from \"~/types\";\n\nexport interface ApwCommentStorageOperations extends BaseApwCommentStorageOperations {\n    /**\n     * @internal\n     */\n    getCommentModel(): Promise<CmsModel>;\n}\n\nexport interface ApwReviewerStorageOperations extends BaseApwReviewerStorageOperations {\n    /**\n     * @internal\n     */\n    getReviewerModel(): Promise<CmsModel>;\n}\n\nexport interface ApwWorkflowStorageOperations extends BaseApwWorkflowStorageOperations {\n    /**\n     * @internal\n     */\n    getWorkflowModel(): Promise<CmsModel>;\n}\n\nexport interface ApwContentReviewStorageOperations extends BaseApwContentReviewStorageOperations {\n    /**\n     * @internal\n     */\n    getContentReviewModel(): Promise<CmsModel>;\n}\n\nexport interface ApwChangeRequestStorageOperations extends BaseApwChangeRequestStorageOperations {\n    /**\n     * @internal\n     */\n    getChangeRequestModel(): Promise<CmsModel>;\n}\n\nexport interface ApwStorageOperations\n    extends ApwReviewerStorageOperations,\n        ApwWorkflowStorageOperations,\n        ApwContentReviewStorageOperations,\n        ApwChangeRequestStorageOperations,\n        ApwCommentStorageOperations {}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport type {\n    ApwReviewerStorageOperations as BaseApwReviewerStorageOperations,\n    ApwWorkflowStorageOperations as BaseApwWorkflowStorageOperations,\n    ApwContentReviewStorageOperations as BaseApwContentReviewStorageOperations,\n    ApwChangeRequestStorageOperations as BaseApwChangeRequestStorageOperations,\n    ApwCommentStorageOperations as BaseApwCommentStorageOperations\n} from \"~/types\";\n\nexport interface ApwCommentStorageOperations extends BaseApwCommentStorageOperations {\n    /**\n     * @internal\n     */\n    getCommentModel(): Promise<CmsModel>;\n}\n\nexport interface ApwReviewerStorageOperations extends BaseApwReviewerStorageOperations {\n    /**\n     * @internal\n     */\n    getReviewerModel(): Promise<CmsModel>;\n}\n\nexport interface ApwWorkflowStorageOperations extends BaseApwWorkflowStorageOperations {\n    /**\n     * @internal\n     */\n    getWorkflowModel(): Promise<CmsModel>;\n}\n\nexport interface ApwContentReviewStorageOperations extends BaseApwContentReviewStorageOperations {\n    /**\n     * @internal\n     */\n    getContentReviewModel(): Promise<CmsModel>;\n}\n\nexport interface ApwChangeRequestStorageOperations extends BaseApwChangeRequestStorageOperations {\n    /**\n     * @internal\n     */\n    getChangeRequestModel(): Promise<CmsModel>;\n}\n\nexport interface ApwStorageOperations\n    extends ApwReviewerStorageOperations,\n        ApwWorkflowStorageOperations,\n        ApwContentReviewStorageOperations,\n        ApwChangeRequestStorageOperations,\n        ApwCommentStorageOperations {}\n"],"mappings":"","ignoreList":[]}

package/storageOperations/workflowStorageOperations.d.ts

@@ -1,3 +1,3 @@
-import { ApwWorkflowStorageOperations } from "./types";
-import { CreateApwStorageOperationsParams } from "./index";
+import type { ApwWorkflowStorageOperations } from "./types";
+import type { CreateApwStorageOperationsParams } from "./index";
 export declare const createWorkflowStorageOperations: (params: CreateApwStorageOperationsParams) => ApwWorkflowStorageOperations;

package/storageOperations/workflowStorageOperations.js

@@ -5,29 +5,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWorkflowStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _workflow = require("./models/workflow.model");
 const formatReviewersForRefInput = (data, modelId) => {
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
-    steps: data.steps.map(step => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, step), {}, {
+  return {
+    ...data,
+    steps: data.steps.map(step => ({
+      ...step,
       reviewers: step.reviewers.map(id => ({
         id,
         modelId
       }))
     }))
-  });
+  };
 };
 const createWorkflowStorageOperations = params => {
   const {
-    cms,
-    security
+    cms
   } = params;
   const getWorkflowModel = async () => {
-    const model = await security.withoutAuthorization(async () => {
-      return cms.getModel(_workflow.WORKFLOW_MODEL_ID);
-    });
+    const model = await cms.getModel(_workflow.WORKFLOW_MODEL_ID);
     if (!model) {
       throw new _error.default(`Could not find "${_workflow.WORKFLOW_MODEL_ID}" model.`, "MODEL_NOT_FOUND_ERROR");
     }
@@ -37,31 +35,28 @@ const createWorkflowStorageOperations = params => {
     id
   }) => {
     const model = await getWorkflowModel();
-    const entry = await security.withoutAuthorization(async () => {
-      return cms.getEntryById(model, id);
-    });
-    return (0, _index.getFieldValues)(entry, _index.baseFields);
+    const entry = await cms.getEntryById(model, id);
+    return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
   };
   return {
     getWorkflowModel,
     getWorkflow,
     async listWorkflows(params) {
       const model = await getWorkflowModel();
-      const [entries, meta] = await security.withoutAuthorization(async () => {
-        return cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-          where: (0, _objectSpread2.default)({}, params.where)
-        }));
+      const [entries, meta] = await cms.listLatestEntries(model, {
+        ...params,
+        where: {
+          ...params.where
+        }
       });
-      return [entries.map(entry => (0, _index.getFieldValues)(entry, _index.baseFields)), meta];
+      return [entries.map(_pickEntryFieldValues.pickEntryFieldValues), meta];
     },
     async createWorkflow(params) {
       const model = await getWorkflowModel();
       const reviewerModel = await this.getReviewerModel();
       const data = formatReviewersForRefInput(params.data, reviewerModel.modelId);
-      const entry = await security.withoutAuthorization(async () => {
-        return cms.createEntry(model, data);
-      });
-      return (0, _index.getFieldValues)(entry, _index.baseFields);
+      const entry = await cms.createEntry(model, data);
+      return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
     },
     async updateWorkflow(params) {
       const model = await getWorkflowModel();
@@ -73,20 +68,22 @@ const createWorkflowStorageOperations = params => {
       const existingEntry = await getWorkflow({
         id: params.id
       });
-      const input = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data);
+      const input = {
+        ...existingEntry,
+        ...params.data,
+        savedOn: new Date()
+      };
       const data = formatReviewersForRefInput(input, reviewerModel.modelId);
-      const entry = await security.withoutAuthorization(async () => {
-        return cms.updateEntry(model, params.id, data);
-      });
-      return (0, _index.getFieldValues)(entry, _index.baseFields);
+      const entry = await cms.updateEntry(model, params.id, data);
+      return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
     },
     async deleteWorkflow(params) {
       const model = await getWorkflowModel();
-      await security.withoutAuthorization(async () => {
-        return cms.deleteEntry(model, params.id);
-      });
+      await cms.deleteEntry(model, params.id);
       return true;
     }
   };
 };
-exports.createWorkflowStorageOperations = createWorkflowStorageOperations;
+exports.createWorkflowStorageOperations = createWorkflowStorageOperations;
+
+//# sourceMappingURL=workflowStorageOperations.js.map

package/storageOperations/workflowStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["formatReviewersForRefInput","data","modelId","steps","map","step","reviewers","id","createWorkflowStorageOperations","params","cms","security","getWorkflowModel","model","withoutAuthorization","getModel","WORKFLOW_MODEL_ID","WebinyError","getWorkflow","entry","getEntryById","getFieldValues","baseFields","listWorkflows","entries","meta","listLatestEntries","where","createWorkflow","reviewerModel","getReviewerModel","createEntry","updateWorkflow","existingEntry","input","updateEntry","deleteWorkflow","deleteEntry"],"sources":["workflowStorageOperations.ts"],"sourcesContent":["import { CreateApwWorkflowParams } from \"~/types\";\nimport { ApwStorageOperations, ApwWorkflowStorageOperations } from \"./types\";\nimport {\n    baseFields,\n    CreateApwStorageOperationsParams,\n    getFieldValues\n} from \"~/storageOperations/index\";\nimport WebinyError from \"@webiny/error\";\nimport { WORKFLOW_MODEL_ID } from \"~/storageOperations/models/workflow.model\";\n\ntype ReviewersRefInput = CreateApwWorkflowParams<{ modelId: string; id: string }>;\n\nconst formatReviewersForRefInput = (\n    data: CreateApwWorkflowParams,\n    modelId: string\n): ReviewersRefInput => {\n    return {\n        ...data,\n        steps: data.steps.map(step => ({\n            ...step,\n            reviewers: step.reviewers.map(id => ({\n                id,\n                modelId\n            }))\n        }))\n    };\n};\n\nexport const createWorkflowStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwWorkflowStorageOperations => {\n    const { cms, security } = params;\n    const getWorkflowModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(WORKFLOW_MODEL_ID);\n        });\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${WORKFLOW_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getWorkflow: ApwWorkflowStorageOperations[\"getWorkflow\"] = async ({ id }) => {\n        const model = await getWorkflowModel();\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n        return getFieldValues(entry, baseFields);\n    };\n    return {\n        getWorkflowModel,\n        getWorkflow,\n        async listWorkflows(params) {\n            const model = await getWorkflowModel();\n\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, {\n                    ...params,\n                    where: {\n                        ...params.where\n                    }\n                });\n            });\n            return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n        },\n        async createWorkflow(this: ApwStorageOperations, params) {\n            const model = await getWorkflowModel();\n            const reviewerModel = await this.getReviewerModel();\n\n            const data = formatReviewersForRefInput(params.data, reviewerModel.modelId);\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, data);\n            });\n\n            return getFieldValues(entry, baseFields);\n        },\n        async updateWorkflow(this: ApwStorageOperations, params) {\n            const model = await getWorkflowModel();\n            const reviewerModel = await this.getReviewerModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getWorkflow({ id: params.id });\n            const input = {\n                ...existingEntry,\n                ...params.data\n            };\n            const data = formatReviewersForRefInput(\n                input as CreateApwWorkflowParams,\n                reviewerModel.modelId\n            );\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, data);\n            });\n\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteWorkflow(params) {\n            const model = await getWorkflowModel();\n\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_pickEntryFieldValues","require","_error","_interopRequireDefault","_workflow","formatReviewersForRefInput","data","modelId","steps","map","step","reviewers","id","createWorkflowStorageOperations","params","cms","getWorkflowModel","model","getModel","WORKFLOW_MODEL_ID","WebinyError","getWorkflow","entry","getEntryById","pickEntryFieldValues","listWorkflows","entries","meta","listLatestEntries","where","createWorkflow","reviewerModel","getReviewerModel","createEntry","updateWorkflow","existingEntry","input","savedOn","Date","updateEntry","deleteWorkflow","deleteEntry","exports"],"sources":["workflowStorageOperations.ts"],"sourcesContent":["import type { ApwWorkflow, CreateApwWorkflowParams } from \"~/types\";\nimport type { ApwStorageOperations, ApwWorkflowStorageOperations } from \"./types\";\nimport type { CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues\";\nimport WebinyError from \"@webiny/error\";\nimport { WORKFLOW_MODEL_ID } from \"~/storageOperations/models/workflow.model\";\n\ntype ReviewersRefInput = CreateApwWorkflowParams<{ modelId: string; id: string }>;\n\nconst formatReviewersForRefInput = (\n    data: CreateApwWorkflowParams,\n    modelId: string\n): ReviewersRefInput => {\n    return {\n        ...data,\n        steps: data.steps.map(step => ({\n            ...step,\n            reviewers: step.reviewers.map(id => ({\n                id,\n                modelId\n            }))\n        }))\n    };\n};\n\nexport const createWorkflowStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwWorkflowStorageOperations => {\n    const { cms } = params;\n    const getWorkflowModel = async () => {\n        const model = await cms.getModel(WORKFLOW_MODEL_ID);\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${WORKFLOW_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getWorkflow: ApwWorkflowStorageOperations[\"getWorkflow\"] = async ({ id }) => {\n        const model = await getWorkflowModel();\n        const entry = await cms.getEntryById(model, id);\n        return pickEntryFieldValues(entry);\n    };\n    return {\n        getWorkflowModel,\n        getWorkflow,\n        async listWorkflows(params) {\n            const model = await getWorkflowModel();\n\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where\n                }\n            });\n            return [entries.map(pickEntryFieldValues<ApwWorkflow>), meta];\n        },\n        async createWorkflow(this: ApwStorageOperations, params) {\n            const model = await getWorkflowModel();\n            const reviewerModel = await this.getReviewerModel();\n\n            const data = formatReviewersForRefInput(params.data, reviewerModel.modelId);\n\n            const entry = await cms.createEntry(model, data);\n\n            return pickEntryFieldValues(entry);\n        },\n        async updateWorkflow(this: ApwStorageOperations, params) {\n            const model = await getWorkflowModel();\n            const reviewerModel = await this.getReviewerModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getWorkflow({ id: params.id });\n            const input = {\n                ...existingEntry,\n                ...params.data,\n                savedOn: new Date()\n            };\n            const data = formatReviewersForRefInput(\n                input as CreateApwWorkflowParams,\n                reviewerModel.modelId\n            );\n\n            const entry = await cms.updateEntry(model, params.id, data);\n\n            return pickEntryFieldValues(entry);\n        },\n        async deleteWorkflow(params) {\n            const model = await getWorkflowModel();\n\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/types.d.ts

@@ -1,18 +1,14 @@
-import { CmsEntry as BaseCmsEntry, OnEntryBeforePublishTopicParams, OnEntryAfterPublishTopicParams, OnEntryAfterUnpublishTopicParams } from "@webiny/api-headless-cms/types";
-import { Page, OnPageBeforeCreateTopicParams, OnPageBeforeCreateFromTopicParams, OnPageBeforeUpdateTopicParams, OnPageBeforePublishTopicParams, PageSettings } from "@webiny/api-page-builder/types";
-import { Context } from "@webiny/api/types";
-import { PageBuilderContextObject } from "@webiny/api-page-builder/graphql/types";
-import { SecurityIdentity, SecurityPermission } from "@webiny/api-security/types";
-import { I18NLocale } from "@webiny/api-i18n/types";
-import { Tenant } from "@webiny/api-tenancy/types";
-import { Topic } from "@webiny/pubsub/types";
-import { ApwScheduleActionCrud, ScheduleActionContext } from "./scheduler/types";
-import HandlerClient from "@webiny/handler-client/HandlerClient";
-import { PluginsContainer } from "@webiny/plugins";
-import { WcpContextObject } from "@webiny/api-wcp/types";
-import { MailerContext } from "@webiny/api-mailer/types";
-import { AdminSettingsContext } from "@webiny/api-admin-settings/types";
-import { CmsPrivateModelFull } from "@webiny/api-headless-cms";
+import type { CmsEntry as BaseCmsEntry, OnEntryBeforePublishTopicParams, OnEntryAfterPublishTopicParams, OnEntryAfterUnpublishTopicParams, CmsEntryListSort } from "@webiny/api-headless-cms/types";
+import type { Context } from "@webiny/api/types";
+import type { SecurityIdentity, SecurityPermission } from "@webiny/api-security/types";
+import type { I18NLocale } from "@webiny/api-i18n/types";
+import type { Tenant } from "@webiny/api-tenancy/types";
+import type { Topic } from "@webiny/pubsub/types";
+import type { ApwScheduleActionCrud, ScheduleActionContext } from "./scheduler/types";
+import type HandlerClient from "@webiny/handler-client/HandlerClient";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { WcpContextObject } from "@webiny/api-wcp/types";
+import type { MailerContext } from "@webiny/api-mailer/types";
 export interface ApwCmsEntry extends BaseCmsEntry {
     title: string;
     meta: {
@@ -47,7 +43,7 @@ export interface ListWhere {
 }
 export interface ListParams {
     where?: ListWhere;
-    sort?: string[];
+    sort?: CmsEntryListSort;
     limit?: number;
     after?: string | null;
 }
@@ -69,19 +65,6 @@ export declare enum ApwContentTypes {
     PAGE = "page",
     CMS_ENTRY = "cms_entry"
 }
-export interface PageSettingsWithWorkflow extends PageSettings {
-    apw: {
-        workflowId: string;
-        contentReviewId: string | null;
-    };
-}
-export interface PageWithWorkflow extends Page {
-    settings: PageSettingsWithWorkflow;
-}
-export declare type ApwOnPageBeforeCreateTopicParams = OnPageBeforeCreateTopicParams<PageWithWorkflow>;
-export declare type ApwOnPageBeforeCreateFromTopicParams = OnPageBeforeCreateFromTopicParams<PageWithWorkflow>;
-export declare type ApwOnPageBeforeUpdateTopicParams = OnPageBeforeUpdateTopicParams<PageWithWorkflow>;
-export declare type ApwOnPageBeforePublishTopicParams = OnPageBeforePublishTopicParams<PageWithWorkflow>;
 export declare enum WorkflowScopeTypes {
     DEFAULT = "default",
     CUSTOM = "custom"
@@ -118,8 +101,11 @@ export interface ApwBaseFields {
     id: string;
     entryId: string;
     createdOn: string;
+    modifiedOn: string | null;
     savedOn: string;
     createdBy: ApwIdentity;
+    modifiedBy: ApwIdentity;
+    savedBy: ApwIdentity;
 }
 export interface ApwReviewer extends ApwBaseFields {
     identityId: string;
@@ -191,7 +177,7 @@ export declare enum ApwContentReviewStatus {
     READY_TO_BE_PUBLISHED = "readyToBePublished",
     PUBLISHED = "published"
 }
-export declare type ApwContentReviewListFilter = ApwContentReviewStatus | "requiresMyAttention";
+export type ApwContentReviewListFilter = ApwContentReviewStatus | "requiresMyAttention";
 export interface ApwWorkflowStep<TReviewer = ApwReviewer> {
     title: string;
     type: ApwWorkflowStepTypes;
@@ -281,7 +267,7 @@ interface BaseApwCrud<TEntry, TCreateEntryParams, TUpdateEntryParams> {
     get(id: string): Promise<TEntry>;
     create(data: TCreateEntryParams): Promise<TEntry>;
     update(id: string, data: TUpdateEntryParams): Promise<TEntry>;
-    delete(id: string): Promise<Boolean>;
+    delete(id: string): Promise<boolean>;
 }
 export interface ApwWorkflowCrud extends BaseApwCrud<ApwWorkflow, CreateApwWorkflowParams, UpdateApwWorkflowParams> {
     list(params?: ListWorkflowsParams): Promise<[ApwWorkflow[], ListMeta]>;
@@ -350,14 +336,14 @@ export interface ApwChangeRequestCrud extends BaseApwCrud<ApwChangeRequest, Crea
 }
 export interface ApwContentReviewCrud extends BaseApwCrud<ApwContentReview, CreateApwContentReviewParams, UpdateApwContentReviewParams> {
     list(params: ApwContentReviewListParams): Promise<[ApwContentReview[], ListMeta]>;
-    provideSignOff(id: string, step: string): Promise<Boolean>;
-    retractSignOff(id: string, step: string): Promise<Boolean>;
+    provideSignOff(id: string, step: string): Promise<boolean>;
+    retractSignOff(id: string, step: string): Promise<boolean>;
     isReviewRequired(data: ApwContentReviewContent): Promise<{
         isReviewRequired: boolean;
         contentReviewId?: string | null;
     }>;
-    publishContent(id: string, datetime?: string): Promise<Boolean>;
-    unpublishContent(id: string, datetime?: string): Promise<Boolean>;
+    publishContent(id: string, datetime?: string): Promise<boolean>;
+    unpublishContent(id: string, datetime?: string): Promise<boolean>;
     scheduleAction(data: ApwScheduleActionData): Promise<string>;
     deleteScheduledAction(id: string): Promise<boolean>;
     /**
@@ -371,15 +357,15 @@ export interface ApwContentReviewCrud extends BaseApwCrud<ApwContentReview, Crea
     onContentReviewAfterDelete: Topic<OnContentReviewAfterDeleteTopicParams>;
     onContentReviewBeforeList: Topic<OnContentReviewBeforeListTopicParams>;
 }
-export declare type ContentGetter = (id: string, settings: {
+export type ContentGetter = (id: string, settings: {
     modelId?: string;
-}) => Promise<PageWithWorkflow | ApwCmsEntry | null>;
-export declare type ContentPublisher = (id: string, settings: {
+}) => Promise<ApwCmsEntry | null>;
+export type ContentPublisher = (id: string, settings: {
     modelId?: string;
-}) => Promise<Boolean | null>;
-export declare type ContentUnPublisher = (id: string, settings: {
+}) => Promise<boolean | null>;
+export type ContentUnPublisher = (id: string, settings: {
     modelId?: string;
-}) => Promise<Boolean | null>;
+}) => Promise<boolean | null>;
 export interface AdvancedPublishingWorkflow {
     addContentGetter: (type: ApwContentTypes, func: ContentGetter) => void;
     getContentGetter: (type: ApwContentTypes) => ContentGetter;
@@ -394,9 +380,8 @@ export interface AdvancedPublishingWorkflow {
     contentReview: ApwContentReviewCrud;
     scheduleAction: ApwScheduleActionCrud;
 }
-export interface ApwContext extends Context, MailerContext, AdminSettingsContext {
+export interface ApwContext extends Context, MailerContext {
     apw: AdvancedPublishingWorkflow;
-    pageBuilder: PageBuilderContextObject;
     wcp: WcpContextObject;
     scheduleAction: ScheduleActionContext["scheduleAction"];
 }
@@ -418,7 +403,7 @@ export interface CreateApwParams {
 interface StorageOperationsGetReviewerParams {
     id: string;
 }
-declare type StorageOperationsListReviewersParams = ApwReviewerListParams;
+type StorageOperationsListReviewersParams = ApwReviewerListParams;
 interface CreateApwReviewerData {
     identityId: string;
     displayName: string | null;
@@ -447,8 +432,8 @@ interface StorageOperationsGetParams {
 interface StorageOperationsDeleteParams {
     id: string;
 }
-declare type StorageOperationsGetWorkflowParams = StorageOperationsGetParams;
-declare type StorageOperationsListWorkflowsParams = ListParams;
+type StorageOperationsGetWorkflowParams = StorageOperationsGetParams;
+type StorageOperationsListWorkflowsParams = ListParams;
 interface StorageOperationsCreateWorkflowParams {
     data: CreateApwWorkflowParams;
 }
@@ -456,8 +441,8 @@ interface StorageOperationsUpdateWorkflowParams {
     id: string;
     data: UpdateApwWorkflowParams;
 }
-declare type StorageOperationsDeleteWorkflowParams = StorageOperationsDeleteParams;
-declare type StorageOperationsGetContentReviewParams = StorageOperationsGetParams;
+type StorageOperationsDeleteWorkflowParams = StorageOperationsDeleteParams;
+type StorageOperationsGetContentReviewParams = StorageOperationsGetParams;
 export interface ApwContentReviewListParams extends ListParams {
     where: ListWhere & {
         reviewStatus?: ApwContentReviewListFilter;
@@ -467,7 +452,7 @@ export interface ApwContentReviewListParams extends ListParams {
         workflowId_in?: string[];
     };
 }
-declare type StorageOperationsListContentReviewsParams = ApwContentReviewListParams;
+type StorageOperationsListContentReviewsParams = ApwContentReviewListParams;
 interface StorageOperationsCreateContentReviewParams {
     data: CreateApwContentReviewParams;
 }
@@ -475,9 +460,9 @@ interface StorageOperationsUpdateContentReviewParams {
     id: string;
     data: UpdateApwContentReviewParams;
 }
-declare type StorageOperationsDeleteContentReviewParams = StorageOperationsDeleteParams;
-declare type StorageOperationsGetChangeRequestParams = StorageOperationsGetParams;
-declare type StorageOperationsListChangeRequestsParams = ApwChangeRequestListParams;
+type StorageOperationsDeleteContentReviewParams = StorageOperationsDeleteParams;
+type StorageOperationsGetChangeRequestParams = StorageOperationsGetParams;
+type StorageOperationsListChangeRequestsParams = ApwChangeRequestListParams;
 interface StorageOperationsCreateChangeRequestParams {
     data: CreateApwChangeRequestParams;
 }
@@ -485,10 +470,10 @@ interface StorageOperationsUpdateChangeRequestParams {
     id: string;
     data: UpdateApwChangeRequestParams;
 }
-declare type StorageOperationsDeleteChangeRequestParams = StorageOperationsDeleteParams;
-declare type StorageOperationsGetCommentParams = StorageOperationsGetParams;
-declare type StorageOperationsDeleteCommentParams = StorageOperationsDeleteParams;
-declare type StorageOperationsListCommentsParams = ApwCommentListParams;
+type StorageOperationsDeleteChangeRequestParams = StorageOperationsDeleteParams;
+type StorageOperationsGetCommentParams = StorageOperationsGetParams;
+type StorageOperationsDeleteCommentParams = StorageOperationsDeleteParams;
+type StorageOperationsListCommentsParams = ApwCommentListParams;
 interface StorageOperationsCreateCommentParams {
     data: CreateApwCommentParams;
 }
@@ -501,35 +486,35 @@ export interface ApwReviewerStorageOperations {
     listReviewers(params: StorageOperationsListReviewersParams): Promise<[ApwReviewer[], ListMeta]>;
     createReviewer(params: StorageOperationsCreateReviewerParams): Promise<ApwReviewer>;
     updateReviewer(params: StorageOperationsUpdateReviewerParams): Promise<ApwReviewer>;
-    deleteReviewer(params: StorageOperationsDeleteReviewerParams): Promise<Boolean>;
+    deleteReviewer(params: StorageOperationsDeleteReviewerParams): Promise<boolean>;
 }
 export interface ApwWorkflowStorageOperations {
     getWorkflow(params: StorageOperationsGetWorkflowParams): Promise<ApwWorkflow>;
     listWorkflows(params: StorageOperationsListWorkflowsParams): Promise<[ApwWorkflow[], ListMeta]>;
     createWorkflow(params: StorageOperationsCreateWorkflowParams): Promise<ApwWorkflow>;
     updateWorkflow(params: StorageOperationsUpdateWorkflowParams): Promise<ApwWorkflow>;
-    deleteWorkflow(params: StorageOperationsDeleteWorkflowParams): Promise<Boolean>;
+    deleteWorkflow(params: StorageOperationsDeleteWorkflowParams): Promise<boolean>;
 }
 export interface ApwContentReviewStorageOperations {
     getContentReview(params: StorageOperationsGetContentReviewParams): Promise<ApwContentReview>;
     listContentReviews(params: StorageOperationsListContentReviewsParams): Promise<[ApwContentReview[], ListMeta]>;
     createContentReview(params: StorageOperationsCreateContentReviewParams): Promise<ApwContentReview>;
     updateContentReview(params: StorageOperationsUpdateContentReviewParams): Promise<ApwContentReview>;
-    deleteContentReview(params: StorageOperationsDeleteContentReviewParams): Promise<Boolean>;
+    deleteContentReview(params: StorageOperationsDeleteContentReviewParams): Promise<boolean>;
 }
 export interface ApwChangeRequestStorageOperations {
     getChangeRequest(params: StorageOperationsGetChangeRequestParams): Promise<ApwChangeRequest>;
     listChangeRequests(params: StorageOperationsListChangeRequestsParams): Promise<[ApwChangeRequest[], ListMeta]>;
     createChangeRequest(params: StorageOperationsCreateChangeRequestParams): Promise<ApwChangeRequest>;
     updateChangeRequest(params: StorageOperationsUpdateChangeRequestParams): Promise<ApwChangeRequest>;
-    deleteChangeRequest(params: StorageOperationsDeleteChangeRequestParams): Promise<Boolean>;
+    deleteChangeRequest(params: StorageOperationsDeleteChangeRequestParams): Promise<boolean>;
 }
 export interface ApwCommentStorageOperations {
     getComment(params: StorageOperationsGetCommentParams): Promise<ApwComment>;
     listComments(params: StorageOperationsListCommentsParams): Promise<[ApwComment[], ListMeta]>;
     createComment(params: StorageOperationsCreateCommentParams): Promise<ApwComment>;
     updateComment(params: StorageOperationsUpdateCommentParams): Promise<ApwComment>;
-    deleteComment(params: StorageOperationsDeleteCommentParams): Promise<Boolean>;
+    deleteComment(params: StorageOperationsDeleteCommentParams): Promise<boolean>;
 }
 export interface ApwStorageOperations extends ApwReviewerStorageOperations, ApwWorkflowStorageOperations, ApwContentReviewStorageOperations, ApwChangeRequestStorageOperations, ApwCommentStorageOperations {
 }
@@ -737,7 +722,6 @@ export interface OnWorkflowBeforeDeleteTopicParams {
 export interface OnWorkflowAfterDeleteTopicParams {
     workflow: ApwWorkflow;
 }
-export declare type WorkflowModelDefinition = Omit<CmsPrivateModelFull, "noValidate" | "group">;
 /**
  * Headless CMS
  */