@webiny/api-apw 5.39.0-beta.0 → 5.39.0-beta.2

package/scheduler/handlers/scheduleAction/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_utils","require","_scheduleAction","_handlerAws","InvocationTypes","exports","log","console","createScheduleActionLambda","params","cwClient","cloudWatchEventClient","storageOperations","handlers","createRawEventHandler","payload","context","lambdaContext","eventContext","locale","tenant","invocationType","SCHEDULED","executeTask","args","lambdaName","executeAction","handlerClient","currentTask","getCurrentTask","where","nextItem","list","sort","limit","nextTaskDatetime","data","datetime","currentTaskDatetime","isDateTimeInNextCentury","shouldScheduleTask","futureDatetime","moveDateTimeToNextCentury","update","item","_objectSpread2","default","input","shouldRestoreDatetime","restoreDateTime","task","scheduleLambdaExecution","invokedFunctionArn","updateCurrentTask","ex","error","JSON","stringify","message","code","scheduleActionHandlerPlugins","config","basePlugins"],"sources":["index.ts"],"sourcesContent":["/**\n * This logic/file should be moved somewhere else as it is relying on AWS specific stuff.\n */\nimport { ApwScheduleActionStorageOperations } from \"~/scheduler/types\";\nimport {\n    isDateTimeInNextCentury,\n    moveDateTimeToNextCentury,\n    shouldRestoreDatetime,\n    basePlugins\n} from \"~/scheduler/handlers/utils\";\nimport {\n    executeTask,\n    shouldScheduleTask,\n    restoreDateTime,\n    scheduleLambdaExecution\n} from \"./scheduleAction.utils\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\n\nexport enum InvocationTypes {\n    SCHEDULED = \"scheduled\"\n}\n\nexport interface HandlerArgs {\n    datetime: string;\n    tenant: string;\n    locale: string;\n    invocationType?: InvocationTypes;\n    futureDatetime?: string;\n}\n\nexport interface Configuration {\n    cwClient: any;\n    storageOperations: ApwScheduleActionStorageOperations;\n    handlers: {\n        executeAction: string;\n    };\n}\n\nconst log = console.log;\n\n/**\n * Handler that creates a cloudwatch event rule for the schedule action workflow.\n */\nconst createScheduleActionLambda = (params: Configuration) => {\n    const { cwClient: cloudWatchEventClient, storageOperations, handlers } = params;\n\n    return createRawEventHandler<HandlerArgs>(\n        async ({ payload, context, lambdaContext: eventContext }) => {\n            try {\n                const { locale, tenant, invocationType } = payload;\n                /**\n                 * If invocationType is \"scheduled\", execute the action.\n                 */\n                if (invocationType === InvocationTypes.SCHEDULED) {\n                    await executeTask({\n                        args: payload,\n                        lambdaName: handlers.executeAction,\n                        handlerClient: context.handlerClient,\n                        storageOperations\n                    });\n                }\n\n                /**\n                 * Get current scheduled task from the DB.\n                 */\n                const currentTask = await storageOperations.getCurrentTask({\n                    where: {\n                        tenant,\n                        locale\n                    }\n                });\n\n                /**\n                 * Get next task from the DB.\n                 */\n                const [[nextItem]] = await storageOperations.list({\n                    where: {\n                        tenant,\n                        locale\n                    },\n                    sort: [\"datetime_ASC\"],\n                    limit: 1\n                });\n\n                if (!nextItem) {\n                    log(`No item found.`);\n                    return;\n                }\n\n                const nextTaskDatetime = nextItem.data.datetime;\n                const currentTaskDatetime = currentTask && currentTask.data.datetime;\n\n                if (isDateTimeInNextCentury(nextTaskDatetime)) {\n                    log(`Already processed the task.`);\n                    return;\n                }\n\n                if (!shouldScheduleTask(nextTaskDatetime, currentTaskDatetime)) {\n                    log(`Already scheduled the task.`);\n                    return;\n                }\n\n                const futureDatetime = moveDateTimeToNextCentury(nextItem.data.datetime);\n                /**\n                 * Update \"datetime\" to a future date to mark it as scheduled.\n                 */\n                log(`Update task's datetime to `, futureDatetime);\n                await storageOperations.update({\n                    item: {\n                        ...nextItem,\n                        data: { ...nextItem.data, datetime: futureDatetime }\n                    },\n                    input: { ...nextItem.data, datetime: futureDatetime }\n                });\n                /**\n                 * Restore \"datetime\" of current task so that it can be schedule in next cycle.\n                 */\n                if (\n                    currentTaskDatetime &&\n                    shouldRestoreDatetime({\n                        invocationType,\n                        datetime: currentTaskDatetime\n                    })\n                ) {\n                    await restoreDateTime({\n                        tenant,\n                        locale,\n                        task: currentTask,\n                        storageOperations\n                    });\n                }\n                /**\n                 * Schedule Lambda\n                 */\n                log(`Schedule Lambda Execution...`);\n                await scheduleLambdaExecution({\n                    cloudWatchEventClient,\n                    invokedFunctionArn: eventContext.invokedFunctionArn,\n                    datetime: nextItem.data.datetime,\n                    futureDatetime: futureDatetime,\n                    tenant,\n                    locale\n                });\n                /**\n                 * Update current task.\n                 */\n                await storageOperations.updateCurrentTask({ item: nextItem });\n            } catch (ex) {\n                console.error(\n                    \"[HANDLER_CREATE_RULE] => \",\n                    JSON.stringify({\n                        message: ex.message,\n                        code: ex.code,\n                        data: ex.data\n                    })\n                );\n                // TODO: Handler error. Maybe save it into DB.\n            }\n        }\n    );\n};\n\nexport const scheduleActionHandlerPlugins = (config: Configuration) => [\n    basePlugins(),\n    createScheduleActionLambda(config)\n];\n"],"mappings":";;;;;;;;AAIA,IAAAA,MAAA,GAAAC,OAAA;AAMA,IAAAC,eAAA,GAAAD,OAAA;AAMA,IAAAE,WAAA,GAAAF,OAAA;AAhBA;AACA;AACA;AAFA,IAkBYG,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAAAC,OAAA,CAAAD,eAAA,GAAAA,eAAA;AAoB3B,MAAME,GAAG,GAAGC,OAAO,CAACD,GAAG;;AAEvB;AACA;AACA;AACA,MAAME,0BAA0B,GAAIC,MAAqB,IAAK;EAC1D,MAAM;IAAEC,QAAQ,EAAEC,qBAAqB;IAAEC,iBAAiB;IAAEC;EAAS,CAAC,GAAGJ,MAAM;EAE/E,OAAO,IAAAK,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC,OAAO;IAAEC,aAAa,EAAEC;EAAa,CAAC,KAAK;IACzD,IAAI;MACA,MAAM;QAAEC,MAAM;QAAEC,MAAM;QAAEC;MAAe,CAAC,GAAGN,OAAO;MAClD;AAChB;AACA;MACgB,IAAIM,cAAc,KAAKjB,eAAe,CAACkB,SAAS,EAAE;QAC9C,MAAM,IAAAC,2BAAW,EAAC;UACdC,IAAI,EAAET,OAAO;UACbU,UAAU,EAAEZ,QAAQ,CAACa,aAAa;UAClCC,aAAa,EAAEX,OAAO,CAACW,aAAa;UACpCf;QACJ,CAAC,CAAC;MACN;;MAEA;AAChB;AACA;MACgB,MAAMgB,WAAW,GAAG,MAAMhB,iBAAiB,CAACiB,cAAc,CAAC;QACvDC,KAAK,EAAE;UACHV,MAAM;UACND;QACJ;MACJ,CAAC,CAAC;;MAEF;AAChB;AACA;MACgB,MAAM,CAAC,CAACY,QAAQ,CAAC,CAAC,GAAG,MAAMnB,iBAAiB,CAACoB,IAAI,CAAC;QAC9CF,KAAK,EAAE;UACHV,MAAM;UACND;QACJ,CAAC;QACDc,IAAI,EAAE,CAAC,cAAc,CAAC;QACtBC,KAAK,EAAE;MACX,CAAC,CAAC;MAEF,IAAI,CAACH,QAAQ,EAAE;QACXzB,GAAG,CAAE,gBAAe,CAAC;QACrB;MACJ;MAEA,MAAM6B,gBAAgB,GAAGJ,QAAQ,CAACK,IAAI,CAACC,QAAQ;MAC/C,MAAMC,mBAAmB,GAAGV,WAAW,IAAIA,WAAW,CAACQ,IAAI,CAACC,QAAQ;MAEpE,IAAI,IAAAE,8BAAuB,EAACJ,gBAAgB,CAAC,EAAE;QAC3C7B,GAAG,CAAE,6BAA4B,CAAC;QAClC;MACJ;MAEA,IAAI,CAAC,IAAAkC,kCAAkB,EAACL,gBAAgB,EAAEG,mBAAmB,CAAC,EAAE;QAC5DhC,GAAG,CAAE,6BAA4B,CAAC;QAClC;MACJ;MAEA,MAAMmC,cAAc,GAAG,IAAAC,gCAAyB,EAACX,QAAQ,CAACK,IAAI,CAACC,QAAQ,CAAC;MACxE;AAChB;AACA;MACgB/B,GAAG,CAAE,4BAA2B,EAAEmC,cAAc,CAAC;MACjD,MAAM7B,iBAAiB,CAAC+B,MAAM,CAAC;QAC3BC,IAAI,MAAAC,cAAA,CAAAC,OAAA,MAAAD,cAAA,CAAAC,OAAA,MACGf,QAAQ;UACXK,IAAI,MAAAS,cAAA,CAAAC,OAAA,MAAAD,cAAA,CAAAC,OAAA,MAAOf,QAAQ,CAACK,IAAI;YAAEC,QAAQ,EAAEI;UAAc;QAAE,EACvD;QACDM,KAAK,MAAAF,cAAA,CAAAC,OAAA,MAAAD,cAAA,CAAAC,OAAA,MAAOf,QAAQ,CAACK,IAAI;UAAEC,QAAQ,EAAEI;QAAc;MACvD,CAAC,CAAC;MACF;AAChB;AACA;MACgB,IACIH,mBAAmB,IACnB,IAAAU,4BAAqB,EAAC;QAClB3B,cAAc;QACdgB,QAAQ,EAAEC;MACd,CAAC,CAAC,EACJ;QACE,MAAM,IAAAW,+BAAe,EAAC;UAClB7B,MAAM;UACND,MAAM;UACN+B,IAAI,EAAEtB,WAAW;UACjBhB;QACJ,CAAC,CAAC;MACN;MACA;AAChB;AACA;MACgBN,GAAG,CAAE,8BAA6B,CAAC;MACnC,MAAM,IAAA6C,uCAAuB,EAAC;QAC1BxC,qBAAqB;QACrByC,kBAAkB,EAAElC,YAAY,CAACkC,kBAAkB;QACnDf,QAAQ,EAAEN,QAAQ,CAACK,IAAI,CAACC,QAAQ;QAChCI,cAAc,EAAEA,cAAc;QAC9BrB,MAAM;QACND;MACJ,CAAC,CAAC;MACF;AAChB;AACA;MACgB,MAAMP,iBAAiB,CAACyC,iBAAiB,CAAC;QAAET,IAAI,EAAEb;MAAS,CAAC,CAAC;IACjE,CAAC,CAAC,OAAOuB,EAAE,EAAE;MACT/C,OAAO,CAACgD,KAAK,CACT,2BAA2B,EAC3BC,IAAI,CAACC,SAAS,CAAC;QACXC,OAAO,EAAEJ,EAAE,CAACI,OAAO;QACnBC,IAAI,EAAEL,EAAE,CAACK,IAAI;QACbvB,IAAI,EAAEkB,EAAE,CAAClB;MACb,CAAC,CACL,CAAC;MACD;IACJ;EACJ,CACJ,CAAC;AACL,CAAC;;AAEM,MAAMwB,4BAA4B,GAAIC,MAAqB,IAAK,CACnE,IAAAC,kBAAW,EAAC,CAAC,EACbtD,0BAA0B,CAACqD,MAAM,CAAC,CACrC;AAACxD,OAAA,CAAAuD,4BAAA,GAAAA,4BAAA"}
+{"version":3,"names":["_utils","require","_scheduleAction","_handlerAws","InvocationTypes","exports","log","console","createScheduleActionLambda","params","cwClient","cloudWatchEventClient","storageOperations","handlers","createRawEventHandler","payload","context","lambdaContext","eventContext","locale","tenant","invocationType","SCHEDULED","executeTask","args","lambdaName","executeAction","handlerClient","currentTask","getCurrentTask","where","nextItem","list","sort","limit","nextTaskDatetime","data","datetime","currentTaskDatetime","isDateTimeInNextCentury","shouldScheduleTask","futureDatetime","moveDateTimeToNextCentury","update","item","input","shouldRestoreDatetime","restoreDateTime","task","scheduleLambdaExecution","invokedFunctionArn","updateCurrentTask","ex","error","JSON","stringify","message","code","scheduleActionHandlerPlugins","config","basePlugins"],"sources":["index.ts"],"sourcesContent":["/**\n * This logic/file should be moved somewhere else as it is relying on AWS specific stuff.\n */\nimport { ApwScheduleActionStorageOperations } from \"~/scheduler/types\";\nimport {\n    isDateTimeInNextCentury,\n    moveDateTimeToNextCentury,\n    shouldRestoreDatetime,\n    basePlugins\n} from \"~/scheduler/handlers/utils\";\nimport {\n    executeTask,\n    shouldScheduleTask,\n    restoreDateTime,\n    scheduleLambdaExecution\n} from \"./scheduleAction.utils\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\n\nexport enum InvocationTypes {\n    SCHEDULED = \"scheduled\"\n}\n\nexport interface HandlerArgs {\n    datetime: string;\n    tenant: string;\n    locale: string;\n    invocationType?: InvocationTypes;\n    futureDatetime?: string;\n}\n\nexport interface Configuration {\n    cwClient: any;\n    storageOperations: ApwScheduleActionStorageOperations;\n    handlers: {\n        executeAction: string;\n    };\n}\n\nconst log = console.log;\n\n/**\n * Handler that creates a cloudwatch event rule for the schedule action workflow.\n */\nconst createScheduleActionLambda = (params: Configuration) => {\n    const { cwClient: cloudWatchEventClient, storageOperations, handlers } = params;\n\n    return createRawEventHandler<HandlerArgs>(\n        async ({ payload, context, lambdaContext: eventContext }) => {\n            try {\n                const { locale, tenant, invocationType } = payload;\n                /**\n                 * If invocationType is \"scheduled\", execute the action.\n                 */\n                if (invocationType === InvocationTypes.SCHEDULED) {\n                    await executeTask({\n                        args: payload,\n                        lambdaName: handlers.executeAction,\n                        handlerClient: context.handlerClient,\n                        storageOperations\n                    });\n                }\n\n                /**\n                 * Get current scheduled task from the DB.\n                 */\n                const currentTask = await storageOperations.getCurrentTask({\n                    where: {\n                        tenant,\n                        locale\n                    }\n                });\n\n                /**\n                 * Get next task from the DB.\n                 */\n                const [[nextItem]] = await storageOperations.list({\n                    where: {\n                        tenant,\n                        locale\n                    },\n                    sort: [\"datetime_ASC\"],\n                    limit: 1\n                });\n\n                if (!nextItem) {\n                    log(`No item found.`);\n                    return;\n                }\n\n                const nextTaskDatetime = nextItem.data.datetime;\n                const currentTaskDatetime = currentTask && currentTask.data.datetime;\n\n                if (isDateTimeInNextCentury(nextTaskDatetime)) {\n                    log(`Already processed the task.`);\n                    return;\n                }\n\n                if (!shouldScheduleTask(nextTaskDatetime, currentTaskDatetime)) {\n                    log(`Already scheduled the task.`);\n                    return;\n                }\n\n                const futureDatetime = moveDateTimeToNextCentury(nextItem.data.datetime);\n                /**\n                 * Update \"datetime\" to a future date to mark it as scheduled.\n                 */\n                log(`Update task's datetime to `, futureDatetime);\n                await storageOperations.update({\n                    item: {\n                        ...nextItem,\n                        data: { ...nextItem.data, datetime: futureDatetime }\n                    },\n                    input: { ...nextItem.data, datetime: futureDatetime }\n                });\n                /**\n                 * Restore \"datetime\" of current task so that it can be schedule in next cycle.\n                 */\n                if (\n                    currentTaskDatetime &&\n                    shouldRestoreDatetime({\n                        invocationType,\n                        datetime: currentTaskDatetime\n                    })\n                ) {\n                    await restoreDateTime({\n                        tenant,\n                        locale,\n                        task: currentTask,\n                        storageOperations\n                    });\n                }\n                /**\n                 * Schedule Lambda\n                 */\n                log(`Schedule Lambda Execution...`);\n                await scheduleLambdaExecution({\n                    cloudWatchEventClient,\n                    invokedFunctionArn: eventContext.invokedFunctionArn,\n                    datetime: nextItem.data.datetime,\n                    futureDatetime: futureDatetime,\n                    tenant,\n                    locale\n                });\n                /**\n                 * Update current task.\n                 */\n                await storageOperations.updateCurrentTask({ item: nextItem });\n            } catch (ex) {\n                console.error(\n                    \"[HANDLER_CREATE_RULE] => \",\n                    JSON.stringify({\n                        message: ex.message,\n                        code: ex.code,\n                        data: ex.data\n                    })\n                );\n                // TODO: Handler error. Maybe save it into DB.\n            }\n        }\n    );\n};\n\nexport const scheduleActionHandlerPlugins = (config: Configuration) => [\n    basePlugins(),\n    createScheduleActionLambda(config)\n];\n"],"mappings":"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"}

package/scheduler/handlers/scheduleAction/scheduleAction.utils.js

@@ -1,16 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.restoreDateTime = exports.executeTask = void 0;
 exports.scheduleLambdaExecution = scheduleLambdaExecution;
 exports.shouldScheduleTask = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _utils = require("../utils");
 var _index = require("./index");
-var _clientCloudwatchEvents = require("@aws-sdk/client-cloudwatch-events");
+var _clientCloudwatch = require("@webiny/aws-sdk/client-cloudwatch");
 const log = console.log;
 /**
  * Current API limit/quota for Cloudwatch events is sufficient for now. But, we should watch for it;
@@ -32,7 +30,7 @@ async function scheduleLambdaExecution({
   /**
    * Remove the target
    */
-  const removeTargetsCommand = new _clientCloudwatchEvents.RemoveTargetsCommand({
+  const removeTargetsCommand = new _clientCloudwatch.RemoveTargetsCommand({
     Rule: eventRuleName,
     Ids: [eventTargetId]
   });
@@ -47,7 +45,7 @@ async function scheduleLambdaExecution({
   /**
    * Delete the Rule
    */
-  const deleteRuleCommand = new _clientCloudwatchEvents.DeleteRuleCommand({
+  const deleteRuleCommand = new _clientCloudwatch.DeleteRuleCommand({
     Name: eventRuleName
   });
   await cloudWatchEventClient.send(deleteRuleCommand);
@@ -64,11 +62,11 @@ async function scheduleLambdaExecution({
     State: "ENABLED",
     Description: `Enable us to schedule an action in publishing workflow at a particular datetime`
   };
-  await cloudWatchEventClient.send(new _clientCloudwatchEvents.PutRuleCommand(ruleParams));
+  await cloudWatchEventClient.send(new _clientCloudwatch.PutRuleCommand(ruleParams));
   /**
    * Add lambda as target for the rule.
    */
-  await cloudWatchEventClient.send(new _clientCloudwatchEvents.PutTargetsCommand({
+  await cloudWatchEventClient.send(new _clientCloudwatch.PutTargetsCommand({
     Rule: eventRuleName,
     Targets: [{
       Arn: invokedFunctionArn,
@@ -104,14 +102,17 @@ const restoreDateTime = async ({
   if (item) {
     const newDateTime = (0, _utils.moveDateTimeToCurrentCentury)(item.data.datetime);
     await storageOperations.update({
-      item: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-        data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item.data), {}, {
+      item: {
+        ...item,
+        data: {
+          ...item.data,
           datetime: newDateTime
-        })
-      }),
-      input: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item.data), {}, {
+        }
+      },
+      input: {
+        ...item.data,
         datetime: newDateTime
-      })
+      }
     });
   }
 };

package/scheduler/handlers/scheduleAction/scheduleAction.utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["_utils","require","_index","_clientCloudwatchEvents","log","console","scheduleLambdaExecution","cloudWatchEventClient","invokedFunctionArn","datetime","futureDatetime","tenant","locale","eventTargetId","eventRuleName","getApwSettings","removeTargetsCommand","RemoveTargetsCommand","Rule","Ids","removeTargetsResponse","send","FailedEntryCount","info","FailedEntries","deleteRuleCommand","DeleteRuleCommand","Name","cronExpression","dateTimeToCronExpression","ruleParams","ScheduleExpression","State","Description","PutRuleCommand","PutTargetsCommand","Targets","Arn","Id","Input","JSON","stringify","invocationType","InvocationTypes","SCHEDULED","shouldScheduleTask","nextTaskDatetime","currentTaskDatetime","exports","restoreDateTime","task","currentTask","storageOperations","id","item","get","where","newDateTime","moveDateTimeToCurrentCentury","data","update","_objectSpread2","default","input","executeTask","args","lambdaName","handlerClient","Date","toISOString","invoke","name","payload","await","deleteCurrentTask","e","error"],"sources":["scheduleAction.utils.ts"],"sourcesContent":["import { dateTimeToCronExpression, moveDateTimeToCurrentCentury } from \"~/scheduler/handlers/utils\";\nimport { ApwScheduleAction } from \"~/scheduler/types\";\nimport {\n    HandlerArgs,\n    InvocationTypes,\n    Configuration\n} from \"~/scheduler/handlers/scheduleAction/index\";\nimport {\n    DeleteRuleCommand,\n    RemoveTargetsCommand,\n    PutTargetsCommand,\n    PutRuleCommand\n} from \"@aws-sdk/client-cloudwatch-events\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport { getApwSettings } from \"~/scheduler/handlers/utils\";\n\nconst log = console.log;\n\ninterface ScheduleLambdaExecutionParams extends Omit<HandlerArgs, \"invocationType\"> {\n    cloudWatchEventClient: any;\n    invokedFunctionArn: string;\n}\n\n/**\n * Current API limit/quota for Cloudwatch events is sufficient for now. But, we should watch for it;\n * in case of scheduling becoming the most frequently used feature.\n * https://aws.amazon.com/about-aws/whats-new/2017/07/cloudwatch-events-increases-rules-and-api-requests-limits/\n */\nexport async function scheduleLambdaExecution({\n    cloudWatchEventClient,\n    invokedFunctionArn,\n    datetime,\n    futureDatetime,\n    tenant,\n    locale\n}: ScheduleLambdaExecutionParams) {\n    const { eventTargetId, eventRuleName } = await getApwSettings();\n    /**\n     * Remove the target\n     */\n    const removeTargetsCommand = new RemoveTargetsCommand({\n        Rule: eventRuleName,\n        Ids: [eventTargetId]\n    });\n    const removeTargetsResponse = await cloudWatchEventClient.send(removeTargetsCommand);\n    /**\n     * Log error.\n     */\n    if (\n        typeof removeTargetsResponse.FailedEntryCount === \"number\" &&\n        removeTargetsResponse.FailedEntryCount !== 0\n    ) {\n        console.info(\"Failed in removing the targets!\");\n        console.info(removeTargetsResponse.FailedEntries);\n    }\n    /**\n     * Delete the Rule\n     */\n    const deleteRuleCommand = new DeleteRuleCommand({\n        Name: eventRuleName\n    });\n    await cloudWatchEventClient.send(deleteRuleCommand);\n\n    /**\n     * Create a new one.\n     * Min  H   D   M   DW  Y\n     * 20   10  10  03  *   2022\n     */\n    const cronExpression = dateTimeToCronExpression(datetime);\n\n    const ruleParams = {\n        Name: eventRuleName,\n        ScheduleExpression: `cron(${cronExpression})`,\n        State: \"ENABLED\",\n        Description: `Enable us to schedule an action in publishing workflow at a particular datetime`\n    };\n\n    await cloudWatchEventClient.send(new PutRuleCommand(ruleParams));\n    /**\n     * Add lambda as target for the rule.\n     */\n    await cloudWatchEventClient.send(\n        new PutTargetsCommand({\n            Rule: eventRuleName,\n            Targets: [\n                {\n                    Arn: invokedFunctionArn,\n                    Id: eventTargetId,\n                    Input: JSON.stringify({\n                        datetime: datetime,\n                        tenant: tenant,\n                        locale: locale,\n                        invocationType: InvocationTypes.SCHEDULED,\n                        futureDatetime: futureDatetime\n                    } as HandlerArgs)\n                }\n            ]\n        })\n    );\n}\n\nexport const shouldScheduleTask = (\n    nextTaskDatetime: string,\n    currentTaskDatetime: string | null\n): boolean => {\n    return !currentTaskDatetime || nextTaskDatetime < currentTaskDatetime;\n};\n\ninterface RestoreDateTimeParams\n    extends Pick<Configuration, \"storageOperations\">,\n        Pick<HandlerArgs, \"tenant\" | \"locale\"> {\n    task: ApwScheduleAction;\n}\n\nexport const restoreDateTime = async ({\n    locale,\n    tenant,\n    task: currentTask,\n    storageOperations\n}: RestoreDateTimeParams): Promise<void> => {\n    log(`Mark task \"${currentTask.id}\" as undone by restoring original \"datetime\".`);\n    const item = await storageOperations.get({\n        where: {\n            tenant,\n            locale,\n            id: currentTask.id\n        }\n    });\n    if (item) {\n        const newDateTime = moveDateTimeToCurrentCentury(item.data.datetime);\n        await storageOperations.update({\n            item: {\n                ...item,\n                data: { ...item.data, datetime: newDateTime }\n            },\n            input: { ...item.data, datetime: newDateTime }\n        });\n    }\n};\n\ninterface ExecuteTaskParams\n    extends Pick<ClientContext, \"handlerClient\">,\n        Pick<Configuration, \"storageOperations\"> {\n    args: HandlerArgs;\n    lambdaName: string;\n}\n\nexport const executeTask = async ({\n    args,\n    lambdaName,\n    handlerClient,\n    storageOperations\n}: ExecuteTaskParams): Promise<void> => {\n    log(`Executing task at: `, new Date().toISOString());\n\n    if (typeof handlerClient.invoke === \"function\") {\n        await handlerClient.invoke({\n            name: lambdaName,\n            payload: {\n                futureDatetime: args.futureDatetime,\n                datetime: args.datetime,\n                tenant: args.tenant,\n                locale: args.locale\n            },\n            await: false\n        });\n    } else {\n        console.log(`context.handlerClient.invoke is not a function!`);\n    }\n\n    /**\n     * Delete current schedule Task. So that, we can schedule a new one later.\n     */\n    try {\n        await storageOperations.deleteCurrentTask({\n            tenant: args.tenant,\n            locale: args.locale\n        });\n    } catch (e) {\n        console.error(e);\n    }\n};\n"],"mappings":"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"}
+{"version":3,"names":["_utils","require","_index","_clientCloudwatch","log","console","scheduleLambdaExecution","cloudWatchEventClient","invokedFunctionArn","datetime","futureDatetime","tenant","locale","eventTargetId","eventRuleName","getApwSettings","removeTargetsCommand","RemoveTargetsCommand","Rule","Ids","removeTargetsResponse","send","FailedEntryCount","info","FailedEntries","deleteRuleCommand","DeleteRuleCommand","Name","cronExpression","dateTimeToCronExpression","ruleParams","ScheduleExpression","State","Description","PutRuleCommand","PutTargetsCommand","Targets","Arn","Id","Input","JSON","stringify","invocationType","InvocationTypes","SCHEDULED","shouldScheduleTask","nextTaskDatetime","currentTaskDatetime","exports","restoreDateTime","task","currentTask","storageOperations","id","item","get","where","newDateTime","moveDateTimeToCurrentCentury","data","update","input","executeTask","args","lambdaName","handlerClient","Date","toISOString","invoke","name","payload","await","deleteCurrentTask","e","error"],"sources":["scheduleAction.utils.ts"],"sourcesContent":["import { dateTimeToCronExpression, moveDateTimeToCurrentCentury } from \"~/scheduler/handlers/utils\";\nimport { ApwScheduleAction } from \"~/scheduler/types\";\nimport {\n    HandlerArgs,\n    InvocationTypes,\n    Configuration\n} from \"~/scheduler/handlers/scheduleAction/index\";\nimport {\n    DeleteRuleCommand,\n    RemoveTargetsCommand,\n    PutTargetsCommand,\n    PutRuleCommand,\n    PutRuleCommandInput\n} from \"@webiny/aws-sdk/client-cloudwatch\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport { getApwSettings } from \"~/scheduler/handlers/utils\";\n\nconst log = console.log;\n\ninterface ScheduleLambdaExecutionParams extends Omit<HandlerArgs, \"invocationType\"> {\n    cloudWatchEventClient: any;\n    invokedFunctionArn: string;\n}\n\n/**\n * Current API limit/quota for Cloudwatch events is sufficient for now. But, we should watch for it;\n * in case of scheduling becoming the most frequently used feature.\n * https://aws.amazon.com/about-aws/whats-new/2017/07/cloudwatch-events-increases-rules-and-api-requests-limits/\n */\nexport async function scheduleLambdaExecution({\n    cloudWatchEventClient,\n    invokedFunctionArn,\n    datetime,\n    futureDatetime,\n    tenant,\n    locale\n}: ScheduleLambdaExecutionParams) {\n    const { eventTargetId, eventRuleName } = await getApwSettings();\n    /**\n     * Remove the target\n     */\n    const removeTargetsCommand = new RemoveTargetsCommand({\n        Rule: eventRuleName,\n        Ids: [eventTargetId]\n    });\n    const removeTargetsResponse = await cloudWatchEventClient.send(removeTargetsCommand);\n    /**\n     * Log error.\n     */\n    if (\n        typeof removeTargetsResponse.FailedEntryCount === \"number\" &&\n        removeTargetsResponse.FailedEntryCount !== 0\n    ) {\n        console.info(\"Failed in removing the targets!\");\n        console.info(removeTargetsResponse.FailedEntries);\n    }\n    /**\n     * Delete the Rule\n     */\n    const deleteRuleCommand = new DeleteRuleCommand({\n        Name: eventRuleName\n    });\n    await cloudWatchEventClient.send(deleteRuleCommand);\n\n    /**\n     * Create a new one.\n     * Min  H   D   M   DW  Y\n     * 20   10  10  03  *   2022\n     */\n    const cronExpression = dateTimeToCronExpression(datetime);\n\n    const ruleParams: PutRuleCommandInput = {\n        Name: eventRuleName,\n        ScheduleExpression: `cron(${cronExpression})`,\n        State: \"ENABLED\",\n        Description: `Enable us to schedule an action in publishing workflow at a particular datetime`\n    };\n\n    await cloudWatchEventClient.send(new PutRuleCommand(ruleParams));\n    /**\n     * Add lambda as target for the rule.\n     */\n    await cloudWatchEventClient.send(\n        new PutTargetsCommand({\n            Rule: eventRuleName,\n            Targets: [\n                {\n                    Arn: invokedFunctionArn,\n                    Id: eventTargetId,\n                    Input: JSON.stringify({\n                        datetime: datetime,\n                        tenant: tenant,\n                        locale: locale,\n                        invocationType: InvocationTypes.SCHEDULED,\n                        futureDatetime: futureDatetime\n                    } as HandlerArgs)\n                }\n            ]\n        })\n    );\n}\n\nexport const shouldScheduleTask = (\n    nextTaskDatetime: string,\n    currentTaskDatetime: string | null\n): boolean => {\n    return !currentTaskDatetime || nextTaskDatetime < currentTaskDatetime;\n};\n\ninterface RestoreDateTimeParams\n    extends Pick<Configuration, \"storageOperations\">,\n        Pick<HandlerArgs, \"tenant\" | \"locale\"> {\n    task: ApwScheduleAction;\n}\n\nexport const restoreDateTime = async ({\n    locale,\n    tenant,\n    task: currentTask,\n    storageOperations\n}: RestoreDateTimeParams): Promise<void> => {\n    log(`Mark task \"${currentTask.id}\" as undone by restoring original \"datetime\".`);\n    const item = await storageOperations.get({\n        where: {\n            tenant,\n            locale,\n            id: currentTask.id\n        }\n    });\n    if (item) {\n        const newDateTime = moveDateTimeToCurrentCentury(item.data.datetime);\n        await storageOperations.update({\n            item: {\n                ...item,\n                data: { ...item.data, datetime: newDateTime }\n            },\n            input: { ...item.data, datetime: newDateTime }\n        });\n    }\n};\n\ninterface ExecuteTaskParams\n    extends Pick<ClientContext, \"handlerClient\">,\n        Pick<Configuration, \"storageOperations\"> {\n    args: HandlerArgs;\n    lambdaName: string;\n}\n\nexport const executeTask = async ({\n    args,\n    lambdaName,\n    handlerClient,\n    storageOperations\n}: ExecuteTaskParams): Promise<void> => {\n    log(`Executing task at: `, new Date().toISOString());\n\n    if (typeof handlerClient.invoke === \"function\") {\n        await handlerClient.invoke({\n            name: lambdaName,\n            payload: {\n                futureDatetime: args.futureDatetime,\n                datetime: args.datetime,\n                tenant: args.tenant,\n                locale: args.locale\n            },\n            await: false\n        });\n    } else {\n        console.log(`context.handlerClient.invoke is not a function!`);\n    }\n\n    /**\n     * Delete current schedule Task. So that, we can schedule a new one later.\n     */\n    try {\n        await storageOperations.deleteCurrentTask({\n            tenant: args.tenant,\n            locale: args.locale\n        });\n    } catch (e) {\n        console.error(e);\n    }\n};\n"],"mappings":"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"}

package/scheduler/handlers/utils.d.ts

@@ -1,4 +1,3 @@
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
 import { InvocationTypes } from "../types";
 export declare const getIsoStringTillMinutes: (datetime: string) => string;
 export declare const dateTimeToCronExpression: (datetime: string) => string;
@@ -18,8 +17,8 @@ interface EncodeTokenParams {
 export declare const encodeToken: ({ id, tenant, locale }: EncodeTokenParams) => string;
 export declare const TOKEN_PREFIX = "apw-";
 export declare const decodeToken: (token: string) => Partial<EncodeTokenParams>;
-export declare const documentClient: DocumentClient;
-export declare const basePlugins: () => (import("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin").ValueFilterPlugin[][] | import("@webiny/handler").HandlerResultPlugin<import("@webiny/handler/types").Context> | import("@webiny/api").ContextPlugin<import("@webiny/handler-db/types").DbContext>[])[];
+export declare const documentClient: import("@webiny/aws-sdk/client-dynamodb").DynamoDBDocument;
+export declare const basePlugins: () => (import("@webiny/handler").HandlerResultPlugin<import("@webiny/handler/types").Context> | import("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin").ValueFilterPlugin[][] | import("@webiny/api").ContextPlugin<import("@webiny/handler-db/types").DbContext>[])[];
 /**
  * Get APW settings record from DDB.
  */

package/scheduler/handlers/utils.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.shouldRestoreDatetime = exports.moveDateTimeToNextCentury = exports.moveDateTimeToCurrentCentury = exports.isDateTimeInNextCentury = exports.getIsoStringTillMinutes = exports.getApwSettings = exports.encodeToken = exports.documentClient = exports.decodeToken = exports.dateTimeToCronExpression = exports.basePlugins = exports.TOKEN_PREFIX = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _utc = _interopRequireDefault(require("dayjs/plugin/utc"));
-var _dynamodb = require("aws-sdk/clients/dynamodb");
+var _clientDynamodb = require("@webiny/aws-sdk/client-dynamodb");
 var _handlerDb = _interopRequireDefault(require("@webiny/handler-db"));
 var _dbDynamodb = require("@webiny/db-dynamodb");
 var _plugins = _interopRequireDefault(require("@webiny/db-dynamodb/plugins"));
@@ -93,10 +93,7 @@ const decodeToken = token => {
   };
 };
 exports.decodeToken = decodeToken;
-const documentClient = new _dynamodb.DocumentClient({
-  convertEmptyValues: true,
-  region: process.env.AWS_REGION
-});
+const documentClient = (0, _clientDynamodb.getDocumentClient)();
 exports.documentClient = documentClient;
 const basePlugins = () => [(0, _plugins.default)(), (0, _handlerLogs.default)(), (0, _handlerDb.default)({
   table: process.env.DB_TABLE,
@@ -120,7 +117,7 @@ const getApwSettings = async () => {
   };
   const {
     Item
-  } = await documentClient.get(params).promise();
+  } = await documentClient.get(params);
   return {
     mainGraphqlFunctionArn: Item ? Item["mainGraphqlFunctionArn"] : "mainGraphqlFunctionArn",
     eventRuleName: Item ? Item["eventRuleName"] : "eventRuleName",

package/scheduler/handlers/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dayjs","_interopRequireDefault","require","_utc","_dynamodb","_handlerDb","_dbDynamodb","_plugins","_handlerLogs","_types","dayjs","extend","utc","TIME_SEPARATOR","ELAPSED_CRON_EXPRESSION","getIsoStringTillMinutes","datetime","isNaN","Date","parse","slice","lastIndexOf","exports","dateTimeToCronExpression","dayOfWeek","format","moveDateTimeToNextCentury","add","toISOString","moveDateTimeToCurrentCentury","subtract","isDateTimeInNextCentury","isAfter","shouldRestoreDatetime","invocationType","selfInvoked","InvocationTypes","SCHEDULED","today","isExecutionPending","encodeToken","id","tenant","locale","TOKEN_PREFIX","decodeToken","token","auth","length","split","documentClient","DocumentClient","convertEmptyValues","region","process","env","AWS_REGION","basePlugins","dynamoDbPlugins","logsPlugins","dbPlugins","table","DB_TABLE","driver","DynamoDbDriver","getApwSettings","variant","STAGED_ROLLOUTS_VARIANT","params","TableName","Key","PK","SK","Item","get","promise","mainGraphqlFunctionArn","eventRuleName","eventTargetId"],"sources":["utils.ts"],"sourcesContent":["import dayjs from \"dayjs\";\nimport utc from \"dayjs/plugin/utc\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport dbPlugins from \"@webiny/handler-db\";\nimport { DynamoDbDriver } from \"@webiny/db-dynamodb\";\nimport dynamoDbPlugins from \"@webiny/db-dynamodb/plugins\";\nimport logsPlugins from \"@webiny/handler-logs\";\nimport { InvocationTypes } from \"~/scheduler/types\";\n\n/**\n * https://day.js.org/docs/en/plugin/utc\n */\ndayjs.extend(utc);\n\nconst TIME_SEPARATOR = \":\";\nconst ELAPSED_CRON_EXPRESSION = \"* * * * ? 2000\";\n\nexport const getIsoStringTillMinutes = (datetime: string): string => {\n    /**\n     * Validate datetime.\n     */\n    if (isNaN(Date.parse(datetime))) {\n        return datetime;\n    }\n    // input = \"2022-03-08T05:41:13.230Z\"\n    // output = \"2022-03-08T05:41\"\n    return datetime.slice(0, datetime.lastIndexOf(TIME_SEPARATOR));\n};\n\nexport const dateTimeToCronExpression = (datetime: string): string => {\n    if (!datetime) {\n        return ELAPSED_CRON_EXPRESSION;\n    }\n    /**\n     * You can't specify the Day-of-month and Day-of-week fields in the same cron expression.\n     * If you specify a value (or a *) in one of the fields, you must use a ? (question mark) in the other.\n     *\n     *  https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html\n     */\n    const dayOfWeek = \"?\";\n\n    return dayjs.utc(datetime).format(`mm H D M [${dayOfWeek}] YYYY`);\n};\n\nexport const moveDateTimeToNextCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).add(100, \"year\").toISOString();\n};\n\nexport const moveDateTimeToCurrentCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).subtract(100, \"year\").toISOString();\n};\n\nexport const isDateTimeInNextCentury = (datetime: string): boolean => {\n    return dayjs.utc(datetime).isAfter(\"2100-01-01\", \"year\");\n};\n\ninterface ShouldRestoreDatetimeParams {\n    invocationType?: InvocationTypes;\n    datetime: string;\n}\n\nexport const shouldRestoreDatetime = ({\n    invocationType,\n    datetime\n}: ShouldRestoreDatetimeParams): boolean => {\n    /**\n     * \"invocationType\" will not be SCHEDULED when the lambda is called from Main GQL handler.\n     *\n     * Which means a new content is scheduled for \"publish\"/\"unpublish\" therefore, we need to restore the previously\n     * scheduled action if it has not been executed already.\n     */\n    const selfInvoked = invocationType === InvocationTypes.SCHEDULED;\n\n    const today = dayjs.utc();\n    const isExecutionPending = dayjs.utc(datetime).isAfter(today);\n\n    return !selfInvoked && isExecutionPending;\n};\n\ninterface EncodeTokenParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport const encodeToken = ({ id, tenant, locale }: EncodeTokenParams) => {\n    return `${TOKEN_PREFIX}${id}__${tenant}__${locale}`;\n};\n\nexport const TOKEN_PREFIX = \"apw-\";\n\nexport const decodeToken = (token: string): Partial<EncodeTokenParams> => {\n    const auth = token.slice(TOKEN_PREFIX.length);\n    const [id, tenant, locale] = auth.split(\"__\");\n\n    return {\n        id,\n        tenant,\n        locale\n    };\n};\n\nexport const documentClient = new DocumentClient({\n    convertEmptyValues: true,\n    region: process.env.AWS_REGION\n});\n\nexport const basePlugins = () => [\n    dynamoDbPlugins(),\n    logsPlugins(),\n    dbPlugins({\n        table: process.env.DB_TABLE,\n        driver: new DynamoDbDriver({\n            documentClient\n        })\n    })\n];\n\n/**\n * Get APW settings record from DDB.\n */\nexport interface ApwSettings {\n    mainGraphqlFunctionArn: string;\n    eventRuleName: string;\n    eventTargetId: string;\n}\n\nexport const getApwSettings = async (): Promise<ApwSettings> => {\n    const variant = process.env.STAGED_ROLLOUTS_VARIANT;\n\n    const params = {\n        TableName: process.env.DB_TABLE as string,\n        Key: {\n            PK: `APW#SETTINGS`,\n            SK: variant || \"default\"\n        }\n    };\n\n    const { Item } = await documentClient.get(params).promise();\n\n    return {\n        mainGraphqlFunctionArn: Item ? Item[\"mainGraphqlFunctionArn\"] : \"mainGraphqlFunctionArn\",\n        eventRuleName: Item ? Item[\"eventRuleName\"] : \"eventRuleName\",\n        eventTargetId: Item ? Item[\"eventTargetId\"] : \"eventTargetId\"\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_dayjs","_interopRequireDefault","require","_utc","_clientDynamodb","_handlerDb","_dbDynamodb","_plugins","_handlerLogs","_types","dayjs","extend","utc","TIME_SEPARATOR","ELAPSED_CRON_EXPRESSION","getIsoStringTillMinutes","datetime","isNaN","Date","parse","slice","lastIndexOf","exports","dateTimeToCronExpression","dayOfWeek","format","moveDateTimeToNextCentury","add","toISOString","moveDateTimeToCurrentCentury","subtract","isDateTimeInNextCentury","isAfter","shouldRestoreDatetime","invocationType","selfInvoked","InvocationTypes","SCHEDULED","today","isExecutionPending","encodeToken","id","tenant","locale","TOKEN_PREFIX","decodeToken","token","auth","length","split","documentClient","getDocumentClient","basePlugins","dynamoDbPlugins","logsPlugins","dbPlugins","table","process","env","DB_TABLE","driver","DynamoDbDriver","getApwSettings","variant","STAGED_ROLLOUTS_VARIANT","params","TableName","Key","PK","SK","Item","get","mainGraphqlFunctionArn","eventRuleName","eventTargetId"],"sources":["utils.ts"],"sourcesContent":["import dayjs from \"dayjs\";\nimport utc from \"dayjs/plugin/utc\";\nimport { getDocumentClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport dbPlugins from \"@webiny/handler-db\";\nimport { DynamoDbDriver } from \"@webiny/db-dynamodb\";\nimport dynamoDbPlugins from \"@webiny/db-dynamodb/plugins\";\nimport logsPlugins from \"@webiny/handler-logs\";\nimport { InvocationTypes } from \"~/scheduler/types\";\n\n/**\n * https://day.js.org/docs/en/plugin/utc\n */\ndayjs.extend(utc);\n\nconst TIME_SEPARATOR = \":\";\nconst ELAPSED_CRON_EXPRESSION = \"* * * * ? 2000\";\n\nexport const getIsoStringTillMinutes = (datetime: string): string => {\n    /**\n     * Validate datetime.\n     */\n    if (isNaN(Date.parse(datetime))) {\n        return datetime;\n    }\n    // input = \"2022-03-08T05:41:13.230Z\"\n    // output = \"2022-03-08T05:41\"\n    return datetime.slice(0, datetime.lastIndexOf(TIME_SEPARATOR));\n};\n\nexport const dateTimeToCronExpression = (datetime: string): string => {\n    if (!datetime) {\n        return ELAPSED_CRON_EXPRESSION;\n    }\n    /**\n     * You can't specify the Day-of-month and Day-of-week fields in the same cron expression.\n     * If you specify a value (or a *) in one of the fields, you must use a ? (question mark) in the other.\n     *\n     *  https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html\n     */\n    const dayOfWeek = \"?\";\n\n    return dayjs.utc(datetime).format(`mm H D M [${dayOfWeek}] YYYY`);\n};\n\nexport const moveDateTimeToNextCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).add(100, \"year\").toISOString();\n};\n\nexport const moveDateTimeToCurrentCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).subtract(100, \"year\").toISOString();\n};\n\nexport const isDateTimeInNextCentury = (datetime: string): boolean => {\n    return dayjs.utc(datetime).isAfter(\"2100-01-01\", \"year\");\n};\n\ninterface ShouldRestoreDatetimeParams {\n    invocationType?: InvocationTypes;\n    datetime: string;\n}\n\nexport const shouldRestoreDatetime = ({\n    invocationType,\n    datetime\n}: ShouldRestoreDatetimeParams): boolean => {\n    /**\n     * \"invocationType\" will not be SCHEDULED when the lambda is called from Main GQL handler.\n     *\n     * Which means a new content is scheduled for \"publish\"/\"unpublish\" therefore, we need to restore the previously\n     * scheduled action if it has not been executed already.\n     */\n    const selfInvoked = invocationType === InvocationTypes.SCHEDULED;\n\n    const today = dayjs.utc();\n    const isExecutionPending = dayjs.utc(datetime).isAfter(today);\n\n    return !selfInvoked && isExecutionPending;\n};\n\ninterface EncodeTokenParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport const encodeToken = ({ id, tenant, locale }: EncodeTokenParams) => {\n    return `${TOKEN_PREFIX}${id}__${tenant}__${locale}`;\n};\n\nexport const TOKEN_PREFIX = \"apw-\";\n\nexport const decodeToken = (token: string): Partial<EncodeTokenParams> => {\n    const auth = token.slice(TOKEN_PREFIX.length);\n    const [id, tenant, locale] = auth.split(\"__\");\n\n    return {\n        id,\n        tenant,\n        locale\n    };\n};\n\nexport const documentClient = getDocumentClient();\n\nexport const basePlugins = () => [\n    dynamoDbPlugins(),\n    logsPlugins(),\n    dbPlugins({\n        table: process.env.DB_TABLE,\n        driver: new DynamoDbDriver({\n            documentClient\n        })\n    })\n];\n\n/**\n * Get APW settings record from DDB.\n */\nexport interface ApwSettings {\n    mainGraphqlFunctionArn: string;\n    eventRuleName: string;\n    eventTargetId: string;\n}\n\nexport const getApwSettings = async (): Promise<ApwSettings> => {\n    const variant = process.env.STAGED_ROLLOUTS_VARIANT;\n\n    const params = {\n        TableName: process.env.DB_TABLE as string,\n        Key: {\n            PK: `APW#SETTINGS`,\n            SK: variant || \"default\"\n        }\n    };\n\n    const { Item } = await documentClient.get(params);\n\n    return {\n        mainGraphqlFunctionArn: Item ? Item[\"mainGraphqlFunctionArn\"] : \"mainGraphqlFunctionArn\",\n        eventRuleName: Item ? Item[\"eventRuleName\"] : \"eventRuleName\",\n        eventTargetId: Item ? Item[\"eventTargetId\"] : \"eventTargetId\"\n    };\n};\n"],"mappings":"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"}

package/scheduler/types.d.ts

@@ -50,8 +50,11 @@ export declare enum ApwContentTypes {
 export interface BaseFields {
     id: string;
     createdOn: string;
-    savedOn?: string;
+    modifiedOn: string | null;
+    savedOn: string;
     createdBy: ApwIdentity;
+    modifiedBy: ApwIdentity | null;
+    savedBy: ApwIdentity;
     tenant: string;
     locale: string;
 }
@@ -80,13 +83,13 @@ interface BaseApwCrud<TEntry, TCreateEntryParams, TUpdateEntryParams> {
     get(id: string): Promise<TEntry | null>;
     create(data: TCreateEntryParams): Promise<TEntry>;
     update(id: string, data: TUpdateEntryParams): Promise<TEntry>;
-    delete(id: string): Promise<Boolean>;
+    delete(id: string): Promise<boolean>;
 }
 export interface ApwScheduleActionCrud extends BaseApwCrud<ApwScheduleAction, ApwScheduleActionData, ApwScheduleActionData> {
     list(params: ListParams): Promise<[ApwScheduleAction[], ListMeta]>;
     getCurrentTask(): Promise<ApwScheduleAction | null>;
     updateCurrentTask(item: ApwScheduleAction): Promise<ApwScheduleAction>;
-    deleteCurrentTask(): Promise<Boolean>;
+    deleteCurrentTask(): Promise<boolean>;
 }
 export interface ScheduleActionContext extends Context, I18NContext, TenancyContext {
     scheduleAction: ApwScheduleActionCrud;
@@ -141,10 +144,10 @@ export interface ApwScheduleActionStorageOperations {
     list(params: StorageOperationsListScheduleActionsParams): Promise<StorageOperationsListScheduleActionsResponse>;
     create(params: StorageOperationsCreateScheduleActionParams): Promise<ApwScheduleAction>;
     update(params: StorageOperationsUpdateScheduleActionParams): Promise<ApwScheduleAction>;
-    delete(params: StorageOperationsDeleteScheduleActionParams): Promise<Boolean>;
+    delete(params: StorageOperationsDeleteScheduleActionParams): Promise<boolean>;
     getCurrentTask(params: StorageOperationsGetCurrentTaskParams): Promise<ApwScheduleAction | null>;
     updateCurrentTask(params: StorageOperationsUpdateCurrentTaskParams): Promise<ApwScheduleAction>;
-    deleteCurrentTask(params: StorageOperationsDeleteCurrentTaskParams): Promise<Boolean>;
+    deleteCurrentTask(params: StorageOperationsDeleteCurrentTaskParams): Promise<boolean>;
 }
 export interface CreateApwContextParams {
     storageOperations: ApwScheduleActionStorageOperations;

package/scheduler/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["ApwContentTypes","exports","ApwScheduleActionTypes","InvocationTypes"],"sources":["types.ts"],"sourcesContent":["import { Context } from \"@webiny/api/types\";\nimport { SecurityIdentity, SecurityPermission } from \"@webiny/api-security/types\";\nimport { I18NContext, I18NLocale } from \"@webiny/api-i18n/types\";\nimport { TenancyContext, Tenant } from \"@webiny/api-tenancy/types\";\nimport { ApwIdentity } from \"~/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\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: ApwIdentity;\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":";;;;;;IAiDYA,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAAAC,OAAA,CAAAD,eAAA,GAAAA,eAAA;AAAA,IAkBfE,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA;AAAAD,OAAA,CAAAC,sBAAA,GAAAA,sBAAA;AAAA,IAiBtBC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAAAF,OAAA,CAAAE,eAAA,GAAAA,eAAA"}
+{"version":3,"names":["ApwContentTypes","exports","ApwScheduleActionTypes","InvocationTypes"],"sources":["types.ts"],"sourcesContent":["import { Context } from \"@webiny/api/types\";\nimport { SecurityIdentity, SecurityPermission } from \"@webiny/api-security/types\";\nimport { I18NContext, I18NLocale } from \"@webiny/api-i18n/types\";\nimport { TenancyContext, Tenant } from \"@webiny/api-tenancy/types\";\nimport { ApwIdentity } from \"~/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\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\n    createdOn: string;\n    modifiedOn: string | null;\n    savedOn: string;\n    createdBy: ApwIdentity;\n    modifiedBy: ApwIdentity | null;\n    savedBy: ApwIdentity;\n\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":";;;;;;IAiDYA,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAAAC,OAAA,CAAAD,eAAA,GAAAA,eAAA;AAAA,IAuBfE,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA;AAAAD,OAAA,CAAAC,sBAAA,GAAAA,sBAAA;AAAA,IAiBtBC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAAAF,OAAA,CAAAE,eAAA,GAAAA,eAAA"}

package/storageOperations/changeRequestStorageOperations.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createChangeRequestStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _fieldResolver = require("../utils/fieldResolver");
 var _error = _interopRequireDefault(require("@webiny/error"));
 const createChangeRequestStorageOperations = params => {
@@ -33,7 +32,7 @@ const createChangeRequestStorageOperations = params => {
     });
     return (0, _fieldResolver.getFieldValues)({
       entry,
-      fields: _index.baseFields,
+      fields: _pickEntryFieldValues.baseFields,
       context: getCmsContext(),
       transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
     });
@@ -44,14 +43,17 @@ const createChangeRequestStorageOperations = params => {
     async listChangeRequests(params) {
       const model = await getChangeRequestModel();
       const [entries, meta] = await security.withoutAuthorization(async () => {
-        return cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-          where: (0, _objectSpread2.default)({}, params.where)
-        }));
+        return cms.listLatestEntries(model, {
+          ...params,
+          where: {
+            ...params.where
+          }
+        });
       });
       try {
         const all = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
           entry,
-          fields: _index.baseFields,
+          fields: _pickEntryFieldValues.baseFields,
           context: getCmsContext(),
           transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
         })));
@@ -67,7 +69,7 @@ const createChangeRequestStorageOperations = params => {
       });
       return (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
@@ -90,13 +92,15 @@ const createChangeRequestStorageOperations = params => {
         throw new _error.default("A change request can only be updated by its creator.", "ONLY_CREATOR_CAN_UPDATE_CHANGE_REQUEST");
       }
       const entry = await security.withoutAuthorization(async () => {
-        return cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data), {}, {
+        return cms.updateEntry(model, params.id, {
+          ...existingEntry,
+          ...params.data,
           savedOn: new Date()
-        }));
+        });
       });
       return (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });

package/storageOperations/changeRequestStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["_index","require","_fieldResolver","_error","_interopRequireDefault","createChangeRequestStorageOperations","params","cms","getCmsContext","security","getChangeRequestModel","model","withoutAuthorization","getModel","WebinyError","getChangeRequest","id","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","listChangeRequests","entries","meta","listLatestEntries","_objectSpread2","default","where","all","Promise","map","ex","message","code","data","createChangeRequest","createEntry","updateChangeRequest","existingEntry","createdBy","getIdentity","updateEntry","savedOn","Date","deleteChangeRequest","deleteEntry","exports"],"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    params: CreateApwStorageOperationsParams\n): ApwChangeRequestStorageOperations => {\n    const { cms, getCmsContext, security } = params;\n    const getChangeRequestModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(\"apwChangeRequestModelDefinition\");\n        });\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwChangeRequestModelDefinition` 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\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\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\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, {\n                    ...params,\n                    where: {\n                        ...params.where\n                    }\n                });\n            });\n            try {\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            } catch (ex) {\n                throw new WebinyError(ex.message, ex.code, ex.data);\n            }\n        },\n        async createChangeRequest(params) {\n            const model = await getChangeRequestModel();\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, params.data);\n            });\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            /**\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            /**\n             * Only creator can update the change request\n             */\n            if (existingEntry.createdBy.id !== security.getIdentity().id) {\n                throw new WebinyError(\n                    \"A change request can only be updated by its creator.\",\n                    \"ONLY_CREATOR_CAN_UPDATE_CHANGE_REQUEST\"\n                );\n            }\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\n                });\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\n            if (!security.getIdentity()) {\n                return true;\n            }\n\n            /**\n             * We're fetching the existing entry\n             */\n            const existingEntry = await getChangeRequest({ id: params.id });\n\n            /**\n             * Only creator can delete the change request\n             */\n            if (existingEntry.createdBy.id !== security.getIdentity().id) {\n                throw new WebinyError(\n                    \"A change request can only be deleted by its creator.\",\n                    \"ONLY_CREATOR_CAN_DELETE_CHANGE_REQUEST\"\n                );\n            }\n\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_pickEntryFieldValues","require","_fieldResolver","_error","_interopRequireDefault","createChangeRequestStorageOperations","params","cms","getCmsContext","security","getChangeRequestModel","model","withoutAuthorization","getModel","WebinyError","getChangeRequest","id","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","listChangeRequests","entries","meta","listLatestEntries","where","all","Promise","map","ex","message","code","data","createChangeRequest","createEntry","updateChangeRequest","existingEntry","createdBy","getIdentity","updateEntry","savedOn","Date","deleteChangeRequest","deleteEntry","exports"],"sources":["changeRequestStorageOperations.ts"],"sourcesContent":["import { ApwChangeRequestStorageOperations } from \"./types\";\nimport { CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { baseFields } from \"~/utils/pickEntryFieldValues\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwChangeRequest } from \"~/types\";\n\nexport const createChangeRequestStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwChangeRequestStorageOperations => {\n    const { cms, getCmsContext, security } = params;\n    const getChangeRequestModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(\"apwChangeRequestModelDefinition\");\n        });\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwChangeRequestModelDefinition` 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\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\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\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, {\n                    ...params,\n                    where: {\n                        ...params.where\n                    }\n                });\n            });\n            try {\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            } catch (ex) {\n                throw new WebinyError(ex.message, ex.code, ex.data);\n            }\n        },\n        async createChangeRequest(params) {\n            const model = await getChangeRequestModel();\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, params.data);\n            });\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            /**\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            /**\n             * Only creator can update the change request\n             */\n            if (existingEntry.createdBy.id !== security.getIdentity().id) {\n                throw new WebinyError(\n                    \"A change request can only be updated by its creator.\",\n                    \"ONLY_CREATOR_CAN_UPDATE_CHANGE_REQUEST\"\n                );\n            }\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\n                });\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\n            if (!security.getIdentity()) {\n                return true;\n            }\n\n            /**\n             * We're fetching the existing entry\n             */\n            const existingEntry = await getChangeRequest({ id: params.id });\n\n            /**\n             * Only creator can delete the change request\n             */\n            if (existingEntry.createdBy.id !== security.getIdentity().id) {\n                throw new WebinyError(\n                    \"A change request can only be deleted by its creator.\",\n                    \"ONLY_CREATOR_CAN_DELETE_CHANGE_REQUEST\"\n                );\n            }\n\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}

package/storageOperations/commentStorageOperations.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCommentStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
 var _fieldResolver = require("../utils/fieldResolver");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _comment = require("./models/comment.model");
 const pickIdFromChangeRequest = obj => {
@@ -41,7 +40,7 @@ const createCommentStorageOperations = ({
     });
     return (0, _fieldResolver.getFieldValues)({
       entry,
-      fields: _index.baseFields,
+      fields: _pickEntryFieldValues.baseFields,
       context: getCmsContext(),
       transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
     });
@@ -59,7 +58,7 @@ const createCommentStorageOperations = ({
       });
       const values = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       })));
@@ -70,16 +69,17 @@ const createCommentStorageOperations = ({
       const model = await getCommentModel();
       const refModel = await this.getChangeRequestModel();
       const entry = await security.withoutAuthorization(async () => {
-        return cms.createEntry(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.data), {}, {
+        return cms.createEntry(model, {
+          ...params.data,
           changeRequest: {
             id: params.data.changeRequest,
             modelId: refModel.modelId
           }
-        }));
+        });
       });
       const values = await (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
@@ -95,13 +95,15 @@ const createCommentStorageOperations = ({
         id: params.id
       });
       const entry = await security.withoutAuthorization(async () => {
-        return cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data), {}, {
+        return cms.updateEntry(model, params.id, {
+          ...existingEntry,
+          ...params.data,
           savedOn: new Date()
-        }));
+        });
       });
       const values = await (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });

package/storageOperations/commentStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["_index","require","_fieldResolver","_error","_interopRequireDefault","_comment","pickIdFromChangeRequest","obj","rawValue","id","createCommentStorageOperations","cms","getCmsContext","security","getCommentModel","model","withoutAuthorization","getModel","COMMENT_MODEL_ID","WebinyError","getComment","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","params","values","listComments","entries","meta","listLatestEntries","Promise","all","map","value","createComment","refModel","getChangeRequestModel","createEntry","_objectSpread2","default","data","changeRequest","modelId","updateComment","existingEntry","updateEntry","savedOn","Date","deleteComment","deleteEntry","exports"],"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\";\nimport { COMMENT_MODEL_ID } from \"~/storageOperations/models/comment.model\";\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    security\n}: CreateApwStorageOperationsParams): ApwCommentStorageOperations => {\n    const getCommentModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(COMMENT_MODEL_ID);\n        });\n\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${COMMENT_MODEL_ID}\" 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 security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n\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 security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, 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\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, {\n                    ...params.data,\n                    changeRequest: {\n                        id: params.data.changeRequest,\n                        modelId: refModel.modelId\n                    }\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 security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\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 deleteComment(params) {\n            const model = await getCommentModel();\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":["_fieldResolver","require","_pickEntryFieldValues","_error","_interopRequireDefault","_comment","pickIdFromChangeRequest","obj","rawValue","id","createCommentStorageOperations","cms","getCmsContext","security","getCommentModel","model","withoutAuthorization","getModel","COMMENT_MODEL_ID","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","savedOn","Date","deleteComment","deleteEntry","exports"],"sources":["commentStorageOperations.ts"],"sourcesContent":["import { ApwStorageOperations } from \"./types\";\nimport { ApwCommentStorageOperations } from \"./types\";\nimport { CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport { baseFields } from \"~/utils/pickEntryFieldValues\";\n\nimport WebinyError from \"@webiny/error\";\nimport { ApwComment } from \"~/types\";\nimport { CmsEntryListParams } from \"@webiny/api-headless-cms/types\";\nimport { COMMENT_MODEL_ID } from \"~/storageOperations/models/comment.model\";\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    security\n}: CreateApwStorageOperationsParams): ApwCommentStorageOperations => {\n    const getCommentModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(COMMENT_MODEL_ID);\n        });\n\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${COMMENT_MODEL_ID}\" 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 security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n\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 security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, 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\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, {\n                    ...params.data,\n                    changeRequest: {\n                        id: params.data.changeRequest,\n                        modelId: refModel.modelId\n                    }\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 security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\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 deleteComment(params) {\n            const model = await getCommentModel();\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;AAGA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,qBAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AAGA,IAAAI,QAAA,GAAAJ,OAAA;AAEA,MAAMK,uBAAuB,GAAIC,GAAwB,IAAiB;EACtE,MAAMC,QAAQ,GAAGD,GAAG,CAAC,eAAe,CAAC;EACrC,IAAI,CAACC,QAAQ,EAAE;IACX,OAAOD,GAAG;EACd;EACAA,GAAG,CAAC,eAAe,CAAC,GAAGC,QAAQ,CAACC,EAAE;EAClC,OAAOF,GAAG;AACd,CAAC;AAEM,MAAMG,8BAA8B,GAAGA,CAAC;EAC3CC,GAAG;EACHC,aAAa;EACbC;AAC8B,CAAC,KAAkC;EACjE,MAAMC,eAAe,GAAG,MAAAA,CAAA,KAAY;IAChC,MAAMC,KAAK,GAAG,MAAMF,QAAQ,CAACG,oBAAoB,CAAC,YAAY;MAC1D,OAAOL,GAAG,CAACM,QAAQ,CAACC,yBAAgB,CAAC;IACzC,CAAC,CAAC;IAEF,IAAI,CAACH,KAAK,EAAE;MACR,MAAM,IAAII,cAAW,CAChB,mBAAkBD,yBAAiB,UAAS,EAC7C,uBACJ,CAAC;IACL;IACA,OAAOH,KAAK;EAChB,CAAC;EACD,MAAMK,UAAqD,GAAG,MAAAA,CAAO;IAAEX;EAAG,CAAC,KAAK;IAC5E,MAAMM,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;IACrC,MAAMO,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;MAC1D,OAAOL,GAAG,CAACW,YAAY,CAACP,KAAK,EAAEN,EAAE,CAAC;IACtC,CAAC,CAAC;IAEF,OAAO,IAAAc,6BAAc,EAAC;MAClBF,KAAK;MACLG,MAAM,EAAEC,gCAAU;MAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;MACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;IAChD,CAAC,CAAC;EACN,CAAC;EACD,OAAO;IACHD,eAAe;IACfM,UAAU,EAAE,MAAMS,MAAM,IAAI;MACxB,MAAMC,MAAM,GAAG,MAAMV,UAAU,CAACS,MAAM,CAAC;MACvC,OAAOvB,uBAAuB,CAACwB,MAAM,CAAC;IAC1C,CAAC;IACD,MAAMC,YAAYA,CAACF,MAAM,EAAE;MACvB,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC,MAAM,CAACkB,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMpB,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QACpE,OAAOL,GAAG,CAACuB,iBAAiB,CAACnB,KAAK,EAAEc,MAA4B,CAAC;MACrE,CAAC,CAAC;MACF,MAAMC,MAAM,GAAG,MAAMK,OAAO,CAACC,GAAG,CAC5BJ,OAAO,CAACK,GAAG,CAAChB,KAAK,IACb,IAAAE,6BAAc,EAAa;QACvBF,KAAK;QACLG,MAAM,EAAEC,gCAAU;QAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;QACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;MAChD,CAAC,CACL,CACJ,CAAC;MACD,MAAMqB,GAAG,GAAGN,MAAM,CAACO,GAAG,CAACC,KAAK,IAAIhC,uBAAuB,CAACgC,KAAK,CAAC,CAAC;MAC/D,OAAO,CAACF,GAAG,EAAEH,IAAI,CAAC;IACtB,CAAC;IACD,MAAMM,aAAaA,CAA6BV,MAAM,EAAE;MACpD,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC,MAAM0B,QAAQ,GAAG,MAAM,IAAI,CAACC,qBAAqB,CAAC,CAAC;MAEnD,MAAMpB,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC1D,OAAOL,GAAG,CAAC+B,WAAW,CAAC3B,KAAK,EAAE;UAC1B,GAAGc,MAAM,CAACc,IAAI;UACdC,aAAa,EAAE;YACXnC,EAAE,EAAEoB,MAAM,CAACc,IAAI,CAACC,aAAa;YAC7BC,OAAO,EAAEL,QAAQ,CAACK;UACtB;QACJ,CAAC,CAAC;MACN,CAAC,CAAC;MAEF,MAAMf,MAAM,GAAG,MAAM,IAAAP,6BAAc,EAAC;QAChCF,KAAK;QACLG,MAAM,EAAEC,gCAAU;QAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;QACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;MAChD,CAAC,CAAC;MACF,OAAOT,uBAAuB,CAACwB,MAAM,CAAC;IAC1C,CAAC;IACD,MAAMgB,aAAaA,CAACjB,MAAM,EAAE;MACxB,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC;AACZ;AACA;AACA;MACY,MAAMiC,aAAa,GAAG,MAAM3B,UAAU,CAAC;QAAEX,EAAE,EAAEoB,MAAM,CAACpB;MAAG,CAAC,CAAC;MAEzD,MAAMY,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC1D,OAAOL,GAAG,CAACqC,WAAW,CAACjC,KAAK,EAAEc,MAAM,CAACpB,EAAE,EAAE;UACrC,GAAGsC,aAAa;UAChB,GAAGlB,MAAM,CAACc,IAAI;UACdM,OAAO,EAAE,IAAIC,IAAI,CAAC;QACtB,CAAC,CAAC;MACN,CAAC,CAAC;MAEF,MAAMpB,MAAM,GAAG,MAAM,IAAAP,6BAAc,EAAC;QAChCF,KAAK;QACLG,MAAM,EAAEC,gCAAU;QAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;QACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;MAChD,CAAC,CAAC;MACF,OAAOT,uBAAuB,CAACwB,MAAM,CAAC;IAC1C,CAAC;IACD,MAAMqB,aAAaA,CAACtB,MAAM,EAAE;MACxB,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC,MAAMD,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC5C,OAAOL,GAAG,CAACyC,WAAW,CAACrC,KAAK,EAAEc,MAAM,CAACpB,EAAE,CAAC;MAC5C,CAAC,CAAC;MACF,OAAO,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAAC4C,OAAA,CAAA3C,8BAAA,GAAAA,8BAAA"}

package/storageOperations/contentReviewStorageOperations.d.ts

@@ -1,3 +1,3 @@
 import { ApwContentReviewStorageOperations } from "./types";
-import { CreateApwStorageOperationsParams } from "./index";
+import { CreateApwStorageOperationsParams } from ".";
 export declare const createContentReviewStorageOperations: ({ cms, security }: CreateApwStorageOperationsParams) => ApwContentReviewStorageOperations;