@webiny/api-page-builder-import-export 0.0.0-unstable.7f63ea0744 → 0.0.0-unstable.8b6c57b569

package/export/process/formsHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_types","require","_client","_handlerGraphql","_mockSecurity","_utils","_FormExporter","formsHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","formBuilder","pageBuilder","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","formId","exportFormsDataKey","revisionType","form","ExportRevisionType","PUBLISHED","getLatestPublishedFormRevision","getForm","e","NotFoundError","version","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","formExporter","FormExporter","formDataZip","execute","COMPLETED","message","key","Key","FAILED","name","stack","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process","exports"],"sources":["formsHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ExportRevisionType, ImportExportTaskStatus } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport type { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport type { Configuration, Payload, Response } from \"~/export/process\";\nimport { FormExporter } from \"./exporters/FormExporter\";\n\n/**\n * Handles the export forms process workflow.\n */\nexport const formsHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Forms Process Handler\");\n    const { formBuilder, pageBuilder } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Form Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { formId, exportFormsDataKey, revisionType } = input;\n\n        /**\n         * At the moment, we only export a single revision of the form.\n         * It could be \"published\" or \"latest\" depending upon user input.\n         *\n         * Note: In case of no \"published\" revision available, we use the latest revision.\n         */\n        let form;\n        try {\n            if (revisionType === ExportRevisionType.PUBLISHED) {\n                // Get \"published\" form.\n                form = await formBuilder.getLatestPublishedFormRevision(formId);\n            } else {\n                // Get \"latest\" form.\n                form = await formBuilder.getForm(formId);\n            }\n        } catch (e) {\n            // If we're looking for \"published\" form and doesn't found it, get latest form.\n            if (revisionType === ExportRevisionType.PUBLISHED && e instanceof NotFoundError) {\n                form = await formBuilder.getForm(formId);\n            } else {\n                throw e;\n            }\n        }\n\n        if (!form) {\n            log(`Unable to load form \"${formId}\"`);\n            throw new NotFoundError(`Unable to load form \"${formId}\"`);\n        }\n\n        log(`Processing form key \"${formId}\" | version ${form.version} | ${form.status}`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting form data and uploading to storage...`);\n        const formExporter = new FormExporter();\n        const formDataZip = await formExporter.execute(form, exportFormsDataKey);\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for form \"${form.id}\" v${form.version} (${form.status}).`,\n                key: formDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_PAGES_PROCESS] Error => \", e);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    stack: e.stack,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual form zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export forms - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current form error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    type,\n                    subTaskIndex: subTaskIndex + 1,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export forms - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/export/process/index.d.ts

@@ -1,5 +1,5 @@
-import { PbImportExportContext } from "../../types";
-import { SecurityIdentity } from "@webiny/api-security/types";
+import type { PbImportExportContext } from "../../types";
+import type { SecurityIdentity } from "@webiny/api-security/types";
 export interface Configuration {
     handlers: {
         process: string;

package/export/process/index.js

@@ -6,27 +6,36 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _handlerAws = require("@webiny/handler-aws");
 var _blocksHandler = require("./blocksHandler");
-var _pagesHandler = require("./pagesHandler");
+var _formsHandler = require("./formsHandler");
 var _templatesHandler = require("./templatesHandler");
 var _default = configuration => {
   return (0, _handlerAws.createRawEventHandler)(async ({
     payload,
     context
   }) => {
-    switch (payload.type) {
-      case "block":
-        {
-          return await (0, _blocksHandler.blocksHandler)(configuration, payload, context);
-        }
-      case "template":
-        {
-          return await (0, _templatesHandler.templatesHandler)(configuration, payload, context);
-        }
-      default:
-        {
-          return await (0, _pagesHandler.pagesHandler)(configuration, payload, context);
-        }
-    }
+    return context.security.withoutAuthorization(() => {
+      switch (payload.type) {
+        case "block":
+          {
+            return (0, _blocksHandler.blocksHandler)(configuration, payload, context);
+          }
+        case "form":
+          {
+            return (0, _formsHandler.formsHandler)(configuration, payload, context);
+          }
+        case "template":
+          {
+            return (0, _templatesHandler.templatesHandler)(configuration, payload, context);
+          }
+        default:
+          {
+            console.log("Export PB process", JSON.stringify(payload));
+            throw new Error("Invalid type provided: pb process.");
+          }
+      }
+    });
   });
 };
-exports.default = _default;
+exports.default = _default;
+
+//# sourceMappingURL=index.js.map

package/export/process/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["configuration","createRawEventHandler","payload","context","type","blocksHandler","templatesHandler","pagesHandler"],"sources":["index.ts"],"sourcesContent":["import { PbImportExportContext } from \"~/types\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/export/process/blocksHandler\";\nimport { pagesHandler } from \"~/export/process/pagesHandler\";\nimport { templatesHandler } from \"~/export/process/templatesHandler\";\n\nexport interface Configuration {\n    handlers: {\n        process: string;\n        combine: string;\n    };\n}\n\nexport interface Payload {\n    taskId: string;\n    subTaskIndex: number;\n    type: string;\n    identity?: SecurityIdentity;\n}\n\nexport interface Response {\n    data: string | null;\n    error: Partial<Error> | null;\n}\n\nexport default (configuration: Configuration) => {\n    return createRawEventHandler<Payload, PbImportExportContext, Response>(\n        async ({ payload, context }) => {\n            switch (payload.type) {\n                case \"block\": {\n                    return await blocksHandler(configuration, payload, context);\n                }\n                case \"template\": {\n                    return await templatesHandler(configuration, payload, context);\n                }\n                default: {\n                    return await pagesHandler(configuration, payload, context);\n                }\n            }\n        }\n    );\n};\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AAAqE,eAqBrDA,aAA4B,IAAK;EAC7C,OAAO,IAAAC,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,QAAQD,OAAO,CAACE,IAAI;MAChB,KAAK,OAAO;QAAE;UACV,OAAO,MAAM,IAAAC,4BAAa,EAACL,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC/D;MACA,KAAK,UAAU;QAAE;UACb,OAAO,MAAM,IAAAG,kCAAgB,EAACN,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAClE;MACA;QAAS;UACL,OAAO,MAAM,IAAAI,0BAAY,EAACP,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;QAC9D;IAAC;EAET,CAAC,CACJ;AACL,CAAC;AAAA"}
+{"version":3,"names":["_handlerAws","require","_blocksHandler","_formsHandler","_templatesHandler","_default","configuration","createRawEventHandler","payload","context","security","withoutAuthorization","type","blocksHandler","formsHandler","templatesHandler","console","log","JSON","stringify","Error","exports","default"],"sources":["index.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport type { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { createRawEventHandler } from \"@webiny/handler-aws\";\nimport { blocksHandler } from \"~/export/process/blocksHandler\";\nimport { formsHandler } from \"~/export/process/formsHandler\";\nimport { templatesHandler } from \"~/export/process/templatesHandler\";\n\nexport interface Configuration {\n    handlers: {\n        process: string;\n        combine: string;\n    };\n}\n\nexport interface Payload {\n    taskId: string;\n    subTaskIndex: number;\n    type: string;\n    identity?: SecurityIdentity;\n}\n\nexport interface Response {\n    data: string | null;\n    error: Partial<Error> | null;\n}\n\nexport default (configuration: Configuration) => {\n    return createRawEventHandler<Payload, PbImportExportContext, Response>(\n        async ({ payload, context }) => {\n            return context.security.withoutAuthorization(() => {\n                switch (payload.type) {\n                    case \"block\": {\n                        return blocksHandler(configuration, payload, context);\n                    }\n                    case \"form\": {\n                        return formsHandler(configuration, payload, context);\n                    }\n                    case \"template\": {\n                        return templatesHandler(configuration, payload, context);\n                    }\n                    default: {\n                        console.log(\"Export PB process\", JSON.stringify(payload));\n                        throw new Error(\"Invalid type provided: pb process.\");\n                    }\n                }\n            });\n        }\n    );\n};\n"],"mappings":";;;;;;AAEA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAAqE,IAAAI,QAAA,GAqBrDC,aAA4B,IAAK;EAC7C,OAAO,IAAAC,iCAAqB,EACxB,OAAO;IAAEC,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC5B,OAAOA,OAAO,CAACC,QAAQ,CAACC,oBAAoB,CAAC,MAAM;MAC/C,QAAQH,OAAO,CAACI,IAAI;QAChB,KAAK,OAAO;UAAE;YACV,OAAO,IAAAC,4BAAa,EAACP,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACzD;QACA,KAAK,MAAM;UAAE;YACT,OAAO,IAAAK,0BAAY,EAACR,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UACxD;QACA,KAAK,UAAU;UAAE;YACb,OAAO,IAAAM,kCAAgB,EAACT,aAAa,EAAEE,OAAO,EAAEC,OAAO,CAAC;UAC5D;QACA;UAAS;YACLO,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAEC,IAAI,CAACC,SAAS,CAACX,OAAO,CAAC,CAAC;YACzD,MAAM,IAAIY,KAAK,CAAC,oCAAoC,CAAC;UACzD;MACJ;IACJ,CAAC,CAAC;EACN,CACJ,CAAC;AACL,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAjB,QAAA","ignoreList":[]}

package/export/process/templatesHandler.d.ts

@@ -1,5 +1,5 @@
-import { PbImportExportContext } from "../../types";
-import { Configuration, Payload, Response } from ".";
+import type { PbImportExportContext } from "../../types";
+import type { Configuration, Payload, Response } from "./";
 /**
  * Handles the export templates process workflow.
  */

package/export/process/templatesHandler.js

@@ -7,9 +7,9 @@ exports.templatesHandler = void 0;
 var _types = require("../../types");
 var _client = require("../../client");
 var _handlerGraphql = require("@webiny/handler-graphql");
-var _utils = require("../utils");
 var _mockSecurity = require("../../mockSecurity");
-var _utils2 = require("@webiny/utils");
+var _utils = require("@webiny/utils");
+var _PageTemplateExporter = require("./exporters/PageTemplateExporter");
 /**
  * Handles the export templates process workflow.
  */
@@ -37,7 +37,7 @@ const templatesHandler = async (configuration, payload, context) => {
      * Note: We're not going to DB for finding the next sub-task to process,
      * because the data might be out of sync due to GSI eventual consistency.
      */
-    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils2.zeroPad)(subTaskIndex, 5));
+    subTask = await pageBuilder.importExportTask.getSubTask(taskId, (0, _utils.zeroPad)(subTaskIndex, 5));
     /**
      * Base condition!!
      * Bail out early, if task not found or task's status is not "pending".
@@ -59,7 +59,11 @@ const templatesHandler = async (configuration, payload, context) => {
       templateId,
       exportTemplatesDataKey
     } = input;
-    const template = await pageBuilder.getPageTemplate(templateId);
+    const template = await pageBuilder.getPageTemplate({
+      where: {
+        id: templateId
+      }
+    });
     if (!template) {
       log(`Unable to load template "${templateId}"`);
       throw new _handlerGraphql.NotFoundError(`Unable to load template "${templateId}"`);
@@ -77,8 +81,8 @@ const templatesHandler = async (configuration, payload, context) => {
     });
     prevStatusOfSubTask = subTask.status;
     log(`Extracting template data and uploading to storage...`);
-    // Extract Template
-    const templateDataZip = await (0, _utils.exportTemplate)(template, exportTemplatesDataKey, fileManager);
+    const templateExporter = new _PageTemplateExporter.PageTemplateExporter(fileManager);
+    const templateDataZip = await templateExporter.execute(template, exportTemplatesDataKey);
     log(`Finish uploading zip...`);
     // Update task record in DB
     subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {
@@ -159,4 +163,6 @@ const templatesHandler = async (configuration, payload, context) => {
     error: null
   };
 };
-exports.templatesHandler = templatesHandler;
+exports.templatesHandler = templatesHandler;
+
+//# sourceMappingURL=templatesHandler.js.map

package/export/process/templatesHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["templatesHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","fileManager","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","templateId","exportTemplatesDataKey","template","getPageTemplate","NotFoundError","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","templateDataZip","exportTemplate","COMPLETED","message","key","Key","e","FAILED","name","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process"],"sources":["templatesHandler.ts"],"sourcesContent":["import { ImportExportTaskStatus, PbImportExportContext } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport { exportTemplate } from \"~/export/utils\";\nimport { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport { Configuration, Payload, Response } from \"~/export/process\";\n\n/**\n * Handles the export templates process workflow.\n */\nexport const templatesHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Templates Process Handler\");\n    const { pageBuilder, fileManager } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { templateId, exportTemplatesDataKey } = input;\n\n        const template = await pageBuilder.getPageTemplate(templateId);\n\n        if (!template) {\n            log(`Unable to load template \"${templateId}\"`);\n            throw new NotFoundError(`Unable to load template \"${templateId}\"`);\n        }\n\n        log(`Processing template key \"${templateId}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting template data and uploading to storage...`);\n        // Extract Template\n        const templateDataZip = await exportTemplate(template, exportTemplatesDataKey, fileManager);\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for template \"${template.id}\"`,\n                key: templateDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_PROCESS] Error => \", e.message);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual template zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current template error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AAEA;AAEA;AAGA;AACA;AACA;AACO,MAAMA,gBAAgB,GAAG,OAC5BC,aAA4B,EAC5BC,OAAgB,EAChBC,OAA8B,KACV;EACpB,MAAMC,GAAG,GAAGC,OAAO,CAACD,GAAG;EACvB,IAAIE,OAAO;EACX,IAAIC,aAAa,GAAG,IAAI;EACxB,IAAIC,mBAAmB,GAAGC,6BAAsB,CAACC,OAAO;EAExDN,GAAG,CAAC,0CAA0C,CAAC;EAC/C,MAAM;IAAEO,WAAW;IAAEC;EAAY,CAAC,GAAGT,OAAO;EAC5C,MAAM;IAAEU,MAAM;IAAEC,YAAY;IAAEC,IAAI;IAAEC;EAAS,CAAC,GAAGd,OAAO;EACxD;EACA;EACA,IAAAe,0BAAY,EAACD,QAAQ,EAAsBb,OAAO,CAAC;EACnD,IAAI;IACA;AACR;AACA;AACA;IACQG,OAAO,GAAG,MAAMK,WAAW,CAACO,gBAAgB,CAACC,UAAU,CAACN,MAAM,EAAE,IAAAO,eAAO,EAACN,YAAY,EAAE,CAAC,CAAC,CAAC;IACzF;AACR;AACA;AACA;IACQ,IAAI,CAACR,OAAO,IAAIA,OAAO,CAACe,MAAM,KAAKZ,6BAAsB,CAACC,OAAO,EAAE;MAC/DH,aAAa,GAAG,IAAI;MACpB,OAAO;QACHe,IAAI,EAAE,EAAE;QACRC,KAAK,EAAE;MACX,CAAC;IACL,CAAC,MAAM;MACHhB,aAAa,GAAG,KAAK;IACzB;IAEAH,GAAG,CAAE,uBAAsBE,OAAO,CAACkB,EAAG,EAAC,CAAC;IAExC,MAAM;MAAEC;IAAM,CAAC,GAAGnB,OAAO;IACzB,MAAM;MAAEoB,UAAU;MAAEC;IAAuB,CAAC,GAAGF,KAAK;IAEpD,MAAMG,QAAQ,GAAG,MAAMjB,WAAW,CAACkB,eAAe,CAACH,UAAU,CAAC;IAE9D,IAAI,CAACE,QAAQ,EAAE;MACXxB,GAAG,CAAE,4BAA2BsB,UAAW,GAAE,CAAC;MAC9C,MAAM,IAAII,6BAAa,CAAE,4BAA2BJ,UAAW,GAAE,CAAC;IACtE;IAEAtB,GAAG,CAAE,4BAA2BsB,UAAW,GAAE,CAAC;;IAE9C;IACApB,OAAO,GAAG,MAAMK,WAAW,CAACO,gBAAgB,CAACa,aAAa,CAAClB,MAAM,EAAEP,OAAO,CAACkB,EAAE,EAAE;MAC3EH,MAAM,EAAEZ,6BAAsB,CAACuB;IACnC,CAAC,CAAC;IACF;IACA,MAAMrB,WAAW,CAACO,gBAAgB,CAACe,WAAW,CAACpB,MAAM,EAAE;MACnDqB,UAAU,EAAE1B,mBAAmB;MAC/B2B,UAAU,EAAE1B,6BAAsB,CAACuB;IACvC,CAAC,CAAC;IACFxB,mBAAmB,GAAGF,OAAO,CAACe,MAAM;IAEpCjB,GAAG,CAAE,sDAAqD,CAAC;IAC3D;IACA,MAAMgC,eAAe,GAAG,MAAM,IAAAC,qBAAc,EAACT,QAAQ,EAAED,sBAAsB,EAAEf,WAAW,CAAC;IAC3FR,GAAG,CAAE,yBAAwB,CAAC;IAC9B;IACAE,OAAO,GAAG,MAAMK,WAAW,CAACO,gBAAgB,CAACa,aAAa,CAAClB,MAAM,EAAEP,OAAO,CAACkB,EAAE,EAAE;MAC3EH,MAAM,EAAEZ,6BAAsB,CAAC6B,SAAS;MACxChB,IAAI,EAAE;QACFiB,OAAO,EAAG,uCAAsCX,QAAQ,CAACJ,EAAG,GAAE;QAC9DgB,GAAG,EAAEJ,eAAe,CAACK;MACzB;IACJ,CAAC,CAAC;IACF;IACA,MAAM9B,WAAW,CAACO,gBAAgB,CAACe,WAAW,CAACpB,MAAM,EAAE;MACnDqB,UAAU,EAAE1B,mBAAmB;MAC/B2B,UAAU,EAAE1B,6BAAsB,CAAC6B;IACvC,CAAC,CAAC;IACF9B,mBAAmB,GAAGF,OAAO,CAACe,MAAM;EACxC,CAAC,CAAC,OAAOqB,CAAC,EAAE;IACRtC,GAAG,CAAC,sCAAsC,EAAEsC,CAAC,CAACH,OAAO,CAAC;IAEtD,IAAIjC,OAAO,IAAIA,OAAO,CAACkB,EAAE,EAAE;MACvB;AACZ;AACA;AACA;MACYlB,OAAO,GAAG,MAAMK,WAAW,CAACO,gBAAgB,CAACa,aAAa,CAAClB,MAAM,EAAEP,OAAO,CAACkB,EAAE,EAAE;QAC3EH,MAAM,EAAEZ,6BAAsB,CAACkC,MAAM;QACrCpB,KAAK,EAAE;UACHqB,IAAI,EAAEF,CAAC,CAACE,IAAI;UACZL,OAAO,EAAEG,CAAC,CAACH,OAAO;UAClBM,IAAI,EAAE;QACV;MACJ,CAAC,CAAC;;MAEF;MACA,MAAMlC,WAAW,CAACO,gBAAgB,CAACe,WAAW,CAACpB,MAAM,EAAE;QACnDqB,UAAU,EAAE1B,mBAAmB;QAC/B2B,UAAU,EAAE1B,6BAAsB,CAACkC;MACvC,CAAC,CAAC;MACFnC,mBAAmB,GAAGF,OAAO,CAACe,MAAM;IACxC;IAEA,OAAO;MACHC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHgB,OAAO,EAAEG,CAAC,CAACH;MACf;IACJ,CAAC;EACL,CAAC,SAAS;IACN;IACA,IAAIhC,aAAa,EAAE;MACfH,GAAG,CAAE,gCAA+BS,MAAO,EAAC,CAAC;MAC7C;MACA,MAAM,IAAAiC,2BAAmB,EAAiB;QACtC3C,OAAO;QACPyC,IAAI,EAAE3C,aAAa,CAAC8C,QAAQ,CAACC,OAAO;QACpC9C,OAAO,EAAE;UACLW,MAAM;UACNE,IAAI;UACJC,QAAQ,EAAEb,OAAO,CAAC8C,QAAQ,CAACC,WAAW;QAC1C,CAAC;QACDC,WAAW,EAAE;MACjB,CAAC,CAAC;IACN,CAAC,MAAM;MACH9C,OAAO,CAACD,GAAG,CAAE,8BAA6BU,YAAY,GAAG,CAAE,GAAE,CAAC;MAC9D;MACA,MAAM,IAAAgC,2BAAmB,EAAU;QAC/B3C,OAAO;QACPyC,IAAI,EAAE3C,aAAa,CAAC8C,QAAQ,CAACK,OAAO;QACpClD,OAAO,EAAE;UACLW,MAAM;UACNC,YAAY,EAAEA,YAAY,GAAG,CAAC;UAC9BC,IAAI;UACJC,QAAQ,EAAEb,OAAO,CAAC8C,QAAQ,CAACC,WAAW;QAC1C,CAAC;QACDC,WAAW,EAAE;MACjB,CAAC,CAAC;IACN;EACJ;EACA,OAAO;IACH7B,IAAI,EAAE,EAAE;IACRC,KAAK,EAAE;EACX,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["_types","require","_client","_handlerGraphql","_mockSecurity","_utils","_PageTemplateExporter","templatesHandler","configuration","payload","context","log","console","subTask","noPendingTask","prevStatusOfSubTask","ImportExportTaskStatus","PENDING","pageBuilder","fileManager","taskId","subTaskIndex","type","identity","mockSecurity","importExportTask","getSubTask","zeroPad","status","data","error","id","input","templateId","exportTemplatesDataKey","template","getPageTemplate","where","NotFoundError","updateSubTask","PROCESSING","updateStats","prevStatus","nextStatus","templateExporter","PageTemplateExporter","templateDataZip","execute","COMPLETED","message","key","Key","e","FAILED","name","code","invokeHandlerClient","handlers","combine","security","getIdentity","description","process","exports"],"sources":["templatesHandler.ts"],"sourcesContent":["import type { PbImportExportContext } from \"~/types\";\nimport { ImportExportTaskStatus } from \"~/types\";\nimport { invokeHandlerClient } from \"~/client\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport type { Payload as ExtractPayload } from \"../combine\";\nimport { mockSecurity } from \"~/mockSecurity\";\nimport type { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { zeroPad } from \"@webiny/utils\";\nimport type { Configuration, Payload, Response } from \"~/export/process\";\nimport { PageTemplateExporter } from \"~/export/process/exporters/PageTemplateExporter\";\n\n/**\n * Handles the export templates process workflow.\n */\nexport const templatesHandler = async (\n    configuration: Configuration,\n    payload: Payload,\n    context: PbImportExportContext\n): Promise<Response> => {\n    const log = console.log;\n    let subTask;\n    let noPendingTask = true;\n    let prevStatusOfSubTask = ImportExportTaskStatus.PENDING;\n\n    log(\"RUNNING Export Templates Process Handler\");\n    const { pageBuilder, fileManager } = context;\n    const { taskId, subTaskIndex, type, identity } = payload;\n    // Disable authorization; this is necessary because we call Page Builder CRUD methods which include authorization checks\n    // and this Lambda is invoked internally, without credentials.\n    mockSecurity(identity as SecurityIdentity, context);\n    try {\n        /*\n         * Note: We're not going to DB for finding the next sub-task to process,\n         * because the data might be out of sync due to GSI eventual consistency.\n         */\n        subTask = await pageBuilder.importExportTask.getSubTask(taskId, zeroPad(subTaskIndex, 5));\n        /**\n         * Base condition!!\n         * Bail out early, if task not found or task's status is not \"pending\".\n         */\n        if (!subTask || subTask.status !== ImportExportTaskStatus.PENDING) {\n            noPendingTask = true;\n            return {\n                data: \"\",\n                error: null\n            };\n        } else {\n            noPendingTask = false;\n        }\n\n        log(`Fetched sub task => ${subTask.id}`);\n\n        const { input } = subTask;\n        const { templateId, exportTemplatesDataKey } = input;\n\n        const template = await pageBuilder.getPageTemplate({ where: { id: templateId } });\n\n        if (!template) {\n            log(`Unable to load template \"${templateId}\"`);\n            throw new NotFoundError(`Unable to load template \"${templateId}\"`);\n        }\n\n        log(`Processing template key \"${templateId}\"`);\n\n        // Mark task status as PROCESSING\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.PROCESSING\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.PROCESSING\n        });\n        prevStatusOfSubTask = subTask.status;\n\n        log(`Extracting template data and uploading to storage...`);\n        const templateExporter = new PageTemplateExporter(fileManager);\n        const templateDataZip = await templateExporter.execute(template, exportTemplatesDataKey);\n\n        log(`Finish uploading zip...`);\n        // Update task record in DB\n        subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n            status: ImportExportTaskStatus.COMPLETED,\n            data: {\n                message: `Finish uploading data for template \"${template.id}\"`,\n                key: templateDataZip.Key\n            }\n        });\n        // Update stats in main task\n        await pageBuilder.importExportTask.updateStats(taskId, {\n            prevStatus: prevStatusOfSubTask,\n            nextStatus: ImportExportTaskStatus.COMPLETED\n        });\n        prevStatusOfSubTask = subTask.status;\n    } catch (e) {\n        log(\"[EXPORT_TEMPLATES_PROCESS] Error => \", e.message);\n\n        if (subTask && subTask.id) {\n            /**\n             * In case of error, we'll update the task status to \"failed\",\n             * so that, client can show notify the user appropriately.\n             */\n            subTask = await pageBuilder.importExportTask.updateSubTask(taskId, subTask.id, {\n                status: ImportExportTaskStatus.FAILED,\n                error: {\n                    name: e.name,\n                    message: e.message,\n                    code: \"EXPORT_FAILED\"\n                }\n            });\n\n            // Update stats in main task\n            await pageBuilder.importExportTask.updateStats(taskId, {\n                prevStatus: prevStatusOfSubTask,\n                nextStatus: ImportExportTaskStatus.FAILED\n            });\n            prevStatusOfSubTask = subTask.status;\n        }\n\n        return {\n            data: null,\n            error: {\n                message: e.message\n            }\n        };\n    } finally {\n        // Base condition!\n        if (noPendingTask) {\n            log(`No pending sub-task for task ${taskId}`);\n            // Combine individual template zip files.\n            await invokeHandlerClient<ExtractPayload>({\n                context,\n                name: configuration.handlers.combine,\n                payload: {\n                    taskId,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - combine\"\n            });\n        } else {\n            console.log(`Invoking PROCESS for task \"${subTaskIndex + 1}\"`);\n            // We want to continue with Self invocation no matter if current template error out.\n            await invokeHandlerClient<Payload>({\n                context,\n                name: configuration.handlers.process,\n                payload: {\n                    taskId,\n                    subTaskIndex: subTaskIndex + 1,\n                    type,\n                    identity: context.security.getIdentity()\n                },\n                description: \"Export templates - process - subtask\"\n            });\n        }\n    }\n    return {\n        data: \"\",\n        error: null\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/export/s3Stream.d.ts

@@ -1,31 +1,36 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { PassThrough, Readable } from "stream";
-import S3 from "aws-sdk/clients/s3";
+/// <reference types="node" />
+import type { Readable } from "stream";
+import type { ListObjectsOutput, DeleteObjectOutput, HeadObjectOutput } from "@webiny/aws-sdk/client-s3";
+import { S3 } from "@webiny/aws-sdk/client-s3";
+export type { ListObjectsOutput };
 declare class S3Stream {
     s3: S3;
     bucket: string;
     constructor();
-    getPresignedUrl(key: string): string;
+    getPresignedUrl(key?: string): Promise<string>;
     /**
      * We're checking if the file is accessible on S3 by getting object meta data.
      * It help us to filter files that we need to download as part of export data.
      * @param Key {string}
      */
     isFileAccessible(Key: string): Promise<boolean>;
-    getObjectHead(Key: string): Promise<S3.HeadObjectOutput>;
-    readStream(Key: string): Readable;
+    getObjectHead(Key: string): Promise<HeadObjectOutput>;
+    readStream(Key: string): Promise<Readable>;
     writeStream(Key: string, contentType?: string): {
-        streamPassThrough: PassThrough;
-        streamPassThroughUploadPromise: Promise<S3.ManagedUpload.SendData>;
+        streamPassThrough: import("stream").PassThrough;
+        /**
+         * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.
+         */
+        streamPassThroughUploadPromise: Promise<import("@webiny/aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
     };
     upload(params: {
         Key: string;
         ContentType: string;
         Body: Buffer;
-    }): Promise<S3.ManagedUpload.SendData>;
-    listObject(prefix: string): Promise<S3.ListObjectsOutput>;
-    deleteObject(key: string): Promise<S3.DeleteObjectOutput>;
+    }): Promise<void>;
+    listObject(prefix: string): Promise<ListObjectsOutput>;
+    deleteObject(key: string): Promise<DeleteObjectOutput>;
 }
 export declare const s3Stream: S3Stream;
-export {};

package/export/s3Stream.js

@@ -1,29 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.s3Stream = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _stream = require("stream");
-var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
+var _clientS = require("@webiny/aws-sdk/client-s3");
+var _libStorage = require("@webiny/aws-sdk/lib-storage");
 const ARCHIVE_CONTENT_TYPE = "application/zip";
 class S3Stream {
   constructor() {
-    (0, _defineProperty2.default)(this, "s3", void 0);
-    (0, _defineProperty2.default)(this, "bucket", void 0);
-    this.s3 = new _s.default({
+    this.s3 = new _clientS.S3({
       region: process.env.AWS_REGION
     });
     this.bucket = process.env.S3_BUCKET;
   }
   getPresignedUrl(key) {
-    return this.s3.getSignedUrl("getObject", {
+    return (0, _clientS.getSignedUrl)(this.s3, new _clientS.GetObjectCommand({
       Bucket: this.bucket,
-      Key: key,
-      Expires: 604800 // 1 week
+      Key: key
+    }), {
+      expiresIn: 604800 // 1 week
     });
   }
 
@@ -46,13 +43,14 @@ class S3Stream {
     return this.s3.headObject({
       Bucket: this.bucket,
       Key
-    }).promise();
+    });
   }
-  readStream(Key) {
-    return this.s3.getObject({
+  async readStream(Key) {
+    const response = await this.s3.send(new _clientS.GetObjectCommand({
       Bucket: this.bucket,
       Key
-    }).createReadStream();
+    }));
+    return response.Body;
   }
   writeStream(Key, contentType = ARCHIVE_CONTENT_TYPE) {
     const streamPassThrough = new _stream.Stream.PassThrough();
@@ -63,32 +61,38 @@ class S3Stream {
       ContentType: contentType,
       Key
     };
+    const upload = new _libStorage.Upload({
+      client: this.s3,
+      params
+    });
     return {
       streamPassThrough: streamPassThrough,
       /**
        * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.
        */
-      streamPassThroughUploadPromise: this.s3.upload(params).promise()
+      streamPassThroughUploadPromise: upload.done()
     };
   }
-  upload(params) {
-    return this.s3.upload((0, _objectSpread2.default)({
+  async upload(params) {
+    await this.s3.send(new _clientS.PutObjectCommand({
       ACL: "private",
-      Bucket: this.bucket
-    }, params)).promise();
+      Bucket: this.bucket,
+      ...params
+    }));
   }
   listObject(prefix) {
     return this.s3.listObjects({
       Bucket: this.bucket,
       Prefix: prefix
-    }).promise();
+    });
   }
   deleteObject(key) {
     return this.s3.deleteObject({
       Key: key,
       Bucket: this.bucket
-    }).promise();
+    });
   }
 }
-const s3Stream = new S3Stream();
-exports.s3Stream = s3Stream;
+const s3Stream = exports.s3Stream = new S3Stream();
+
+//# sourceMappingURL=s3Stream.js.map

package/export/s3Stream.js.map

@@ -1 +1 @@
-{"version":3,"names":["ARCHIVE_CONTENT_TYPE","S3Stream","constructor","s3","S3","region","process","env","AWS_REGION","bucket","S3_BUCKET","getPresignedUrl","key","getSignedUrl","Bucket","Key","Expires","isFileAccessible","getObjectHead","error","console","warn","log","headObject","promise","readStream","getObject","createReadStream","writeStream","contentType","streamPassThrough","Stream","PassThrough","params","ACL","Body","ContentType","streamPassThroughUploadPromise","upload","listObject","prefix","listObjects","Prefix","deleteObject","s3Stream"],"sources":["s3Stream.ts"],"sourcesContent":["import { Stream, PassThrough, Readable } from \"stream\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst ARCHIVE_CONTENT_TYPE = \"application/zip\";\n\nclass S3Stream {\n    s3: S3;\n    bucket: string;\n\n    constructor() {\n        this.s3 = new S3({\n            region: process.env.AWS_REGION as string\n        });\n        this.bucket = process.env.S3_BUCKET as string;\n    }\n\n    getPresignedUrl(key: string) {\n        return this.s3.getSignedUrl(\"getObject\", {\n            Bucket: this.bucket,\n            Key: key,\n            Expires: 604800 // 1 week\n        });\n    }\n\n    /**\n     * We're checking if the file is accessible on S3 by getting object meta data.\n     * It help us to filter files that we need to download as part of export data.\n     * @param Key {string}\n     */\n    async isFileAccessible(Key: string): Promise<boolean> {\n        try {\n            await this.getObjectHead(Key);\n            return true;\n        } catch (error) {\n            console.warn(`Error while fetching meta data for file \"${Key}\"`);\n            console.log(error);\n            return false;\n        }\n    }\n\n    getObjectHead(Key: string): Promise<S3.HeadObjectOutput> {\n        return this.s3.headObject({ Bucket: this.bucket, Key }).promise();\n    }\n\n    readStream(Key: string): Readable {\n        return this.s3.getObject({ Bucket: this.bucket, Key }).createReadStream();\n    }\n\n    writeStream(\n        Key: string,\n        contentType: string = ARCHIVE_CONTENT_TYPE\n    ): {\n        streamPassThrough: PassThrough;\n        streamPassThroughUploadPromise: Promise<S3.ManagedUpload.SendData>;\n    } {\n        const streamPassThrough = new Stream.PassThrough();\n\n        const params: S3.PutObjectRequest = {\n            ACL: \"private\",\n            Body: streamPassThrough,\n            Bucket: this.bucket,\n            ContentType: contentType,\n            Key\n        };\n\n        return {\n            streamPassThrough: streamPassThrough,\n            /**\n             * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.\n             */\n            streamPassThroughUploadPromise: this.s3.upload(params).promise()\n        };\n    }\n\n    upload(params: {\n        Key: string;\n        ContentType: string;\n        Body: Buffer;\n    }): Promise<S3.ManagedUpload.SendData> {\n        return this.s3\n            .upload({\n                ACL: \"private\",\n                Bucket: this.bucket,\n                ...params\n            })\n            .promise();\n    }\n\n    listObject(prefix: string): Promise<S3.ListObjectsOutput> {\n        return this.s3\n            .listObjects({\n                Bucket: this.bucket,\n                Prefix: prefix\n            })\n            .promise();\n    }\n\n    deleteObject(key: string): Promise<S3.DeleteObjectOutput> {\n        return this.s3.deleteObject({ Key: key, Bucket: this.bucket }).promise();\n    }\n}\n\nexport const s3Stream = new S3Stream();\n"],"mappings":";;;;;;;;;AAAA;AACA;AAEA,MAAMA,oBAAoB,GAAG,iBAAiB;AAE9C,MAAMC,QAAQ,CAAC;EAIXC,WAAW,GAAG;IAAA;IAAA;IACV,IAAI,CAACC,EAAE,GAAG,IAAIC,UAAE,CAAC;MACbC,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;IACxB,CAAC,CAAC;IACF,IAAI,CAACC,MAAM,GAAGH,OAAO,CAACC,GAAG,CAACG,SAAmB;EACjD;EAEAC,eAAe,CAACC,GAAW,EAAE;IACzB,OAAO,IAAI,CAACT,EAAE,CAACU,YAAY,CAAC,WAAW,EAAE;MACrCC,MAAM,EAAE,IAAI,CAACL,MAAM;MACnBM,GAAG,EAAEH,GAAG;MACRI,OAAO,EAAE,MAAM,CAAC;IACpB,CAAC,CAAC;EACN;;EAEA;AACJ;AACA;AACA;AACA;EACI,MAAMC,gBAAgB,CAACF,GAAW,EAAoB;IAClD,IAAI;MACA,MAAM,IAAI,CAACG,aAAa,CAACH,GAAG,CAAC;MAC7B,OAAO,IAAI;IACf,CAAC,CAAC,OAAOI,KAAK,EAAE;MACZC,OAAO,CAACC,IAAI,CAAE,4CAA2CN,GAAI,GAAE,CAAC;MAChEK,OAAO,CAACE,GAAG,CAACH,KAAK,CAAC;MAClB,OAAO,KAAK;IAChB;EACJ;EAEAD,aAAa,CAACH,GAAW,EAAgC;IACrD,OAAO,IAAI,CAACZ,EAAE,CAACoB,UAAU,CAAC;MAAET,MAAM,EAAE,IAAI,CAACL,MAAM;MAAEM;IAAI,CAAC,CAAC,CAACS,OAAO,EAAE;EACrE;EAEAC,UAAU,CAACV,GAAW,EAAY;IAC9B,OAAO,IAAI,CAACZ,EAAE,CAACuB,SAAS,CAAC;MAAEZ,MAAM,EAAE,IAAI,CAACL,MAAM;MAAEM;IAAI,CAAC,CAAC,CAACY,gBAAgB,EAAE;EAC7E;EAEAC,WAAW,CACPb,GAAW,EACXc,WAAmB,GAAG7B,oBAAoB,EAI5C;IACE,MAAM8B,iBAAiB,GAAG,IAAIC,cAAM,CAACC,WAAW,EAAE;IAElD,MAAMC,MAA2B,GAAG;MAChCC,GAAG,EAAE,SAAS;MACdC,IAAI,EAAEL,iBAAiB;MACvBhB,MAAM,EAAE,IAAI,CAACL,MAAM;MACnB2B,WAAW,EAAEP,WAAW;MACxBd;IACJ,CAAC;IAED,OAAO;MACHe,iBAAiB,EAAEA,iBAAiB;MACpC;AACZ;AACA;MACYO,8BAA8B,EAAE,IAAI,CAAClC,EAAE,CAACmC,MAAM,CAACL,MAAM,CAAC,CAACT,OAAO;IAClE,CAAC;EACL;EAEAc,MAAM,CAACL,MAIN,EAAsC;IACnC,OAAO,IAAI,CAAC9B,EAAE,CACTmC,MAAM;MACHJ,GAAG,EAAE,SAAS;MACdpB,MAAM,EAAE,IAAI,CAACL;IAAM,GAChBwB,MAAM,EACX,CACDT,OAAO,EAAE;EAClB;EAEAe,UAAU,CAACC,MAAc,EAAiC;IACtD,OAAO,IAAI,CAACrC,EAAE,CACTsC,WAAW,CAAC;MACT3B,MAAM,EAAE,IAAI,CAACL,MAAM;MACnBiC,MAAM,EAAEF;IACZ,CAAC,CAAC,CACDhB,OAAO,EAAE;EAClB;EAEAmB,YAAY,CAAC/B,GAAW,EAAkC;IACtD,OAAO,IAAI,CAACT,EAAE,CAACwC,YAAY,CAAC;MAAE5B,GAAG,EAAEH,GAAG;MAAEE,MAAM,EAAE,IAAI,CAACL;IAAO,CAAC,CAAC,CAACe,OAAO,EAAE;EAC5E;AACJ;AAEO,MAAMoB,QAAQ,GAAG,IAAI3C,QAAQ,EAAE;AAAC"}
+{"version":3,"names":["_stream","require","_clientS","_libStorage","ARCHIVE_CONTENT_TYPE","S3Stream","constructor","s3","S3","region","process","env","AWS_REGION","bucket","S3_BUCKET","getPresignedUrl","key","getSignedUrl","GetObjectCommand","Bucket","Key","expiresIn","isFileAccessible","getObjectHead","error","console","warn","log","headObject","readStream","response","send","Body","writeStream","contentType","streamPassThrough","Stream","PassThrough","params","ACL","ContentType","upload","Upload","client","streamPassThroughUploadPromise","done","PutObjectCommand","listObject","prefix","listObjects","Prefix","deleteObject","s3Stream","exports"],"sources":["s3Stream.ts"],"sourcesContent":["import type { Readable } from \"stream\";\nimport { Stream } from \"stream\";\nimport type {\n    ListObjectsOutput,\n    DeleteObjectOutput,\n    HeadObjectOutput,\n    PutObjectCommandInput\n} from \"@webiny/aws-sdk/client-s3\";\nimport { S3, getSignedUrl, GetObjectCommand, PutObjectCommand } from \"@webiny/aws-sdk/client-s3\";\nimport { Upload } from \"@webiny/aws-sdk/lib-storage\";\n\nexport type { ListObjectsOutput };\n\nconst ARCHIVE_CONTENT_TYPE = \"application/zip\";\n\nclass S3Stream {\n    s3: S3;\n    bucket: string;\n\n    constructor() {\n        this.s3 = new S3({\n            region: process.env.AWS_REGION as string\n        });\n        this.bucket = process.env.S3_BUCKET as string;\n    }\n\n    getPresignedUrl(key?: string) {\n        return getSignedUrl(\n            this.s3,\n            new GetObjectCommand({\n                Bucket: this.bucket,\n                Key: key\n            }),\n            {\n                expiresIn: 604800 // 1 week\n            }\n        );\n    }\n\n    /**\n     * We're checking if the file is accessible on S3 by getting object meta data.\n     * It help us to filter files that we need to download as part of export data.\n     * @param Key {string}\n     */\n    async isFileAccessible(Key: string): Promise<boolean> {\n        try {\n            await this.getObjectHead(Key);\n            return true;\n        } catch (error) {\n            console.warn(`Error while fetching meta data for file \"${Key}\"`);\n            console.log(error);\n            return false;\n        }\n    }\n\n    getObjectHead(Key: string): Promise<HeadObjectOutput> {\n        return this.s3.headObject({ Bucket: this.bucket, Key });\n    }\n\n    async readStream(Key: string): Promise<Readable> {\n        const response = await this.s3.send(new GetObjectCommand({ Bucket: this.bucket, Key }));\n        return response.Body as Readable;\n    }\n\n    writeStream(Key: string, contentType: string = ARCHIVE_CONTENT_TYPE) {\n        const streamPassThrough = new Stream.PassThrough();\n\n        const params: PutObjectCommandInput = {\n            ACL: \"private\",\n            Body: streamPassThrough,\n            Bucket: this.bucket,\n            ContentType: contentType,\n            Key\n        };\n\n        const upload = new Upload({\n            client: this.s3,\n            params\n        });\n\n        return {\n            streamPassThrough: streamPassThrough,\n            /**\n             * We're not using the `FileManager` storage plugin here because it currently doesn't support streams.\n             */\n            streamPassThroughUploadPromise: upload.done()\n        };\n    }\n\n    async upload(params: { Key: string; ContentType: string; Body: Buffer }): Promise<void> {\n        await this.s3.send(\n            new PutObjectCommand({\n                ACL: \"private\",\n                Bucket: this.bucket,\n                ...params\n            })\n        );\n    }\n\n    listObject(prefix: string): Promise<ListObjectsOutput> {\n        return this.s3.listObjects({\n            Bucket: this.bucket,\n            Prefix: prefix\n        });\n    }\n\n    deleteObject(key: string): Promise<DeleteObjectOutput> {\n        return this.s3.deleteObject({ Key: key, Bucket: this.bucket });\n    }\n}\n\nexport const s3Stream = new S3Stream();\n"],"mappings":"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","ignoreList":[]}

package/export/utils.d.ts

@@ -1,22 +1,24 @@
-import S3 from "aws-sdk/clients/s3";
-import { Page, PageBlock, PageTemplate } from "@webiny/api-page-builder/types";
-import { FileManagerContext, File } from "@webiny/api-file-manager/types";
+import type { CompleteMultipartUploadOutput } from "@webiny/aws-sdk/client-s3";
+import type { BlockCategory, Page, PageBlock, PageTemplate } from "@webiny/api-page-builder/types";
+import type { FileManagerContext, File } from "@webiny/api-file-manager/types";
 export declare const EXPORT_PAGES_FOLDER_KEY = "WEBINY_PB_EXPORT_PAGES";
 export declare const EXPORT_BLOCKS_FOLDER_KEY = "WEBINY_PB_EXPORT_BLOCK";
 export declare const EXPORT_TEMPLATES_FOLDER_KEY = "WEBINY_PB_EXPORT_TEMPLATE";
+export declare const EXPORT_FORMS_FOLDER_KEY = "WEBINY_FB_EXPORT_FORM";
 export interface ExportedPageData {
     page: Pick<Page, "content" | "title" | "version" | "status" | "settings" | "path">;
     files: File[];
 }
-export declare function exportPage(page: Page, exportPagesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
+export declare function exportPage(page: Page, exportPagesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<CompleteMultipartUploadOutput>;
 export interface ExportedBlockData {
-    block: Pick<PageBlock, "name" | "content" | "preview">;
+    block: Pick<PageBlock, "name" | "content">;
+    category: BlockCategory;
     files: File[];
 }
-export declare function exportBlock(block: PageBlock, exportBlocksDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
+export declare function exportBlock(block: PageBlock, blockCategory: BlockCategory, exportBlocksDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<CompleteMultipartUploadOutput>;
 export interface ExportedTemplateData {
-    template: Pick<PageTemplate, "title" | "description" | "content">;
+    template: Pick<PageTemplate, "title" | "slug" | "tags" | "description" | "content" | "layout" | "pageCategory" | "dataSources" | "dataBindings">;
     files: File[];
 }
-export declare function exportTemplate(template: PageTemplate, exportTemplatesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<S3.ManagedUpload.SendData>;
-export declare function extractFilesFromData(data: Record<string, any>, files?: any[]): File[];
+export declare function exportTemplate(template: PageTemplate, exportTemplatesDataKey: string, fileManager: FileManagerContext["fileManager"]): Promise<CompleteMultipartUploadOutput>;
+export declare function extractFilesFromData(data: Record<string, any>, files?: File[]): File[];

package/export/utils.js

@@ -4,19 +4,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EXPORT_TEMPLATES_FOLDER_KEY = exports.EXPORT_PAGES_FOLDER_KEY = exports.EXPORT_BLOCKS_FOLDER_KEY = void 0;
+exports.EXPORT_TEMPLATES_FOLDER_KEY = exports.EXPORT_PAGES_FOLDER_KEY = exports.EXPORT_FORMS_FOLDER_KEY = exports.EXPORT_BLOCKS_FOLDER_KEY = void 0;
 exports.exportBlock = exportBlock;
 exports.exportPage = exportPage;
 exports.exportTemplate = exportTemplate;
 exports.extractFilesFromData = extractFilesFromData;
 var _get = _interopRequireDefault(require("lodash/get"));
 var _zipper = _interopRequireDefault(require("./zipper"));
-const EXPORT_PAGES_FOLDER_KEY = "WEBINY_PB_EXPORT_PAGES";
-exports.EXPORT_PAGES_FOLDER_KEY = EXPORT_PAGES_FOLDER_KEY;
-const EXPORT_BLOCKS_FOLDER_KEY = "WEBINY_PB_EXPORT_BLOCK";
-exports.EXPORT_BLOCKS_FOLDER_KEY = EXPORT_BLOCKS_FOLDER_KEY;
-const EXPORT_TEMPLATES_FOLDER_KEY = "WEBINY_PB_EXPORT_TEMPLATE";
-exports.EXPORT_TEMPLATES_FOLDER_KEY = EXPORT_TEMPLATES_FOLDER_KEY;
+const EXPORT_PAGES_FOLDER_KEY = exports.EXPORT_PAGES_FOLDER_KEY = "WEBINY_PB_EXPORT_PAGES";
+const EXPORT_BLOCKS_FOLDER_KEY = exports.EXPORT_BLOCKS_FOLDER_KEY = "WEBINY_PB_EXPORT_BLOCK";
+const EXPORT_TEMPLATES_FOLDER_KEY = exports.EXPORT_TEMPLATES_FOLDER_KEY = "WEBINY_PB_EXPORT_TEMPLATE";
+const EXPORT_FORMS_FOLDER_KEY = exports.EXPORT_FORMS_FOLDER_KEY = "WEBINY_FB_EXPORT_FORM";
 async function exportPage(page, exportPagesDataKey, fileManager) {
   // Extract all files
   const files = extractFilesFromData(page.content || {});
@@ -26,8 +24,10 @@ async function exportPage(page, exportPagesDataKey, fileManager) {
   // Get file data for all images
   const imageFilesData = [];
   if (fileIds.length > 0) {
-    const [filesData] = await fileManager.files.listFiles({
-      ids: fileIds
+    const [filesData] = await fileManager.listFiles({
+      where: {
+        id_in: fileIds
+      }
     });
     imageFilesData.push(...filesData);
   }
@@ -55,29 +55,32 @@ async function exportPage(page, exportPagesDataKey, fileManager) {
   });
   return zipper.process();
 }
-async function exportBlock(block, exportBlocksDataKey, fileManager) {
+async function exportBlock(block, blockCategory, exportBlocksDataKey, fileManager) {
   // Extract all files
   const files = extractFilesFromData(block.content || {});
   const fileIds = files.map(imageFile => imageFile.id);
   // Get file data for all images
   const imageFilesData = [];
   if (fileIds.length > 0) {
-    const [filesData] = await fileManager.files.listFiles({
-      ids: fileIds
+    const [filesData] = await fileManager.listFiles({
+      where: {
+        id_in: fileIds
+      }
     });
     imageFilesData.push(...filesData);
   }
-  // Add block preview image file data
-  if (block.preview.id) {
-    imageFilesData.push(await fileManager.files.getFile(block.preview.id));
-  }
 
   // Extract the block data in a json file and upload it to S3
   const blockData = {
     block: {
       name: block.name,
-      content: block.content,
-      preview: block.preview
+      content: block.content
+    },
+    category: {
+      name: blockCategory.name,
+      slug: blockCategory.slug,
+      icon: blockCategory.icon,
+      description: blockCategory.description
     },
     files: imageFilesData
   };
@@ -99,8 +102,10 @@ async function exportTemplate(template, exportTemplatesDataKey, fileManager) {
   // Get file data for all images
   const imageFilesData = [];
   if (fileIds.length > 0) {
-    const [filesData] = await fileManager.files.listFiles({
-      ids: fileIds
+    const [filesData] = await fileManager.listFiles({
+      where: {
+        id_in: fileIds
+      }
     });
     imageFilesData.push(...filesData);
   }
@@ -109,8 +114,14 @@ async function exportTemplate(template, exportTemplatesDataKey, fileManager) {
   const templateData = {
     template: {
       title: template.title,
+      slug: template.slug,
+      tags: template.tags,
       description: template.description,
-      content: template.content
+      content: template.content,
+      layout: template.layout,
+      pageCategory: template.pageCategory,
+      dataSources: template.dataSources,
+      dataBindings: template.dataBindings
     },
     files: imageFilesData
   };
@@ -126,10 +137,10 @@ async function exportTemplate(template, exportTemplatesDataKey, fileManager) {
   return zipper.process();
 }
 function extractFilesFromData(data, files = []) {
-  // Base case: termination
   if (!data || typeof data !== "object") {
     return files;
   }
+
   // Recursively call function for each element
   if (Array.isArray(data)) {
     for (let i = 0; i < data.length; i++) {
@@ -143,7 +154,6 @@ function extractFilesFromData(data, files = []) {
   const tuple = Object.entries(data);
   for (let i = 0; i < tuple.length; i++) {
     const [key, value] = tuple[i];
-    // TODO: @ashutosh extract it to plugins, so that, we can handle cases for other components too.
     if (key === "file" && value) {
       files.push(value);
     } else if (key === "images" && Array.isArray(value)) {
@@ -154,4 +164,6 @@ function extractFilesFromData(data, files = []) {
     }
   }
   return files;
-}
+}
+
+//# sourceMappingURL=utils.js.map