@webiny/api-apw 5.25.0 → 5.30.0

package/scheduler/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ApwContentTypes","ApwScheduleActionTypes","InvocationTypes"],"sources":["types.ts"],"sourcesContent":["import { Context } from \"@webiny/handler/types\";\nimport { SecurityIdentity, SecurityPermission } from \"@webiny/api-security/types\";\nimport { I18NLocale, I18NContext } from \"@webiny/api-i18n/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { TenancyContext } from \"@webiny/api-tenancy/types\";\n\nexport interface ListWhere {\n    /**\n     * Fields.\n     */\n    id?: string;\n    id_in?: string[];\n    id_not?: string;\n    id_not_in?: string[];\n    /**\n     * Who created the entry?\n     */\n    createdBy?: string;\n    createdBy_not?: string;\n    createdBy_in?: string[];\n    createdBy_not_in?: string[];\n    /**\n     * By datetime field.\n     */\n    datetime_startsWith?: string;\n}\n\nexport interface ListParams {\n    where: ListWhere;\n    sort?: (\"datetime_ASC\" | \"datetime_DESC\")[];\n    limit?: number;\n    after?: string;\n}\n\n/**\n * A interface describing the reference to a user that created some data in the database.\n *\n * @category General\n */\nexport interface CreatedBy {\n    /**\n     * ID if the user.\n     */\n    id: string;\n    /**\n     * Full name of the user.\n     */\n    displayName: string | null;\n    /**\n     * Type of the user (admin, user)\n     */\n    type: string;\n}\n\nexport interface ListMeta {\n    /**\n     * A cursor for pagination.\n     */\n    cursor: string | null;\n    /**\n     * Is there more items to load?\n     */\n    hasMoreItems: boolean;\n    /**\n     * Total count of the items in the storage.\n     */\n    totalCount: number;\n}\n\nexport enum ApwContentTypes {\n    PAGE = \"page\",\n    CMS_ENTRY = \"cms_entry\"\n}\n\nexport interface BaseFields {\n    id: string;\n    createdOn: string;\n    savedOn?: string;\n    createdBy: CreatedBy;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ApwScheduleAction extends BaseFields {\n    data: ApwScheduleActionData;\n}\n\nexport enum ApwScheduleActionTypes {\n    PUBLISH = \"publish\",\n    UNPUBLISH = \"unpublish\"\n}\n\nexport interface ApwScheduleActionData {\n    action: ApwScheduleActionTypes;\n    type: ApwContentTypes;\n    datetime: string;\n    entryId: string;\n    /**\n     * We will add modelId to the data for now.\n     * TODO extract in separate package?\n     */\n    modelId?: string;\n}\n\nexport enum InvocationTypes {\n    SCHEDULED = \"scheduled\"\n}\n\ninterface BaseApwCrud<TEntry, TCreateEntryParams, TUpdateEntryParams> {\n    get(id: string): Promise<TEntry | null>;\n\n    create(data: TCreateEntryParams): Promise<TEntry>;\n\n    update(id: string, data: TUpdateEntryParams): Promise<TEntry>;\n\n    delete(id: string): Promise<Boolean>;\n}\n\nexport interface ApwScheduleActionCrud\n    extends BaseApwCrud<ApwScheduleAction, ApwScheduleActionData, ApwScheduleActionData> {\n    list(params: ListParams): Promise<[ApwScheduleAction[], ListMeta]>;\n\n    getCurrentTask(): Promise<ApwScheduleAction | null>;\n\n    updateCurrentTask(item: ApwScheduleAction): Promise<ApwScheduleAction>;\n\n    deleteCurrentTask(): Promise<Boolean>;\n}\n\nexport interface ScheduleActionContext extends Context, I18NContext, TenancyContext {\n    scheduleAction: ApwScheduleActionCrud;\n}\n\nexport interface CreateScheduleActionParams {\n    getLocale: () => I18NLocale;\n    getIdentity: () => SecurityIdentity;\n    getTenant: () => Tenant;\n    getPermission: (name: string) => Promise<SecurityPermission | null>;\n    storageOperations: ApwScheduleActionStorageOperations;\n}\n\ninterface CreateApwScheduleActionParams {\n    item: ApwScheduleAction;\n    input: ApwScheduleActionData;\n}\n\ninterface StorageOperationsGetParams {\n    where: {\n        id: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\ninterface StorageOperationsDeleteParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ApwScheduleActionListParams extends ListParams {\n    where: ListWhere & {\n        tenant: string;\n        locale: string;\n    };\n}\n\nexport type StorageOperationsGetScheduleActionParams = StorageOperationsGetParams;\n\nexport type StorageOperationsDeleteScheduleActionParams = StorageOperationsDeleteParams;\nexport type StorageOperationsListScheduleActionsParams = ApwScheduleActionListParams;\n\nexport type StorageOperationsCreateScheduleActionParams = CreateApwScheduleActionParams;\n\nexport interface StorageOperationsUpdateScheduleActionParams {\n    item: ApwScheduleAction;\n    input: ApwScheduleActionData;\n}\n\nexport type StorageOperationsListScheduleActionsResponse = [ApwScheduleAction[], ListMeta];\n\nexport interface StorageOperationsUpdateCurrentTaskParams {\n    item: ApwScheduleAction;\n}\n\nexport interface StorageOperationsGetCurrentTaskParams {\n    where: Pick<StorageOperationsGetParams[\"where\"], \"tenant\" | \"locale\">;\n}\n\nexport type StorageOperationsDeleteCurrentTaskParams = Pick<\n    StorageOperationsDeleteParams,\n    \"tenant\" | \"locale\"\n>;\n\nexport interface ApwScheduleActionStorageOperations {\n    get(params: StorageOperationsGetScheduleActionParams): Promise<ApwScheduleAction | null>;\n\n    list(\n        params: StorageOperationsListScheduleActionsParams\n    ): Promise<StorageOperationsListScheduleActionsResponse>;\n\n    create(params: StorageOperationsCreateScheduleActionParams): Promise<ApwScheduleAction>;\n\n    update(params: StorageOperationsUpdateScheduleActionParams): Promise<ApwScheduleAction>;\n\n    delete(params: StorageOperationsDeleteScheduleActionParams): Promise<Boolean>;\n\n    getCurrentTask(\n        params: StorageOperationsGetCurrentTaskParams\n    ): Promise<ApwScheduleAction | null>;\n\n    updateCurrentTask(params: StorageOperationsUpdateCurrentTaskParams): Promise<ApwScheduleAction>;\n\n    deleteCurrentTask(params: StorageOperationsDeleteCurrentTaskParams): Promise<Boolean>;\n}\n\nexport interface CreateApwContextParams {\n    storageOperations: ApwScheduleActionStorageOperations;\n}\n"],"mappings":";;;;;;;AAkCA;AACA;AACA;AACA;AACA;IA+BYA,e;;;WAAAA,e;EAAAA,e;EAAAA,e;GAAAA,e,+BAAAA,e;;IAkBAC,sB;;;WAAAA,sB;EAAAA,sB;EAAAA,sB;GAAAA,sB,sCAAAA,sB;;IAiBAC,e;;;WAAAA,e;EAAAA,e;GAAAA,e,+BAAAA,e"}

package/storageOperations/changeRequestStorageOperations.js

@@ -53,9 +53,7 @@ const createChangeRequestStorageOperations = ({
     async listChangeRequests(params) {
       const model = await getChangeRequestModel();
       const [entries, meta] = await cms.listLatestEntries(model, _objectSpread(_objectSpread({}, params), {}, {
-        where: _objectSpread(_objectSpread({}, params.where), {}, {
-          tenant: model.tenant
-        })
+        where: _objectSpread({}, params.where)
       }));
       const all = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
         entry,

package/storageOperations/changeRequestStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["changeRequestStorageOperations.ts"],"names":["createChangeRequestStorageOperations","cms","getCmsContext","getChangeRequestModel","model","getModel","WebinyError","getChangeRequest","id","entry","getEntryById","fields","baseFields","context","transformers","listChangeRequests","params","entries","meta","listLatestEntries","where","tenant","all","Promise","map","createChangeRequest","createEntry","data","updateChangeRequest","existingEntry","updateEntry","deleteChangeRequest","deleteEntry"],"mappings":"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","sourcesContent":["import { ApwChangeRequestStorageOperations } from \"./types\";\nimport { baseFields, CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwChangeRequest } from \"~/types\";\n\nexport const createChangeRequestStorageOperations = ({\n    cms,\n    getCmsContext\n}: CreateApwStorageOperationsParams): ApwChangeRequestStorageOperations => {\n    const getChangeRequestModel = async () => {\n        const model = await cms.getModel(\"apwChangeRequestModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwWorkflowModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getChangeRequest: ApwChangeRequestStorageOperations[\"getChangeRequest\"] = async ({\n        id\n    }) => {\n        const model = await getChangeRequestModel();\n        const entry = await cms.getEntryById(model, id);\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getChangeRequestModel,\n        getChangeRequest,\n        async listChangeRequests(params) {\n            const model = await getChangeRequestModel();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where,\n                    tenant: model.tenant\n                }\n            });\n            const all = await Promise.all(\n                entries.map(entry =>\n                    getFieldValues<ApwChangeRequest>({\n                        entry,\n                        fields: baseFields,\n                        context: getCmsContext(),\n                        transformers: [getTransformer(model, \"body\")]\n                    })\n                )\n            );\n            return [all, meta];\n        },\n        async createChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            const entry = await cms.createEntry(model, params.data);\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async updateChangeRequest(params) {\n            const model = await getChangeRequestModel();\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 getChangeRequest({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async deleteChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"]}
+{"version":3,"names":["createChangeRequestStorageOperations","cms","getCmsContext","getChangeRequestModel","model","getModel","WebinyError","getChangeRequest","id","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","listChangeRequests","params","entries","meta","listLatestEntries","where","all","Promise","map","createChangeRequest","createEntry","data","updateChangeRequest","existingEntry","updateEntry","deleteChangeRequest","deleteEntry"],"sources":["changeRequestStorageOperations.ts"],"sourcesContent":["import { ApwChangeRequestStorageOperations } from \"./types\";\nimport { baseFields, CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwChangeRequest } from \"~/types\";\n\nexport const createChangeRequestStorageOperations = ({\n    cms,\n    getCmsContext\n}: CreateApwStorageOperationsParams): ApwChangeRequestStorageOperations => {\n    const getChangeRequestModel = async () => {\n        const model = await cms.getModel(\"apwChangeRequestModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwWorkflowModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getChangeRequest: ApwChangeRequestStorageOperations[\"getChangeRequest\"] = async ({\n        id\n    }) => {\n        const model = await getChangeRequestModel();\n        const entry = await cms.getEntryById(model, id);\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getChangeRequestModel,\n        getChangeRequest,\n        async listChangeRequests(params) {\n            const model = await getChangeRequestModel();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where\n                }\n            });\n            const all = await Promise.all(\n                entries.map(entry =>\n                    getFieldValues<ApwChangeRequest>({\n                        entry,\n                        fields: baseFields,\n                        context: getCmsContext(),\n                        transformers: [getTransformer(model, \"body\")]\n                    })\n                )\n            );\n            return [all, meta];\n        },\n        async createChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            const entry = await cms.createEntry(model, params.data);\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async updateChangeRequest(params) {\n            const model = await getChangeRequestModel();\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 getChangeRequest({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async deleteChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AACA;;;;;;AAGO,MAAMA,oCAAoC,GAAG,CAAC;EACjDC,GADiD;EAEjDC;AAFiD,CAAD,KAGuB;EACvE,MAAMC,qBAAqB,GAAG,YAAY;IACtC,MAAMC,KAAK,GAAG,MAAMH,GAAG,CAACI,QAAJ,CAAa,iCAAb,CAApB;;IACA,IAAI,CAACD,KAAL,EAAY;MACR,MAAM,IAAIE,cAAJ,CACF,oDADE,EAEF,uBAFE,CAAN;IAIH;;IACD,OAAOF,KAAP;EACH,CATD;;EAUA,MAAMG,gBAAuE,GAAG,OAAO;IACnFC;EADmF,CAAP,KAE1E;IACF,MAAMJ,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;IACA,MAAMM,KAAK,GAAG,MAAMR,GAAG,CAACS,YAAJ,CAAiBN,KAAjB,EAAwBI,EAAxB,CAApB;IACA,OAAO,IAAAG,6BAAA,EAAe;MAClBF,KADkB;MAElBG,MAAM,EAAEC,iBAFU;MAGlBC,OAAO,EAAEZ,aAAa,EAHJ;MAIlBa,YAAY,EAAE,CAAC,IAAAC,6BAAA,EAAeZ,KAAf,EAAsB,MAAtB,CAAD;IAJI,CAAf,CAAP;EAMH,CAXD;;EAYA,OAAO;IACHD,qBADG;IAEHI,gBAFG;;IAGH,MAAMU,kBAAN,CAAyBC,MAAzB,EAAiC;MAC7B,MAAMd,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA,MAAM,CAACgB,OAAD,EAAUC,IAAV,IAAkB,MAAMnB,GAAG,CAACoB,iBAAJ,CAAsBjB,KAAtB,kCACvBc,MADuB;QAE1BI,KAAK,oBACEJ,MAAM,CAACI,KADT;MAFqB,GAA9B;MAMA,MAAMC,GAAG,GAAG,MAAMC,OAAO,CAACD,GAAR,CACdJ,OAAO,CAACM,GAAR,CAAYhB,KAAK,IACb,IAAAE,6BAAA,EAAiC;QAC7BF,KAD6B;QAE7BG,MAAM,EAAEC,iBAFqB;QAG7BC,OAAO,EAAEZ,aAAa,EAHO;QAI7Ba,YAAY,EAAE,CAAC,IAAAC,6BAAA,EAAeZ,KAAf,EAAsB,MAAtB,CAAD;MAJe,CAAjC,CADJ,CADc,CAAlB;MAUA,OAAO,CAACmB,GAAD,EAAMH,IAAN,CAAP;IACH,CAtBE;;IAuBH,MAAMM,mBAAN,CAA0BR,MAA1B,EAAkC;MAC9B,MAAMd,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA,MAAMM,KAAK,GAAG,MAAMR,GAAG,CAAC0B,WAAJ,CAAgBvB,KAAhB,EAAuBc,MAAM,CAACU,IAA9B,CAApB;MACA,OAAO,IAAAjB,6BAAA,EAAe;QAClBF,KADkB;QAElBG,MAAM,EAAEC,iBAFU;QAGlBC,OAAO,EAAEZ,aAAa,EAHJ;QAIlBa,YAAY,EAAE,CAAC,IAAAC,6BAAA,EAAeZ,KAAf,EAAsB,MAAtB,CAAD;MAJI,CAAf,CAAP;IAMH,CAhCE;;IAiCH,MAAMyB,mBAAN,CAA0BX,MAA1B,EAAkC;MAC9B,MAAMd,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA;AACZ;AACA;AACA;;MACY,MAAM2B,aAAa,GAAG,MAAMvB,gBAAgB,CAAC;QAAEC,EAAE,EAAEU,MAAM,CAACV;MAAb,CAAD,CAA5C;MAEA,MAAMC,KAAK,GAAG,MAAMR,GAAG,CAAC8B,WAAJ,CAAgB3B,KAAhB,EAAuBc,MAAM,CAACV,EAA9B,kCACbsB,aADa,GAEbZ,MAAM,CAACU,IAFM,EAApB;MAIA,OAAO,IAAAjB,6BAAA,EAAe;QAClBF,KADkB;QAElBG,MAAM,EAAEC,iBAFU;QAGlBC,OAAO,EAAEZ,aAAa,EAHJ;QAIlBa,YAAY,EAAE,CAAC,IAAAC,6BAAA,EAAeZ,KAAf,EAAsB,MAAtB,CAAD;MAJI,CAAf,CAAP;IAMH,CAnDE;;IAoDH,MAAM4B,mBAAN,CAA0Bd,MAA1B,EAAkC;MAC9B,MAAMd,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA,MAAMF,GAAG,CAACgC,WAAJ,CAAgB7B,KAAhB,EAAuBc,MAAM,CAACV,EAA9B,CAAN;MACA,OAAO,IAAP;IACH;;EAxDE,CAAP;AA0DH,CApFM"}

package/storageOperations/commentStorageOperations.js

@@ -19,6 +19,17 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+const pickIdFromChangeRequest = obj => {
+  const rawValue = obj["changeRequest"];
+
+  if (!rawValue) {
+    return obj;
+  }
+
+  obj["changeRequest"] = rawValue.id;
+  return obj;
+};
+
 const createCommentStorageOperations = ({
   cms,
   getCmsContext
@@ -48,21 +59,21 @@ const createCommentStorageOperations = ({
 
   return {
     getCommentModel,
-    getComment,
+    getComment: async params => {
+      const values = await getComment(params);
+      return pickIdFromChangeRequest(values);
+    },
 
     async listComments(params) {
       const model = await getCommentModel();
-      const [entries, meta] = await cms.listLatestEntries(model, _objectSpread(_objectSpread({}, params), {}, {
-        where: _objectSpread(_objectSpread({}, params.where), {}, {
-          tenant: model.tenant
-        })
-      }));
-      const all = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
+      const [entries, meta] = await cms.listLatestEntries(model, params);
+      const values = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
         entry,
         fields: _index.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       })));
+      const all = values.map(value => pickIdFromChangeRequest(value));
       return [all, meta];
     },
 
@@ -70,16 +81,18 @@ const createCommentStorageOperations = ({
       const model = await getCommentModel();
       const refModel = await this.getChangeRequestModel();
       const entry = await cms.createEntry(model, _objectSpread(_objectSpread({}, params.data), {}, {
-        changeRequest: _objectSpread(_objectSpread({}, params.data.changeRequest), {}, {
+        changeRequest: {
+          id: params.data.changeRequest,
           modelId: refModel.modelId
-        })
+        }
       }));
-      return (0, _fieldResolver.getFieldValues)({
+      const values = await (0, _fieldResolver.getFieldValues)({
         entry,
         fields: _index.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
+      return pickIdFromChangeRequest(values);
     },
 
     async updateComment(params) {
@@ -93,12 +106,13 @@ const createCommentStorageOperations = ({
         id: params.id
       });
       const entry = await cms.updateEntry(model, params.id, _objectSpread(_objectSpread({}, existingEntry), params.data));
-      return (0, _fieldResolver.getFieldValues)({
+      const values = await (0, _fieldResolver.getFieldValues)({
         entry,
         fields: _index.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
+      return pickIdFromChangeRequest(values);
     },
 
     async deleteComment(params) {

package/storageOperations/commentStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["commentStorageOperations.ts"],"names":["createCommentStorageOperations","cms","getCmsContext","getCommentModel","model","getModel","WebinyError","getComment","id","entry","getEntryById","fields","baseFields","context","transformers","listComments","params","entries","meta","listLatestEntries","where","tenant","all","Promise","map","createComment","refModel","getChangeRequestModel","createEntry","data","changeRequest","modelId","updateComment","existingEntry","updateEntry","deleteComment","deleteEntry"],"mappings":"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","sourcesContent":["import { ApwStorageOperations } from \"./types\";\nimport { ApwCommentStorageOperations } from \"./types\";\nimport { baseFields, CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwComment } from \"~/types\";\n\nexport const createCommentStorageOperations = ({\n    cms,\n    getCmsContext\n}: CreateApwStorageOperationsParams): ApwCommentStorageOperations => {\n    const getCommentModel = async () => {\n        const model = await cms.getModel(\"apwCommentModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwContentReviewModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getComment: ApwCommentStorageOperations[\"getComment\"] = async ({ id }) => {\n        const model = await getCommentModel();\n        const entry = await cms.getEntryById(model, id);\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getCommentModel,\n        getComment,\n        async listComments(params) {\n            const model = await getCommentModel();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where,\n                    tenant: model.tenant\n                }\n            });\n            const all = await Promise.all(\n                entries.map(entry =>\n                    getFieldValues<ApwComment>({\n                        entry,\n                        fields: baseFields,\n                        context: getCmsContext(),\n                        transformers: [getTransformer(model, \"body\")]\n                    })\n                )\n            );\n            return [all, meta];\n        },\n        async createComment(this: ApwStorageOperations, params) {\n            const model = await getCommentModel();\n            const refModel = await this.getChangeRequestModel();\n            const entry = await cms.createEntry(model, {\n                ...params.data,\n                changeRequest: {\n                    ...params.data.changeRequest,\n                    modelId: refModel.modelId\n                }\n            });\n\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async updateComment(params) {\n            const model = await getCommentModel();\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 getComment({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async deleteComment(params) {\n            const model = await getCommentModel();\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"]}
+{"version":3,"names":["pickIdFromChangeRequest","obj","rawValue","id","createCommentStorageOperations","cms","getCmsContext","getCommentModel","model","getModel","WebinyError","getComment","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","params","values","listComments","entries","meta","listLatestEntries","Promise","all","map","value","createComment","refModel","getChangeRequestModel","createEntry","data","changeRequest","modelId","updateComment","existingEntry","updateEntry","deleteComment","deleteEntry"],"sources":["commentStorageOperations.ts"],"sourcesContent":["import { ApwStorageOperations } from \"./types\";\nimport { ApwCommentStorageOperations } from \"./types\";\nimport { baseFields, CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwComment } from \"~/types\";\nimport { CmsEntryListParams } from \"@webiny/api-headless-cms/types\";\n\nconst pickIdFromChangeRequest = (obj: Record<string, any>): ApwComment => {\n    const rawValue = obj[\"changeRequest\"];\n    if (!rawValue) {\n        return obj as unknown as ApwComment;\n    }\n    obj[\"changeRequest\"] = rawValue.id;\n    return obj as unknown as ApwComment;\n};\n\nexport const createCommentStorageOperations = ({\n    cms,\n    getCmsContext\n}: CreateApwStorageOperationsParams): ApwCommentStorageOperations => {\n    const getCommentModel = async () => {\n        const model = await cms.getModel(\"apwCommentModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwContentReviewModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getComment: ApwCommentStorageOperations[\"getComment\"] = async ({ id }) => {\n        const model = await getCommentModel();\n        const entry = await cms.getEntryById(model, id);\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getCommentModel,\n        getComment: async params => {\n            const values = await getComment(params);\n            return pickIdFromChangeRequest(values);\n        },\n        async listComments(params) {\n            const model = await getCommentModel();\n            const [entries, meta] = await cms.listLatestEntries(\n                model,\n                params as CmsEntryListParams\n            );\n            const values = await Promise.all(\n                entries.map(entry =>\n                    getFieldValues<ApwComment>({\n                        entry,\n                        fields: baseFields,\n                        context: getCmsContext(),\n                        transformers: [getTransformer(model, \"body\")]\n                    })\n                )\n            );\n            const all = values.map(value => pickIdFromChangeRequest(value));\n            return [all, meta];\n        },\n        async createComment(this: ApwStorageOperations, params) {\n            const model = await getCommentModel();\n            const refModel = await this.getChangeRequestModel();\n            const entry = await cms.createEntry(model, {\n                ...params.data,\n                changeRequest: {\n                    id: params.data.changeRequest,\n                    modelId: refModel.modelId\n                }\n            });\n\n            const values = await getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n            return pickIdFromChangeRequest(values);\n        },\n        async updateComment(params) {\n            const model = await getCommentModel();\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 getComment({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            const values = await getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n            return pickIdFromChangeRequest(values);\n        },\n        async deleteComment(params) {\n            const model = await getCommentModel();\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}

package/storageOperations/contentReviewStorageOperations.js

@@ -45,9 +45,7 @@ const createContentReviewStorageOperations = ({
     async listContentReviews(params) {
       const model = await getContentReviewModel();
       const [entries, meta] = await cms.listLatestEntries(model, _objectSpread(_objectSpread({}, params), {}, {
-        where: _objectSpread(_objectSpread({}, params.where), {}, {
-          tenant: model.tenant
-        })
+        where: _objectSpread({}, params.where)
       }));
       return [entries.map(entry => (0, _index.getFieldValues)(entry, _index.baseFields)), meta];
     },

package/storageOperations/contentReviewStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["contentReviewStorageOperations.ts"],"names":["createContentReviewStorageOperations","cms","getContentReviewModel","model","getModel","WebinyError","getContentReview","id","entry","getEntryById","baseFields","listContentReviews","params","entries","meta","listLatestEntries","where","tenant","map","createContentReview","createEntry","data","updateContentReview","existingEntry","updateEntry","deleteContentReview","deleteEntry"],"mappings":";;;;;;;;;;;AACA;;AAKA;;;;;;AAEO,MAAMA,oCAAoC,GAAG,CAAC;AACjDC,EAAAA;AADiD,CAAD,KAEoC;AACpF,QAAMC,qBAAqB,GAAG,YAAY;AACtC,UAAMC,KAAK,GAAG,MAAMF,GAAG,CAACG,QAAJ,CAAa,iCAAb,CAApB;;AACA,QAAI,CAACD,KAAL,EAAY;AACR,YAAM,IAAIE,cAAJ,CACF,yDADE,EAEF,uBAFE,CAAN;AAIH;;AACD,WAAOF,KAAP;AACH,GATD;;AAUA,QAAMG,gBAAuE,GAAG,OAAO;AACnFC,IAAAA;AADmF,GAAP,KAE1E;AACF,UAAMJ,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;AACA,UAAMM,KAAK,GAAG,MAAMP,GAAG,CAACQ,YAAJ,CAAiBN,KAAjB,EAAwBI,EAAxB,CAApB;AACA,WAAO,2BAAeC,KAAf,EAAsBE,iBAAtB,CAAP;AACH,GAND;;AAOA,SAAO;AACHR,IAAAA,qBADG;AAEHI,IAAAA,gBAFG;;AAGH,UAAMK,kBAAN,CAAyBC,MAAzB,EAAiC;AAC7B,YAAMT,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;AACA,YAAM,CAACW,OAAD,EAAUC,IAAV,IAAkB,MAAMb,GAAG,CAACc,iBAAJ,CAAsBZ,KAAtB,kCACvBS,MADuB;AAE1BI,QAAAA,KAAK,kCACEJ,MAAM,CAACI,KADT;AAEDC,UAAAA,MAAM,EAAEd,KAAK,CAACc;AAFb;AAFqB,SAA9B;AAOA,aAAO,CAACJ,OAAO,CAACK,GAAR,CAAYV,KAAK,IAAI,2BAAeA,KAAf,EAAsBE,iBAAtB,CAArB,CAAD,EAA0DI,IAA1D,CAAP;AACH,KAbE;;AAcH,UAAMK,mBAAN,CAA0BP,MAA1B,EAAkC;AAC9B,YAAMT,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;AACA,YAAMM,KAAK,GAAG,MAAMP,GAAG,CAACmB,WAAJ,CAAgBjB,KAAhB,EAAuBS,MAAM,CAACS,IAA9B,CAApB;AACA,aAAO,2BAAeb,KAAf,EAAsBE,iBAAtB,CAAP;AACH,KAlBE;;AAmBH,UAAMY,mBAAN,CAA0BV,MAA1B,EAAkC;AAC9B,YAAMT,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;AACA;AACZ;AACA;AACA;;AACY,YAAMqB,aAAa,GAAG,MAAMjB,gBAAgB,CAAC;AAAEC,QAAAA,EAAE,EAAEK,MAAM,CAACL;AAAb,OAAD,CAA5C;AAEA,YAAMC,KAAK,GAAG,MAAMP,GAAG,CAACuB,WAAJ,CAAgBrB,KAAhB,EAAuBS,MAAM,CAACL,EAA9B,kCACbgB,aADa,GAEbX,MAAM,CAACS,IAFM,EAApB;AAIA,aAAO,2BAAeb,KAAf,EAAsBE,iBAAtB,CAAP;AACH,KAhCE;;AAiCH,UAAMe,mBAAN,CAA0Bb,MAA1B,EAAkC;AAC9B,YAAMT,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;AACA,YAAMD,GAAG,CAACyB,WAAJ,CAAgBvB,KAAhB,EAAuBS,MAAM,CAACL,EAA9B,CAAN;AACA,aAAO,IAAP;AACH;;AArCE,GAAP;AAuCH,CA3DM","sourcesContent":["import { ApwContentReviewStorageOperations } from \"./types\";\nimport {\n    baseFields,\n    CreateApwStorageOperationsParams,\n    getFieldValues\n} from \"~/storageOperations/index\";\nimport WebinyError from \"@webiny/error\";\n\nexport const createContentReviewStorageOperations = ({\n    cms\n}: Pick<CreateApwStorageOperationsParams, \"cms\">): ApwContentReviewStorageOperations => {\n    const getContentReviewModel = async () => {\n        const model = await cms.getModel(\"apwContentReviewModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwContentReviewModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getContentReview: ApwContentReviewStorageOperations[\"getContentReview\"] = async ({\n        id\n    }) => {\n        const model = await getContentReviewModel();\n        const entry = await cms.getEntryById(model, id);\n        return getFieldValues(entry, baseFields);\n    };\n    return {\n        getContentReviewModel,\n        getContentReview,\n        async listContentReviews(params) {\n            const model = await getContentReviewModel();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where,\n                    tenant: model.tenant\n                }\n            });\n            return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n        },\n        async createContentReview(params) {\n            const model = await getContentReviewModel();\n            const entry = await cms.createEntry(model, params.data);\n            return getFieldValues(entry, baseFields);\n        },\n        async updateContentReview(params) {\n            const model = await getContentReviewModel();\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 getContentReview({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteContentReview(params) {\n            const model = await getContentReviewModel();\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"]}
+{"version":3,"names":["createContentReviewStorageOperations","cms","getContentReviewModel","model","getModel","WebinyError","getContentReview","id","entry","getEntryById","getFieldValues","baseFields","listContentReviews","params","entries","meta","listLatestEntries","where","map","createContentReview","createEntry","data","updateContentReview","existingEntry","updateEntry","deleteContentReview","deleteEntry"],"sources":["contentReviewStorageOperations.ts"],"sourcesContent":["import { ApwContentReviewStorageOperations } from \"./types\";\nimport {\n    baseFields,\n    CreateApwStorageOperationsParams,\n    getFieldValues\n} from \"~/storageOperations/index\";\nimport WebinyError from \"@webiny/error\";\n\nexport const createContentReviewStorageOperations = ({\n    cms\n}: Pick<CreateApwStorageOperationsParams, \"cms\">): ApwContentReviewStorageOperations => {\n    const getContentReviewModel = async () => {\n        const model = await cms.getModel(\"apwContentReviewModelDefinition\");\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwContentReviewModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getContentReview: ApwContentReviewStorageOperations[\"getContentReview\"] = async ({\n        id\n    }) => {\n        const model = await getContentReviewModel();\n        const entry = await cms.getEntryById(model, id);\n        return getFieldValues(entry, baseFields);\n    };\n    return {\n        getContentReviewModel,\n        getContentReview,\n        async listContentReviews(params) {\n            const model = await getContentReviewModel();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where\n                }\n            });\n            return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n        },\n        async createContentReview(params) {\n            const model = await getContentReviewModel();\n            const entry = await cms.createEntry(model, params.data);\n            return getFieldValues(entry, baseFields);\n        },\n        async updateContentReview(params) {\n            const model = await getContentReviewModel();\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 getContentReview({ id: params.id });\n\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteContentReview(params) {\n            const model = await getContentReviewModel();\n            await cms.deleteEntry(model, params.id);\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AAKA;;;;;;AAEO,MAAMA,oCAAoC,GAAG,CAAC;EACjDC;AADiD,CAAD,KAEoC;EACpF,MAAMC,qBAAqB,GAAG,YAAY;IACtC,MAAMC,KAAK,GAAG,MAAMF,GAAG,CAACG,QAAJ,CAAa,iCAAb,CAApB;;IACA,IAAI,CAACD,KAAL,EAAY;MACR,MAAM,IAAIE,cAAJ,CACF,yDADE,EAEF,uBAFE,CAAN;IAIH;;IACD,OAAOF,KAAP;EACH,CATD;;EAUA,MAAMG,gBAAuE,GAAG,OAAO;IACnFC;EADmF,CAAP,KAE1E;IACF,MAAMJ,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;IACA,MAAMM,KAAK,GAAG,MAAMP,GAAG,CAACQ,YAAJ,CAAiBN,KAAjB,EAAwBI,EAAxB,CAApB;IACA,OAAO,IAAAG,qBAAA,EAAeF,KAAf,EAAsBG,iBAAtB,CAAP;EACH,CAND;;EAOA,OAAO;IACHT,qBADG;IAEHI,gBAFG;;IAGH,MAAMM,kBAAN,CAAyBC,MAAzB,EAAiC;MAC7B,MAAMV,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA,MAAM,CAACY,OAAD,EAAUC,IAAV,IAAkB,MAAMd,GAAG,CAACe,iBAAJ,CAAsBb,KAAtB,kCACvBU,MADuB;QAE1BI,KAAK,oBACEJ,MAAM,CAACI,KADT;MAFqB,GAA9B;MAMA,OAAO,CAACH,OAAO,CAACI,GAAR,CAAYV,KAAK,IAAI,IAAAE,qBAAA,EAAeF,KAAf,EAAsBG,iBAAtB,CAArB,CAAD,EAA0DI,IAA1D,CAAP;IACH,CAZE;;IAaH,MAAMI,mBAAN,CAA0BN,MAA1B,EAAkC;MAC9B,MAAMV,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA,MAAMM,KAAK,GAAG,MAAMP,GAAG,CAACmB,WAAJ,CAAgBjB,KAAhB,EAAuBU,MAAM,CAACQ,IAA9B,CAApB;MACA,OAAO,IAAAX,qBAAA,EAAeF,KAAf,EAAsBG,iBAAtB,CAAP;IACH,CAjBE;;IAkBH,MAAMW,mBAAN,CAA0BT,MAA1B,EAAkC;MAC9B,MAAMV,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA;AACZ;AACA;AACA;;MACY,MAAMqB,aAAa,GAAG,MAAMjB,gBAAgB,CAAC;QAAEC,EAAE,EAAEM,MAAM,CAACN;MAAb,CAAD,CAA5C;MAEA,MAAMC,KAAK,GAAG,MAAMP,GAAG,CAACuB,WAAJ,CAAgBrB,KAAhB,EAAuBU,MAAM,CAACN,EAA9B,kCACbgB,aADa,GAEbV,MAAM,CAACQ,IAFM,EAApB;MAIA,OAAO,IAAAX,qBAAA,EAAeF,KAAf,EAAsBG,iBAAtB,CAAP;IACH,CA/BE;;IAgCH,MAAMc,mBAAN,CAA0BZ,MAA1B,EAAkC;MAC9B,MAAMV,KAAK,GAAG,MAAMD,qBAAqB,EAAzC;MACA,MAAMD,GAAG,CAACyB,WAAJ,CAAgBvB,KAAhB,EAAuBU,MAAM,CAACN,EAA9B,CAAN;MACA,OAAO,IAAP;IACH;;EApCE,CAAP;AAsCH,CA1DM"}

package/storageOperations/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":["getFieldValues","entry","fields","values","baseFields","createStorageOperations","cms","getCmsContext","context"],"mappings":";;;;;;;;;;;;AAAA;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAOA;AACA;AACA;AACA;AACO,SAASA,cAAT,CAAwBC,KAAxB,EAAyCC,MAAzC,EAAgE;AACnE,yCAAY,mBAAKD,KAAL,EAAYC,MAAZ,CAAZ,GAAoCD,KAAK,CAACE,MAA1C;AACH;;AAEM,MAAMC,UAAU,GAAG,CAAC,IAAD,EAAO,WAAP,EAAoB,WAApB,EAAiC,SAAjC,CAAnB;;;AAEA,MAAMC,uBAAuB,GAAG,CAAC;AACpCC,EAAAA,GADoC;AAEpCC,EAAAA;AAFoC,CAAD,KAGuB;AAC1D,QAAMC,OAAO,GAAGD,aAAa,EAA7B;AACA;AACJ;AACA;;AACI,+BAAgBC,OAAhB;AAEA,mFACO,gEAAgC;AAAEF,IAAAA;AAAF,GAAhC,CADP,GAEO,gEAAgC;AAAEA,IAAAA;AAAF,GAAhC,CAFP,GAGO,0EAAqC;AAAEA,IAAAA;AAAF,GAArC,CAHP,GAIO,0EAAqC;AAAEA,IAAAA,GAAF;AAAOC,IAAAA;AAAP,GAArC,CAJP,GAKO,8DAA+B;AAC9BD,IAAAA,GAD8B;AAE9BC,IAAAA;AAF8B,GAA/B,CALP;AAUH,CApBM","sourcesContent":["import pick from \"lodash/pick\";\nimport { CmsContext, CmsEntry, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { ApwStorageOperations } from \"~/types\";\nimport { createReviewerStorageOperations } from \"./reviewerStorageOperations\";\nimport { createWorkflowStorageOperations } from \"./workflowStorageOperations\";\nimport { createContentReviewStorageOperations } from \"./contentReviewStorageOperations\";\nimport { createChangeRequestStorageOperations } from \"./changeRequestStorageOperations\";\nimport { createCommentStorageOperations } from \"~/storageOperations/commentStorageOperations\";\nimport { createApwModels } from \"./models\";\n\nexport interface CreateApwStorageOperationsParams {\n    cms: HeadlessCms;\n    getCmsContext: () => CmsContext;\n}\n\n/**\n * Using any because value can be a lot of types.\n * TODO @ts-refactor figure out correct types.\n */\nexport function getFieldValues(entry: CmsEntry, fields: string[]): any {\n    return { ...pick(entry, fields), ...entry.values };\n}\n\nexport const baseFields = [\"id\", \"createdBy\", \"createdOn\", \"savedOn\"];\n\nexport const createStorageOperations = ({\n    cms,\n    getCmsContext\n}: CreateApwStorageOperationsParams): ApwStorageOperations => {\n    const context = getCmsContext();\n    /**\n     * Register Apw models.\n     */\n    createApwModels(context);\n\n    return {\n        ...createReviewerStorageOperations({ cms }),\n        ...createWorkflowStorageOperations({ cms }),\n        ...createContentReviewStorageOperations({ cms }),\n        ...createChangeRequestStorageOperations({ cms, getCmsContext }),\n        ...createCommentStorageOperations({\n            cms,\n            getCmsContext\n        })\n    };\n};\n"]}
+{"version":3,"names":["getFieldValues","entry","fields","pick","values","baseFields","createStorageOperations","cms","getCmsContext","context","createApwModels","createReviewerStorageOperations","createWorkflowStorageOperations","createContentReviewStorageOperations","createChangeRequestStorageOperations","createCommentStorageOperations"],"sources":["index.ts"],"sourcesContent":["import pick from \"lodash/pick\";\nimport { CmsContext, CmsEntry, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { ApwStorageOperations } from \"~/types\";\nimport { createReviewerStorageOperations } from \"./reviewerStorageOperations\";\nimport { createWorkflowStorageOperations } from \"./workflowStorageOperations\";\nimport { createContentReviewStorageOperations } from \"./contentReviewStorageOperations\";\nimport { createChangeRequestStorageOperations } from \"./changeRequestStorageOperations\";\nimport { createCommentStorageOperations } from \"~/storageOperations/commentStorageOperations\";\nimport { createApwModels } from \"./models\";\n\nexport interface CreateApwStorageOperationsParams {\n    cms: HeadlessCms;\n    getCmsContext: () => CmsContext;\n}\n\n/**\n * Using any because value can be a lot of types.\n * TODO @ts-refactor figure out correct types.\n */\nexport function getFieldValues(entry: CmsEntry, fields: string[]): any {\n    return { ...pick(entry, fields), ...entry.values };\n}\n\nexport const baseFields = [\"id\", \"createdBy\", \"createdOn\", \"savedOn\"];\n\nexport const createStorageOperations = ({\n    cms,\n    getCmsContext\n}: CreateApwStorageOperationsParams): ApwStorageOperations => {\n    const context = getCmsContext();\n    /**\n     * Register Apw models.\n     */\n    createApwModels(context);\n\n    return {\n        ...createReviewerStorageOperations({ cms }),\n        ...createWorkflowStorageOperations({ cms }),\n        ...createContentReviewStorageOperations({ cms }),\n        ...createChangeRequestStorageOperations({ cms, getCmsContext }),\n        ...createCommentStorageOperations({\n            cms,\n            getCmsContext\n        })\n    };\n};\n"],"mappings":";;;;;;;;;;;;AAAA;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAOA;AACA;AACA;AACA;AACO,SAASA,cAAT,CAAwBC,KAAxB,EAAyCC,MAAzC,EAAgE;EACnE,uCAAY,IAAAC,aAAA,EAAKF,KAAL,EAAYC,MAAZ,CAAZ,GAAoCD,KAAK,CAACG,MAA1C;AACH;;AAEM,MAAMC,UAAU,GAAG,CAAC,IAAD,EAAO,WAAP,EAAoB,WAApB,EAAiC,SAAjC,CAAnB;;;AAEA,MAAMC,uBAAuB,GAAG,CAAC;EACpCC,GADoC;EAEpCC;AAFoC,CAAD,KAGuB;EAC1D,MAAMC,OAAO,GAAGD,aAAa,EAA7B;EACA;AACJ;AACA;;EACI,IAAAE,uBAAA,EAAgBD,OAAhB;EAEA,iFACO,IAAAE,0DAAA,EAAgC;IAAEJ;EAAF,CAAhC,CADP,GAEO,IAAAK,0DAAA,EAAgC;IAAEL;EAAF,CAAhC,CAFP,GAGO,IAAAM,oEAAA,EAAqC;IAAEN;EAAF,CAArC,CAHP,GAIO,IAAAO,oEAAA,EAAqC;IAAEP,GAAF;IAAOC;EAAP,CAArC,CAJP,GAKO,IAAAO,wDAAA,EAA+B;IAC9BR,GAD8B;IAE9BC;EAF8B,CAA/B,CALP;AAUH,CApBM"}

package/storageOperations/models/changeRequest.model.d.ts

@@ -1,2 +1,3 @@
 import { WorkflowModelDefinition } from "../../types";
+export declare const CHANGE_REQUEST_MODEL_ID = "apwChangeRequestModelDefinition";
 export declare const createChangeRequestModelDefinition: () => WorkflowModelDefinition;

package/storageOperations/models/changeRequest.model.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createChangeRequestModelDefinition = void 0;
+exports.createChangeRequestModelDefinition = exports.CHANGE_REQUEST_MODEL_ID = void 0;
 
 var _utils = require("./utils");
 
@@ -36,18 +36,23 @@ const stepField = () => (0, _utils.createModelField)({
   type: "text",
   parent: "changeRequest",
   validation: [{
-    name: "required",
-    message: "Value is required"
+    message: "`step` field value is required in changeRequest.",
+    name: "required"
   }]
 });
 
+const CHANGE_REQUEST_MODEL_ID = "apwChangeRequestModelDefinition";
+exports.CHANGE_REQUEST_MODEL_ID = CHANGE_REQUEST_MODEL_ID;
+
 const createChangeRequestModelDefinition = () => {
   return {
     name: "APW - Change Request",
-    modelId: "apwChangeRequestModelDefinition",
+    modelId: CHANGE_REQUEST_MODEL_ID,
     titleFieldId: "changeRequest_title",
     layout: [["changeRequest_body"], ["changeRequest_title"]],
-    fields: [bodyField(), titleField(), resolvedField(), mediaField(), stepField()]
+    fields: [bodyField(), titleField(), resolvedField(), mediaField(), stepField()],
+    description: "",
+    isPrivate: true
   };
 };
 

package/storageOperations/models/changeRequest.model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["changeRequest.model.ts"],"names":["bodyField","label","type","parent","titleField","resolvedField","mediaField","stepField","validation","name","message","createChangeRequestModelDefinition","modelId","titleFieldId","layout","fields"],"mappings":";;;;;;;AAAA;;AAGA,MAAMA,SAAS,GAAG,MACd,6BAAiB;AACbC,EAAAA,KAAK,EAAE,MADM;AAEbC,EAAAA,IAAI,EAAE,WAFO;AAGbC,EAAAA,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMC,UAAU,GAAG,MACf,6BAAiB;AACbH,EAAAA,KAAK,EAAE,OADM;AAEbC,EAAAA,IAAI,EAAE,MAFO;AAGbC,EAAAA,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAME,aAAa,GAAG,MAClB,6BAAiB;AACbJ,EAAAA,KAAK,EAAE,UADM;AAEbC,EAAAA,IAAI,EAAE,SAFO;AAGbC,EAAAA,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMG,UAAU,GAAG,MACf,6BAAiB;AACbL,EAAAA,KAAK,EAAE,OADM;AAEbC,EAAAA,IAAI,EAAE,MAFO;AAGbC,EAAAA,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMI,SAAS,GAAG,MACd,6BAAiB;AACbN,EAAAA,KAAK,EAAE,MADM;AAEbC,EAAAA,IAAI,EAAE,MAFO;AAGbC,EAAAA,MAAM,EAAE,eAHK;AAIbK,EAAAA,UAAU,EAAE,CACR;AACIC,IAAAA,IAAI,EAAE,UADV;AAEIC,IAAAA,OAAO,EAAE;AAFb,GADQ;AAJC,CAAjB,CADJ;;AAaO,MAAMC,kCAAkC,GAAG,MAA+B;AAC7E,SAAO;AACHF,IAAAA,IAAI,EAAE,sBADH;AAEHG,IAAAA,OAAO,EAAE,iCAFN;AAGHC,IAAAA,YAAY,EAAE,qBAHX;AAIHC,IAAAA,MAAM,EAAE,CAAC,CAAC,oBAAD,CAAD,EAAyB,CAAC,qBAAD,CAAzB,CAJL;AAKHC,IAAAA,MAAM,EAAE,CAACf,SAAS,EAAV,EAAcI,UAAU,EAAxB,EAA4BC,aAAa,EAAzC,EAA6CC,UAAU,EAAvD,EAA2DC,SAAS,EAApE;AALL,GAAP;AAOH,CARM","sourcesContent":["import { createModelField } from \"./utils\";\nimport { WorkflowModelDefinition } from \"~/types\";\n\nconst bodyField = () =>\n    createModelField({\n        label: \"Body\",\n        type: \"rich-text\",\n        parent: \"changeRequest\"\n    });\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        parent: \"changeRequest\"\n    });\n\nconst resolvedField = () =>\n    createModelField({\n        label: \"Resolved\",\n        type: \"boolean\",\n        parent: \"changeRequest\"\n    });\n\nconst mediaField = () =>\n    createModelField({\n        label: \"Media\",\n        type: \"file\",\n        parent: \"changeRequest\"\n    });\n\nconst stepField = () =>\n    createModelField({\n        label: \"Step\",\n        type: \"text\",\n        parent: \"changeRequest\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required\"\n            }\n        ]\n    });\n\nexport const createChangeRequestModelDefinition = (): WorkflowModelDefinition => {\n    return {\n        name: \"APW - Change Request\",\n        modelId: \"apwChangeRequestModelDefinition\",\n        titleFieldId: \"changeRequest_title\",\n        layout: [[\"changeRequest_body\"], [\"changeRequest_title\"]],\n        fields: [bodyField(), titleField(), resolvedField(), mediaField(), stepField()]\n    };\n};\n"]}
+{"version":3,"names":["bodyField","createModelField","label","type","parent","titleField","resolvedField","mediaField","stepField","validation","message","name","CHANGE_REQUEST_MODEL_ID","createChangeRequestModelDefinition","modelId","titleFieldId","layout","fields","description","isPrivate"],"sources":["changeRequest.model.ts"],"sourcesContent":["import { createModelField } from \"./utils\";\nimport { WorkflowModelDefinition } from \"~/types\";\n\nconst bodyField = () =>\n    createModelField({\n        label: \"Body\",\n        type: \"rich-text\",\n        parent: \"changeRequest\"\n    });\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        parent: \"changeRequest\"\n    });\n\nconst resolvedField = () =>\n    createModelField({\n        label: \"Resolved\",\n        type: \"boolean\",\n        parent: \"changeRequest\"\n    });\n\nconst mediaField = () =>\n    createModelField({\n        label: \"Media\",\n        type: \"file\",\n        parent: \"changeRequest\"\n    });\n\nconst stepField = () =>\n    createModelField({\n        label: \"Step\",\n        type: \"text\",\n        parent: \"changeRequest\",\n        validation: [\n            {\n                message: \"`step` field value is required in changeRequest.\",\n                name: \"required\"\n            }\n        ]\n    });\n\nexport const CHANGE_REQUEST_MODEL_ID = \"apwChangeRequestModelDefinition\";\n\nexport const createChangeRequestModelDefinition = (): WorkflowModelDefinition => {\n    return {\n        name: \"APW - Change Request\",\n        modelId: CHANGE_REQUEST_MODEL_ID,\n        titleFieldId: \"changeRequest_title\",\n        layout: [[\"changeRequest_body\"], [\"changeRequest_title\"]],\n        fields: [bodyField(), titleField(), resolvedField(), mediaField(), stepField()],\n        description: \"\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;;AAAA;;AAGA,MAAMA,SAAS,GAAG,MACd,IAAAC,uBAAA,EAAiB;EACbC,KAAK,EAAE,MADM;EAEbC,IAAI,EAAE,WAFO;EAGbC,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMC,UAAU,GAAG,MACf,IAAAJ,uBAAA,EAAiB;EACbC,KAAK,EAAE,OADM;EAEbC,IAAI,EAAE,MAFO;EAGbC,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAME,aAAa,GAAG,MAClB,IAAAL,uBAAA,EAAiB;EACbC,KAAK,EAAE,UADM;EAEbC,IAAI,EAAE,SAFO;EAGbC,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMG,UAAU,GAAG,MACf,IAAAN,uBAAA,EAAiB;EACbC,KAAK,EAAE,OADM;EAEbC,IAAI,EAAE,MAFO;EAGbC,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMI,SAAS,GAAG,MACd,IAAAP,uBAAA,EAAiB;EACbC,KAAK,EAAE,MADM;EAEbC,IAAI,EAAE,MAFO;EAGbC,MAAM,EAAE,eAHK;EAIbK,UAAU,EAAE,CACR;IACIC,OAAO,EAAE,kDADb;IAEIC,IAAI,EAAE;EAFV,CADQ;AAJC,CAAjB,CADJ;;AAaO,MAAMC,uBAAuB,GAAG,iCAAhC;;;AAEA,MAAMC,kCAAkC,GAAG,MAA+B;EAC7E,OAAO;IACHF,IAAI,EAAE,sBADH;IAEHG,OAAO,EAAEF,uBAFN;IAGHG,YAAY,EAAE,qBAHX;IAIHC,MAAM,EAAE,CAAC,CAAC,oBAAD,CAAD,EAAyB,CAAC,qBAAD,CAAzB,CAJL;IAKHC,MAAM,EAAE,CAACjB,SAAS,EAAV,EAAcK,UAAU,EAAxB,EAA4BC,aAAa,EAAzC,EAA6CC,UAAU,EAAvD,EAA2DC,SAAS,EAApE,CALL;IAMHU,WAAW,EAAE,EANV;IAOHC,SAAS,EAAE;EAPR,CAAP;AASH,CAVM"}

package/storageOperations/models/comment.model.d.ts

@@ -2,5 +2,6 @@ import { WorkflowModelDefinition } from "../../types";
 interface CreateCommentModelDefinitionParams {
     modelId: string;
 }
+export declare const COMMENT_MODEL_ID = "apwCommentModelDefinition";
 export declare const createCommentModelDefinition: ({ modelId }: CreateCommentModelDefinitionParams) => WorkflowModelDefinition;
 export {};

package/storageOperations/models/comment.model.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createCommentModelDefinition = void 0;
+exports.createCommentModelDefinition = exports.COMMENT_MODEL_ID = void 0;
 
 var _utils = require("./utils");
 
@@ -24,15 +24,36 @@ const changeRequestRef = modelId => (0, _utils.createModelField)({
   }
 });
 
+const stepField = () => (0, _utils.createModelField)({
+  label: "Step",
+  type: "text",
+  parent: "comment",
+  validation: [{
+    message: "`step` field value is required in comment.",
+    name: "required"
+  }]
+});
+
+const mediaField = () => (0, _utils.createModelField)({
+  label: "Media",
+  type: "file",
+  parent: "comment"
+});
+
+const COMMENT_MODEL_ID = "apwCommentModelDefinition";
+exports.COMMENT_MODEL_ID = COMMENT_MODEL_ID;
+
 const createCommentModelDefinition = ({
   modelId
 }) => {
   return {
     name: "APW - Comment",
-    modelId: "apwCommentModelDefinition",
+    modelId: COMMENT_MODEL_ID,
     titleFieldId: "displayName",
     layout: [["comment_body"], ["comment_displayName"]],
-    fields: [commentBody(), changeRequestRef(modelId)]
+    fields: [commentBody(), changeRequestRef(modelId), stepField(), mediaField()],
+    description: "",
+    isPrivate: true
   };
 };
 

package/storageOperations/models/comment.model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["comment.model.ts"],"names":["commentBody","label","type","parent","changeRequestRef","modelId","settings","models","createCommentModelDefinition","name","titleFieldId","layout","fields"],"mappings":";;;;;;;AAAA;;AAGA,MAAMA,WAAW,GAAG,MAChB,6BAAiB;AACbC,EAAAA,KAAK,EAAE,MADM;AAEbC,EAAAA,IAAI,EAAE,WAFO;AAGbC,EAAAA,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMC,gBAAgB,GAAIC,OAAD,IACrB,6BAAiB;AACbJ,EAAAA,KAAK,EAAE,gBADM;AAEbC,EAAAA,IAAI,EAAE,KAFO;AAGbC,EAAAA,MAAM,EAAE,SAHK;AAIbG,EAAAA,QAAQ,EAAE;AACNC,IAAAA,MAAM,EAAE,CACJ;AACIF,MAAAA;AADJ,KADI;AADF;AAJG,CAAjB,CADJ;;AAiBO,MAAMG,4BAA4B,GAAG,CAAC;AACzCH,EAAAA;AADyC,CAAD,KAEuB;AAC/D,SAAO;AACHI,IAAAA,IAAI,EAAE,eADH;AAEHJ,IAAAA,OAAO,EAAE,2BAFN;AAGHK,IAAAA,YAAY,EAAE,aAHX;AAIHC,IAAAA,MAAM,EAAE,CAAC,CAAC,cAAD,CAAD,EAAmB,CAAC,qBAAD,CAAnB,CAJL;AAKHC,IAAAA,MAAM,EAAE,CAACZ,WAAW,EAAZ,EAAgBI,gBAAgB,CAACC,OAAD,CAAhC;AALL,GAAP;AAOH,CAVM","sourcesContent":["import { createModelField } from \"./utils\";\nimport { WorkflowModelDefinition } from \"~/types\";\n\nconst commentBody = () =>\n    createModelField({\n        label: \"Body\",\n        type: \"rich-text\",\n        parent: \"comment\"\n    });\n\nconst changeRequestRef = (modelId: string) =>\n    createModelField({\n        label: \"Change Request\",\n        type: \"ref\",\n        parent: \"comment\",\n        settings: {\n            models: [\n                {\n                    modelId\n                }\n            ]\n        }\n    });\n\ninterface CreateCommentModelDefinitionParams {\n    modelId: string;\n}\nexport const createCommentModelDefinition = ({\n    modelId\n}: CreateCommentModelDefinitionParams): WorkflowModelDefinition => {\n    return {\n        name: \"APW - Comment\",\n        modelId: \"apwCommentModelDefinition\",\n        titleFieldId: \"displayName\",\n        layout: [[\"comment_body\"], [\"comment_displayName\"]],\n        fields: [commentBody(), changeRequestRef(modelId)]\n    };\n};\n"]}
+{"version":3,"names":["commentBody","createModelField","label","type","parent","changeRequestRef","modelId","settings","models","stepField","validation","message","name","mediaField","COMMENT_MODEL_ID","createCommentModelDefinition","titleFieldId","layout","fields","description","isPrivate"],"sources":["comment.model.ts"],"sourcesContent":["import { createModelField } from \"./utils\";\nimport { WorkflowModelDefinition } from \"~/types\";\n\nconst commentBody = () =>\n    createModelField({\n        label: \"Body\",\n        type: \"rich-text\",\n        parent: \"comment\"\n    });\n\nconst changeRequestRef = (modelId: string) =>\n    createModelField({\n        label: \"Change Request\",\n        type: \"ref\",\n        parent: \"comment\",\n        settings: {\n            models: [\n                {\n                    modelId\n                }\n            ]\n        }\n    });\n\nconst stepField = () =>\n    createModelField({\n        label: \"Step\",\n        type: \"text\",\n        parent: \"comment\",\n        validation: [\n            {\n                message: \"`step` field value is required in comment.\",\n                name: \"required\"\n            }\n        ]\n    });\n\nconst mediaField = () =>\n    createModelField({\n        label: \"Media\",\n        type: \"file\",\n        parent: \"comment\"\n    });\n\ninterface CreateCommentModelDefinitionParams {\n    modelId: string;\n}\n\nexport const COMMENT_MODEL_ID = \"apwCommentModelDefinition\";\n\nexport const createCommentModelDefinition = ({\n    modelId\n}: CreateCommentModelDefinitionParams): WorkflowModelDefinition => {\n    return {\n        name: \"APW - Comment\",\n        modelId: COMMENT_MODEL_ID,\n        titleFieldId: \"displayName\",\n        layout: [[\"comment_body\"], [\"comment_displayName\"]],\n        fields: [commentBody(), changeRequestRef(modelId), stepField(), mediaField()],\n        description: \"\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;;AAAA;;AAGA,MAAMA,WAAW,GAAG,MAChB,IAAAC,uBAAA,EAAiB;EACbC,KAAK,EAAE,MADM;EAEbC,IAAI,EAAE,WAFO;EAGbC,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAOA,MAAMC,gBAAgB,GAAIC,OAAD,IACrB,IAAAL,uBAAA,EAAiB;EACbC,KAAK,EAAE,gBADM;EAEbC,IAAI,EAAE,KAFO;EAGbC,MAAM,EAAE,SAHK;EAIbG,QAAQ,EAAE;IACNC,MAAM,EAAE,CACJ;MACIF;IADJ,CADI;EADF;AAJG,CAAjB,CADJ;;AAcA,MAAMG,SAAS,GAAG,MACd,IAAAR,uBAAA,EAAiB;EACbC,KAAK,EAAE,MADM;EAEbC,IAAI,EAAE,MAFO;EAGbC,MAAM,EAAE,SAHK;EAIbM,UAAU,EAAE,CACR;IACIC,OAAO,EAAE,4CADb;IAEIC,IAAI,EAAE;EAFV,CADQ;AAJC,CAAjB,CADJ;;AAaA,MAAMC,UAAU,GAAG,MACf,IAAAZ,uBAAA,EAAiB;EACbC,KAAK,EAAE,OADM;EAEbC,IAAI,EAAE,MAFO;EAGbC,MAAM,EAAE;AAHK,CAAjB,CADJ;;AAWO,MAAMU,gBAAgB,GAAG,2BAAzB;;;AAEA,MAAMC,4BAA4B,GAAG,CAAC;EACzCT;AADyC,CAAD,KAEuB;EAC/D,OAAO;IACHM,IAAI,EAAE,eADH;IAEHN,OAAO,EAAEQ,gBAFN;IAGHE,YAAY,EAAE,aAHX;IAIHC,MAAM,EAAE,CAAC,CAAC,cAAD,CAAD,EAAmB,CAAC,qBAAD,CAAnB,CAJL;IAKHC,MAAM,EAAE,CAAClB,WAAW,EAAZ,EAAgBK,gBAAgB,CAACC,OAAD,CAAhC,EAA2CG,SAAS,EAApD,EAAwDI,UAAU,EAAlE,CALL;IAMHM,WAAW,EAAE,EANV;IAOHC,SAAS,EAAE;EAPR,CAAP;AASH,CAZM"}

package/storageOperations/models/contentModelPluginFactory.d.ts

@@ -1,5 +1,5 @@
-import { CmsGroup } from "@webiny/api-headless-cms/content/plugins/CmsGroupPlugin";
-import { CmsModelPlugin } from "@webiny/api-headless-cms/content/plugins/CmsModelPlugin";
+import { CmsGroup } from "@webiny/api-headless-cms";
+import { CmsModelPlugin } from "@webiny/api-headless-cms";
 import { CmsModel } from "@webiny/api-headless-cms/types";
 declare type ModelDefinition = Omit<CmsModel, "locale" | "tenant" | "webinyVersion" | "group">;
 interface Params {

package/storageOperations/models/contentModelPluginFactory.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _CmsModelPlugin = require("@webiny/api-headless-cms/content/plugins/CmsModelPlugin");
+var _apiHeadlessCms = require("@webiny/api-headless-cms");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -22,7 +22,7 @@ const contentModelPluginFactory = params => {
     tenant,
     modelDefinition
   } = params;
-  return new _CmsModelPlugin.CmsModelPlugin(_objectSpread({
+  return new _apiHeadlessCms.CmsModelPlugin(_objectSpread({
     group,
     locale,
     tenant

package/storageOperations/models/contentModelPluginFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["contentModelPluginFactory.ts"],"names":["contentModelPluginFactory","params","group","locale","tenant","modelDefinition","CmsModelPlugin"],"mappings":";;;;;;;;;;;AACA;;;;;;AAiBA,MAAMA,yBAAyB,GAAIC,MAAD,IAAoC;AAClE,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,MAAT;AAAiBC,IAAAA,MAAjB;AAAyBC,IAAAA;AAAzB,MAA6CJ,MAAnD;AAEA,SAAO,IAAIK,8BAAJ;AACHJ,IAAAA,KADG;AAEHC,IAAAA,MAFG;AAGHC,IAAAA;AAHG,KAIAC,eAJA,EAAP;AAMH,CATD;;eAWeL,yB","sourcesContent":["import { CmsGroup } from \"@webiny/api-headless-cms/content/plugins/CmsGroupPlugin\";\nimport { CmsModelPlugin } from \"@webiny/api-headless-cms/content/plugins/CmsModelPlugin\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ntype ModelDefinition = Omit<CmsModel, \"locale\" | \"tenant\" | \"webinyVersion\" | \"group\">;\n\ninterface Params {\n    group: CmsGroup;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: ModelDefinition;\n}\n\nconst contentModelPluginFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return new CmsModelPlugin({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition\n    });\n};\n\nexport default contentModelPluginFactory;\n"]}
+{"version":3,"names":["contentModelPluginFactory","params","group","locale","tenant","modelDefinition","CmsModelPlugin"],"sources":["contentModelPluginFactory.ts"],"sourcesContent":["import { CmsGroup } from \"@webiny/api-headless-cms\";\nimport { CmsModelPlugin } from \"@webiny/api-headless-cms\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ntype ModelDefinition = Omit<CmsModel, \"locale\" | \"tenant\" | \"webinyVersion\" | \"group\">;\n\ninterface Params {\n    group: CmsGroup;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: ModelDefinition;\n}\n\nconst contentModelPluginFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return new CmsModelPlugin({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition\n    });\n};\n\nexport default contentModelPluginFactory;\n"],"mappings":";;;;;;;;;;;AACA;;;;;;AAiBA,MAAMA,yBAAyB,GAAIC,MAAD,IAAoC;EAClE,MAAM;IAAEC,KAAF;IAASC,MAAT;IAAiBC,MAAjB;IAAyBC;EAAzB,IAA6CJ,MAAnD;EAEA,OAAO,IAAIK,8BAAJ;IACHJ,KADG;IAEHC,MAFG;IAGHC;EAHG,GAIAC,eAJA,EAAP;AAMH,CATD;;eAWeL,yB"}

package/storageOperations/models/contentReview.model.d.ts

@@ -2,5 +2,6 @@ import { WorkflowModelDefinition } from "../../types";
 interface CreateContentReviewModelDefinitionParams {
     reviewerModelId: string;
 }
+export declare const CONTENT_REVIEW_MODEL_ID = "apwContentReviewModelDefinition";
 export declare const createContentReviewModelDefinition: ({ reviewerModelId }: CreateContentReviewModelDefinitionParams) => WorkflowModelDefinition;
 export {};

package/storageOperations/models/contentReview.model.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createContentReviewModelDefinition = void 0;
+exports.createContentReviewModelDefinition = exports.CONTENT_REVIEW_MODEL_ID = void 0;
 
 var _utils = require("./utils");
 
@@ -18,8 +18,8 @@ const contentField = fields => (0, _utils.createModelField)({
     fields
   },
   validation: [{
-    name: "required",
-    message: "Value is required."
+    message: "`content` field value is required in contentReview.",
+    name: "required"
   }]
 });
 
@@ -41,8 +41,18 @@ const contentStatus = () => (0, _utils.createModelField)({
     }]
   },
   validation: [{
-    name: "required",
-    message: "Value is required."
+    message: "`status` field value is required in contentReview.",
+    name: "required"
+  }]
+});
+
+const titleField = () => (0, _utils.createModelField)({
+  label: "Title",
+  type: "text",
+  parent: "contentReview",
+  validation: [{
+    message: "`title` field value is required in contentReview.",
+    name: "required"
   }]
 });
 
@@ -51,8 +61,18 @@ const contentIdField = () => (0, _utils.createModelField)({
   type: "text",
   parent: "contentReview Content",
   validation: [{
-    name: "required",
-    message: "Value is required."
+    message: "`id` field value is required in contentReview Content.",
+    name: "required"
+  }]
+});
+
+const contentWorkflowIdField = () => (0, _utils.createModelField)({
+  label: "Workflow Id",
+  type: "text",
+  parent: "contentReview Content",
+  validation: [{
+    message: "`workflowId` field value is required in contentReview Content.",
+    name: "required"
   }]
 });
 
@@ -71,16 +91,49 @@ const contentTypeField = () => (0, _utils.createModelField)({
     }]
   },
   validation: [{
-    name: "required",
-    message: "Value is required."
+    message: "`type` field value is required in contentReview Type.",
+    name: "required"
   }]
-}); // TODO: Find a way to store JSON value without "object" field.
-
+});
 
-const contentSettingsField = () => (0, _utils.createModelField)({
+const contentSettingsField = fields => (0, _utils.createModelField)({
   label: "Settings",
+  parent: "contentReview Content",
+  type: "object",
+  multipleValues: false,
+  settings: {
+    fields
+  }
+});
+
+const contentSettingsModelIdField = () => (0, _utils.createModelField)({
+  label: "Model Id",
+  parent: "contentReview Settings",
+  type: "text"
+});
+
+const scheduledActionIdField = () => (0, _utils.createModelField)({
+  label: "Scheduled action Id",
+  type: "text",
+  parent: "contentReview Content"
+});
+
+const contentScheduledOnField = () => (0, _utils.createModelField)({
+  label: "Scheduled on",
+  type: "datetime",
+  parent: "contentReview Content"
+});
+
+const contentScheduledByField = () => (0, _utils.createModelField)({
+  label: "Scheduled by",
+  type: "text",
+  parent: "contentReview Content"
+});
+
+const contentPublishedByField = () => (0, _utils.createModelField)({
+  label: "Published by",
   type: "text",
-  parent: "contentReview Settings"
+  parent: "contentReview Content"
 });
 
 const stepStatusField = () => ({
@@ -106,8 +159,8 @@ const stepStatusField = () => ({
   id: "contentReview_steps_status",
   type: "text",
   validation: [{
-    name: "required",
-    message: "Value is required."
+    message: "`status` field value is required in contentReview steps status.",
+    name: "required"
   }],
   fieldId: "status"
 });
@@ -117,11 +170,27 @@ const stepPendingChangeRequests = () => (0, _utils.createModelField)({
   type: "number",
   parent: "contentReview Step",
   validation: [{
-    name: "required",
-    message: "Value is required."
+    message: "`pendingChangeRequests` field value is required in contentReview step.",
+    name: "required"
   }]
 });
 
+const stepTotalComments = () => (0, _utils.createModelField)({
+  label: "Total comments",
+  type: "number",
+  parent: "contentReview Step",
+  validation: [{
+    message: "`totalComments` field value is required in contentReview step.",
+    name: "required"
+  }]
+});
+
+const latestCommentId = () => (0, _utils.createModelField)({
+  label: "Latest comment Id",
+  type: "text",
+  parent: "contentReview"
+});
+
 const stepSignOffProvidedOn = () => (0, _utils.createModelField)({
   label: "Sign off provided on",
   type: "datetime",
@@ -168,16 +237,19 @@ const stepsField = fields => ({
   }
 });
 
+const CONTENT_REVIEW_MODEL_ID = "apwContentReviewModelDefinition";
+exports.CONTENT_REVIEW_MODEL_ID = CONTENT_REVIEW_MODEL_ID;
+
 const createContentReviewModelDefinition = ({
   reviewerModelId
-}) => {
-  return {
-    name: "APW - Content Review",
-    modelId: "apwContentReviewModelDefinition",
-    titleFieldId: "content",
-    layout: [["contentReview_content"], ["contentReview_reviewRequestedBy"], ["contentReview_steps"], ["contentReview_changeRequested"]],
-    fields: [contentField([contentIdField(), contentTypeField(), contentSettingsField()]), contentStatus(), stepsField([(0, _workflow.stepTitleField)(), (0, _workflow.stepTypeField)(), (0, _workflow.stepSlugField)(), (0, _workflow.stepReviewersField)(reviewerModelId), stepStatusField(), stepPendingChangeRequests(), stepSignOffProvidedOn(), stepSignOffProvidedBy([stepSignOffProvidedById(), stepSignOffProvidedByDisplayName()])])]
-  };
-};
+}) => ({
+  name: "APW - Content Review",
+  modelId: CONTENT_REVIEW_MODEL_ID,
+  titleFieldId: "content",
+  layout: [["contentReview_content"], ["contentReview_reviewRequestedBy"], ["contentReview_steps"], ["contentReview_changeRequested"]],
+  fields: [titleField(), contentField([contentIdField(), contentTypeField(), contentWorkflowIdField(), contentSettingsField([contentSettingsModelIdField()]), contentScheduledOnField(), contentScheduledByField(), scheduledActionIdField(), contentPublishedByField()]), contentStatus(), stepsField([(0, _workflow.stepTitleField)(), (0, _workflow.stepTypeField)(), (0, _workflow.stepIdField)(), (0, _workflow.stepReviewersField)(reviewerModelId), stepStatusField(), stepPendingChangeRequests(), stepTotalComments(), stepSignOffProvidedOn(), stepSignOffProvidedBy([stepSignOffProvidedById(), stepSignOffProvidedByDisplayName()])]), latestCommentId()],
+  description: "",
+  isPrivate: true
+});
 
 exports.createContentReviewModelDefinition = createContentReviewModelDefinition;